diff --git a/CREDITS.md b/CREDITS.md index 88e237d5a0..adda65f5e1 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -1,7 +1,7 @@ Credits ======= -*Copyright (C) 1998-2018 OpenLink Software * +*Copyright (C) 1998-2019 OpenLink Software * Included Functionality diff --git a/ChangeLog b/ChangeLog index d027ddc713..9ac324717c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,260 @@ +2018-10-02 Patrick van Kleef + + Updated version to 7.2.6-rc1 + + Fixed issue building with --debug-mtx + + Moved binsrc/yacutia binsrc/conductor + + Fixed missing variable declaration + +2018-10-02 Patrick van Kleef + + Revert "Fixed use TTLP_V" + + This reverts commit 33568d4754b3d94b6049bb6bed38e9d30a7cb071. + +2018-10-01 Patrick van Kleef + + Merge branch 'feature/fct_fixes' into develop/7 + + Renamed binsrc/b3s to binsrc/fct + + Updated VAD version + + Fixed issue "Value of ANY type column too long" with long shapes + + Fixed error handling + + Fixed do counts separately instead of using UNION to avoid issue with expected/generated columns error + + Fixed i18n issue + + Fixed bad check + + Fixed use TTLP_V + + Disabled unwanted 'extra' decoding + + Fixed bad URL encoding in tabs + + Fixed URL encoding in pager + + Fixed redirect URL encoding after sponging + + Fixed missing call to onchange so page refreshes when Show x rows selector changes + + Fixed typo + + Added function urilbl_ac_init_state to reflect state of Entity Data generation + + Fixed disable input fields to goto specific page if there is only a single page + + Added check to make sure page is in range 0 .. last + + Added guard against shortning already short URLs + + Fixed issues loading insecure content into secure page + + Fixed use https:// to work well with secure pages + + Fixed issues with https in /describe content negotiation Alternates and Location headers + + Fixed move usual proxyIRI-handling above embedded fragments + + Fixed missing css + + Added support for optionally tagging links as 'nofollow' + + Added preview snippet for embedded content + + Fixed issues with /describe page behind a (ssl) proxy + + Fixed issues in b3s_get_types on weird data + + Fixed issues using current prefixes for DBpedia in demos + + Commented out debug lines + + Fixed use RDFa instead of microdata + + Commented out test code + + Added statistics about users of IRI as subject or object in graph to Metadata page + + Added support for IRIs from RDFviews + + Fixed i18n issues in fct + + Added timeout to the sparql query + + Fixed types are always IRIs not a number or literal + + Fixed fct_pretty_print could alter text inside strings leadign to mssing records in /sparql call + + Fixed plink + + Fixed show lang type in font + + Fixed show language if available + +2018-09-29 Patrick van Kleef + + Fixed compiler warning + + Removed duplicate memset + + Fixed wrong sizeof potentially resulting in read io overhead + + Fixed handling of empty and invalid geometries in exporter of geo_t to geos::geom::Geometry and in DE9-IM relate() + +2018-09-24 Patrick van Kleef + + Merge branch 'feature/jdbc_cleanup' into develop/7 + + Rebuild JDBC drivers + + Updated JDBC driver version + + Files to ignore + + Removed old ifdefs + + Regenerated JDBC drivers + + Updated JDBC driver version + + Renamed default namespace from jdbc2 to jdbc4 + + Fixed spelling removing dangling quote e.g. cann't to cannot + + Moved SSL support into the regular driver to save disk space + + Removed support for JDK 1.1, 1.2, 1.3, 1.4 and 1.5 + + Fixed missign source file + +2018-09-23 Sergey Malinin + + Fix close() for PreparedStatement + +2018-09-21 VOS Maintainer + + Fixed issue with LDP POST command + + Fixed LDP folder content return (by GET) + +2018-09-20 Patrick van Kleef + + Fixed typos + + Added new README.GeoSPARQL.md to documentation list + + Added initial README for GeoSPARQL functionality + + Added missing file + + Merge branch 'feature/geosparql_port' into develop/7 + + Fixed order of libraries checked for tgetent to use with -ledit + + Add plugin names to BUILD_OPTS when libraries check out + + Fixed portability issues with testing features from libraries + + Fixed portability + + Added /usr/share/proj to allowed dirs for proj4 init + + Fixed small issues building plugins + + Added missing X509_STRING_DATE + + Fixed indentation + + Added stubs for single thread rwlock + + Added more functions for plugin usage + + Added option to pass extra include file to generated c code + + Fixed conflict with GROUPING keyword and langinfo.h + +2018-09-18 Patrick van Kleef + + Merge branch 'feature/geosparql_plugins' into develop/7 + + Updated engine version to 3230 + + Added proj4, geos and shapefileio plugins to build environment + +2018-09-18 Ivan Mikhailov + + Initial merge of GeoSPARQL functionaly into VOS + + Fixed issues with C++ compiler + +2018-09-18 Patrick van Kleef + + Fixed namespace check for bif: and sql: and issues with system functions + + Fixed issues using plugins with C++ compiler + + Updated dict to use rwlock instead of mutex + + Fixed issue building on windows + + Merge branch 'feature/ssl' into develop/7 + + Fixed default cipher list + + Fixed issues with SSL_CTX options + + Fixed set default protocol to TLSv1.2 or newer when possible + + Added support for Strict-Transport-Security header + + Added check to make sure RPNG is properly seeded + + Added support for Forward Secrecy using DH and ECDH + + Fixed issue setting cipherlist on https ctx + +2018-08-16 Patrick van Kleef + + Merge tag 'v7.2.5.1' into develop/7 + + Tagged v7.2.5.1 for release + +2018-08-16 Patrick van Kleef + + Merge branch 'hotfix/7.2.5.1' into stable/7 + + Fixed issue installing duplicate doc files + +2018-08-15 Patrick van Kleef + + Started new development cycle 7.2.6-dev + +2018-08-15 Patrick van Kleef + + Merge tag 'v7.2.5' into develop/7 + + Tagged version 7.2.5 as next stable release + 2018-08-15 Patrick van Kleef + Merge branch 'release/7.2.5' into stable/7 + + Updated changelog + Updated version to 7.2.5.3229 for stable release Fixed layout of binary .tar.gz file 2018-08-15 Sergey Malinin - Fixed VS projects + Fix VS projects 2018-08-15 Patrick van Kleef diff --git a/LICENSE.md b/LICENSE.md index 05272a1c10..201c2cfb5e 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,7 +1,7 @@ License ======= -*Copyright (C) 1998-2018 OpenLink Software * +*Copyright (C) 1998-2019 OpenLink Software * OpenLink Software's Virtuoso Open-Source (VOS) project ------------------------------------------------------ diff --git a/Makefile.am b/Makefile.am index b23dc75d01..f2167f2869 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -39,6 +39,7 @@ dist_doc_DATA = \ $(srcdir)/NEWS.md \ $(srcdir)/README \ $(srcdir)/README.GIT.md \ + $(srcdir)/README.GeoSPARQL.md \ $(srcdir)/README.hibernate.md \ $(srcdir)/README.jena.md \ $(srcdir)/README.jsse.md \ diff --git a/NEWS.md b/NEWS.md index 90b92cf63f..e63c982ac0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,50 @@ NEWS ==== +October 2, 2018, v7.2.6-dev: +---------------------------- + + * Virtuoso Engine + - Added new plugins proj4, geos and shapefileio for GeoSPARQL + - Added support for Strict-Transport-Security header + - Added check to make sure RPNG is properly seeded + - Added support for Forward Secrecy using DH and ECDH + - Added missing X509_STRING_DATE + - Added support for rwlock in dict + - Fixed default cipher list + - Fixed issues with SSL_CTX options + - Fixed set default protocol to TLSv1.2 or newer when possible + - Fixed issue setting cipherlist on https ctx + + * SPARQL + - Added initial support for GeoSPARQL functions + - Fixed namespace check for bif: and sql: and issues with system functions + + * JDBC Driver + - Fixed issue with closing stmt handle in PreparedStatement + - Removed support for deprecated versions of JDKs 1.1, 1.2, 1.3, 1.4 and 1.5 + - Moved SSL connectivity into regular jdbc drivers + + * Faceted Browser + - Added page to show state of Entity Data generation + - Added preview for embedded content + - Added statistics about users of IRI as subject or object in graph to Metadata page + - Added support for IRIs from RDFviews + - Fixed number of i18n issues with URL encodings in /describe + - Fixed issues with long values such as geo shapes + - Fixed issue with pager in /describe + - Fixed issue with page refresh when Show x rows selector changes + - Fixed issues with https in /describe content negotiation in Alternates and Location headers + - Fixed issues with /describe page behind a (ssl) proxy + + * Conductor + - Moved binsrc/yacutia binsrc/conductor + + * DAV + - Fixed issue with LDP POST command + - Fixed LDP folder content return (by GET) + + August 15, 2018, v7.2.5 ----------------------- * Virtuoso Engine diff --git a/README b/README index 50401bedad..eb4db8e6b5 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ Virtuoso Open-Source Edition: Building ====================================== -Copyright (C) 1998-2018 OpenLink Software +Copyright (C) 1998-2019 OpenLink Software Table of Contents @@ -54,17 +54,21 @@ Introduction This document explains steps to take after obtaining a Virtuoso source snapshot or git clone. -These sections explain how to compile, test and install and what -components are produced by the make process and how one can interact -with them. +These sections explain how to compile, test, and install; what components +are produced by the make process; and how one can interact with them. Package Dependencies ==================== To generate the configure script and all other build files necessary, -please make sure the following packages and recommended versions are -installed on your system. +please make sure the following packages and recommended versions (and +any GNU packages required by these) are installed on your system. + +*NOTE* - The versions listed below are the _minimum_ recommended versions +of these packages. Older version can sometimes be used, but could cause +build problems. Newer versions are usually fine, with exceptions as +discussed further below (e.g., OpenSSL). Package Version From ------- ------- ---- @@ -72,23 +76,18 @@ installed on your system. automake 1.9 http://www.gnu.org/software/automake/ libtool 1.5.16 http://www.gnu.org/software/libtool/ flex 2.5.33 (was 2.5.4) http://www.gnu.org/software/non-gnu/flex/ - bison 2.3 (was 1.35) http://www.gnu.org/software/bison/ + bison 2.3 (was 1.35) http://www.gnu.org/software/bison/ gperf 2.7.2 http://www.gnu.org/software/gperf/ gawk 3.1.1 http://www.gnu.org/software/gawk/ m4 1.4.1 http://www.gnu.org/software/m4/ make 3.79.1 http://www.gnu.org/software/make/ - OpenSSL 0.9.8e http://www.openssl.org/ - -and any GNU packages required by these. The autogen.sh and configure -scripts check for the presence and right version of some of the required -components. + OpenSSL 0.9.8e (max 1.0.x) http://www.openssl.org/ -The above version are the minimum recommended versions of these packages. -Older version of these packages can sometimes be used, but could cause -build problems. +The `autogen.sh` and `configure` scripts check the presence and version +of some of the required components. -To check the version number of the tools installed on your system, -use one of the following commands: +You can use the following commands to check the versions of the tools +installed on your system: $ autoconf --version $ automake --version @@ -101,73 +100,99 @@ use one of the following commands: $ make --version $ openssl version -If you have an older version than automake version 1.9 you can edit -the configure.ac script around line 47 using the examples provided for +If you have an `automake` version older than 1.9, you can edit the +`configure.ac` script around line 47 using the examples provided for each version. -Note that uptodate operating systems (particularly all Linux distibutions) -split some of these packages into runtime and development -packages, so users of these platforms may need to run e.g.: +Note that current operating systems (particularly all Linux distibutions) +split some of these packages into runtime and development packages, so +users of these platforms may need to run, for instance, one of the +following commands to get development headers & libraries for OpenSSL, +even if OpenSSL runtime components are already present: apt-get install libssl-dev -or +-- or -- + + yum install openssl-devel + +**NOTE** OpenSSL 1.1 cannot currently be used to build Virtuoso, due to +significant changes relative to prior versions. The necessary commands +to get the OpenSSL 1.0 development tools vary with the specific Linux +distribution and package manager. For instance -- + +* apt (common on Debian) -- + + sudo apt install libssl1.0-dev + + -- or -- + + sudo apt-get install libssl1.0-dev - yum install openssl-devel +* yum (common on older versions of Fedora) -to get development headers & libraries for OpenSSL. + yum install openssl-devel + +* dnf (common on recent versions of Fedora) -- + + - before building Virtuoso -- + + sudo dnf install compat-openssl10-devel --allowerasing + + - after building Virtuoso, before building anything else that + requires OpenSSL 1.1 -- + + sudo dnf install openssl-devel --allowerasing Diskspace Requirements ====================== -The build produces a demo database and Virtuoso application packages -that are quite large. At least 800 MB of free space should be available -in the build file system. +The complete build produces a demo database and Virtuoso application +packages that are quite large. At least 800 MB of free space should be +available in the build file system. -When running `make install', the target file system should have about 460 -MB free. By default, the install target directories are under /usr/local/, -but you can specify +When running `make install`, the target file system should have about +460 MB free. By default, the install target directories are under +`/usr/local/`, but you can specify something different with -- ./configure --prefix=/path/to/dir -instead. - The minimum working configuration consists of the server executable -and config files plus database, no more than a few MB for the server -executable, depending on platform and options. +(generally only a few MB, depending on platform and options) and +config files plus database. Make FAQ ======== -In the root directory of the checkout perform the following commands: +In the root directory of the checkout, perform the following commands +to produce the default binaries, VAD packages, and demo database: ./autogen.sh # should only be needed in git clone ./configure make -to produce the default binaries, VAD packages and demo database. This -takes some time, principally due to building and filling the demo -database, rendering the XML documentation into several target formats -and composing various Virtuoso application packages. It takes about 30 -minutes on a 2GHz machine. +This will take some time, principally due to building and filling the +demo database, rendering the XML documentation into several target +formats, and composing various Virtuoso application packages. It takes +about 30 minutes on a 2GHz machine. -The default configure does not enable most of the runtime-hosting and -extension features. See the links on the building page for instructions -on how to enable these and what additional software is required. +The default `configure` does not enable most of the runtime-hosting and +extension features. See the building page for instructions on how to +enable these and for notes about what additional software is required. -Some builds require additional C compiler and other environment flags to -be set before running the configure command, especially when building -64-bit versions of the server. If your system is not in this list, -please try to run the configure command without any environment settings. +Some builds require additional `C` compiler and other environment flags +to be set before running the configure command, especially when building +64-bit versions of the server. If your system is not in the list below, +try running the `configure` command without any environment settings. -Warning: if VAD or other packages fail to be built, especially on -64-bit Linux platforms, ensure you're not using excessive optimization. -CFLAGS="-O2" is known to work but there are reports of -O3 failing. +Warning: Some packages may fail to build, especially on 64-bit Linux +platforms, when using excessive optimization. `CFLAGS="-O2"` is known +to work, but there are reports of `CFLAGS="-O3"` failing. -If your system requires additional flags not listed below, please contact -us at . +If your system requires additional flags not listed below, please +contact us at . Generic build environment ------------------------- @@ -292,7 +317,7 @@ Mac OS X 10.5 64-bit export CFLAGS ./configure ... -Mac OS X 10.5 Universal +Mac OS X 10.5 Universal ----------------------- CFLAGS="-O -isysroot /Developer/SDKs/MacOSX10.5.sdk -arch ppc -arch i386 -arch ppc64 -arch x86_64 -mmacosx-version-min=10.5" export CFLAGS @@ -310,7 +335,7 @@ Mac OS X 10.6 64-bit export CFLAGS ./configure ... -Mac OS X 10.6 Universal +Mac OS X 10.6 Universal ----------------------- CFLAGS="-O -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -mmacosx-version-min=10.6" export CFLAGS @@ -328,7 +353,7 @@ Mac OS X 10.7 64-bit export CFLAGS ./configure ... -Mac OS X 10.7 Universal +Mac OS X 10.7 Universal ----------------------- CFLAGS="-O -arch i386 -arch x86_64 -mmacosx-version-min=10.7" export CFLAGS @@ -336,9 +361,8 @@ Mac OS X 10.7 Universal Solaris 2.x i386 32-bit ----------------------- -Note: on Solaris or Open Solaris we recommend you use gmake either from -/usr/ sfw/bin/ or install it from sunfreeware, as long as it's version -3.80 or better. +Note: on Solaris or Open Solaris we recommend you use gmake version +3.80 or better, from /usr/sfw/bin/ or installed from sunfreeware. CC=cc CFLAGS="-O" @@ -381,104 +405,111 @@ Solaris 2.8 and above SPARC 32-bit Installation ============ -After running configure && make, +After running `configure` and `make`, running the following command at +the root of the build tree copies the files to the location specified by +the `--prefix` option to `configure`: make install -at the root of the build tree copies the files to the locations -specified by the --prefix option to configure. The default of --prefix -is /usr/local/. You can override this by specifying `make install -prefix=/home/virtuoso' instead, for example. +You can override the `--prefix` set with `configure` (including the +default, `/usr/local/`) for the `make install` with a command like -- + + make install prefix=/home/virtuoso -These subdirectories are all appended to the specified prefix, -i.e. /usr/local/ by default: +Several subdirectories are created and/or populated below the specified +prefix (whether `/usr/local/`, `/home/virtuoso/`, or otherwise), with +contents as noted: * share/virtuoso/doc/html * share/virtuoso/doc/pdf - * share/virtuoso/vad - VAD packages BPEL, Conductor, tutorials, documentation + * share/virtuoso/vad - VAD packages including BPEL, Conductor, tutorials, + and documentation * var/lib/virtuoso/db - Empty database - * var/lib/virtuoso/demo - Demo database - obsolete as of version 5.0.3 - * bin/ - The virtuoso-t, isql, isqlw, virt_mail, virtuoso-sample-t, inifile - executables - * lib/ - libvirtuoso-t.a libvirtuoso-t.la virtodbc32.a virtodbc32.la - virtodbc32 r.a virtodbc32_r.la virtodbc_r.so wikiv.so, plus any plugins - that may be enabled. - * lib/virtuoso - hosting sample.a hosting_sample.la hosting_sample.so - plugin_sample.a plugin_sample.so + * var/lib/virtuoso/demo - Demo database; obsolete as of version 5.0.3 + * bin/ - Primarily executables such as virtuoso-t, isql, isqlw, virt_mail, + virtuoso-sample-t, and inifile + * lib/ - libvirtuoso-t.a, libvirtuoso-t.la, virtodbc32.a, virtodbc32.la, + virtodbc32_r.a, virtodbc32_r.la, virtodbc_r.so, and wikiv.so, plus any + plugins that may be enabled. + * lib/virtuoso - hosting_sample.a, hosting_sample.la, hosting_sample.so, + plugin_sample.a, plugin_sample.so -Note: as of version 5.0.2, the ./configure script supports different -subdirectory structures with the --with-layout= parameter. If you've -specified something other than the default, the above may differ -accordingly. +Note: As of version 5.0.2, the `./configure` script supports different +subdirectory structures which may be specified with the `--with-layout=` +parameter. If you've specified a layout other than the default, the above +will differ accordingly. -As of version 5.0.3, the demo is a VAD package, not a separate directory. +As of version 5.0.3, the demo database is delivered as a VAD package, +not a separate directory. Test Suite ========== -Optionally, you can run +Optionally, you can run the following at the root of the build tree to +start the automated test suite: make check -at the root of the build tree to start the automated test suite. This -takes about an hour on a 2GHz machine and requires approximately 1 GB -of free disk space. +This requires approximately 1 GB of free disk space and takes about an +hour on a 2GHz machine. Getting Started =============== -Run +Run the following to start the server in the background (albeit in +foreground mode): - cd var/lib/virtuoso/db + cd var/lib/virtuoso/db virtuoso-t -f & -to start the server in the background. It will not detach from the shell, -so you see the startup messages. +It will not detach from the shell, so you will see the startup messages. -By default, when no -c parameter is specified, virtuoso will use the -virtuoso.ini file in this directory, which is generated as part of -`make install'. +By default (i.e., when no `-c` parameter is specified), Virtuoso will use +the `virtuoso.ini` config file in the present working directory. A default +config file is generated in the `{prefix}/var/lib/virtuoso/db` directory as +part of `make install`. -The first time it's run, it will create the empty database (no special -commands required) and install the Conductor VAD package. From here, you -can access http://localhost:8890/ and http://localhost:8890/conductor/ and -use the System Administration / Packages page to install other packages -such as Demo and the ODS suite (addressbook, weblog, feeds manager and -other applications) etc. +The first time Virtuoso is run (no special commands are required), it will +create an empty database and install the Conductor VAD package. You can then +access and/or +and use the `System Administration` -> `Packages` page to install more VAD +packages such as the Demo catalog/database, or the ODS application suite +(addressbook, weblog, feeds manager, etc.). -The default login is `dba' with a password of `dba' for the Conductor and -isql (for DAV functions, the default login is `dav' with a password of -`dav'). +The default username is `dba` with a password of `dba` for the Conductor +and iSQL. For DAV functions, the default username is `dav` with a password +of `dav`. -You will see a checkpoint in the terminal for each package selected: +You will see a `checkpoint` in the terminal for each package you install: 15:33:54 INFO: Checkpoint made, log reused -To connect with the command line SQL tool, +To connect with the command line iSQL tool (i.e., to get a `SQL>` prompt), +run -- - isql 1112 dba dba + isql 1111 dba dba -gives a SQL> prompt. +If you've installed the `demo` VAD containing the Microsoft Northwind +sample tables, you can type the following at the `SQL>` prompt to switch +to the demo database: -If you've installed the demo VAD above, type - SQL> use Demo; + use Demo; -to switch to the demo database, containing the Microsoft Northwind sample -tables. The `help' command in isql gives further instructions. +The simple `help` command in iSQL will get further instructions. -To use the web admin interface, point the browser to: +To use the HTTP browser-based admin interface, point your browser to -- http://localhost:8890/conductor -To read the documents online: +To read the local documentation, visit -- http://localhost:8890/doc/html -To experiment with online tutorials you can use the conductor to install -the Tutorial vad package into your database, then point the browser to: +To experiment with online tutorials, you can use the Conductor to install +the Tutorial VAD package, then point your browser to -- http://localhost:8890/tutorial @@ -486,16 +517,15 @@ the Tutorial vad package into your database, then point the browser to: VAD Packages ============ -The different VAD packages can be installed via ISQL using the following -command (if the installation packages reside in the filesystem): +Any VAD package accessible in the filesystem (and contained within the +list of `DirsAllowed` specified in the `[Parameters]` section of the +config file) can be installed via iSQL using the following command form +at the `SQL>` prompt: - SQL> vad_install ('file/system/path/package-name.vad', 0); + vad_install ('file/system/path/package-name.vad', 0); -Alternatively, you can copy VAD packages to Virtuoso's DAV repository -and then execute the following command (also from ISQL): +Alternatively, you can copy VAD packages into Virtuoso's DAV repository, +and then execute the following command (also at the `SQL>` prompt): - SQL> vad_install ('webdav/path>/package-name.vad', 1); + vad_install ('DAV/webdav/path/package-name.vad', 1); -at the isql command line. Note that the DirsAllowed parameter of the -Parameters section of the ini-file must allow access to the directory -where the package file is located. diff --git a/README.GIT.md b/README.GIT.md index 8926ec9b37..619a2b3f29 100644 --- a/README.GIT.md +++ b/README.GIT.md @@ -1,7 +1,7 @@ Using Virtuoso Open Source Edition GIT Tree =========================================== -Copyright (C) 1998-2018 OpenLink Software +Copyright (C) 1998-2019 OpenLink Software Introduction diff --git a/README.GeoSPARQL.md b/README.GeoSPARQL.md new file mode 100644 index 0000000000..8b5362db6b --- /dev/null +++ b/README.GeoSPARQL.md @@ -0,0 +1,239 @@ +# Virtuoso GeoSPARQL support + +_Copyright (C) 2018-2019 OpenLink Software_ + +## Introduction +This release marks the addition of GeoSPARQL function support to Virtuoso Open Source Edition. + +Besides a number of enhancements to the core Virtuoso engine, OpenLink added three plugins that +extend Virtuoso's functionality: + + * proj4 + * geos + * shapefileio + + +## Requirements +Two of these plugins can only be built against very specific versions of third party libraries which +may not be available on every OS distribution so probably will need to be built by you prior to +building Virtuoso. +``` + Package Version From + ------- ------- --------------------------- + proj 4.9.3 https://proj4.org + geo 3.5.1 https://www.osgeo.org/geos/ +``` +The new plugins are automatically added to the build process if the third party libraries and header +files are found when running the configure tool. + +The following new options have been added: +``` + $ ./configure --help + ... + ... + --enable-proj4(=DIR) enable the proj4 plugin (default) + --disable-proj4 disable the proj4 plugin + --enable-geos(=DIR) enable the geos plugin (default) + --disable-geos disable the geos plugin + --enable-shapefileio(=DIR) + enable the shapefileio plugin (default) + --disable-shapefileio disable the shapefileio plugin + ... +``` + +OpenLink will be providing binary releases of Virtuoso Open Source edition for a number of platforms +including Linux, Mac OS X and Windows. + + +## New Plugins + +### The proj4 plugin + +The proj4 plugin adds an interface between the Virtuoso engine and the [__PROJ__ library](https://proj4.org) +currently maintained by Frank Warmerdam et al. + +This plugin adds support for transforming geospatial coordinates from one coordinate reference +system (CRS) to another, including both cartographic projections as well as geodetic +transformations. + +The proj4 plugin currently requires __v4.9.3__ of the library which can be [downloaded +here](https://download.osgeo.org/proj/proj-4.9.3.tar.gz) + +The PROJ library uses the following license: +``` + All source, data files and other contents of the PROJ.4 package are + available under the following terms. Note that the PROJ 4.3 and earlier + was "public domain" as is common with US government work, but apparently + this is not a well defined legal term in many countries. I am placing + everything under the following MIT style license because I believe it is + effectively the same as public domain, allowing anyone to use the code as + they wish, including making proprietary derivatives. + + Though I have put my own name as copyright holder, I don't mean to imply + I did the work. Essentially all work was done by Gerald Evenden. + + -------------- + + Copyright (c) 2000, Frank Warmerdam + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. +``` + +### The geos plugin +The geos plugin adds an interface between the Virtuoso engine and the [__GEOS__ +library](https://www.osgeo.org/projects/geos/) currently maintained by the Open Source Geospatial +Foundation. + +According to their website: +``` + GEOS (Geometry Engine - Open Source) is a C++ port of the Topology Suite (JTS). As such, it aims + to contain the complete functionality of JTS in C++. This includes all the GIS Simple Features for + SQL spatial predicate functions and spatial operators, as well as specific JTS enhanced topology + functions. +``` + +This plugin adds support for GeoSPARQL functions to the Virtuoso engine. + +The geos plugin currently requires __v3.5.1__ of the library which can be [downloaded +here](http://download.osgeo.org/geos/geos-3.5.1.tar.bz2) + +The GEOS library is licensed under the terms of the [GNU Lesser General Public License +v2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html). + + +### The shapefileio plugin +The shapefileio plugin adds an interface between the Virtuoso engine and the [__Shapefile__ C +Library](https://shapelib.maptools.org) currently maintainer by Frank Warmerdam et al. + +This plugin adds support for reading ESRI Shapefiles. + +At this time a version of this library is embedded in the Virtuoso code base so no external packages are required. + +The shapefile library uses the following license: +``` + LICENSE + The source for the Shapefile C Library is (c) 1998 Frank Warmerdam, and released under the following + conditions. The intent is that anyone can do anything with the code, but that I do not assume any + liability, nor express any warranty for this code. As of Shapelib 1.2.6 the core portions of the + library are made available under two possible licenses. The licensee can choose to use the code + under either the Library GNU Public License (LGPL) described in COPYING or under the following MIT + style license. Any files in the Shapelib distribution without explicit copyright license terms (such + as this documentation, the Makefile and so forth) should be considered to have the following + licensing terms. Some auxilary portions of Shapelib, notably some of the components in the contrib + directory come under slightly different license restrictions. Check the source files that you are + actually using for conditions. + + DEFAULT LICENSE TERMS + Copyright (c) 1999, Frank Warmerdam + This software is available under the following "MIT Style" license, or at the option of the + licensee under the LGPL (see COPYING). This option is discussed in more detail in shapelib.html. + + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and + associated documentation files (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, publish, distribute, + sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all copies or substantial + portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT + NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES + OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + SHAPELIB MODIFICATIONS + I am pleased to receive bug fixes, and improvements for Shapelib. Unless the submissions indicate + otherwise I will assume that changes submitted to me remain under the the above "dual license" + terms. If changes are made to the library with the intention that those changes should be protected + by the LGPL then I should be informed upon submission. Note that I will not generally incorporate + changes into the core of Shapelib that are protected under the LGPL as this would effectively limit + the whole file and distribution to LGPL terms. + + Opting for LGPL + For licensee's opting to use Shapelib under LGPL as opposed to the MIT Style license above, and + wishing to redistribute the software based on Shapelib, I would ask that all "dual license" modules + be updated to indicate that only the LGPL (and not the MIT Style license) applies. This action + represents opting for the LGPL, and thereafter LGPL terms apply to any redistribution and + modification of the affected modules. +``` + + + +## Changes to virtuoso.ini +After building and installing the new plugins, you may need to add them to the __Plugins__ section of +any existing virtuoso.ini file. You need to make sure that each _Load_ line uses a unique number +although numbering does not have to be sequential. +``` + [Plugins] + ... + ... + Load20 = plain, proj4 + Load21 = plain, geos + Load22 = plain, shapefileio +``` + +The proj4 plugin requires access to a number of data files from the proj project which are normally +installed in /usr/share/proj. For this you need to change your virtuoso.ini file and add this +directory to the existing __DirsAllowed__ setting like this: +``` + [Parameters] + .. + .. + DirsAllowed = ., /opt/virtuoso-opensource/vad, /usr/share/proj + .. + .. +``` + +After making these modifications to the virtuoso.ini file, you need to restart the virtuoso engine +so these additional functions become available. + + +## Troubleshooting +If the plugins are successfully build and installed you should see the following lines in your +virtuoso.log file: +``` + 12:08:51 { Loading plugin 8: Type `plain', file `proj4' in `/opt/virtuoso-opensource/hosting' + 12:08:51 plain version 3230 from OpenLink Software + 12:08:51 Cartographic Projections support based on Frank Warmerdam's proj4 library + 12:08:51 SUCCESS plugin 8: loaded from /opt/virtuoso-opensource/hosting/proj4.so } + 12:08:51 { Loading plugin 9: Type `plain', file `geos' in `/opt/virtuoso-opensource/hosting' + 12:08:51 plain version 3230 from OpenLink Software + 12:08:51 GEOS plugin based on Geometry Engine Open Source library from Open Source Geospatial Foundation + 12:08:51 SUCCESS plugin 9: loaded from /opt/virtuoso-opensource/hosting/geos.so } + 12:08:51 { Loading plugin 10: Type `plain', file `shapefileio' in `/opt/virtuoso-opensource/hosting' + 12:08:51 ShapefileIO version 0.1virt71 from OpenLink Software + 12:08:51 Shapefile support based on Frank Warmerdam's Shapelib + 12:08:51 SUCCESS plugin 10: loaded from /opt/virtuoso-opensource/hosting/shapefileio.so } +``` + +If you see the following lines near the bottom of you virtuoso.log file then you need to install the +proj-data package if your operating distribution has this available. +``` + 12:23:17 PL LOG: Initial setup of DB.DBA.SYS_PROJ4_SRIDS data from files in "/usr/share/proj" + 12:23:17 PL LOG: Error during initial setup of DB.DBA.SYS_PROJ4_SRIDS data: 39000: FA005: + Can't open file '/usr/share/proj/epsg', error 2 +``` + +If the proj plugin is initialized successfully you will see the following lines near the bottom of your virtuoso.ini file: +``` + 12:10:08 PL LOG: Initial setup of DB.DBA.SYS_PROJ4_SRIDS data from files in "/usr/share/proj" + 12:10:08 PL LOG: DB.DBA.SYS_PROJ4_SRIDS now contains 8650 spatial reference systems +``` diff --git a/README.MACOSX.md b/README.MACOSX.md index c3b5728b95..6073270714 100644 --- a/README.MACOSX.md +++ b/README.MACOSX.md @@ -1,7 +1,7 @@ Building Virtuoso Open Source Edition on Mac OS X ================================================= -*Copyright (C) 1998-2018 OpenLink Software * +*Copyright (C) 1998-2019 OpenLink Software * ## Introduction diff --git a/README.OpenSSL.md b/README.OpenSSL.md index 9e4cdf460c..72e1faf93b 100644 --- a/README.OpenSSL.md +++ b/README.OpenSSL.md @@ -1,7 +1,7 @@ Virtuoso and OpenSSL ==================== -*Copyright (C) 1998-2018 OpenLink Software * +*Copyright (C) 1998-2019 OpenLink Software * Virtuoso Open Source Edition uses the OpenSSL libraries for cryptographic operations as well as handling both client-side and server-side secure connections for both HTTPS as well as iSQL/ODBC diff --git a/README.UPGRADE.md b/README.UPGRADE.md index 42bbf274a7..2dbf5afc23 100644 --- a/README.UPGRADE.md +++ b/README.UPGRADE.md @@ -1,7 +1,7 @@ Virtuoso Open Source Upgrade Notes ================================== -*Copyright (C) 1998-2018 OpenLink Software * +*Copyright (C) 1998-2019 OpenLink Software * Introduction ------------ diff --git a/appsrc/Makefile.am b/appsrc/Makefile.am index 4127262428..cedd57e95e 100644 --- a/appsrc/Makefile.am +++ b/appsrc/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/Makefile.am b/appsrc/ODS-Addressbook/Makefile.am index 2a0295583e..3b40504d26 100644 --- a/appsrc/ODS-Addressbook/Makefile.am +++ b/appsrc/ODS-Addressbook/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/make_vad.sh b/appsrc/ODS-Addressbook/make_vad.sh index 214665d715..36140e1970 100755 --- a/appsrc/ODS-Addressbook/make_vad.sh +++ b/appsrc/ODS-Addressbook/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -272,7 +272,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-Addressbook/sql/DET_CardDAV.sql b/appsrc/ODS-Addressbook/sql/DET_CardDAV.sql index 57f1acdfc5..5783a270a2 100644 --- a/appsrc/ODS-Addressbook/sql/DET_CardDAV.sql +++ b/appsrc/ODS-Addressbook/sql/DET_CardDAV.sql @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/sql/ab-a-api.sql b/appsrc/ODS-Addressbook/sql/ab-a-api.sql index f074785d0b..5f936e2d06 100644 --- a/appsrc/ODS-Addressbook/sql/ab-a-api.sql +++ b/appsrc/ODS-Addressbook/sql/ab-a-api.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/sql/ab-a-code.sql b/appsrc/ODS-Addressbook/sql/ab-a-code.sql index 722ae3dcc3..167ce08e64 100644 --- a/appsrc/ODS-Addressbook/sql/ab-a-code.sql +++ b/appsrc/ODS-Addressbook/sql/ab-a-code.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/sql/ab-a-table.sql b/appsrc/ODS-Addressbook/sql/ab-a-table.sql index ae704d95f4..e01cc22e55 100644 --- a/appsrc/ODS-Addressbook/sql/ab-a-table.sql +++ b/appsrc/ODS-Addressbook/sql/ab-a-table.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/sql/ab-a-update.sql b/appsrc/ODS-Addressbook/sql/ab-a-update.sql index 1694ce01c7..2ae5bbeab3 100644 --- a/appsrc/ODS-Addressbook/sql/ab-a-update.sql +++ b/appsrc/ODS-Addressbook/sql/ab-a-update.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/sql/ab-a-wa.sql b/appsrc/ODS-Addressbook/sql/ab-a-wa.sql index 55c81e247e..42494c88d4 100644 --- a/appsrc/ODS-Addressbook/sql/ab-a-wa.sql +++ b/appsrc/ODS-Addressbook/sql/ab-a-wa.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/sql/ab-d.sql b/appsrc/ODS-Addressbook/sql/ab-d.sql index 9766be0cd4..7dffaec164 100644 --- a/appsrc/ODS-Addressbook/sql/ab-d.sql +++ b/appsrc/ODS-Addressbook/sql/ab-d.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/sql/sioc_ab.sql b/appsrc/ODS-Addressbook/sql/sioc_ab.sql index 78c21c544e..4417b05d8f 100644 --- a/appsrc/ODS-Addressbook/sql/sioc_ab.sql +++ b/appsrc/ODS-Addressbook/sql/sioc_ab.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/ab_login.vspx b/appsrc/ODS-Addressbook/www/ab_login.vspx index 983fb345d6..982bd57f41 100644 --- a/appsrc/ODS-Addressbook/www/ab_login.vspx +++ b/appsrc/ODS-Addressbook/www/ab_login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/ajax.vsp b/appsrc/ODS-Addressbook/www/ajax.vsp index 696f004a19..476e438f02 100644 --- a/appsrc/ODS-Addressbook/www/ajax.vsp +++ b/appsrc/ODS-Addressbook/www/ajax.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/annotea.vspx b/appsrc/ODS-Addressbook/www/annotea.vspx index 3a871382c9..b1eb0c5b6d 100644 --- a/appsrc/ODS-Addressbook/www/annotea.vspx +++ b/appsrc/ODS-Addressbook/www/annotea.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/conversation.vspx b/appsrc/ODS-Addressbook/www/conversation.vspx index 5fb76fd030..a0545eee3a 100644 --- a/appsrc/ODS-Addressbook/www/conversation.vspx +++ b/appsrc/ODS-Addressbook/www/conversation.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/css/style.css b/appsrc/ODS-Addressbook/www/css/style.css index 7b29c42367..149324a43f 100644 --- a/appsrc/ODS-Addressbook/www/css/style.css +++ b/appsrc/ODS-Addressbook/www/css/style.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/error.vspx b/appsrc/ODS-Addressbook/www/error.vspx index f3687cfc8e..c20dea0b5b 100644 --- a/appsrc/ODS-Addressbook/www/error.vspx +++ b/appsrc/ODS-Addressbook/www/error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/export.vspx b/appsrc/ODS-Addressbook/www/export.vspx index d80fdd3771..42f99342a7 100644 --- a/appsrc/ODS-Addressbook/www/export.vspx +++ b/appsrc/ODS-Addressbook/www/export.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/gems.vsp b/appsrc/ODS-Addressbook/www/gems.vsp index f48bb39993..e0485e951e 100644 --- a/appsrc/ODS-Addressbook/www/gems.vsp +++ b/appsrc/ODS-Addressbook/www/gems.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/home.vspx b/appsrc/ODS-Addressbook/www/home.vspx index a9609f635d..e0220c2680 100644 --- a/appsrc/ODS-Addressbook/www/home.vspx +++ b/appsrc/ODS-Addressbook/www/home.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/invite.vspx b/appsrc/ODS-Addressbook/www/invite.vspx index ff04b1bb69..705e4fdf24 100644 --- a/appsrc/ODS-Addressbook/www/invite.vspx +++ b/appsrc/ODS-Addressbook/www/invite.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/js/ab.js b/appsrc/ODS-Addressbook/www/js/ab.js index 62207a3f0e..8284290dce 100644 --- a/appsrc/ODS-Addressbook/www/js/ab.js +++ b/appsrc/ODS-Addressbook/www/js/ab.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/message.vspx b/appsrc/ODS-Addressbook/www/message.vspx index 416ef37353..a14c713b01 100644 --- a/appsrc/ODS-Addressbook/www/message.vspx +++ b/appsrc/ODS-Addressbook/www/message.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/search.vspx b/appsrc/ODS-Addressbook/www/search.vspx index 52a6c1f974..e9427a0333 100644 --- a/appsrc/ODS-Addressbook/www/search.vspx +++ b/appsrc/ODS-Addressbook/www/search.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/tags.vspx b/appsrc/ODS-Addressbook/www/tags.vspx index 3c997eed46..1d0ed54321 100644 --- a/appsrc/ODS-Addressbook/www/tags.vspx +++ b/appsrc/ODS-Addressbook/www/tags.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/template/popup.vspx b/appsrc/ODS-Addressbook/www/template/popup.vspx index 2d7fe046c1..ced8c1a0d7 100644 --- a/appsrc/ODS-Addressbook/www/template/popup.vspx +++ b/appsrc/ODS-Addressbook/www/template/popup.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/template/template.vspx b/appsrc/ODS-Addressbook/www/template/template.vspx index 597a51b639..3c510ca0a9 100644 --- a/appsrc/ODS-Addressbook/www/template/template.vspx +++ b/appsrc/ODS-Addressbook/www/template/template.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/www/template/template.xsl b/appsrc/ODS-Addressbook/www/template/template.xsl index 56bf27b40c..637f1a5b31 100644 --- a/appsrc/ODS-Addressbook/www/template/template.xsl +++ b/appsrc/ODS-Addressbook/www/template/template.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/xslt/rss2atom.xsl b/appsrc/ODS-Addressbook/xslt/rss2atom.xsl index f742cf5f60..fe6ab15f68 100644 --- a/appsrc/ODS-Addressbook/xslt/rss2atom.xsl +++ b/appsrc/ODS-Addressbook/xslt/rss2atom.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/xslt/rss2atom03.xsl b/appsrc/ODS-Addressbook/xslt/rss2atom03.xsl index c6fb984bfd..4505afba5d 100644 --- a/appsrc/ODS-Addressbook/xslt/rss2atom03.xsl +++ b/appsrc/ODS-Addressbook/xslt/rss2atom03.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/xslt/rss2rdf.xsl b/appsrc/ODS-Addressbook/xslt/rss2rdf.xsl index 39d99f5311..d70a92b47c 100644 --- a/appsrc/ODS-Addressbook/xslt/rss2rdf.xsl +++ b/appsrc/ODS-Addressbook/xslt/rss2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Addressbook/xslt/rss2xbel.xsl b/appsrc/ODS-Addressbook/xslt/rss2xbel.xsl index ec892f065b..0b11836016 100644 --- a/appsrc/ODS-Addressbook/xslt/rss2xbel.xsl +++ b/appsrc/ODS-Addressbook/xslt/rss2xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/Makefile.am b/appsrc/ODS-Blog/Makefile.am index 97d16a1f8c..1932e49ea7 100644 --- a/appsrc/ODS-Blog/Makefile.am +++ b/appsrc/ODS-Blog/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/atom_pub.sql b/appsrc/ODS-Blog/atom_pub.sql index d462fdb4a1..03753d2a2b 100644 --- a/appsrc/ODS-Blog/atom_pub.sql +++ b/appsrc/ODS-Blog/atom_pub.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/blog.sql b/appsrc/ODS-Blog/blog.sql index 06e646bddd..d8240abbc8 100644 --- a/appsrc/ODS-Blog/blog.sql +++ b/appsrc/ODS-Blog/blog.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/conv.sql b/appsrc/ODS-Blog/conv.sql index 067f43157f..821f934965 100644 --- a/appsrc/ODS-Blog/conv.sql +++ b/appsrc/ODS-Blog/conv.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/dav_browser.sql b/appsrc/ODS-Blog/dav_browser.sql index 2d1fb092ce..d351316fc9 100644 --- a/appsrc/ODS-Blog/dav_browser.sql +++ b/appsrc/ODS-Blog/dav_browser.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/gdata.sql b/appsrc/ODS-Blog/gdata.sql index 7e645a10ec..a8f34ad127 100644 --- a/appsrc/ODS-Blog/gdata.sql +++ b/appsrc/ODS-Blog/gdata.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/index.vsp b/appsrc/ODS-Blog/index.vsp index ced73e3bfe..0d76817f11 100644 --- a/appsrc/ODS-Blog/index.vsp +++ b/appsrc/ODS-Blog/index.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/index.vspx b/appsrc/ODS-Blog/index.vspx index 00c87714f6..8388614dae 100644 --- a/appsrc/ODS-Blog/index.vspx +++ b/appsrc/ODS-Blog/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/install.sql b/appsrc/ODS-Blog/install.sql index 603fd1eff9..e1efe6812e 100644 --- a/appsrc/ODS-Blog/install.sql +++ b/appsrc/ODS-Blog/install.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/make_vad.sh b/appsrc/ODS-Blog/make_vad.sh index d7adc19713..c9487db6de 100755 --- a/appsrc/ODS-Blog/make_vad.sh +++ b/appsrc/ODS-Blog/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -282,7 +282,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-Blog/public/back_nav.vspx b/appsrc/ODS-Blog/public/back_nav.vspx index ccedb9f34b..10ea568dd4 100644 --- a/appsrc/ODS-Blog/public/back_nav.vspx +++ b/appsrc/ODS-Blog/public/back_nav.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/c_confirm.vspx b/appsrc/ODS-Blog/public/c_confirm.vspx index 2e90879954..0fe3daf9a4 100644 --- a/appsrc/ODS-Blog/public/c_confirm.vspx +++ b/appsrc/ODS-Blog/public/c_confirm.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/css/dav.css b/appsrc/ODS-Blog/public/css/dav.css index 109f9d2c37..31d89f731f 100644 --- a/appsrc/ODS-Blog/public/css/dav.css +++ b/appsrc/ODS-Blog/public/css/dav.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/css/default.css b/appsrc/ODS-Blog/public/css/default.css index 9e997fab80..d4978ea29a 100644 --- a/appsrc/ODS-Blog/public/css/default.css +++ b/appsrc/ODS-Blog/public/css/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/css/rte.css b/appsrc/ODS-Blog/public/css/rte.css index 79ec22b0e4..266596a810 100644 --- a/appsrc/ODS-Blog/public/css/rte.css +++ b/appsrc/ODS-Blog/public/css/rte.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/css/webdav.css b/appsrc/ODS-Blog/public/css/webdav.css index a26c5ff478..14fea1da3c 100644 --- a/appsrc/ODS-Blog/public/css/webdav.css +++ b/appsrc/ODS-Blog/public/css/webdav.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/appsrc/ODS-Blog/public/openid_helper.vsp b/appsrc/ODS-Blog/public/openid_helper.vsp index 85a0f3e01c..ebf80e71ef 100644 --- a/appsrc/ODS-Blog/public/openid_helper.vsp +++ b/appsrc/ODS-Blog/public/openid_helper.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/popup_browser.vspx b/appsrc/ODS-Blog/public/popup_browser.vspx index a8909117ef..598f4915db 100644 --- a/appsrc/ODS-Blog/public/popup_browser.vspx +++ b/appsrc/ODS-Blog/public/popup_browser.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/r_unsubscribe.vspx b/appsrc/ODS-Blog/public/r_unsubscribe.vspx index d341c6861a..686ef31184 100644 --- a/appsrc/ODS-Blog/public/r_unsubscribe.vspx +++ b/appsrc/ODS-Blog/public/r_unsubscribe.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/scripts/browserdetect.js b/appsrc/ODS-Blog/public/scripts/browserdetect.js index 7856908cea..56d15173a6 100644 --- a/appsrc/ODS-Blog/public/scripts/browserdetect.js +++ b/appsrc/ODS-Blog/public/scripts/browserdetect.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/scripts/entry.js b/appsrc/ODS-Blog/public/scripts/entry.js index 2c3bee9920..37e099476b 100644 --- a/appsrc/ODS-Blog/public/scripts/entry.js +++ b/appsrc/ODS-Blog/public/scripts/entry.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/scripts/form.js b/appsrc/ODS-Blog/public/scripts/form.js index b3ec57367b..7836514cd6 100644 --- a/appsrc/ODS-Blog/public/scripts/form.js +++ b/appsrc/ODS-Blog/public/scripts/form.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/scripts/openid.js b/appsrc/ODS-Blog/public/scripts/openid.js index 6e0704f7c4..fc86e244aa 100644 --- a/appsrc/ODS-Blog/public/scripts/openid.js +++ b/appsrc/ODS-Blog/public/scripts/openid.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/scripts/plugins.js b/appsrc/ODS-Blog/public/scripts/plugins.js index 31e23516c6..4510950c35 100644 --- a/appsrc/ODS-Blog/public/scripts/plugins.js +++ b/appsrc/ODS-Blog/public/scripts/plugins.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/search.vspx b/appsrc/ODS-Blog/public/search.vspx index d991359155..3303e85e82 100644 --- a/appsrc/ODS-Blog/public/search.vspx +++ b/appsrc/ODS-Blog/public/search.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/view.vspx b/appsrc/ODS-Blog/public/view.vspx index 70411e0c93..7bc77bf9c6 100644 --- a/appsrc/ODS-Blog/public/view.vspx +++ b/appsrc/ODS-Blog/public/view.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/public/view_file.vspx b/appsrc/ODS-Blog/public/view_file.vspx index 26eb01a6c2..14f306416f 100644 --- a/appsrc/ODS-Blog/public/view_file.vspx +++ b/appsrc/ODS-Blog/public/view_file.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/sioc_blog.sql b/appsrc/ODS-Blog/sioc_blog.sql index c45f7fea88..88c8ac6d6d 100644 --- a/appsrc/ODS-Blog/sioc_blog.sql +++ b/appsrc/ODS-Blog/sioc_blog.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/template.sql b/appsrc/ODS-Blog/template.sql index 6c8587e915..d26d954d8f 100644 --- a/appsrc/ODS-Blog/template.sql +++ b/appsrc/ODS-Blog/template.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/atlantis/default.css b/appsrc/ODS-Blog/templates/atlantis/default.css index a14f0d184b..47ea2ce562 100644 --- a/appsrc/ODS-Blog/templates/atlantis/default.css +++ b/appsrc/ODS-Blog/templates/atlantis/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/atlantis/index.vspx b/appsrc/ODS-Blog/templates/atlantis/index.vspx index 69e687a7ec..4af08cc618 100644 --- a/appsrc/ODS-Blog/templates/atlantis/index.vspx +++ b/appsrc/ODS-Blog/templates/atlantis/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/autumn/default.css b/appsrc/ODS-Blog/templates/autumn/default.css index fa98fe2983..19603666d3 100644 --- a/appsrc/ODS-Blog/templates/autumn/default.css +++ b/appsrc/ODS-Blog/templates/autumn/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/autumn/index.vspx b/appsrc/ODS-Blog/templates/autumn/index.vspx index f234c39d1e..de0d077617 100644 --- a/appsrc/ODS-Blog/templates/autumn/index.vspx +++ b/appsrc/ODS-Blog/templates/autumn/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/blue_left/default.css b/appsrc/ODS-Blog/templates/blue_left/default.css index d5463079df..d0b2dd6c2c 100644 --- a/appsrc/ODS-Blog/templates/blue_left/default.css +++ b/appsrc/ODS-Blog/templates/blue_left/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/blue_left/index.vspx b/appsrc/ODS-Blog/templates/blue_left/index.vspx index ea0c9b5c94..68947817a5 100644 --- a/appsrc/ODS-Blog/templates/blue_left/index.vspx +++ b/appsrc/ODS-Blog/templates/blue_left/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/columns_clean/archive.vspx b/appsrc/ODS-Blog/templates/columns_clean/archive.vspx index 2f3595e3f0..794370c795 100644 --- a/appsrc/ODS-Blog/templates/columns_clean/archive.vspx +++ b/appsrc/ODS-Blog/templates/columns_clean/archive.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/columns_clean/default.css b/appsrc/ODS-Blog/templates/columns_clean/default.css index c7916533bb..66c00a2998 100644 --- a/appsrc/ODS-Blog/templates/columns_clean/default.css +++ b/appsrc/ODS-Blog/templates/columns_clean/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/columns_clean/index.vspx b/appsrc/ODS-Blog/templates/columns_clean/index.vspx index 18f3b37f39..c248f5c961 100644 --- a/appsrc/ODS-Blog/templates/columns_clean/index.vspx +++ b/appsrc/ODS-Blog/templates/columns_clean/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/columns_clean/linkblog.vspx b/appsrc/ODS-Blog/templates/columns_clean/linkblog.vspx index 9156a4f9a4..5df07cffdd 100644 --- a/appsrc/ODS-Blog/templates/columns_clean/linkblog.vspx +++ b/appsrc/ODS-Blog/templates/columns_clean/linkblog.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/columns_clean/summary.vspx b/appsrc/ODS-Blog/templates/columns_clean/summary.vspx index 1859a57856..9ba7f79ebb 100644 --- a/appsrc/ODS-Blog/templates/columns_clean/summary.vspx +++ b/appsrc/ODS-Blog/templates/columns_clean/summary.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/default/default.css b/appsrc/ODS-Blog/templates/default/default.css index 0cb25afdb6..4546010726 100644 --- a/appsrc/ODS-Blog/templates/default/default.css +++ b/appsrc/ODS-Blog/templates/default/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/default/index.vspx b/appsrc/ODS-Blog/templates/default/index.vspx index ad4b117ed2..124cdc29c4 100644 --- a/appsrc/ODS-Blog/templates/default/index.vspx +++ b/appsrc/ODS-Blog/templates/default/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/default/red.css b/appsrc/ODS-Blog/templates/default/red.css index 1de48839f2..e8700dd64a 100644 --- a/appsrc/ODS-Blog/templates/default/red.css +++ b/appsrc/ODS-Blog/templates/default/red.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/archive.vspx b/appsrc/ODS-Blog/templates/digital_bazaar/archive.vspx index a3cdfd7c3f..8618fe9eca 100644 --- a/appsrc/ODS-Blog/templates/digital_bazaar/archive.vspx +++ b/appsrc/ODS-Blog/templates/digital_bazaar/archive.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - -- Copyright (C) 1998-2018 OpenLink Software +- Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/default.css b/appsrc/ODS-Blog/templates/digital_bazaar/default.css index c0e6793821..85f0cb5675 100644 --- a/appsrc/ODS-Blog/templates/digital_bazaar/default.css +++ b/appsrc/ODS-Blog/templates/digital_bazaar/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/index.vspx b/appsrc/ODS-Blog/templates/digital_bazaar/index.vspx index 0c318c5456..de45777abb 100644 --- a/appsrc/ODS-Blog/templates/digital_bazaar/index.vspx +++ b/appsrc/ODS-Blog/templates/digital_bazaar/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/linkblog.vspx b/appsrc/ODS-Blog/templates/digital_bazaar/linkblog.vspx index c1fe85c990..8b7561fd89 100644 --- a/appsrc/ODS-Blog/templates/digital_bazaar/linkblog.vspx +++ b/appsrc/ODS-Blog/templates/digital_bazaar/linkblog.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/digital_bazaar/summary.vspx b/appsrc/ODS-Blog/templates/digital_bazaar/summary.vspx index fc346d1f34..22c2b306ce 100644 --- a/appsrc/ODS-Blog/templates/digital_bazaar/summary.vspx +++ b/appsrc/ODS-Blog/templates/digital_bazaar/summary.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - -- Copyright (C) 1998-2018 OpenLink Software +- Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/main.vspx b/appsrc/ODS-Blog/templates/main.vspx index a48363e9e6..afcd1ea374 100644 --- a/appsrc/ODS-Blog/templates/main.vspx +++ b/appsrc/ODS-Blog/templates/main.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/micro/default.css b/appsrc/ODS-Blog/templates/micro/default.css index d7db198744..d89fabe8fd 100644 --- a/appsrc/ODS-Blog/templates/micro/default.css +++ b/appsrc/ODS-Blog/templates/micro/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/micro/index.vspx b/appsrc/ODS-Blog/templates/micro/index.vspx index 71cfb96322..3f63a35ec5 100644 --- a/appsrc/ODS-Blog/templates/micro/index.vspx +++ b/appsrc/ODS-Blog/templates/micro/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/modern/default.css b/appsrc/ODS-Blog/templates/modern/default.css index c9610f7301..c91d4d2498 100644 --- a/appsrc/ODS-Blog/templates/modern/default.css +++ b/appsrc/ODS-Blog/templates/modern/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/modern/index.vspx b/appsrc/ODS-Blog/templates/modern/index.vspx index 57e936734e..bbe8d92258 100644 --- a/appsrc/ODS-Blog/templates/modern/index.vspx +++ b/appsrc/ODS-Blog/templates/modern/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/modern/red.css b/appsrc/ODS-Blog/templates/modern/red.css index 86e0b684b9..e68c22bf3c 100644 --- a/appsrc/ODS-Blog/templates/modern/red.css +++ b/appsrc/ODS-Blog/templates/modern/red.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/newspaper_view/archive.vspx b/appsrc/ODS-Blog/templates/newspaper_view/archive.vspx index 7056f53627..7cd5f9bcae 100644 --- a/appsrc/ODS-Blog/templates/newspaper_view/archive.vspx +++ b/appsrc/ODS-Blog/templates/newspaper_view/archive.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/newspaper_view/default.css b/appsrc/ODS-Blog/templates/newspaper_view/default.css index b7c4b40a44..63cfef3745 100644 --- a/appsrc/ODS-Blog/templates/newspaper_view/default.css +++ b/appsrc/ODS-Blog/templates/newspaper_view/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/newspaper_view/index.vspx b/appsrc/ODS-Blog/templates/newspaper_view/index.vspx index 916f0f05d2..3247bf671c 100644 --- a/appsrc/ODS-Blog/templates/newspaper_view/index.vspx +++ b/appsrc/ODS-Blog/templates/newspaper_view/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/newspaper_view/linkblog.vspx b/appsrc/ODS-Blog/templates/newspaper_view/linkblog.vspx index 921f85b2f8..03384318ae 100644 --- a/appsrc/ODS-Blog/templates/newspaper_view/linkblog.vspx +++ b/appsrc/ODS-Blog/templates/newspaper_view/linkblog.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/newspaper_view/summary.vspx b/appsrc/ODS-Blog/templates/newspaper_view/summary.vspx index e90c59e334..48c862bf0f 100644 --- a/appsrc/ODS-Blog/templates/newspaper_view/summary.vspx +++ b/appsrc/ODS-Blog/templates/newspaper_view/summary.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/about.vspx b/appsrc/ODS-Blog/templates/openlink/about.vspx index e3b1589e94..7b9710e2fb 100644 --- a/appsrc/ODS-Blog/templates/openlink/about.vspx +++ b/appsrc/ODS-Blog/templates/openlink/about.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/archive.vspx b/appsrc/ODS-Blog/templates/openlink/archive.vspx index c624fa193d..69dd31e925 100644 --- a/appsrc/ODS-Blog/templates/openlink/archive.vspx +++ b/appsrc/ODS-Blog/templates/openlink/archive.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/bridge.vspx b/appsrc/ODS-Blog/templates/openlink/bridge.vspx index 9a8c1640dc..afbf70fa88 100644 --- a/appsrc/ODS-Blog/templates/openlink/bridge.vspx +++ b/appsrc/ODS-Blog/templates/openlink/bridge.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/category.vspx b/appsrc/ODS-Blog/templates/openlink/category.vspx index 513ef65585..b373312fa8 100644 --- a/appsrc/ODS-Blog/templates/openlink/category.vspx +++ b/appsrc/ODS-Blog/templates/openlink/category.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/channel_list.vspx b/appsrc/ODS-Blog/templates/openlink/channel_list.vspx index db50392c72..d1bf4d6394 100644 --- a/appsrc/ODS-Blog/templates/openlink/channel_list.vspx +++ b/appsrc/ODS-Blog/templates/openlink/channel_list.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/channels.vspx b/appsrc/ODS-Blog/templates/openlink/channels.vspx index 90cfecedce..99840e9686 100644 --- a/appsrc/ODS-Blog/templates/openlink/channels.vspx +++ b/appsrc/ODS-Blog/templates/openlink/channels.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/channels_ctgs.vspx b/appsrc/ODS-Blog/templates/openlink/channels_ctgs.vspx index c3fa37cdae..24c29f0a4d 100644 --- a/appsrc/ODS-Blog/templates/openlink/channels_ctgs.vspx +++ b/appsrc/ODS-Blog/templates/openlink/channels_ctgs.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/comments.vspx b/appsrc/ODS-Blog/templates/openlink/comments.vspx index 3834384724..175ef675b1 100644 --- a/appsrc/ODS-Blog/templates/openlink/comments.vspx +++ b/appsrc/ODS-Blog/templates/openlink/comments.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/community.vspx b/appsrc/ODS-Blog/templates/openlink/community.vspx index 5de9a96ba2..d8c500c4da 100644 --- a/appsrc/ODS-Blog/templates/openlink/community.vspx +++ b/appsrc/ODS-Blog/templates/openlink/community.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/contacts.vspx b/appsrc/ODS-Blog/templates/openlink/contacts.vspx index 4fbd11ce2d..2afb49cdbd 100644 --- a/appsrc/ODS-Blog/templates/openlink/contacts.vspx +++ b/appsrc/ODS-Blog/templates/openlink/contacts.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/default.css b/appsrc/ODS-Blog/templates/openlink/default.css index ee9c7d7e44..c5701af469 100644 --- a/appsrc/ODS-Blog/templates/openlink/default.css +++ b/appsrc/ODS-Blog/templates/openlink/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/edit.vspx b/appsrc/ODS-Blog/templates/openlink/edit.vspx index 6ab51abca3..b0d9a4c8fc 100644 --- a/appsrc/ODS-Blog/templates/openlink/edit.vspx +++ b/appsrc/ODS-Blog/templates/openlink/edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/edit_comments.vspx b/appsrc/ODS-Blog/templates/openlink/edit_comments.vspx index 8210dca3ae..22ac8b15ee 100644 --- a/appsrc/ODS-Blog/templates/openlink/edit_comments.vspx +++ b/appsrc/ODS-Blog/templates/openlink/edit_comments.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/edit_post.vspx b/appsrc/ODS-Blog/templates/openlink/edit_post.vspx index 8aaecae4d4..4cebc490ef 100644 --- a/appsrc/ODS-Blog/templates/openlink/edit_post.vspx +++ b/appsrc/ODS-Blog/templates/openlink/edit_post.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/edit_tb.vspx b/appsrc/ODS-Blog/templates/openlink/edit_tb.vspx index 0c75e52833..0a609bfe75 100644 --- a/appsrc/ODS-Blog/templates/openlink/edit_tb.vspx +++ b/appsrc/ODS-Blog/templates/openlink/edit_tb.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/errors.vspx b/appsrc/ODS-Blog/templates/openlink/errors.vspx index de105fc366..ebbad7c3bf 100644 --- a/appsrc/ODS-Blog/templates/openlink/errors.vspx +++ b/appsrc/ODS-Blog/templates/openlink/errors.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/feed_list.vspx b/appsrc/ODS-Blog/templates/openlink/feed_list.vspx index 8dcdfd3c51..8dda1f299a 100644 --- a/appsrc/ODS-Blog/templates/openlink/feed_list.vspx +++ b/appsrc/ODS-Blog/templates/openlink/feed_list.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/feed_view.vspx b/appsrc/ODS-Blog/templates/openlink/feed_view.vspx index 07a942c089..59c102f580 100644 --- a/appsrc/ODS-Blog/templates/openlink/feed_view.vspx +++ b/appsrc/ODS-Blog/templates/openlink/feed_view.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/get_blogs.vspx b/appsrc/ODS-Blog/templates/openlink/get_blogs.vspx index e3b6e260e0..ca79b3a16b 100644 --- a/appsrc/ODS-Blog/templates/openlink/get_blogs.vspx +++ b/appsrc/ODS-Blog/templates/openlink/get_blogs.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/get_tags.vspx b/appsrc/ODS-Blog/templates/openlink/get_tags.vspx index 245c9dfcd4..788d442ce2 100644 --- a/appsrc/ODS-Blog/templates/openlink/get_tags.vspx +++ b/appsrc/ODS-Blog/templates/openlink/get_tags.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/import.vspx b/appsrc/ODS-Blog/templates/openlink/import.vspx index 354a4e3ac6..deeb8b773f 100644 --- a/appsrc/ODS-Blog/templates/openlink/import.vspx +++ b/appsrc/ODS-Blog/templates/openlink/import.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/index.vspx b/appsrc/ODS-Blog/templates/openlink/index.vspx index 02e802cea0..d17c61b58d 100644 --- a/appsrc/ODS-Blog/templates/openlink/index.vspx +++ b/appsrc/ODS-Blog/templates/openlink/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/linkblog.vspx b/appsrc/ODS-Blog/templates/openlink/linkblog.vspx index 0e3d8c63a0..41bdec3291 100644 --- a/appsrc/ODS-Blog/templates/openlink/linkblog.vspx +++ b/appsrc/ODS-Blog/templates/openlink/linkblog.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/list_comments.vspx b/appsrc/ODS-Blog/templates/openlink/list_comments.vspx index 35ef42694f..4d4d418e19 100644 --- a/appsrc/ODS-Blog/templates/openlink/list_comments.vspx +++ b/appsrc/ODS-Blog/templates/openlink/list_comments.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/login.vspx b/appsrc/ODS-Blog/templates/openlink/login.vspx index 964fcd64ca..44b3470a16 100644 --- a/appsrc/ODS-Blog/templates/openlink/login.vspx +++ b/appsrc/ODS-Blog/templates/openlink/login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/logout.vspx b/appsrc/ODS-Blog/templates/openlink/logout.vspx index 704d7fa8af..1ee8f2b507 100644 --- a/appsrc/ODS-Blog/templates/openlink/logout.vspx +++ b/appsrc/ODS-Blog/templates/openlink/logout.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/member_data.vspx b/appsrc/ODS-Blog/templates/openlink/member_data.vspx index 3050cd922d..a8f91da152 100644 --- a/appsrc/ODS-Blog/templates/openlink/member_data.vspx +++ b/appsrc/ODS-Blog/templates/openlink/member_data.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/membership.vspx b/appsrc/ODS-Blog/templates/openlink/membership.vspx index 5bc476f077..93717d32fa 100644 --- a/appsrc/ODS-Blog/templates/openlink/membership.vspx +++ b/appsrc/ODS-Blog/templates/openlink/membership.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/moblog_mime_select.vspx b/appsrc/ODS-Blog/templates/openlink/moblog_mime_select.vspx index 416acf1aaa..62638df7e4 100644 --- a/appsrc/ODS-Blog/templates/openlink/moblog_mime_select.vspx +++ b/appsrc/ODS-Blog/templates/openlink/moblog_mime_select.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/moblog_msg.vspx b/appsrc/ODS-Blog/templates/openlink/moblog_msg.vspx index f13e8d58fb..7c40acad0e 100644 --- a/appsrc/ODS-Blog/templates/openlink/moblog_msg.vspx +++ b/appsrc/ODS-Blog/templates/openlink/moblog_msg.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/moblogimage.vspx b/appsrc/ODS-Blog/templates/openlink/moblogimage.vspx index ac15bf5a09..32c0fb22fc 100644 --- a/appsrc/ODS-Blog/templates/openlink/moblogimage.vspx +++ b/appsrc/ODS-Blog/templates/openlink/moblogimage.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/ping.vspx b/appsrc/ODS-Blog/templates/openlink/ping.vspx index d217a26bd2..bfc326dba8 100644 --- a/appsrc/ODS-Blog/templates/openlink/ping.vspx +++ b/appsrc/ODS-Blog/templates/openlink/ping.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/ping_queue.vspx b/appsrc/ODS-Blog/templates/openlink/ping_queue.vspx index ad8d219fa0..8c1bda962c 100644 --- a/appsrc/ODS-Blog/templates/openlink/ping_queue.vspx +++ b/appsrc/ODS-Blog/templates/openlink/ping_queue.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/posts.vspx b/appsrc/ODS-Blog/templates/openlink/posts.vspx index 65375b8961..6cd7ea6eff 100644 --- a/appsrc/ODS-Blog/templates/openlink/posts.vspx +++ b/appsrc/ODS-Blog/templates/openlink/posts.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/register.vspx b/appsrc/ODS-Blog/templates/openlink/register.vspx index 0ef77f348b..e366914cbb 100644 --- a/appsrc/ODS-Blog/templates/openlink/register.vspx +++ b/appsrc/ODS-Blog/templates/openlink/register.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/routing_queue.vspx b/appsrc/ODS-Blog/templates/openlink/routing_queue.vspx index cbd7e23bca..c2a5bd8be8 100644 --- a/appsrc/ODS-Blog/templates/openlink/routing_queue.vspx +++ b/appsrc/ODS-Blog/templates/openlink/routing_queue.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/suggest_kwd.vspx b/appsrc/ODS-Blog/templates/openlink/suggest_kwd.vspx index 6ea2dee39f..81316c51da 100644 --- a/appsrc/ODS-Blog/templates/openlink/suggest_kwd.vspx +++ b/appsrc/ODS-Blog/templates/openlink/suggest_kwd.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/suggest_tb.vspx b/appsrc/ODS-Blog/templates/openlink/suggest_tb.vspx index 88c0c410b6..3dad549783 100644 --- a/appsrc/ODS-Blog/templates/openlink/suggest_tb.vspx +++ b/appsrc/ODS-Blog/templates/openlink/suggest_tb.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/summary.vspx b/appsrc/ODS-Blog/templates/openlink/summary.vspx index b3623645c1..95d84af370 100644 --- a/appsrc/ODS-Blog/templates/openlink/summary.vspx +++ b/appsrc/ODS-Blog/templates/openlink/summary.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/tags.vspx b/appsrc/ODS-Blog/templates/openlink/tags.vspx index 8f37d945ad..eae56b8a3c 100644 --- a/appsrc/ODS-Blog/templates/openlink/tags.vspx +++ b/appsrc/ODS-Blog/templates/openlink/tags.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/templates.vspx b/appsrc/ODS-Blog/templates/openlink/templates.vspx index 743688fc7f..e8c5e27f50 100644 --- a/appsrc/ODS-Blog/templates/openlink/templates.vspx +++ b/appsrc/ODS-Blog/templates/openlink/templates.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/wa.vspx b/appsrc/ODS-Blog/templates/openlink/wa.vspx index 3083934e87..9f230205e1 100644 --- a/appsrc/ODS-Blog/templates/openlink/wa.vspx +++ b/appsrc/ODS-Blog/templates/openlink/wa.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/wa_left.vspx b/appsrc/ODS-Blog/templates/openlink/wa_left.vspx index 029444a416..20875d1165 100644 --- a/appsrc/ODS-Blog/templates/openlink/wa_left.vspx +++ b/appsrc/ODS-Blog/templates/openlink/wa_left.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink/wa_right.vspx b/appsrc/ODS-Blog/templates/openlink/wa_right.vspx index 35ce8b7609..4a806e4457 100644 --- a/appsrc/ODS-Blog/templates/openlink/wa_right.vspx +++ b/appsrc/ODS-Blog/templates/openlink/wa_right.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/openlink_classic/default.css b/appsrc/ODS-Blog/templates/openlink_classic/default.css index 6597e9a8c7..bf78b9592c 100644 --- a/appsrc/ODS-Blog/templates/openlink_classic/default.css +++ b/appsrc/ODS-Blog/templates/openlink_classic/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/round_the_corner/default.css b/appsrc/ODS-Blog/templates/round_the_corner/default.css index 5c0b2345c5..a0eea2f131 100644 --- a/appsrc/ODS-Blog/templates/round_the_corner/default.css +++ b/appsrc/ODS-Blog/templates/round_the_corner/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/round_the_corner/index.vspx b/appsrc/ODS-Blog/templates/round_the_corner/index.vspx index ef714a9085..82cd1e3b68 100644 --- a/appsrc/ODS-Blog/templates/round_the_corner/index.vspx +++ b/appsrc/ODS-Blog/templates/round_the_corner/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/round_wheat/default.css b/appsrc/ODS-Blog/templates/round_wheat/default.css index d82f194bfb..0f2e09ae20 100644 --- a/appsrc/ODS-Blog/templates/round_wheat/default.css +++ b/appsrc/ODS-Blog/templates/round_wheat/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/round_wheat/index.vspx b/appsrc/ODS-Blog/templates/round_wheat/index.vspx index 46b1475920..acb4bb6bee 100644 --- a/appsrc/ODS-Blog/templates/round_wheat/index.vspx +++ b/appsrc/ODS-Blog/templates/round_wheat/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/seattle/default.css b/appsrc/ODS-Blog/templates/seattle/default.css index 61ca1a2a92..c2c96ef59a 100644 --- a/appsrc/ODS-Blog/templates/seattle/default.css +++ b/appsrc/ODS-Blog/templates/seattle/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/seattle/index.vspx b/appsrc/ODS-Blog/templates/seattle/index.vspx index d23daefdee..2149e08273 100644 --- a/appsrc/ODS-Blog/templates/seattle/index.vspx +++ b/appsrc/ODS-Blog/templates/seattle/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/spring/default.css b/appsrc/ODS-Blog/templates/spring/default.css index d1bee49013..c85e4fd063 100644 --- a/appsrc/ODS-Blog/templates/spring/default.css +++ b/appsrc/ODS-Blog/templates/spring/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/spring/index.vspx b/appsrc/ODS-Blog/templates/spring/index.vspx index e4d22707c6..a0da5562cc 100644 --- a/appsrc/ODS-Blog/templates/spring/index.vspx +++ b/appsrc/ODS-Blog/templates/spring/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/archive.vspx b/appsrc/ODS-Blog/templates/squeaky_clean/archive.vspx index d1ce65e9f1..b206c9bea2 100644 --- a/appsrc/ODS-Blog/templates/squeaky_clean/archive.vspx +++ b/appsrc/ODS-Blog/templates/squeaky_clean/archive.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/default.css b/appsrc/ODS-Blog/templates/squeaky_clean/default.css index 8de3096dc5..d60c9fa810 100644 --- a/appsrc/ODS-Blog/templates/squeaky_clean/default.css +++ b/appsrc/ODS-Blog/templates/squeaky_clean/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/index.vspx b/appsrc/ODS-Blog/templates/squeaky_clean/index.vspx index 2b75080b5c..987bea6190 100644 --- a/appsrc/ODS-Blog/templates/squeaky_clean/index.vspx +++ b/appsrc/ODS-Blog/templates/squeaky_clean/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/linkblog.vspx b/appsrc/ODS-Blog/templates/squeaky_clean/linkblog.vspx index b93738999d..9f60dc5cf8 100644 --- a/appsrc/ODS-Blog/templates/squeaky_clean/linkblog.vspx +++ b/appsrc/ODS-Blog/templates/squeaky_clean/linkblog.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/mr_green_genes.css b/appsrc/ODS-Blog/templates/squeaky_clean/mr_green_genes.css index 45879f7562..3a68e3253b 100644 --- a/appsrc/ODS-Blog/templates/squeaky_clean/mr_green_genes.css +++ b/appsrc/ODS-Blog/templates/squeaky_clean/mr_green_genes.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/squeaky_clean/summary.vspx b/appsrc/ODS-Blog/templates/squeaky_clean/summary.vspx index dc05e7eb03..17adc62b80 100644 --- a/appsrc/ODS-Blog/templates/squeaky_clean/summary.vspx +++ b/appsrc/ODS-Blog/templates/squeaky_clean/summary.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/archive.vspx b/appsrc/ODS-Blog/templates/squeaky_clean_2col/archive.vspx index d081e36c2a..db3b774f8c 100644 --- a/appsrc/ODS-Blog/templates/squeaky_clean_2col/archive.vspx +++ b/appsrc/ODS-Blog/templates/squeaky_clean_2col/archive.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/default.css b/appsrc/ODS-Blog/templates/squeaky_clean_2col/default.css index 5ed77c0b6b..4c2200a713 100644 --- a/appsrc/ODS-Blog/templates/squeaky_clean_2col/default.css +++ b/appsrc/ODS-Blog/templates/squeaky_clean_2col/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/index.vspx b/appsrc/ODS-Blog/templates/squeaky_clean_2col/index.vspx index 066e905245..4c18b71597 100644 --- a/appsrc/ODS-Blog/templates/squeaky_clean_2col/index.vspx +++ b/appsrc/ODS-Blog/templates/squeaky_clean_2col/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/linkblog.vspx b/appsrc/ODS-Blog/templates/squeaky_clean_2col/linkblog.vspx index ff6fc10c3d..1855e6889c 100644 --- a/appsrc/ODS-Blog/templates/squeaky_clean_2col/linkblog.vspx +++ b/appsrc/ODS-Blog/templates/squeaky_clean_2col/linkblog.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/mr_green_genes.css b/appsrc/ODS-Blog/templates/squeaky_clean_2col/mr_green_genes.css index 45879f7562..3a68e3253b 100644 --- a/appsrc/ODS-Blog/templates/squeaky_clean_2col/mr_green_genes.css +++ b/appsrc/ODS-Blog/templates/squeaky_clean_2col/mr_green_genes.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/squeaky_clean_2col/summary.vspx b/appsrc/ODS-Blog/templates/squeaky_clean_2col/summary.vspx index a2e2874b4a..655132a938 100644 --- a/appsrc/ODS-Blog/templates/squeaky_clean_2col/summary.vspx +++ b/appsrc/ODS-Blog/templates/squeaky_clean_2col/summary.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/thin_clean/default.css b/appsrc/ODS-Blog/templates/thin_clean/default.css index 7f0f815c78..db97dc8a13 100644 --- a/appsrc/ODS-Blog/templates/thin_clean/default.css +++ b/appsrc/ODS-Blog/templates/thin_clean/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/thin_clean/index.vspx b/appsrc/ODS-Blog/templates/thin_clean/index.vspx index 0144bed85e..86306690a4 100644 --- a/appsrc/ODS-Blog/templates/thin_clean/index.vspx +++ b/appsrc/ODS-Blog/templates/thin_clean/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/thin_pastel/default.css b/appsrc/ODS-Blog/templates/thin_pastel/default.css index 83b71830b1..f0e4c89190 100644 --- a/appsrc/ODS-Blog/templates/thin_pastel/default.css +++ b/appsrc/ODS-Blog/templates/thin_pastel/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/templates/thin_pastel/index.vspx b/appsrc/ODS-Blog/templates/thin_pastel/index.vspx index b8e8befae3..5999908c23 100644 --- a/appsrc/ODS-Blog/templates/thin_pastel/index.vspx +++ b/appsrc/ODS-Blog/templates/thin_pastel/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/trackback.sql b/appsrc/ODS-Blog/trackback.sql index 91dbea5f3a..dd4a0d6437 100644 --- a/appsrc/ODS-Blog/trackback.sql +++ b/appsrc/ODS-Blog/trackback.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/uninst.sql b/appsrc/ODS-Blog/uninst.sql index 679a82a243..a3cdf0562f 100644 --- a/appsrc/ODS-Blog/uninst.sql +++ b/appsrc/ODS-Blog/uninst.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/wa_integration.sql b/appsrc/ODS-Blog/wa_integration.sql index e100e62804..08e5ba6a4f 100644 --- a/appsrc/ODS-Blog/wa_integration.sql +++ b/appsrc/ODS-Blog/wa_integration.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/wa_search_blog.sql b/appsrc/ODS-Blog/wa_search_blog.sql index 31acf883e4..f11b55aca1 100644 --- a/appsrc/ODS-Blog/wa_search_blog.sql +++ b/appsrc/ODS-Blog/wa_search_blog.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/blog_template_check.xsl b/appsrc/ODS-Blog/widgets/blog_template_check.xsl index 13c58932c5..4ec6c34e44 100644 --- a/appsrc/ODS-Blog/widgets/blog_template_check.xsl +++ b/appsrc/ODS-Blog/widgets/blog_template_check.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/blog_tidy.xsl b/appsrc/ODS-Blog/widgets/blog_tidy.xsl index f8c608e7f1..f8e81d69d7 100644 --- a/appsrc/ODS-Blog/widgets/blog_tidy.xsl +++ b/appsrc/ODS-Blog/widgets/blog_tidy.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/calendar.xsl b/appsrc/ODS-Blog/widgets/calendar.xsl index 9449cbaec4..1450142935 100644 --- a/appsrc/ODS-Blog/widgets/calendar.xsl +++ b/appsrc/ODS-Blog/widgets/calendar.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/comment_check.xsl b/appsrc/ODS-Blog/widgets/comment_check.xsl index 094f0a4a75..2f25b4a04e 100644 --- a/appsrc/ODS-Blog/widgets/comment_check.xsl +++ b/appsrc/ODS-Blog/widgets/comment_check.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/compat.xsl b/appsrc/ODS-Blog/widgets/compat.xsl index dd6d03c951..11de025b28 100644 --- a/appsrc/ODS-Blog/widgets/compat.xsl +++ b/appsrc/ODS-Blog/widgets/compat.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/dav_browser.xsl b/appsrc/ODS-Blog/widgets/dav_browser.xsl index 3ef0ef9c1f..d62fffafce 100644 --- a/appsrc/ODS-Blog/widgets/dav_browser.xsl +++ b/appsrc/ODS-Blog/widgets/dav_browser.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/error.xsl b/appsrc/ODS-Blog/widgets/error.xsl index d6fcc9179c..b9ffcc1b83 100644 --- a/appsrc/ODS-Blog/widgets/error.xsl +++ b/appsrc/ODS-Blog/widgets/error.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/foaf.xsl b/appsrc/ODS-Blog/widgets/foaf.xsl index 617661b26f..fd748875b9 100644 --- a/appsrc/ODS-Blog/widgets/foaf.xsl +++ b/appsrc/ODS-Blog/widgets/foaf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/main.xsl b/appsrc/ODS-Blog/widgets/main.xsl index fdb32ced21..f85cf31465 100644 --- a/appsrc/ODS-Blog/widgets/main.xsl +++ b/appsrc/ODS-Blog/widgets/main.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/make_sp.xsl b/appsrc/ODS-Blog/widgets/make_sp.xsl index 5a01fa2801..a9c3f2c252 100644 --- a/appsrc/ODS-Blog/widgets/make_sp.xsl +++ b/appsrc/ODS-Blog/widgets/make_sp.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/opml2ocs.xsl b/appsrc/ODS-Blog/widgets/opml2ocs.xsl index ef6a158ed7..9d7fbac69b 100644 --- a/appsrc/ODS-Blog/widgets/opml2ocs.xsl +++ b/appsrc/ODS-Blog/widgets/opml2ocs.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/opml2ocs03.xsl b/appsrc/ODS-Blog/widgets/opml2ocs03.xsl index 7796696d66..caf60dbeb1 100644 --- a/appsrc/ODS-Blog/widgets/opml2ocs03.xsl +++ b/appsrc/ODS-Blog/widgets/opml2ocs03.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/render.xsl b/appsrc/ODS-Blog/widgets/render.xsl index 3aef0bb015..ec0620e540 100644 --- a/appsrc/ODS-Blog/widgets/render.xsl +++ b/appsrc/ODS-Blog/widgets/render.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/rss11.xsl b/appsrc/ODS-Blog/widgets/rss11.xsl index 8404ffdd88..60c1a27e0f 100644 --- a/appsrc/ODS-Blog/widgets/rss11.xsl +++ b/appsrc/ODS-Blog/widgets/rss11.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/rss2atom.xsl b/appsrc/ODS-Blog/widgets/rss2atom.xsl index ba7fdd5f0d..3f4a2f8b35 100644 --- a/appsrc/ODS-Blog/widgets/rss2atom.xsl +++ b/appsrc/ODS-Blog/widgets/rss2atom.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/rss2atom03.xsl b/appsrc/ODS-Blog/widgets/rss2atom03.xsl index ee17026093..5ad5d6ee8e 100644 --- a/appsrc/ODS-Blog/widgets/rss2atom03.xsl +++ b/appsrc/ODS-Blog/widgets/rss2atom03.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/rss2mrss.xsl b/appsrc/ODS-Blog/widgets/rss2mrss.xsl index 8a2e2f4b87..51376a6930 100644 --- a/appsrc/ODS-Blog/widgets/rss2mrss.xsl +++ b/appsrc/ODS-Blog/widgets/rss2mrss.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/rss2rdf.xsl b/appsrc/ODS-Blog/widgets/rss2rdf.xsl index 83396ebe31..f7ceeaec30 100644 --- a/appsrc/ODS-Blog/widgets/rss2rdf.xsl +++ b/appsrc/ODS-Blog/widgets/rss2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/rss2wml.xsl b/appsrc/ODS-Blog/widgets/rss2wml.xsl index 9f618f65d7..cc9e9a1595 100644 --- a/appsrc/ODS-Blog/widgets/rss2wml.xsl +++ b/appsrc/ODS-Blog/widgets/rss2wml.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/rss2xbel.xsl b/appsrc/ODS-Blog/widgets/rss2xbel.xsl index 468dc2652b..a6d7cc805f 100644 --- a/appsrc/ODS-Blog/widgets/rss2xbel.xsl +++ b/appsrc/ODS-Blog/widgets/rss2xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/store.xsl b/appsrc/ODS-Blog/widgets/store.xsl index 620f081959..f7d40389c9 100644 --- a/appsrc/ODS-Blog/widgets/store.xsl +++ b/appsrc/ODS-Blog/widgets/store.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/store_post.xsl b/appsrc/ODS-Blog/widgets/store_post.xsl index 5f9809306b..c3ef9c0f9a 100644 --- a/appsrc/ODS-Blog/widgets/store_post.xsl +++ b/appsrc/ODS-Blog/widgets/store_post.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Blog/widgets/xbel.xsl b/appsrc/ODS-Blog/widgets/xbel.xsl index 3ff59c90d4..0f9dc238d0 100644 --- a/appsrc/ODS-Blog/widgets/xbel.xsl +++ b/appsrc/ODS-Blog/widgets/xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/Makefile.am b/appsrc/ODS-Bookmark/Makefile.am index 4609a099b5..23b58630fc 100644 --- a/appsrc/ODS-Bookmark/Makefile.am +++ b/appsrc/ODS-Bookmark/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/make_vad.sh b/appsrc/ODS-Bookmark/make_vad.sh index 0f5af5b69d..555b6f658d 100755 --- a/appsrc/ODS-Bookmark/make_vad.sh +++ b/appsrc/ODS-Bookmark/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -272,7 +272,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-Bookmark/sql/DET_Bookmark.sql b/appsrc/ODS-Bookmark/sql/DET_Bookmark.sql index f6be0c0f4b..e322dbadff 100644 --- a/appsrc/ODS-Bookmark/sql/DET_Bookmark.sql +++ b/appsrc/ODS-Bookmark/sql/DET_Bookmark.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-api.sql b/appsrc/ODS-Bookmark/sql/bmk-a-api.sql index 433500148d..507e37079c 100644 --- a/appsrc/ODS-Bookmark/sql/bmk-a-api.sql +++ b/appsrc/ODS-Bookmark/sql/bmk-a-api.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-code.sql b/appsrc/ODS-Bookmark/sql/bmk-a-code.sql index a783982459..8ad9192d8f 100644 --- a/appsrc/ODS-Bookmark/sql/bmk-a-code.sql +++ b/appsrc/ODS-Bookmark/sql/bmk-a-code.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-ods.sql b/appsrc/ODS-Bookmark/sql/bmk-a-ods.sql index ede2751efe..3022f9c9c6 100644 --- a/appsrc/ODS-Bookmark/sql/bmk-a-ods.sql +++ b/appsrc/ODS-Bookmark/sql/bmk-a-ods.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-table.sql b/appsrc/ODS-Bookmark/sql/bmk-a-table.sql index 2290351b51..7c3a5530f5 100644 --- a/appsrc/ODS-Bookmark/sql/bmk-a-table.sql +++ b/appsrc/ODS-Bookmark/sql/bmk-a-table.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-update.sql b/appsrc/ODS-Bookmark/sql/bmk-a-update.sql index 0e8c3c2407..400e80b2e5 100644 --- a/appsrc/ODS-Bookmark/sql/bmk-a-update.sql +++ b/appsrc/ODS-Bookmark/sql/bmk-a-update.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/sql/bmk-a-wa.sql b/appsrc/ODS-Bookmark/sql/bmk-a-wa.sql index 23ea9a9c0b..f73c14bd14 100644 --- a/appsrc/ODS-Bookmark/sql/bmk-a-wa.sql +++ b/appsrc/ODS-Bookmark/sql/bmk-a-wa.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/sql/bmk-d.sql b/appsrc/ODS-Bookmark/sql/bmk-d.sql index 75f9e5d287..44fa63497b 100644 --- a/appsrc/ODS-Bookmark/sql/bmk-d.sql +++ b/appsrc/ODS-Bookmark/sql/bmk-d.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/sql/sioc_bmk.sql b/appsrc/ODS-Bookmark/sql/sioc_bmk.sql index 8f1f29cdac..0a5ccbac94 100644 --- a/appsrc/ODS-Bookmark/sql/sioc_bmk.sql +++ b/appsrc/ODS-Bookmark/sql/sioc_bmk.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/ajax.vsp b/appsrc/ODS-Bookmark/www/ajax.vsp index df36728afb..70a01a377b 100644 --- a/appsrc/ODS-Bookmark/www/ajax.vsp +++ b/appsrc/ODS-Bookmark/www/ajax.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/annotea.vspx b/appsrc/ODS-Bookmark/www/annotea.vspx index d5b31f0d00..78873ec08a 100644 --- a/appsrc/ODS-Bookmark/www/annotea.vspx +++ b/appsrc/ODS-Bookmark/www/annotea.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/bmk_login.vspx b/appsrc/ODS-Bookmark/www/bmk_login.vspx index 894777ae4b..740f2ea73d 100644 --- a/appsrc/ODS-Bookmark/www/bmk_login.vspx +++ b/appsrc/ODS-Bookmark/www/bmk_login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/bookmarks.vspx b/appsrc/ODS-Bookmark/www/bookmarks.vspx index 98ef16776a..d1ba3059e7 100644 --- a/appsrc/ODS-Bookmark/www/bookmarks.vspx +++ b/appsrc/ODS-Bookmark/www/bookmarks.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/conversation.vspx b/appsrc/ODS-Bookmark/www/conversation.vspx index c8e82ca197..efffd96af8 100644 --- a/appsrc/ODS-Bookmark/www/conversation.vspx +++ b/appsrc/ODS-Bookmark/www/conversation.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/css/style.css b/appsrc/ODS-Bookmark/www/css/style.css index 3c925dd08b..316c78a8c8 100644 --- a/appsrc/ODS-Bookmark/www/css/style.css +++ b/appsrc/ODS-Bookmark/www/css/style.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/error.vspx b/appsrc/ODS-Bookmark/www/error.vspx index 1fa5be4b3a..37e2a452e8 100644 --- a/appsrc/ODS-Bookmark/www/error.vspx +++ b/appsrc/ODS-Bookmark/www/error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/export.vspx b/appsrc/ODS-Bookmark/www/export.vspx index b2e7b48030..7a3ec55fbb 100644 --- a/appsrc/ODS-Bookmark/www/export.vspx +++ b/appsrc/ODS-Bookmark/www/export.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/forms.vspx b/appsrc/ODS-Bookmark/www/forms.vspx index 4a0ffbb431..a84c4094a2 100644 --- a/appsrc/ODS-Bookmark/www/forms.vspx +++ b/appsrc/ODS-Bookmark/www/forms.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/gems.vsp b/appsrc/ODS-Bookmark/www/gems.vsp index ff56317c14..d6618bdccf 100644 --- a/appsrc/ODS-Bookmark/www/gems.vsp +++ b/appsrc/ODS-Bookmark/www/gems.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/js/bookmark.js b/appsrc/ODS-Bookmark/www/js/bookmark.js index b2b91f4293..e64461f6e6 100644 --- a/appsrc/ODS-Bookmark/www/js/bookmark.js +++ b/appsrc/ODS-Bookmark/www/js/bookmark.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/message.vspx b/appsrc/ODS-Bookmark/www/message.vspx index 416ef37353..a14c713b01 100644 --- a/appsrc/ODS-Bookmark/www/message.vspx +++ b/appsrc/ODS-Bookmark/www/message.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/search.vspx b/appsrc/ODS-Bookmark/www/search.vspx index 5ae2b8be4f..1f7f99981d 100644 --- a/appsrc/ODS-Bookmark/www/search.vspx +++ b/appsrc/ODS-Bookmark/www/search.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/settings.vspx b/appsrc/ODS-Bookmark/www/settings.vspx index 769e70069a..bc56ae798a 100644 --- a/appsrc/ODS-Bookmark/www/settings.vspx +++ b/appsrc/ODS-Bookmark/www/settings.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/tags.vspx b/appsrc/ODS-Bookmark/www/tags.vspx index 50d15344b2..f366c9ed63 100644 --- a/appsrc/ODS-Bookmark/www/tags.vspx +++ b/appsrc/ODS-Bookmark/www/tags.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/template/popup.vspx b/appsrc/ODS-Bookmark/www/template/popup.vspx index 1985e84568..3195c62e35 100644 --- a/appsrc/ODS-Bookmark/www/template/popup.vspx +++ b/appsrc/ODS-Bookmark/www/template/popup.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/template/template.vspx b/appsrc/ODS-Bookmark/www/template/template.vspx index c52402fbff..53155831dc 100644 --- a/appsrc/ODS-Bookmark/www/template/template.vspx +++ b/appsrc/ODS-Bookmark/www/template/template.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/www/template/template.xsl b/appsrc/ODS-Bookmark/www/template/template.xsl index 28f9c97441..420b0760bc 100644 --- a/appsrc/ODS-Bookmark/www/template/template.xsl +++ b/appsrc/ODS-Bookmark/www/template/template.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/xslt/Netscape.xsl b/appsrc/ODS-Bookmark/xslt/Netscape.xsl index 58a63fc61d..81ca18c751 100644 --- a/appsrc/ODS-Bookmark/xslt/Netscape.xsl +++ b/appsrc/ODS-Bookmark/xslt/Netscape.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/xslt/XBEL.xsl b/appsrc/ODS-Bookmark/xslt/XBEL.xsl index 0dd0d5b307..c5bfc6d3bf 100644 --- a/appsrc/ODS-Bookmark/xslt/XBEL.xsl +++ b/appsrc/ODS-Bookmark/xslt/XBEL.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/xslt/rss2atom.xsl b/appsrc/ODS-Bookmark/xslt/rss2atom.xsl index f742cf5f60..fe6ab15f68 100644 --- a/appsrc/ODS-Bookmark/xslt/rss2atom.xsl +++ b/appsrc/ODS-Bookmark/xslt/rss2atom.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/xslt/rss2atom03.xsl b/appsrc/ODS-Bookmark/xslt/rss2atom03.xsl index c6fb984bfd..4505afba5d 100644 --- a/appsrc/ODS-Bookmark/xslt/rss2atom03.xsl +++ b/appsrc/ODS-Bookmark/xslt/rss2atom03.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/xslt/rss2rdf.xsl b/appsrc/ODS-Bookmark/xslt/rss2rdf.xsl index 6fc704ae5c..e1d88e4cf2 100644 --- a/appsrc/ODS-Bookmark/xslt/rss2rdf.xsl +++ b/appsrc/ODS-Bookmark/xslt/rss2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Bookmark/xslt/rss2xbel.xsl b/appsrc/ODS-Bookmark/xslt/rss2xbel.xsl index 468dc2652b..a6d7cc805f 100644 --- a/appsrc/ODS-Bookmark/xslt/rss2xbel.xsl +++ b/appsrc/ODS-Bookmark/xslt/rss2xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/Makefile.am b/appsrc/ODS-Briefcase/Makefile.am index a37b165188..71e6c29df0 100644 --- a/appsrc/ODS-Briefcase/Makefile.am +++ b/appsrc/ODS-Briefcase/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/make_vad.sh b/appsrc/ODS-Briefcase/make_vad.sh index 825f48b173..82f0c24f8a 100755 --- a/appsrc/ODS-Briefcase/make_vad.sh +++ b/appsrc/ODS-Briefcase/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -283,7 +283,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-Briefcase/new/DET_Box.sql b/appsrc/ODS-Briefcase/new/DET_Box.sql index f6fd0208d5..5bf633ada6 100644 --- a/appsrc/ODS-Briefcase/new/DET_Box.sql +++ b/appsrc/ODS-Briefcase/new/DET_Box.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/DET_Dropbox.sql b/appsrc/ODS-Briefcase/new/DET_Dropbox.sql index dadfec2e4b..2617be36f0 100644 --- a/appsrc/ODS-Briefcase/new/DET_Dropbox.sql +++ b/appsrc/ODS-Briefcase/new/DET_Dropbox.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/DET_GDrive.sql b/appsrc/ODS-Briefcase/new/DET_GDrive.sql index fb9097b2c0..6e436ce6fb 100644 --- a/appsrc/ODS-Briefcase/new/DET_GDrive.sql +++ b/appsrc/ODS-Briefcase/new/DET_GDrive.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/DET_Rackspace.sql b/appsrc/ODS-Briefcase/new/DET_Rackspace.sql index ca548ecddb..695ea667d1 100644 --- a/appsrc/ODS-Briefcase/new/DET_Rackspace.sql +++ b/appsrc/ODS-Briefcase/new/DET_Rackspace.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/DET_SkyDrive.sql b/appsrc/ODS-Briefcase/new/DET_SkyDrive.sql index dbe16c6a55..1652b0ca66 100644 --- a/appsrc/ODS-Briefcase/new/DET_SkyDrive.sql +++ b/appsrc/ODS-Briefcase/new/DET_SkyDrive.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/DET_WebDAV.sql b/appsrc/ODS-Briefcase/new/DET_WebDAV.sql index b5e286ddc0..3bc5138b06 100644 --- a/appsrc/ODS-Briefcase/new/DET_WebDAV.sql +++ b/appsrc/ODS-Briefcase/new/DET_WebDAV.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/od-a-api.sql b/appsrc/ODS-Briefcase/new/od-a-api.sql index ec7a9314b1..60b08e1f15 100644 --- a/appsrc/ODS-Briefcase/new/od-a-api.sql +++ b/appsrc/ODS-Briefcase/new/od-a-api.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/od-a-code.sql b/appsrc/ODS-Briefcase/new/od-a-code.sql index 971d977d1b..6db6ce6fe2 100644 --- a/appsrc/ODS-Briefcase/new/od-a-code.sql +++ b/appsrc/ODS-Briefcase/new/od-a-code.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/od-a-dc-data.sql b/appsrc/ODS-Briefcase/new/od-a-dc-data.sql index 09d76750ec..439871cce7 100644 --- a/appsrc/ODS-Briefcase/new/od-a-dc-data.sql +++ b/appsrc/ODS-Briefcase/new/od-a-dc-data.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/od-a-dc.sql b/appsrc/ODS-Briefcase/new/od-a-dc.sql index bf0533809f..5008eb2fa3 100644 --- a/appsrc/ODS-Briefcase/new/od-a-dc.sql +++ b/appsrc/ODS-Briefcase/new/od-a-dc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/od-a-ddk.sql b/appsrc/ODS-Briefcase/new/od-a-ddk.sql index 8a38eed711..0b09f8f15a 100644 --- a/appsrc/ODS-Briefcase/new/od-a-ddk.sql +++ b/appsrc/ODS-Briefcase/new/od-a-ddk.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/od-a-ods.sql b/appsrc/ODS-Briefcase/new/od-a-ods.sql index f1ed032964..9a121ece01 100644 --- a/appsrc/ODS-Briefcase/new/od-a-ods.sql +++ b/appsrc/ODS-Briefcase/new/od-a-ods.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/od-a-rdf-data.sql b/appsrc/ODS-Briefcase/new/od-a-rdf-data.sql index ef76cf83c4..64c8bf7594 100644 --- a/appsrc/ODS-Briefcase/new/od-a-rdf-data.sql +++ b/appsrc/ODS-Briefcase/new/od-a-rdf-data.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/od-a-rdf.sql b/appsrc/ODS-Briefcase/new/od-a-rdf.sql index 372103c806..113621e9e3 100644 --- a/appsrc/ODS-Briefcase/new/od-a-rdf.sql +++ b/appsrc/ODS-Briefcase/new/od-a-rdf.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/od-a-update.sql b/appsrc/ODS-Briefcase/new/od-a-update.sql index b2cddeda40..2d6d870658 100644 --- a/appsrc/ODS-Briefcase/new/od-a-update.sql +++ b/appsrc/ODS-Briefcase/new/od-a-update.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/od-a-wa.sql b/appsrc/ODS-Briefcase/new/od-a-wa.sql index a0cdb9767a..920fa61106 100644 --- a/appsrc/ODS-Briefcase/new/od-a-wa.sql +++ b/appsrc/ODS-Briefcase/new/od-a-wa.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/od-d.sql b/appsrc/ODS-Briefcase/new/od-d.sql index b2742941c0..d4d0891748 100644 --- a/appsrc/ODS-Briefcase/new/od-d.sql +++ b/appsrc/ODS-Briefcase/new/od-d.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/new/sioc_briefcase.sql b/appsrc/ODS-Briefcase/new/sioc_briefcase.sql index 933d4e06a2..fa9468aa44 100644 --- a/appsrc/ODS-Briefcase/new/sioc_briefcase.sql +++ b/appsrc/ODS-Briefcase/new/sioc_briefcase.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/DOAP.rdf b/appsrc/ODS-Briefcase/schemas/DOAP.rdf index 4f92050ac5..060ea4bb12 100644 --- a/appsrc/ODS-Briefcase/schemas/DOAP.rdf +++ b/appsrc/ODS-Briefcase/schemas/DOAP.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/EML.rdf b/appsrc/ODS-Briefcase/schemas/EML.rdf index fb6cbee357..e1cdee0f0d 100644 --- a/appsrc/ODS-Briefcase/schemas/EML.rdf +++ b/appsrc/ODS-Briefcase/schemas/EML.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/FOAF.rdf b/appsrc/ODS-Briefcase/schemas/FOAF.rdf index f146bd4eed..c7f1cc53b5 100644 --- a/appsrc/ODS-Briefcase/schemas/FOAF.rdf +++ b/appsrc/ODS-Briefcase/schemas/FOAF.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/ICS.rdf b/appsrc/ODS-Briefcase/schemas/ICS.rdf index b53fa86c70..80b6afd21d 100644 --- a/appsrc/ODS-Briefcase/schemas/ICS.rdf +++ b/appsrc/ODS-Briefcase/schemas/ICS.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/MODS.rdf b/appsrc/ODS-Briefcase/schemas/MODS.rdf index 6232e493ca..819f64acc1 100644 --- a/appsrc/ODS-Briefcase/schemas/MODS.rdf +++ b/appsrc/ODS-Briefcase/schemas/MODS.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/OPML.rdf b/appsrc/ODS-Briefcase/schemas/OPML.rdf index 104ddd88a6..36eefe5368 100644 --- a/appsrc/ODS-Briefcase/schemas/OPML.rdf +++ b/appsrc/ODS-Briefcase/schemas/OPML.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/Office.rdf b/appsrc/ODS-Briefcase/schemas/Office.rdf index d2db33248f..09e456a455 100644 --- a/appsrc/ODS-Briefcase/schemas/Office.rdf +++ b/appsrc/ODS-Briefcase/schemas/Office.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/RDF.rdf b/appsrc/ODS-Briefcase/schemas/RDF.rdf index 16627ad9e8..07b9a050c2 100644 --- a/appsrc/ODS-Briefcase/schemas/RDF.rdf +++ b/appsrc/ODS-Briefcase/schemas/RDF.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/RSS.rdf b/appsrc/ODS-Briefcase/schemas/RSS.rdf index 07ae38a842..cd91364786 100644 --- a/appsrc/ODS-Briefcase/schemas/RSS.rdf +++ b/appsrc/ODS-Briefcase/schemas/RSS.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/Spotlight.rdf b/appsrc/ODS-Briefcase/schemas/Spotlight.rdf index 635e52a02e..001b1e720a 100644 --- a/appsrc/ODS-Briefcase/schemas/Spotlight.rdf +++ b/appsrc/ODS-Briefcase/schemas/Spotlight.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/VAD.rdf b/appsrc/ODS-Briefcase/schemas/VAD.rdf index b47efa0225..9bbe49bc10 100644 --- a/appsrc/ODS-Briefcase/schemas/VAD.rdf +++ b/appsrc/ODS-Briefcase/schemas/VAD.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/VSPX.rdf b/appsrc/ODS-Briefcase/schemas/VSPX.rdf index 0ce314fa4d..8469b0270d 100644 --- a/appsrc/ODS-Briefcase/schemas/VSPX.rdf +++ b/appsrc/ODS-Briefcase/schemas/VSPX.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/WSDL.rdf b/appsrc/ODS-Briefcase/schemas/WSDL.rdf index 5fee945dd9..0b4b9ba208 100644 --- a/appsrc/ODS-Briefcase/schemas/WSDL.rdf +++ b/appsrc/ODS-Briefcase/schemas/WSDL.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/Wiki.rdf b/appsrc/ODS-Briefcase/schemas/Wiki.rdf index 188ea5ece4..40a9079a2a 100644 --- a/appsrc/ODS-Briefcase/schemas/Wiki.rdf +++ b/appsrc/ODS-Briefcase/schemas/Wiki.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/XBEL.rdf b/appsrc/ODS-Briefcase/schemas/XBEL.rdf index 31b8bc21d3..240d523b6f 100644 --- a/appsrc/ODS-Briefcase/schemas/XBEL.rdf +++ b/appsrc/ODS-Briefcase/schemas/XBEL.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/XBRL.rdf b/appsrc/ODS-Briefcase/schemas/XBRL.rdf index d1ceeb7145..847cdc4d32 100644 --- a/appsrc/ODS-Briefcase/schemas/XBRL.rdf +++ b/appsrc/ODS-Briefcase/schemas/XBRL.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/XDDL.rdf b/appsrc/ODS-Briefcase/schemas/XDDL.rdf index 9f8b7c4f1c..5b15c184b1 100644 --- a/appsrc/ODS-Briefcase/schemas/XDDL.rdf +++ b/appsrc/ODS-Briefcase/schemas/XDDL.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/XHTML.rdf b/appsrc/ODS-Briefcase/schemas/XHTML.rdf index 1c2f3301f2..59f8692200 100644 --- a/appsrc/ODS-Briefcase/schemas/XHTML.rdf +++ b/appsrc/ODS-Briefcase/schemas/XHTML.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/annotea.rdf b/appsrc/ODS-Briefcase/schemas/annotea.rdf index 0274069725..827f007f54 100644 --- a/appsrc/ODS-Briefcase/schemas/annotea.rdf +++ b/appsrc/ODS-Briefcase/schemas/annotea.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/archive.rdf b/appsrc/ODS-Briefcase/schemas/archive.rdf index 811346faa0..9a062cb312 100644 --- a/appsrc/ODS-Briefcase/schemas/archive.rdf +++ b/appsrc/ODS-Briefcase/schemas/archive.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/audio.rdf b/appsrc/ODS-Briefcase/schemas/audio.rdf index 020f4f946a..dd60209f9b 100644 --- a/appsrc/ODS-Briefcase/schemas/audio.rdf +++ b/appsrc/ODS-Briefcase/schemas/audio.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/google-kinds.rdf b/appsrc/ODS-Briefcase/schemas/google-kinds.rdf index 71b8aa2cc7..b9b0134e30 100644 --- a/appsrc/ODS-Briefcase/schemas/google-kinds.rdf +++ b/appsrc/ODS-Briefcase/schemas/google-kinds.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/image.rdf b/appsrc/ODS-Briefcase/schemas/image.rdf index 8d98537491..58ce7e3bcf 100644 --- a/appsrc/ODS-Briefcase/schemas/image.rdf +++ b/appsrc/ODS-Briefcase/schemas/image.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/opl-lic.rdf b/appsrc/ODS-Briefcase/schemas/opl-lic.rdf index 198ed08353..a6ec0c86a8 100644 --- a/appsrc/ODS-Briefcase/schemas/opl-lic.rdf +++ b/appsrc/ODS-Briefcase/schemas/opl-lic.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/photo.rdf b/appsrc/ODS-Briefcase/schemas/photo.rdf index d062c90eca..2217b6bc7c 100644 --- a/appsrc/ODS-Briefcase/schemas/photo.rdf +++ b/appsrc/ODS-Briefcase/schemas/photo.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/schemas/vcard-rdf.rdf b/appsrc/ODS-Briefcase/schemas/vcard-rdf.rdf index 8f0508f96f..5bc8f7255b 100644 --- a/appsrc/ODS-Briefcase/schemas/vcard-rdf.rdf +++ b/appsrc/ODS-Briefcase/schemas/vcard-rdf.rdf @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/ajax.vsp b/appsrc/ODS-Briefcase/www/ajax.vsp index 3a1564b873..62ee29c45e 100644 --- a/appsrc/ODS-Briefcase/www/ajax.vsp +++ b/appsrc/ODS-Briefcase/www/ajax.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/css/style.css b/appsrc/ODS-Briefcase/www/css/style.css index 7b8da76cee..4fed671457 100644 --- a/appsrc/ODS-Briefcase/www/css/style.css +++ b/appsrc/ODS-Briefcase/www/css/style.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/error.vspx b/appsrc/ODS-Briefcase/www/error.vspx index fd1053963e..d62d830790 100644 --- a/appsrc/ODS-Briefcase/www/error.vspx +++ b/appsrc/ODS-Briefcase/www/error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/export.vspx b/appsrc/ODS-Briefcase/www/export.vspx index a652d083d2..d843831568 100644 --- a/appsrc/ODS-Briefcase/www/export.vspx +++ b/appsrc/ODS-Briefcase/www/export.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/forms.vspx b/appsrc/ODS-Briefcase/www/forms.vspx index f540ac82df..4ed11d68d5 100644 --- a/appsrc/ODS-Briefcase/www/forms.vspx +++ b/appsrc/ODS-Briefcase/www/forms.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/home.vspx b/appsrc/ODS-Briefcase/www/home.vspx index 668915a0fd..a702a37dc2 100644 --- a/appsrc/ODS-Briefcase/www/home.vspx +++ b/appsrc/ODS-Briefcase/www/home.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/js/odrive.js b/appsrc/ODS-Briefcase/www/js/odrive.js index 7a0988b031..562562fa85 100644 --- a/appsrc/ODS-Briefcase/www/js/odrive.js +++ b/appsrc/ODS-Briefcase/www/js/odrive.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/js/tbl.js b/appsrc/ODS-Briefcase/www/js/tbl.js index b6e4c317ce..08df401d11 100644 --- a/appsrc/ODS-Briefcase/www/js/tbl.js +++ b/appsrc/ODS-Briefcase/www/js/tbl.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/mimes.vspx b/appsrc/ODS-Briefcase/www/mimes.vspx index da81ba9009..fcaeb7998e 100644 --- a/appsrc/ODS-Briefcase/www/mimes.vspx +++ b/appsrc/ODS-Briefcase/www/mimes.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/mimes_select.vspx b/appsrc/ODS-Briefcase/www/mimes_select.vspx index 3458ffcbe6..35d86c52e6 100644 --- a/appsrc/ODS-Briefcase/www/mimes_select.vspx +++ b/appsrc/ODS-Briefcase/www/mimes_select.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/odrive_login.vspx b/appsrc/ODS-Briefcase/www/odrive_login.vspx index 8241d98860..3ee9288a72 100644 --- a/appsrc/ODS-Briefcase/www/odrive_login.vspx +++ b/appsrc/ODS-Briefcase/www/odrive_login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/settings.vspx b/appsrc/ODS-Briefcase/www/settings.vspx index a44fb47cf0..7446299c19 100644 --- a/appsrc/ODS-Briefcase/www/settings.vspx +++ b/appsrc/ODS-Briefcase/www/settings.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/subscriptions.vspx b/appsrc/ODS-Briefcase/www/subscriptions.vspx index 9334600acc..a37e5ec956 100644 --- a/appsrc/ODS-Briefcase/www/subscriptions.vspx +++ b/appsrc/ODS-Briefcase/www/subscriptions.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/template/popup.vspx b/appsrc/ODS-Briefcase/www/template/popup.vspx index 987a6ccfdd..ec35a33f8e 100644 --- a/appsrc/ODS-Briefcase/www/template/popup.vspx +++ b/appsrc/ODS-Briefcase/www/template/popup.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/template/template.vspx b/appsrc/ODS-Briefcase/www/template/template.vspx index 1db609228d..21b73aa82d 100644 --- a/appsrc/ODS-Briefcase/www/template/template.vspx +++ b/appsrc/ODS-Briefcase/www/template/template.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/template/template.xsl b/appsrc/ODS-Briefcase/www/template/template.xsl index 113af1e56f..60841dbc79 100644 --- a/appsrc/ODS-Briefcase/www/template/template.xsl +++ b/appsrc/ODS-Briefcase/www/template/template.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/view.vsp b/appsrc/ODS-Briefcase/www/view.vsp index 0eb46cc723..32dd2f5b8f 100644 --- a/appsrc/ODS-Briefcase/www/view.vsp +++ b/appsrc/ODS-Briefcase/www/view.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/www/vmds.vspx b/appsrc/ODS-Briefcase/www/vmds.vspx index de9a59e1cd..d2dd723ee5 100644 --- a/appsrc/ODS-Briefcase/www/vmds.vspx +++ b/appsrc/ODS-Briefcase/www/vmds.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/xslt/rss2atom.xsl b/appsrc/ODS-Briefcase/xslt/rss2atom.xsl index f742cf5f60..fe6ab15f68 100644 --- a/appsrc/ODS-Briefcase/xslt/rss2atom.xsl +++ b/appsrc/ODS-Briefcase/xslt/rss2atom.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/xslt/rss2atom03.xsl b/appsrc/ODS-Briefcase/xslt/rss2atom03.xsl index c6fb984bfd..4505afba5d 100644 --- a/appsrc/ODS-Briefcase/xslt/rss2atom03.xsl +++ b/appsrc/ODS-Briefcase/xslt/rss2atom03.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/xslt/rss2rdf.xsl b/appsrc/ODS-Briefcase/xslt/rss2rdf.xsl index 6fc704ae5c..e1d88e4cf2 100644 --- a/appsrc/ODS-Briefcase/xslt/rss2rdf.xsl +++ b/appsrc/ODS-Briefcase/xslt/rss2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Briefcase/xslt/rss2xbel.xsl b/appsrc/ODS-Briefcase/xslt/rss2xbel.xsl index 468dc2652b..a6d7cc805f 100644 --- a/appsrc/ODS-Briefcase/xslt/rss2xbel.xsl +++ b/appsrc/ODS-Briefcase/xslt/rss2xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/Makefile.am b/appsrc/ODS-Calendar/Makefile.am index 34f10385ee..19e14cfe60 100644 --- a/appsrc/ODS-Calendar/Makefile.am +++ b/appsrc/ODS-Calendar/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/make_vad.sh b/appsrc/ODS-Calendar/make_vad.sh index f66e344836..62ab8f4f97 100755 --- a/appsrc/ODS-Calendar/make_vad.sh +++ b/appsrc/ODS-Calendar/make_vad.sh @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -271,7 +271,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-Calendar/sql/DET_CalDAV.sql b/appsrc/ODS-Calendar/sql/DET_CalDAV.sql index d709dc55d8..dd924e6707 100644 --- a/appsrc/ODS-Calendar/sql/DET_CalDAV.sql +++ b/appsrc/ODS-Calendar/sql/DET_CalDAV.sql @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/sql/DET_Calendar.sql b/appsrc/ODS-Calendar/sql/DET_Calendar.sql index 4410979c6f..665d875cad 100644 --- a/appsrc/ODS-Calendar/sql/DET_Calendar.sql +++ b/appsrc/ODS-Calendar/sql/DET_Calendar.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/sql/calendar-a-api.sql b/appsrc/ODS-Calendar/sql/calendar-a-api.sql index 2231a2dc5c..17f2799f2a 100644 --- a/appsrc/ODS-Calendar/sql/calendar-a-api.sql +++ b/appsrc/ODS-Calendar/sql/calendar-a-api.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/sql/calendar-a-code.sql b/appsrc/ODS-Calendar/sql/calendar-a-code.sql index 5d5c95e309..5d5d604680 100644 --- a/appsrc/ODS-Calendar/sql/calendar-a-code.sql +++ b/appsrc/ODS-Calendar/sql/calendar-a-code.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/sql/calendar-a-table.sql b/appsrc/ODS-Calendar/sql/calendar-a-table.sql index 6b1dbfc4d7..a247acd3ad 100644 --- a/appsrc/ODS-Calendar/sql/calendar-a-table.sql +++ b/appsrc/ODS-Calendar/sql/calendar-a-table.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/sql/calendar-a-update.sql b/appsrc/ODS-Calendar/sql/calendar-a-update.sql index 0aac23d2ba..714592c58e 100644 --- a/appsrc/ODS-Calendar/sql/calendar-a-update.sql +++ b/appsrc/ODS-Calendar/sql/calendar-a-update.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/sql/calendar-a-wa.sql b/appsrc/ODS-Calendar/sql/calendar-a-wa.sql index 8ab0bfba18..5d817eea18 100644 --- a/appsrc/ODS-Calendar/sql/calendar-a-wa.sql +++ b/appsrc/ODS-Calendar/sql/calendar-a-wa.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/sql/calendar-d.sql b/appsrc/ODS-Calendar/sql/calendar-d.sql index f76ae75564..d34c1fc1f5 100644 --- a/appsrc/ODS-Calendar/sql/calendar-d.sql +++ b/appsrc/ODS-Calendar/sql/calendar-d.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/sql/sioc_calendar.sql b/appsrc/ODS-Calendar/sql/sioc_calendar.sql index 3151d3e1d8..2c1e3d682a 100644 --- a/appsrc/ODS-Calendar/sql/sioc_calendar.sql +++ b/appsrc/ODS-Calendar/sql/sioc_calendar.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/ajax.vsp b/appsrc/ODS-Calendar/www/ajax.vsp index dc315bd81e..d6f6e0c70f 100644 --- a/appsrc/ODS-Calendar/www/ajax.vsp +++ b/appsrc/ODS-Calendar/www/ajax.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/annotea.vspx b/appsrc/ODS-Calendar/www/annotea.vspx index c411bd02fb..34725a9617 100644 --- a/appsrc/ODS-Calendar/www/annotea.vspx +++ b/appsrc/ODS-Calendar/www/annotea.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/attendees.vspx b/appsrc/ODS-Calendar/www/attendees.vspx index 05949fce06..595271eb44 100644 --- a/appsrc/ODS-Calendar/www/attendees.vspx +++ b/appsrc/ODS-Calendar/www/attendees.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/calendar_login.vspx b/appsrc/ODS-Calendar/www/calendar_login.vspx index f17e166c62..e58e3de038 100644 --- a/appsrc/ODS-Calendar/www/calendar_login.vspx +++ b/appsrc/ODS-Calendar/www/calendar_login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/calendars.vspx b/appsrc/ODS-Calendar/www/calendars.vspx index dcdf4e1fde..186877d30b 100644 --- a/appsrc/ODS-Calendar/www/calendars.vspx +++ b/appsrc/ODS-Calendar/www/calendars.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/contacts.vspx b/appsrc/ODS-Calendar/www/contacts.vspx index e363482b62..cfe44cd6b8 100644 --- a/appsrc/ODS-Calendar/www/contacts.vspx +++ b/appsrc/ODS-Calendar/www/contacts.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/conversation.vspx b/appsrc/ODS-Calendar/www/conversation.vspx index 28328bda8b..4d8f59d81c 100644 --- a/appsrc/ODS-Calendar/www/conversation.vspx +++ b/appsrc/ODS-Calendar/www/conversation.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/css/style.css b/appsrc/ODS-Calendar/www/css/style.css index 0f26f1f842..23cae30c59 100644 --- a/appsrc/ODS-Calendar/www/css/style.css +++ b/appsrc/ODS-Calendar/www/css/style.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/error.vspx b/appsrc/ODS-Calendar/www/error.vspx index 5f9efab957..a688917d52 100644 --- a/appsrc/ODS-Calendar/www/error.vspx +++ b/appsrc/ODS-Calendar/www/error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/export.vspx b/appsrc/ODS-Calendar/www/export.vspx index fd1e0a20c1..e28dfef777 100644 --- a/appsrc/ODS-Calendar/www/export.vspx +++ b/appsrc/ODS-Calendar/www/export.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/gems.vsp b/appsrc/ODS-Calendar/www/gems.vsp index ed1bb4dcf4..a0b6f640e7 100644 --- a/appsrc/ODS-Calendar/www/gems.vsp +++ b/appsrc/ODS-Calendar/www/gems.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/help.vspx b/appsrc/ODS-Calendar/www/help.vspx index 20e1ff264e..579476b2e8 100644 --- a/appsrc/ODS-Calendar/www/help.vspx +++ b/appsrc/ODS-Calendar/www/help.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/home.vspx b/appsrc/ODS-Calendar/www/home.vspx index 088e5ea191..30fe8999f1 100644 --- a/appsrc/ODS-Calendar/www/home.vspx +++ b/appsrc/ODS-Calendar/www/home.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/js/calendar.js b/appsrc/ODS-Calendar/www/js/calendar.js index 31d8f4d3d7..4d8b167f90 100644 --- a/appsrc/ODS-Calendar/www/js/calendar.js +++ b/appsrc/ODS-Calendar/www/js/calendar.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/logs.vspx b/appsrc/ODS-Calendar/www/logs.vspx index 40b842d132..ee85ba1f66 100644 --- a/appsrc/ODS-Calendar/www/logs.vspx +++ b/appsrc/ODS-Calendar/www/logs.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/message.vspx b/appsrc/ODS-Calendar/www/message.vspx index 416ef37353..a14c713b01 100644 --- a/appsrc/ODS-Calendar/www/message.vspx +++ b/appsrc/ODS-Calendar/www/message.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/tags.vspx b/appsrc/ODS-Calendar/www/tags.vspx index c8ff524e6b..63973e319d 100644 --- a/appsrc/ODS-Calendar/www/tags.vspx +++ b/appsrc/ODS-Calendar/www/tags.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/template/popup.vspx b/appsrc/ODS-Calendar/www/template/popup.vspx index 5967a17985..c2652d87b5 100644 --- a/appsrc/ODS-Calendar/www/template/popup.vspx +++ b/appsrc/ODS-Calendar/www/template/popup.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/template/template.vspx b/appsrc/ODS-Calendar/www/template/template.vspx index 0a4fbeaca5..91ee366753 100644 --- a/appsrc/ODS-Calendar/www/template/template.vspx +++ b/appsrc/ODS-Calendar/www/template/template.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/www/template/template.xsl b/appsrc/ODS-Calendar/www/template/template.xsl index 54eb65a841..dd0bd5493f 100644 --- a/appsrc/ODS-Calendar/www/template/template.xsl +++ b/appsrc/ODS-Calendar/www/template/template.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/xslt/rss2atom.xsl b/appsrc/ODS-Calendar/xslt/rss2atom.xsl index f742cf5f60..fe6ab15f68 100644 --- a/appsrc/ODS-Calendar/xslt/rss2atom.xsl +++ b/appsrc/ODS-Calendar/xslt/rss2atom.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/xslt/rss2atom03.xsl b/appsrc/ODS-Calendar/xslt/rss2atom03.xsl index c6fb984bfd..4505afba5d 100644 --- a/appsrc/ODS-Calendar/xslt/rss2atom03.xsl +++ b/appsrc/ODS-Calendar/xslt/rss2atom03.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/xslt/rss2rdf.xsl b/appsrc/ODS-Calendar/xslt/rss2rdf.xsl index 39d99f5311..d70a92b47c 100644 --- a/appsrc/ODS-Calendar/xslt/rss2rdf.xsl +++ b/appsrc/ODS-Calendar/xslt/rss2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Calendar/xslt/rss2xbel.xsl b/appsrc/ODS-Calendar/xslt/rss2xbel.xsl index ec892f065b..0b11836016 100644 --- a/appsrc/ODS-Calendar/xslt/rss2xbel.xsl +++ b/appsrc/ODS-Calendar/xslt/rss2xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/Makefile.am b/appsrc/ODS-Community/Makefile.am index 6c01c0fcbf..ad4ba6db41 100644 --- a/appsrc/ODS-Community/Makefile.am +++ b/appsrc/ODS-Community/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/make_vad.sh b/appsrc/ODS-Community/make_vad.sh index 8864705a68..70858444e8 100755 --- a/appsrc/ODS-Community/make_vad.sh +++ b/appsrc/ODS-Community/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -263,7 +263,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-Community/sql/exec_no_error.sql b/appsrc/ODS-Community/sql/exec_no_error.sql index 8af3223642..86607b77dc 100644 --- a/appsrc/ODS-Community/sql/exec_no_error.sql +++ b/appsrc/ODS-Community/sql/exec_no_error.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/sql/install.bat b/appsrc/ODS-Community/sql/install.bat index 4ec6709687..3e46adea83 100644 --- a/appsrc/ODS-Community/sql/install.bat +++ b/appsrc/ODS-Community/sql/install.bat @@ -5,7 +5,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/sql/procedures.sql b/appsrc/ODS-Community/sql/procedures.sql index d1d03319ba..fc57e85677 100644 --- a/appsrc/ODS-Community/sql/procedures.sql +++ b/appsrc/ODS-Community/sql/procedures.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/sql/run_install.sql b/appsrc/ODS-Community/sql/run_install.sql index 706ccf1979..0196a8e481 100644 --- a/appsrc/ODS-Community/sql/run_install.sql +++ b/appsrc/ODS-Community/sql/run_install.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/sql/run_uninstall.sql b/appsrc/ODS-Community/sql/run_uninstall.sql index 2559e12539..edb4776542 100644 --- a/appsrc/ODS-Community/sql/run_uninstall.sql +++ b/appsrc/ODS-Community/sql/run_uninstall.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/sql/sioc_xd.sql b/appsrc/ODS-Community/sql/sioc_xd.sql index d5c06a01d3..c5f5dad188 100644 --- a/appsrc/ODS-Community/sql/sioc_xd.sql +++ b/appsrc/ODS-Community/sql/sioc_xd.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/sql/tables.sql b/appsrc/ODS-Community/sql/tables.sql index bc1551ba0d..318beed014 100644 --- a/appsrc/ODS-Community/sql/tables.sql +++ b/appsrc/ODS-Community/sql/tables.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/sql/uninstall.bat b/appsrc/ODS-Community/sql/uninstall.bat index de76258fcd..03ef6cc71a 100644 --- a/appsrc/ODS-Community/sql/uninstall.bat +++ b/appsrc/ODS-Community/sql/uninstall.bat @@ -5,7 +5,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/sql/wa_install.sql b/appsrc/ODS-Community/sql/wa_install.sql index bb227c937c..ba01b49434 100644 --- a/appsrc/ODS-Community/sql/wa_install.sql +++ b/appsrc/ODS-Community/sql/wa_install.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/sql/wa_uninstall.sql b/appsrc/ODS-Community/sql/wa_uninstall.sql index 6eae8c7085..74248029e5 100644 --- a/appsrc/ODS-Community/sql/wa_uninstall.sql +++ b/appsrc/ODS-Community/sql/wa_uninstall.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/index.vsp b/appsrc/ODS-Community/www-root/index.vsp index 8505ef91a0..2567148c0a 100644 --- a/appsrc/ODS-Community/www-root/index.vsp +++ b/appsrc/ODS-Community/www-root/index.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/index.vspx b/appsrc/ODS-Community/www-root/index.vspx index 9280385ad9..5b325a55ca 100644 --- a/appsrc/ODS-Community/www-root/index.vspx +++ b/appsrc/ODS-Community/www-root/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/public/aboutcommunity.html b/appsrc/ODS-Community/www-root/public/aboutcommunity.html index 09e20b4be5..fa0bce9677 100644 --- a/appsrc/ODS-Community/www-root/public/aboutcommunity.html +++ b/appsrc/ODS-Community/www-root/public/aboutcommunity.html @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/public/css/default.css b/appsrc/ODS-Community/www-root/public/css/default.css index 5a64ac566a..adeb077c48 100644 --- a/appsrc/ODS-Community/www-root/public/css/default.css +++ b/appsrc/ODS-Community/www-root/public/css/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/public/images/lightblue/myopenlink.css b/appsrc/ODS-Community/www-root/public/images/lightblue/myopenlink.css index fd260cc813..c38227bded 100644 --- a/appsrc/ODS-Community/www-root/public/images/lightblue/myopenlink.css +++ b/appsrc/ODS-Community/www-root/public/images/lightblue/myopenlink.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/public/js/map_control.js b/appsrc/ODS-Community/www-root/public/js/map_control.js index 99eb5240d2..1b38617dc1 100644 --- a/appsrc/ODS-Community/www-root/public/js/map_control.js +++ b/appsrc/ODS-Community/www-root/public/js/map_control.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/templates/openlink/app_inst.vspx b/appsrc/ODS-Community/www-root/templates/openlink/app_inst.vspx index a12c566c35..7a53f30c29 100644 --- a/appsrc/ODS-Community/www-root/templates/openlink/app_inst.vspx +++ b/appsrc/ODS-Community/www-root/templates/openlink/app_inst.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/templates/openlink/default.css b/appsrc/ODS-Community/www-root/templates/openlink/default.css index 038236e4d8..8b37174208 100644 --- a/appsrc/ODS-Community/www-root/templates/openlink/default.css +++ b/appsrc/ODS-Community/www-root/templates/openlink/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/templates/openlink/errors.vspx b/appsrc/ODS-Community/www-root/templates/openlink/errors.vspx index 615b623226..fbefcab51b 100644 --- a/appsrc/ODS-Community/www-root/templates/openlink/errors.vspx +++ b/appsrc/ODS-Community/www-root/templates/openlink/errors.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/templates/openlink/index.vspx b/appsrc/ODS-Community/www-root/templates/openlink/index.vspx index cfade14b85..2ab984aee2 100644 --- a/appsrc/ODS-Community/www-root/templates/openlink/index.vspx +++ b/appsrc/ODS-Community/www-root/templates/openlink/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/templates/openlink/login.vspx b/appsrc/ODS-Community/www-root/templates/openlink/login.vspx index afa81e41c7..4cf22ff03f 100644 --- a/appsrc/ODS-Community/www-root/templates/openlink/login.vspx +++ b/appsrc/ODS-Community/www-root/templates/openlink/login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/templates/openlink/logout.vspx b/appsrc/ODS-Community/www-root/templates/openlink/logout.vspx index 749c972f58..c569864b10 100644 --- a/appsrc/ODS-Community/www-root/templates/openlink/logout.vspx +++ b/appsrc/ODS-Community/www-root/templates/openlink/logout.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/templates/openlink/settings.vspx b/appsrc/ODS-Community/www-root/templates/openlink/settings.vspx index 4bcb7d9f8a..7cc4683a70 100644 --- a/appsrc/ODS-Community/www-root/templates/openlink/settings.vspx +++ b/appsrc/ODS-Community/www-root/templates/openlink/settings.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/templates/openlink/settings_app.vspx b/appsrc/ODS-Community/www-root/templates/openlink/settings_app.vspx index 09e47f6bdb..c07f61eacf 100644 --- a/appsrc/ODS-Community/www-root/templates/openlink/settings_app.vspx +++ b/appsrc/ODS-Community/www-root/templates/openlink/settings_app.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/templates/openlink/wa_maps.vspx b/appsrc/ODS-Community/www-root/templates/openlink/wa_maps.vspx index 87fe2644be..b0be11fe81 100644 --- a/appsrc/ODS-Community/www-root/templates/openlink/wa_maps.vspx +++ b/appsrc/ODS-Community/www-root/templates/openlink/wa_maps.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/widgets/app_inst_menu.xsl b/appsrc/ODS-Community/www-root/widgets/app_inst_menu.xsl index 7bfb4d48b4..c9ab6d64db 100644 --- a/appsrc/ODS-Community/www-root/widgets/app_inst_menu.xsl +++ b/appsrc/ODS-Community/www-root/widgets/app_inst_menu.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/widgets/apply_custom_settings.xsl b/appsrc/ODS-Community/www-root/widgets/apply_custom_settings.xsl index e3c4726912..bb12feef03 100644 --- a/appsrc/ODS-Community/www-root/widgets/apply_custom_settings.xsl +++ b/appsrc/ODS-Community/www-root/widgets/apply_custom_settings.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/widgets/dashboard.xsl b/appsrc/ODS-Community/www-root/widgets/dashboard.xsl index 4358a9ac06..56b5b30957 100644 --- a/appsrc/ODS-Community/www-root/widgets/dashboard.xsl +++ b/appsrc/ODS-Community/www-root/widgets/dashboard.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/widgets/error.xsl b/appsrc/ODS-Community/www-root/widgets/error.xsl index eebd10e769..6f336b1d9b 100644 --- a/appsrc/ODS-Community/www-root/widgets/error.xsl +++ b/appsrc/ODS-Community/www-root/widgets/error.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/widgets/main.xsl b/appsrc/ODS-Community/www-root/widgets/main.xsl index 753ab78c1a..50a77ad71f 100644 --- a/appsrc/ODS-Community/www-root/widgets/main.xsl +++ b/appsrc/ODS-Community/www-root/widgets/main.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/widgets/map_control.xsl b/appsrc/ODS-Community/www-root/widgets/map_control.xsl index 64aec91788..8aa9aa859f 100644 --- a/appsrc/ODS-Community/www-root/widgets/map_control.xsl +++ b/appsrc/ODS-Community/www-root/widgets/map_control.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Community/www-root/widgets/template_check.xsl b/appsrc/ODS-Community/www-root/widgets/template_check.xsl index a1e9a527cb..d306eeaa2b 100644 --- a/appsrc/ODS-Community/www-root/widgets/template_check.xsl +++ b/appsrc/ODS-Community/www-root/widgets/template_check.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/DET_nntp.sql b/appsrc/ODS-Discussion/DET_nntp.sql index 2ddfa5fea4..c3c98a0b16 100644 --- a/appsrc/ODS-Discussion/DET_nntp.sql +++ b/appsrc/ODS-Discussion/DET_nntp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/Makefile.am b/appsrc/ODS-Discussion/Makefile.am index a996558f89..94cf331526 100644 --- a/appsrc/ODS-Discussion/Makefile.am +++ b/appsrc/ODS-Discussion/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/attachment.vsp b/appsrc/ODS-Discussion/attachment.vsp index ca17f41ab8..83dcb37cb5 100644 --- a/appsrc/ODS-Discussion/attachment.vsp +++ b/appsrc/ODS-Discussion/attachment.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/adv_srh.xsl b/appsrc/ODS-Discussion/comp/adv_srh.xsl index 8b3ea4a0ba..95da3adb0f 100644 --- a/appsrc/ODS-Discussion/comp/adv_srh.xsl +++ b/appsrc/ODS-Discussion/comp/adv_srh.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/attach.xsl b/appsrc/ODS-Discussion/comp/attach.xsl index b7ccfa8f62..9cf80dd94b 100644 --- a/appsrc/ODS-Discussion/comp/attach.xsl +++ b/appsrc/ODS-Discussion/comp/attach.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/common.xsl b/appsrc/ODS-Discussion/comp/common.xsl index d6e73bd839..a9567db782 100644 --- a/appsrc/ODS-Discussion/comp/common.xsl +++ b/appsrc/ODS-Discussion/comp/common.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/dialog.xsl b/appsrc/ODS-Discussion/comp/dialog.xsl index 19660bbd20..b24e4eaabd 100644 --- a/appsrc/ODS-Discussion/comp/dialog.xsl +++ b/appsrc/ODS-Discussion/comp/dialog.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/group_list.xsl b/appsrc/ODS-Discussion/comp/group_list.xsl index bbd9e91d66..56a91887c0 100644 --- a/appsrc/ODS-Discussion/comp/group_list.xsl +++ b/appsrc/ODS-Discussion/comp/group_list.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/group_view.xsl b/appsrc/ODS-Discussion/comp/group_view.xsl index f8e9f6b03f..8da87e0909 100644 --- a/appsrc/ODS-Discussion/comp/group_view.xsl +++ b/appsrc/ODS-Discussion/comp/group_view.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/login.xsl b/appsrc/ODS-Discussion/comp/login.xsl index 27c501af42..2db28eed8a 100644 --- a/appsrc/ODS-Discussion/comp/login.xsl +++ b/appsrc/ODS-Discussion/comp/login.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/menubar.xsl b/appsrc/ODS-Discussion/comp/menubar.xsl index 59ffb3067a..b182fe6dea 100644 --- a/appsrc/ODS-Discussion/comp/menubar.xsl +++ b/appsrc/ODS-Discussion/comp/menubar.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/nntp_cal.xsl b/appsrc/ODS-Discussion/comp/nntp_cal.xsl index 516112f246..c92b22ef49 100644 --- a/appsrc/ODS-Discussion/comp/nntp_cal.xsl +++ b/appsrc/ODS-Discussion/comp/nntp_cal.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/nntpf_tags.xsl b/appsrc/ODS-Discussion/comp/nntpf_tags.xsl index 1433c58dac..f799925a33 100644 --- a/appsrc/ODS-Discussion/comp/nntpf_tags.xsl +++ b/appsrc/ODS-Discussion/comp/nntpf_tags.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/page.xsl b/appsrc/ODS-Discussion/comp/page.xsl index 682af95b46..7b153353fd 100644 --- a/appsrc/ODS-Discussion/comp/page.xsl +++ b/appsrc/ODS-Discussion/comp/page.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/post.xsl b/appsrc/ODS-Discussion/comp/post.xsl index 99cfdea223..ff39538dbf 100644 --- a/appsrc/ODS-Discussion/comp/post.xsl +++ b/appsrc/ODS-Discussion/comp/post.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/register.xsl b/appsrc/ODS-Discussion/comp/register.xsl index f52d15d99a..0b2234188d 100644 --- a/appsrc/ODS-Discussion/comp/register.xsl +++ b/appsrc/ODS-Discussion/comp/register.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/rss_del.xsl b/appsrc/ODS-Discussion/comp/rss_del.xsl index d7b277cfc3..d8cb9b67d9 100644 --- a/appsrc/ODS-Discussion/comp/rss_del.xsl +++ b/appsrc/ODS-Discussion/comp/rss_del.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/rss_group.xsl b/appsrc/ODS-Discussion/comp/rss_group.xsl index 775a297e16..a88d07aa4f 100644 --- a/appsrc/ODS-Discussion/comp/rss_group.xsl +++ b/appsrc/ODS-Discussion/comp/rss_group.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/rss_list.xsl b/appsrc/ODS-Discussion/comp/rss_list.xsl index b1fe070b39..97941a9b32 100644 --- a/appsrc/ODS-Discussion/comp/rss_list.xsl +++ b/appsrc/ODS-Discussion/comp/rss_list.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/search.xsl b/appsrc/ODS-Discussion/comp/search.xsl index 4110567438..96a70c2717 100644 --- a/appsrc/ODS-Discussion/comp/search.xsl +++ b/appsrc/ODS-Discussion/comp/search.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/search_res.xsl b/appsrc/ODS-Discussion/comp/search_res.xsl index fdbc82f2b0..1b69b96e35 100644 --- a/appsrc/ODS-Discussion/comp/search_res.xsl +++ b/appsrc/ODS-Discussion/comp/search_res.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/settings.xsl b/appsrc/ODS-Discussion/comp/settings.xsl index f5ebb943a1..0efc13e15d 100644 --- a/appsrc/ODS-Discussion/comp/settings.xsl +++ b/appsrc/ODS-Discussion/comp/settings.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/thread_view.xsl b/appsrc/ODS-Discussion/comp/thread_view.xsl index 13b7a631ed..f077fb7120 100644 --- a/appsrc/ODS-Discussion/comp/thread_view.xsl +++ b/appsrc/ODS-Discussion/comp/thread_view.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/comp/title.xsl b/appsrc/ODS-Discussion/comp/title.xsl index 22bc5f255a..52a69fcd45 100644 --- a/appsrc/ODS-Discussion/comp/title.xsl +++ b/appsrc/ODS-Discussion/comp/title.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/drop.sql b/appsrc/ODS-Discussion/drop.sql index b047eaa684..da1e5f4ae0 100644 --- a/appsrc/ODS-Discussion/drop.sql +++ b/appsrc/ODS-Discussion/drop.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/login.vspx b/appsrc/ODS-Discussion/login.vspx index 8336a513ac..9d3e613441 100644 --- a/appsrc/ODS-Discussion/login.vspx +++ b/appsrc/ODS-Discussion/login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/mail_notify.sql b/appsrc/ODS-Discussion/mail_notify.sql index e16cafd9b9..df9c6e7319 100644 --- a/appsrc/ODS-Discussion/mail_notify.sql +++ b/appsrc/ODS-Discussion/mail_notify.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/main.xsl b/appsrc/ODS-Discussion/main.xsl index 834c2c9f29..3fe2133d9e 100644 --- a/appsrc/ODS-Discussion/main.xsl +++ b/appsrc/ODS-Discussion/main.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/make_vad.sh b/appsrc/ODS-Discussion/make_vad.sh index 64e310e38c..5f78b0c2a5 100755 --- a/appsrc/ODS-Discussion/make_vad.sh +++ b/appsrc/ODS-Discussion/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -239,7 +239,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-Discussion/nntpf.css b/appsrc/ODS-Discussion/nntpf.css index 21cd5ab8ec..f68f3c4335 100644 --- a/appsrc/ODS-Discussion/nntpf.css +++ b/appsrc/ODS-Discussion/nntpf.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_addtorss.vspx b/appsrc/ODS-Discussion/nntpf_addtorss.vspx index 95559372fe..1414138890 100644 --- a/appsrc/ODS-Discussion/nntpf_addtorss.vspx +++ b/appsrc/ODS-Discussion/nntpf_addtorss.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_adv_search.vspx b/appsrc/ODS-Discussion/nntpf_adv_search.vspx index 7187795d40..e1cbc034e0 100644 --- a/appsrc/ODS-Discussion/nntpf_adv_search.vspx +++ b/appsrc/ODS-Discussion/nntpf_adv_search.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_api.sql b/appsrc/ODS-Discussion/nntpf_api.sql index b48d473dc6..4db3f960ed 100644 --- a/appsrc/ODS-Discussion/nntpf_api.sql +++ b/appsrc/ODS-Discussion/nntpf_api.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_browser.vspx b/appsrc/ODS-Discussion/nntpf_browser.vspx index aadfba86a0..d53d14adf5 100644 --- a/appsrc/ODS-Discussion/nntpf_browser.vspx +++ b/appsrc/ODS-Discussion/nntpf_browser.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_ddl.sql b/appsrc/ODS-Discussion/nntpf_ddl.sql index 0f34b7d949..2ee4d62142 100644 --- a/appsrc/ODS-Discussion/nntpf_ddl.sql +++ b/appsrc/ODS-Discussion/nntpf_ddl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_disp_article.vspx b/appsrc/ODS-Discussion/nntpf_disp_article.vspx index 080e1c3465..4652d961bb 100644 --- a/appsrc/ODS-Discussion/nntpf_disp_article.vspx +++ b/appsrc/ODS-Discussion/nntpf_disp_article.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_edit_rss.vspx b/appsrc/ODS-Discussion/nntpf_edit_rss.vspx index 6008809898..5e95b348d8 100644 --- a/appsrc/ODS-Discussion/nntpf_edit_rss.vspx +++ b/appsrc/ODS-Discussion/nntpf_edit_rss.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_error.vsp b/appsrc/ODS-Discussion/nntpf_error.vsp index 2a7ec05784..81b081d6d9 100644 --- a/appsrc/ODS-Discussion/nntpf_error.vsp +++ b/appsrc/ODS-Discussion/nntpf_error.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_error.vspx b/appsrc/ODS-Discussion/nntpf_error.vspx index 2c07865112..eb3a70d2f0 100644 --- a/appsrc/ODS-Discussion/nntpf_error.vspx +++ b/appsrc/ODS-Discussion/nntpf_error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -30,7 +30,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_logout.vspx b/appsrc/ODS-Discussion/nntpf_logout.vspx index 0dbf1d7023..079084576f 100644 --- a/appsrc/ODS-Discussion/nntpf_logout.vspx +++ b/appsrc/ODS-Discussion/nntpf_logout.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_main.vspx b/appsrc/ODS-Discussion/nntpf_main.vspx index df16247011..94cc28dd69 100644 --- a/appsrc/ODS-Discussion/nntpf_main.vspx +++ b/appsrc/ODS-Discussion/nntpf_main.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_nthread_view.vspx b/appsrc/ODS-Discussion/nntpf_nthread_view.vspx index fad8abc9d7..c1d891b279 100644 --- a/appsrc/ODS-Discussion/nntpf_nthread_view.vspx +++ b/appsrc/ODS-Discussion/nntpf_nthread_view.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_odsnewsgroups_admin.vspx b/appsrc/ODS-Discussion/nntpf_odsnewsgroups_admin.vspx index 48380bf3a9..f064f75bc1 100644 --- a/appsrc/ODS-Discussion/nntpf_odsnewsgroups_admin.vspx +++ b/appsrc/ODS-Discussion/nntpf_odsnewsgroups_admin.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_post.vspx b/appsrc/ODS-Discussion/nntpf_post.vspx index 669da76174..2913f2d610 100644 --- a/appsrc/ODS-Discussion/nntpf_post.vspx +++ b/appsrc/ODS-Discussion/nntpf_post.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_preferences.vspx b/appsrc/ODS-Discussion/nntpf_preferences.vspx index b932ce7d2e..a3919e1104 100644 --- a/appsrc/ODS-Discussion/nntpf_preferences.vspx +++ b/appsrc/ODS-Discussion/nntpf_preferences.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_rss_del.vspx b/appsrc/ODS-Discussion/nntpf_rss_del.vspx index c20fc021e2..7f57c4b22f 100644 --- a/appsrc/ODS-Discussion/nntpf_rss_del.vspx +++ b/appsrc/ODS-Discussion/nntpf_rss_del.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_rss_group.vspx b/appsrc/ODS-Discussion/nntpf_rss_group.vspx index 16f4e0d5be..96eea05fcd 100644 --- a/appsrc/ODS-Discussion/nntpf_rss_group.vspx +++ b/appsrc/ODS-Discussion/nntpf_rss_group.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_rss_list.vspx b/appsrc/ODS-Discussion/nntpf_rss_list.vspx index a2ed071d48..973cf53a33 100644 --- a/appsrc/ODS-Discussion/nntpf_rss_list.vspx +++ b/appsrc/ODS-Discussion/nntpf_rss_list.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_subs.vspx b/appsrc/ODS-Discussion/nntpf_subs.vspx index 1a06da360c..26ed5ceb77 100644 --- a/appsrc/ODS-Discussion/nntpf_subs.vspx +++ b/appsrc/ODS-Discussion/nntpf_subs.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_subs_edit.vspx b/appsrc/ODS-Discussion/nntpf_subs_edit.vspx index a1b28ababa..00afb532e8 100644 --- a/appsrc/ODS-Discussion/nntpf_subs_edit.vspx +++ b/appsrc/ODS-Discussion/nntpf_subs_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_subs_group.vspx b/appsrc/ODS-Discussion/nntpf_subs_group.vspx index 9cce9b38df..6d2b622a4b 100644 --- a/appsrc/ODS-Discussion/nntpf_subs_group.vspx +++ b/appsrc/ODS-Discussion/nntpf_subs_group.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_subs_remove.vspx b/appsrc/ODS-Discussion/nntpf_subs_remove.vspx index 167426ad0f..f5c2ff1874 100644 --- a/appsrc/ODS-Discussion/nntpf_subs_remove.vspx +++ b/appsrc/ODS-Discussion/nntpf_subs_remove.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_tags.sql b/appsrc/ODS-Discussion/nntpf_tags.sql index 0b63024528..e4212b8346 100644 --- a/appsrc/ODS-Discussion/nntpf_tags.sql +++ b/appsrc/ODS-Discussion/nntpf_tags.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_thread_view.vspx b/appsrc/ODS-Discussion/nntpf_thread_view.vspx index 45c472a76f..6d51f1eda1 100644 --- a/appsrc/ODS-Discussion/nntpf_thread_view.vspx +++ b/appsrc/ODS-Discussion/nntpf_thread_view.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_warning.vsp b/appsrc/ODS-Discussion/nntpf_warning.vsp index b440cddbe8..c29b22523f 100644 --- a/appsrc/ODS-Discussion/nntpf_warning.vsp +++ b/appsrc/ODS-Discussion/nntpf_warning.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/nntpf_yacutia.vspx b/appsrc/ODS-Discussion/nntpf_yacutia.vspx index 02d051f5df..b0f09ba3ce 100644 --- a/appsrc/ODS-Discussion/nntpf_yacutia.vspx +++ b/appsrc/ODS-Discussion/nntpf_yacutia.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/openid.js b/appsrc/ODS-Discussion/openid.js index 70e52abf34..10667785eb 100644 --- a/appsrc/ODS-Discussion/openid.js +++ b/appsrc/ODS-Discussion/openid.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/openid_helper.vsp b/appsrc/ODS-Discussion/openid_helper.vsp index f67ba62beb..c6b5250492 100644 --- a/appsrc/ODS-Discussion/openid_helper.vsp +++ b/appsrc/ODS-Discussion/openid_helper.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/register.vspx b/appsrc/ODS-Discussion/register.vspx index 4379ddc7c8..b9778da4b0 100644 --- a/appsrc/ODS-Discussion/register.vspx +++ b/appsrc/ODS-Discussion/register.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/rss.vsp b/appsrc/ODS-Discussion/rss.vsp index 7498ffcba6..772222e413 100644 --- a/appsrc/ODS-Discussion/rss.vsp +++ b/appsrc/ODS-Discussion/rss.vsp @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/rsscomments.vsp b/appsrc/ODS-Discussion/rsscomments.vsp index 6e4fba29d3..764876ee26 100644 --- a/appsrc/ODS-Discussion/rsscomments.vsp +++ b/appsrc/ODS-Discussion/rsscomments.vsp @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/setup.sql b/appsrc/ODS-Discussion/setup.sql index c80aae6772..7755174712 100644 --- a/appsrc/ODS-Discussion/setup.sql +++ b/appsrc/ODS-Discussion/setup.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/sioc_nntp.sql b/appsrc/ODS-Discussion/sioc_nntp.sql index 2041777549..d41dfcdfde 100644 --- a/appsrc/ODS-Discussion/sioc_nntp.sql +++ b/appsrc/ODS-Discussion/sioc_nntp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/virtuoso_app_links.xhtml b/appsrc/ODS-Discussion/virtuoso_app_links.xhtml index e004e72527..0c053a653b 100644 --- a/appsrc/ODS-Discussion/virtuoso_app_links.xhtml +++ b/appsrc/ODS-Discussion/virtuoso_app_links.xhtml @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Discussion/wa_install.sql b/appsrc/ODS-Discussion/wa_install.sql index a33fdfb993..c4400f92d2 100644 --- a/appsrc/ODS-Discussion/wa_install.sql +++ b/appsrc/ODS-Discussion/wa_install.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/Makefile.am b/appsrc/ODS-FeedManager/Makefile.am index 62d2155307..9d0ba1078e 100644 --- a/appsrc/ODS-FeedManager/Makefile.am +++ b/appsrc/ODS-FeedManager/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/make_vad.sh b/appsrc/ODS-FeedManager/make_vad.sh index e327766597..23714bb560 100755 --- a/appsrc/ODS-FeedManager/make_vad.sh +++ b/appsrc/ODS-FeedManager/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -271,7 +271,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-FeedManager/sql/DET_News3.sql b/appsrc/ODS-FeedManager/sql/DET_News3.sql index e08f657d63..b16c6b9aa4 100644 --- a/appsrc/ODS-FeedManager/sql/DET_News3.sql +++ b/appsrc/ODS-FeedManager/sql/DET_News3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/sql/nws-a-api.sql b/appsrc/ODS-FeedManager/sql/nws-a-api.sql index bce97c3148..d67adc66c8 100644 --- a/appsrc/ODS-FeedManager/sql/nws-a-api.sql +++ b/appsrc/ODS-FeedManager/sql/nws-a-api.sql @@ -11,7 +11,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/sql/nws-a-code.sql b/appsrc/ODS-FeedManager/sql/nws-a-code.sql index 50b649433d..7a4e0654df 100644 --- a/appsrc/ODS-FeedManager/sql/nws-a-code.sql +++ b/appsrc/ODS-FeedManager/sql/nws-a-code.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/sql/nws-a-ods.sql b/appsrc/ODS-FeedManager/sql/nws-a-ods.sql index e6e6ad396b..4d22180fef 100644 --- a/appsrc/ODS-FeedManager/sql/nws-a-ods.sql +++ b/appsrc/ODS-FeedManager/sql/nws-a-ods.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/sql/nws-a-table.sql b/appsrc/ODS-FeedManager/sql/nws-a-table.sql index ac50aab87c..a599684d00 100644 --- a/appsrc/ODS-FeedManager/sql/nws-a-table.sql +++ b/appsrc/ODS-FeedManager/sql/nws-a-table.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/sql/nws-a-wa.sql b/appsrc/ODS-FeedManager/sql/nws-a-wa.sql index fa73aa73ce..8cb0f2bc7f 100644 --- a/appsrc/ODS-FeedManager/sql/nws-a-wa.sql +++ b/appsrc/ODS-FeedManager/sql/nws-a-wa.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/sql/nws-d.sql b/appsrc/ODS-FeedManager/sql/nws-d.sql index 0cb4e80773..809b08c1be 100644 --- a/appsrc/ODS-FeedManager/sql/nws-d.sql +++ b/appsrc/ODS-FeedManager/sql/nws-d.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/sql/sioc_feeds.sql b/appsrc/ODS-FeedManager/sql/sioc_feeds.sql index 1c135c6b1c..6ead740ae1 100644 --- a/appsrc/ODS-FeedManager/sql/sioc_feeds.sql +++ b/appsrc/ODS-FeedManager/sql/sioc_feeds.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/ajax.vsp b/appsrc/ODS-FeedManager/www/ajax.vsp index 2e85efe22f..a08fdb26ff 100644 --- a/appsrc/ODS-FeedManager/www/ajax.vsp +++ b/appsrc/ODS-FeedManager/www/ajax.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/annotea.vspx b/appsrc/ODS-FeedManager/www/annotea.vspx index 1713522304..15cf40da0f 100644 --- a/appsrc/ODS-FeedManager/www/annotea.vspx +++ b/appsrc/ODS-FeedManager/www/annotea.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/attachment.vsp b/appsrc/ODS-FeedManager/www/attachment.vsp index d1d57ee193..ac2b3e1d64 100644 --- a/appsrc/ODS-FeedManager/www/attachment.vsp +++ b/appsrc/ODS-FeedManager/www/attachment.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/blog.vspx b/appsrc/ODS-FeedManager/www/blog.vspx index 118229e0bc..d15fb7938c 100644 --- a/appsrc/ODS-FeedManager/www/blog.vspx +++ b/appsrc/ODS-FeedManager/www/blog.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/bookmark.vspx b/appsrc/ODS-FeedManager/www/bookmark.vspx index 16e8c93447..487b100b62 100644 --- a/appsrc/ODS-FeedManager/www/bookmark.vspx +++ b/appsrc/ODS-FeedManager/www/bookmark.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/channels.vspx b/appsrc/ODS-FeedManager/www/channels.vspx index d4391c4051..8efb671bc0 100644 --- a/appsrc/ODS-FeedManager/www/channels.vspx +++ b/appsrc/ODS-FeedManager/www/channels.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/channels_create.vspx b/appsrc/ODS-FeedManager/www/channels_create.vspx index c841b5c59b..8ada22e1f4 100644 --- a/appsrc/ODS-FeedManager/www/channels_create.vspx +++ b/appsrc/ODS-FeedManager/www/channels_create.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/channels_select.vspx b/appsrc/ODS-FeedManager/www/channels_select.vspx index 99894755ca..51d521ebd0 100644 --- a/appsrc/ODS-FeedManager/www/channels_select.vspx +++ b/appsrc/ODS-FeedManager/www/channels_select.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/conversation.vspx b/appsrc/ODS-FeedManager/www/conversation.vspx index fae4897d43..50f83a464a 100644 --- a/appsrc/ODS-FeedManager/www/conversation.vspx +++ b/appsrc/ODS-FeedManager/www/conversation.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/css/style.css b/appsrc/ODS-FeedManager/www/css/style.css index 7d89935031..e1147288ab 100644 --- a/appsrc/ODS-FeedManager/www/css/style.css +++ b/appsrc/ODS-FeedManager/www/css/style.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/directories.vspx b/appsrc/ODS-FeedManager/www/directories.vspx index a248a84178..b1d03cdd83 100644 --- a/appsrc/ODS-FeedManager/www/directories.vspx +++ b/appsrc/ODS-FeedManager/www/directories.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/enews_login.vspx b/appsrc/ODS-FeedManager/www/enews_login.vspx index bed67b42eb..357fcd0e65 100644 --- a/appsrc/ODS-FeedManager/www/enews_login.vspx +++ b/appsrc/ODS-FeedManager/www/enews_login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/error.vspx b/appsrc/ODS-FeedManager/www/error.vspx index daa81163ca..dcab4ca196 100644 --- a/appsrc/ODS-FeedManager/www/error.vspx +++ b/appsrc/ODS-FeedManager/www/error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/export.vspx b/appsrc/ODS-FeedManager/www/export.vspx index b7179f6ad9..89e49663e0 100644 --- a/appsrc/ODS-FeedManager/www/export.vspx +++ b/appsrc/ODS-FeedManager/www/export.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/folders.vspx b/appsrc/ODS-FeedManager/www/folders.vspx index 505d620545..18d7c4be21 100644 --- a/appsrc/ODS-FeedManager/www/folders.vspx +++ b/appsrc/ODS-FeedManager/www/folders.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/gems.vsp b/appsrc/ODS-FeedManager/www/gems.vsp index a4daf93b45..7740d02dcf 100644 --- a/appsrc/ODS-FeedManager/www/gems.vsp +++ b/appsrc/ODS-FeedManager/www/gems.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/item.vspx b/appsrc/ODS-FeedManager/www/item.vspx index 42cc61d676..efa3fa9bdd 100644 --- a/appsrc/ODS-FeedManager/www/item.vspx +++ b/appsrc/ODS-FeedManager/www/item.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/items.vspx b/appsrc/ODS-FeedManager/www/items.vspx index 4a5e468f11..7d004e8c47 100644 --- a/appsrc/ODS-FeedManager/www/items.vspx +++ b/appsrc/ODS-FeedManager/www/items.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/js/enews.js b/appsrc/ODS-FeedManager/www/js/enews.js index 606e7f8e48..aaf0a3ee3f 100644 --- a/appsrc/ODS-FeedManager/www/js/enews.js +++ b/appsrc/ODS-FeedManager/www/js/enews.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/news.vsp b/appsrc/ODS-FeedManager/www/news.vsp index 353ff92835..abb9022c12 100644 --- a/appsrc/ODS-FeedManager/www/news.vsp +++ b/appsrc/ODS-FeedManager/www/news.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/news.vspx b/appsrc/ODS-FeedManager/www/news.vspx index 7a43d9d29d..2a7f963e14 100644 --- a/appsrc/ODS-FeedManager/www/news.vspx +++ b/appsrc/ODS-FeedManager/www/news.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/search.vspx b/appsrc/ODS-FeedManager/www/search.vspx index 4d7e957260..64bc803617 100644 --- a/appsrc/ODS-FeedManager/www/search.vspx +++ b/appsrc/ODS-FeedManager/www/search.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/settings.vspx b/appsrc/ODS-FeedManager/www/settings.vspx index 245918a67e..81a0562a6b 100644 --- a/appsrc/ODS-FeedManager/www/settings.vspx +++ b/appsrc/ODS-FeedManager/www/settings.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/sfolders.vspx b/appsrc/ODS-FeedManager/www/sfolders.vspx index 8fc883bda4..e9511d3eb2 100644 --- a/appsrc/ODS-FeedManager/www/sfolders.vspx +++ b/appsrc/ODS-FeedManager/www/sfolders.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/tags.vspx b/appsrc/ODS-FeedManager/www/tags.vspx index db459374c8..27aa247d31 100644 --- a/appsrc/ODS-FeedManager/www/tags.vspx +++ b/appsrc/ODS-FeedManager/www/tags.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/template/popup.vspx b/appsrc/ODS-FeedManager/www/template/popup.vspx index 15293493e5..a583633ce6 100644 --- a/appsrc/ODS-FeedManager/www/template/popup.vspx +++ b/appsrc/ODS-FeedManager/www/template/popup.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/template/template.vspx b/appsrc/ODS-FeedManager/www/template/template.vspx index b348e77a08..4dfb4296b8 100644 --- a/appsrc/ODS-FeedManager/www/template/template.vspx +++ b/appsrc/ODS-FeedManager/www/template/template.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/template/template.xsl b/appsrc/ODS-FeedManager/www/template/template.xsl index bc785fc55c..041b9354cd 100644 --- a/appsrc/ODS-FeedManager/www/template/template.xsl +++ b/appsrc/ODS-FeedManager/www/template/template.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/www/weblog.vspx b/appsrc/ODS-FeedManager/www/weblog.vspx index 7077856f61..f47a3533bf 100644 --- a/appsrc/ODS-FeedManager/www/weblog.vspx +++ b/appsrc/ODS-FeedManager/www/weblog.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/xslt/foaf.xsl b/appsrc/ODS-FeedManager/xslt/foaf.xsl index 41e3a9052d..b83f6cf20e 100644 --- a/appsrc/ODS-FeedManager/xslt/foaf.xsl +++ b/appsrc/ODS-FeedManager/xslt/foaf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/xslt/rss2atom.xsl b/appsrc/ODS-FeedManager/xslt/rss2atom.xsl index f742cf5f60..fe6ab15f68 100644 --- a/appsrc/ODS-FeedManager/xslt/rss2atom.xsl +++ b/appsrc/ODS-FeedManager/xslt/rss2atom.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/xslt/rss2atom03.xsl b/appsrc/ODS-FeedManager/xslt/rss2atom03.xsl index c6fb984bfd..4505afba5d 100644 --- a/appsrc/ODS-FeedManager/xslt/rss2atom03.xsl +++ b/appsrc/ODS-FeedManager/xslt/rss2atom03.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/xslt/rss2rdf.xsl b/appsrc/ODS-FeedManager/xslt/rss2rdf.xsl index 6fc704ae5c..e1d88e4cf2 100644 --- a/appsrc/ODS-FeedManager/xslt/rss2rdf.xsl +++ b/appsrc/ODS-FeedManager/xslt/rss2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-FeedManager/xslt/rss2xbel.xsl b/appsrc/ODS-FeedManager/xslt/rss2xbel.xsl index 468dc2652b..a6d7cc805f 100644 --- a/appsrc/ODS-FeedManager/xslt/rss2xbel.xsl +++ b/appsrc/ODS-FeedManager/xslt/rss2xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/Makefile.am b/appsrc/ODS-Framework/Makefile.am index 2dfc16b68c..571abcf10a 100644 --- a/appsrc/ODS-Framework/Makefile.am +++ b/appsrc/ODS-Framework/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/aboutus.html b/appsrc/ODS-Framework/aboutus.html index 1d03ebecc2..cb4614ac2f 100644 --- a/appsrc/ODS-Framework/aboutus.html +++ b/appsrc/ODS-Framework/aboutus.html @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/accounts.vspx b/appsrc/ODS-Framework/accounts.vspx index 02671bc766..619f60afa3 100644 --- a/appsrc/ODS-Framework/accounts.vspx +++ b/appsrc/ODS-Framework/accounts.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/add_rule.vspx b/appsrc/ODS-Framework/add_rule.vspx index 73d0f47aaa..8a1eab5bb6 100644 --- a/appsrc/ODS-Framework/add_rule.vspx +++ b/appsrc/ODS-Framework/add_rule.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/admin.vspx b/appsrc/ODS-Framework/admin.vspx index 76ebc32684..118ccef801 100644 --- a/appsrc/ODS-Framework/admin.vspx +++ b/appsrc/ODS-Framework/admin.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/advertise.html b/appsrc/ODS-Framework/advertise.html index d9e9d2491d..a3307ec8d2 100644 --- a/appsrc/ODS-Framework/advertise.html +++ b/appsrc/ODS-Framework/advertise.html @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/afoaf.xml b/appsrc/ODS-Framework/afoaf.xml index 8d37e2608e..955364b9ea 100644 --- a/appsrc/ODS-Framework/afoaf.xml +++ b/appsrc/ODS-Framework/afoaf.xml @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/app.js b/appsrc/ODS-Framework/app.js index 84f4a1d49f..c4aa7c5f56 100644 --- a/appsrc/ODS-Framework/app.js +++ b/appsrc/ODS-Framework/app.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/app.vspx b/appsrc/ODS-Framework/app.vspx index 30afe99eaa..5fe61296f0 100644 --- a/appsrc/ODS-Framework/app.vspx +++ b/appsrc/ODS-Framework/app.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/app_inst.vspx b/appsrc/ODS-Framework/app_inst.vspx index d88e17c730..9fd16c37a8 100644 --- a/appsrc/ODS-Framework/app_inst.vspx +++ b/appsrc/ODS-Framework/app_inst.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/app_instance_limits.vspx b/appsrc/ODS-Framework/app_instance_limits.vspx index b77bb73982..d6a839cbd1 100644 --- a/appsrc/ODS-Framework/app_instance_limits.vspx +++ b/appsrc/ODS-Framework/app_instance_limits.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/app_menu.js b/appsrc/ODS-Framework/app_menu.js index a2ea763aba..b1428af361 100644 --- a/appsrc/ODS-Framework/app_menu.js +++ b/appsrc/ODS-Framework/app_menu.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/app_menu_settings.vspx b/appsrc/ODS-Framework/app_menu_settings.vspx index 0ddb0b277a..b1401fb8b3 100644 --- a/appsrc/ODS-Framework/app_menu_settings.vspx +++ b/appsrc/ODS-Framework/app_menu_settings.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/app_my_inst.vspx b/appsrc/ODS-Framework/app_my_inst.vspx index 54b0e60cd3..f9cb9db903 100644 --- a/appsrc/ODS-Framework/app_my_inst.vspx +++ b/appsrc/ODS-Framework/app_my_inst.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/app_sent_inv.vspx b/appsrc/ODS-Framework/app_sent_inv.vspx index e2f283a7a3..7f2b7599cb 100644 --- a/appsrc/ODS-Framework/app_sent_inv.vspx +++ b/appsrc/ODS-Framework/app_sent_inv.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/app_settings.vspx b/appsrc/ODS-Framework/app_settings.vspx index 775ccfd86f..ba8457794a 100644 --- a/appsrc/ODS-Framework/app_settings.vspx +++ b/appsrc/ODS-Framework/app_settings.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/back_nav.vspx b/appsrc/ODS-Framework/back_nav.vspx index c46e58d267..134e69056c 100644 --- a/appsrc/ODS-Framework/back_nav.vspx +++ b/appsrc/ODS-Framework/back_nav.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/common.css b/appsrc/ODS-Framework/common.css index 3b85d4ea09..29bba069b9 100644 --- a/appsrc/ODS-Framework/common.css +++ b/appsrc/ODS-Framework/common.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/common.js b/appsrc/ODS-Framework/common.js index e73ba326f8..f21468b927 100644 --- a/appsrc/ODS-Framework/common.js +++ b/appsrc/ODS-Framework/common.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/community.vspx b/appsrc/ODS-Framework/community.vspx index ae5e4083d3..2a18b44fca 100644 --- a/appsrc/ODS-Framework/community.vspx +++ b/appsrc/ODS-Framework/community.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/app_inst_menu.xsl b/appsrc/ODS-Framework/comp/app_inst_menu.xsl index 923eec7bf3..0670331e16 100644 --- a/appsrc/ODS-Framework/comp/app_inst_menu.xsl +++ b/appsrc/ODS-Framework/comp/app_inst_menu.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/app_search.xsl b/appsrc/ODS-Framework/comp/app_search.xsl index 721f153ba7..6615fc8e38 100644 --- a/appsrc/ODS-Framework/comp/app_search.xsl +++ b/appsrc/ODS-Framework/comp/app_search.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/apps.xsl b/appsrc/ODS-Framework/comp/apps.xsl index 805ff1278d..0a6d32a425 100644 --- a/appsrc/ODS-Framework/comp/apps.xsl +++ b/appsrc/ODS-Framework/comp/apps.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/check.xsl b/appsrc/ODS-Framework/comp/check.xsl index 11754971a7..052b668542 100644 --- a/appsrc/ODS-Framework/comp/check.xsl +++ b/appsrc/ODS-Framework/comp/check.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/check_register.xsl b/appsrc/ODS-Framework/comp/check_register.xsl index 769c6a1033..b529bbcbfc 100644 --- a/appsrc/ODS-Framework/comp/check_register.xsl +++ b/appsrc/ODS-Framework/comp/check_register.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/dashboard.xsl b/appsrc/ODS-Framework/comp/dashboard.xsl index 1681895641..6b44474486 100644 --- a/appsrc/ODS-Framework/comp/dashboard.xsl +++ b/appsrc/ODS-Framework/comp/dashboard.xsl @@ -1,12 +1,10 @@ + diff --git a/appsrc/ODS-Framework/comp/dashboard_style.xsl b/appsrc/ODS-Framework/comp/dashboard_style.xsl index 201ff2426b..8acd48ec11 100644 --- a/appsrc/ODS-Framework/comp/dashboard_style.xsl +++ b/appsrc/ODS-Framework/comp/dashboard_style.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/dav_browser.xsl b/appsrc/ODS-Framework/comp/dav_browser.xsl index 7a2ffb4552..d59df6517f 100644 --- a/appsrc/ODS-Framework/comp/dav_browser.xsl +++ b/appsrc/ODS-Framework/comp/dav_browser.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/help.xml b/appsrc/ODS-Framework/comp/help.xml index 232e7dd3c6..cb521b8384 100644 --- a/appsrc/ODS-Framework/comp/help.xml +++ b/appsrc/ODS-Framework/comp/help.xml @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/help.xsl b/appsrc/ODS-Framework/comp/help.xsl index 4a8fae6eb9..d746613cfb 100644 --- a/appsrc/ODS-Framework/comp/help.xsl +++ b/appsrc/ODS-Framework/comp/help.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/home.xsl b/appsrc/ODS-Framework/comp/home.xsl index ddf4848479..a6839bb1e9 100644 --- a/appsrc/ODS-Framework/comp/home.xsl +++ b/appsrc/ODS-Framework/comp/home.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/inst.xsl b/appsrc/ODS-Framework/comp/inst.xsl index 2aa35e9801..81cd91621f 100644 --- a/appsrc/ODS-Framework/comp/inst.xsl +++ b/appsrc/ODS-Framework/comp/inst.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/login.xsl b/appsrc/ODS-Framework/comp/login.xsl index 636db2e2f8..922470634a 100644 --- a/appsrc/ODS-Framework/comp/login.xsl +++ b/appsrc/ODS-Framework/comp/login.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/make_sp.xsl b/appsrc/ODS-Framework/comp/make_sp.xsl index 14548ec027..b3f04055b9 100644 --- a/appsrc/ODS-Framework/comp/make_sp.xsl +++ b/appsrc/ODS-Framework/comp/make_sp.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/map_control.js b/appsrc/ODS-Framework/comp/map_control.js index e0f45e7401..953b720b11 100644 --- a/appsrc/ODS-Framework/comp/map_control.js +++ b/appsrc/ODS-Framework/comp/map_control.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/map_control.xsl b/appsrc/ODS-Framework/comp/map_control.xsl index 13b5bcbe11..a959c5ec2b 100644 --- a/appsrc/ODS-Framework/comp/map_control.xsl +++ b/appsrc/ODS-Framework/comp/map_control.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/members.xsl b/appsrc/ODS-Framework/comp/members.xsl index f6756bc575..d73860f202 100644 --- a/appsrc/ODS-Framework/comp/members.xsl +++ b/appsrc/ODS-Framework/comp/members.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/membership.xsl b/appsrc/ODS-Framework/comp/membership.xsl index 3021e20feb..a8df8aebb5 100644 --- a/appsrc/ODS-Framework/comp/membership.xsl +++ b/appsrc/ODS-Framework/comp/membership.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/ods_bar.xsl b/appsrc/ODS-Framework/comp/ods_bar.xsl index 7f86b9484c..a6554cc7f3 100644 --- a/appsrc/ODS-Framework/comp/ods_bar.xsl +++ b/appsrc/ODS-Framework/comp/ods_bar.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/page.xsl b/appsrc/ODS-Framework/comp/page.xsl index d71d47afb2..4014e6d1fd 100644 --- a/appsrc/ODS-Framework/comp/page.xsl +++ b/appsrc/ODS-Framework/comp/page.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/register.xsl b/appsrc/ODS-Framework/comp/register.xsl index c8f643aee0..31cab8656d 100644 --- a/appsrc/ODS-Framework/comp/register.xsl +++ b/appsrc/ODS-Framework/comp/register.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/render.xsl b/appsrc/ODS-Framework/comp/render.xsl index ad4ec8f271..23370b04e9 100644 --- a/appsrc/ODS-Framework/comp/render.xsl +++ b/appsrc/ODS-Framework/comp/render.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/rss2atom.xsl b/appsrc/ODS-Framework/comp/rss2atom.xsl index 909d672b09..8343d52f77 100644 --- a/appsrc/ODS-Framework/comp/rss2atom.xsl +++ b/appsrc/ODS-Framework/comp/rss2atom.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/rss2rdf.xsl b/appsrc/ODS-Framework/comp/rss2rdf.xsl index c8c16db5a7..f0f159eade 100644 --- a/appsrc/ODS-Framework/comp/rss2rdf.xsl +++ b/appsrc/ODS-Framework/comp/rss2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/rss2xbel.xsl b/appsrc/ODS-Framework/comp/rss2xbel.xsl index 468dc2652b..a6d7cc805f 100644 --- a/appsrc/ODS-Framework/comp/rss2xbel.xsl +++ b/appsrc/ODS-Framework/comp/rss2xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/services.xsl b/appsrc/ODS-Framework/comp/services.xsl index 7a623b0851..8cb60da267 100644 --- a/appsrc/ODS-Framework/comp/services.xsl +++ b/appsrc/ODS-Framework/comp/services.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/settings.xsl b/appsrc/ODS-Framework/comp/settings.xsl index b4eeea8896..425fa0a4df 100644 --- a/appsrc/ODS-Framework/comp/settings.xsl +++ b/appsrc/ODS-Framework/comp/settings.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/site_home.xsl b/appsrc/ODS-Framework/comp/site_home.xsl index 4b6858b4ce..08d55b5efd 100644 --- a/appsrc/ODS-Framework/comp/site_home.xsl +++ b/appsrc/ODS-Framework/comp/site_home.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/store.xsl b/appsrc/ODS-Framework/comp/store.xsl index f4fc711605..f904da932c 100644 --- a/appsrc/ODS-Framework/comp/store.xsl +++ b/appsrc/ODS-Framework/comp/store.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/comp/tagging.xsl b/appsrc/ODS-Framework/comp/tagging.xsl index 70e55a933c..a9b697554d 100644 --- a/appsrc/ODS-Framework/comp/tagging.xsl +++ b/appsrc/ODS-Framework/comp/tagging.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/conf.vspx b/appsrc/ODS-Framework/conf.vspx index 964a785e1b..37cd38e574 100644 --- a/appsrc/ODS-Framework/conf.vspx +++ b/appsrc/ODS-Framework/conf.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/conf_app.vspx b/appsrc/ODS-Framework/conf_app.vspx index ccdd2e9c18..211c79083a 100644 --- a/appsrc/ODS-Framework/conf_app.vspx +++ b/appsrc/ODS-Framework/conf_app.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/contact.html b/appsrc/ODS-Framework/contact.html index 6d15118332..01e59320cc 100644 --- a/appsrc/ODS-Framework/contact.html +++ b/appsrc/ODS-Framework/contact.html @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/dashboard.sql b/appsrc/ODS-Framework/dashboard.sql index e724aa8561..92fc640db8 100644 --- a/appsrc/ODS-Framework/dashboard.sql +++ b/appsrc/ODS-Framework/dashboard.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/dav.css b/appsrc/ODS-Framework/dav.css index 367a455248..12d53178a2 100644 --- a/appsrc/ODS-Framework/dav.css +++ b/appsrc/ODS-Framework/dav.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/default.css b/appsrc/ODS-Framework/default.css index b34bc34300..d91b03b8b2 100644 --- a/appsrc/ODS-Framework/default.css +++ b/appsrc/ODS-Framework/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/delete_inst.vspx b/appsrc/ODS-Framework/delete_inst.vspx index fd8954cd6a..a0ddab3dfd 100644 --- a/appsrc/ODS-Framework/delete_inst.vspx +++ b/appsrc/ODS-Framework/delete_inst.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/drop.sql b/appsrc/ODS-Framework/drop.sql index 53ce8211cf..70b62ddcc8 100644 --- a/appsrc/ODS-Framework/drop.sql +++ b/appsrc/ODS-Framework/drop.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/drop_sioc_proc.sql b/appsrc/ODS-Framework/drop_sioc_proc.sql index f3958c1e52..fb4b4d4923 100644 --- a/appsrc/ODS-Framework/drop_sioc_proc.sql +++ b/appsrc/ODS-Framework/drop_sioc_proc.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/drop_sioc_trig.sql b/appsrc/ODS-Framework/drop_sioc_trig.sql index b8232f244d..3f993e79c7 100644 --- a/appsrc/ODS-Framework/drop_sioc_trig.sql +++ b/appsrc/ODS-Framework/drop_sioc_trig.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/edit_inst.vspx b/appsrc/ODS-Framework/edit_inst.vspx index 0c80dda2fb..6e70084114 100644 --- a/appsrc/ODS-Framework/edit_inst.vspx +++ b/appsrc/ODS-Framework/edit_inst.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/edit_interests_popup.vspx b/appsrc/ODS-Framework/edit_interests_popup.vspx index ef9da6c5ba..e5f814563c 100644 --- a/appsrc/ODS-Framework/edit_interests_popup.vspx +++ b/appsrc/ODS-Framework/edit_interests_popup.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/edit_rule.vspx b/appsrc/ODS-Framework/edit_rule.vspx index f8bd46b9c9..873e5028cc 100644 --- a/appsrc/ODS-Framework/edit_rule.vspx +++ b/appsrc/ODS-Framework/edit_rule.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/error.vspx b/appsrc/ODS-Framework/error.vspx index 57058a10e7..edc813c184 100644 --- a/appsrc/ODS-Framework/error.vspx +++ b/appsrc/ODS-Framework/error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/facebook.sql b/appsrc/ODS-Framework/facebook.sql index 6312a164ae..e81368ef07 100644 --- a/appsrc/ODS-Framework/facebook.sql +++ b/appsrc/ODS-Framework/facebook.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/facebook_helper.vsp b/appsrc/ODS-Framework/facebook_helper.vsp index e548674930..b444e07739 100644 --- a/appsrc/ODS-Framework/facebook_helper.vsp +++ b/appsrc/ODS-Framework/facebook_helper.vsp @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/faq.html b/appsrc/ODS-Framework/faq.html index 6a546ce55a..f1b04c2f71 100644 --- a/appsrc/ODS-Framework/faq.html +++ b/appsrc/ODS-Framework/faq.html @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/fb_front.vspx b/appsrc/ODS-Framework/fb_front.vspx index 87b031df99..b9bcd1cffd 100644 --- a/appsrc/ODS-Framework/fb_front.vspx +++ b/appsrc/ODS-Framework/fb_front.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/fb_popup.vspx b/appsrc/ODS-Framework/fb_popup.vspx index 1d9ad33b5d..f6260fd8f0 100644 --- a/appsrc/ODS-Framework/fb_popup.vspx +++ b/appsrc/ODS-Framework/fb_popup.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/foaf.xml b/appsrc/ODS-Framework/foaf.xml index 0ff04f5dfd..916be060fb 100644 --- a/appsrc/ODS-Framework/foaf.xml +++ b/appsrc/ODS-Framework/foaf.xml @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/foaf.xsl b/appsrc/ODS-Framework/foaf.xsl index da7f5e4b9f..79bb4d9eed 100644 --- a/appsrc/ODS-Framework/foaf.xsl +++ b/appsrc/ODS-Framework/foaf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/freeze.vspx b/appsrc/ODS-Framework/freeze.vspx index 3d396ac996..682bbf317e 100644 --- a/appsrc/ODS-Framework/freeze.vspx +++ b/appsrc/ODS-Framework/freeze.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/gdata.sql b/appsrc/ODS-Framework/gdata.sql index c058ac7ab3..04a29ac430 100644 --- a/appsrc/ODS-Framework/gdata.sql +++ b/appsrc/ODS-Framework/gdata.sql @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/generic.vspx b/appsrc/ODS-Framework/generic.vspx index 0290bd9a37..43f83284bc 100644 --- a/appsrc/ODS-Framework/generic.vspx +++ b/appsrc/ODS-Framework/generic.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/get_tags_popup.vspx b/appsrc/ODS-Framework/get_tags_popup.vspx index 1fcf28bb19..ff5c8eb3b0 100644 --- a/appsrc/ODS-Framework/get_tags_popup.vspx +++ b/appsrc/ODS-Framework/get_tags_popup.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/gtags.vspx b/appsrc/ODS-Framework/gtags.vspx index 34b9073fe4..ae1adab68d 100644 --- a/appsrc/ODS-Framework/gtags.vspx +++ b/appsrc/ODS-Framework/gtags.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/help.vspx b/appsrc/ODS-Framework/help.vspx index 95daa9130f..b922e01dae 100644 --- a/appsrc/ODS-Framework/help.vspx +++ b/appsrc/ODS-Framework/help.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/home.vspx b/appsrc/ODS-Framework/home.vspx index a8e9c77fcd..bfe4d42e12 100644 --- a/appsrc/ODS-Framework/home.vspx +++ b/appsrc/ODS-Framework/home.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/home.xsl b/appsrc/ODS-Framework/home.xsl index 95ca96d853..78cbaebc16 100644 --- a/appsrc/ODS-Framework/home.xsl +++ b/appsrc/ODS-Framework/home.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/hosted_services.sql b/appsrc/ODS-Framework/hosted_services.sql index d57823ecf7..fa4e5f64db 100644 --- a/appsrc/ODS-Framework/hosted_services.sql +++ b/appsrc/ODS-Framework/hosted_services.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -2413,13 +2413,13 @@ create procedure INIT_SERVER_SETTINGS () 'Enter your User ID and Password', '', '', - 'Copyright © 1998-2018 OpenLink Software', + 'Copyright © 1998-2019 OpenLink Software', '', sys_stat ('st_host_name'), 1 ); } - update WA_SETTINGS set WS_COPYRIGHT = 'Copyright © 1998-2018 OpenLink Software'; + update WA_SETTINGS set WS_COPYRIGHT = 'Copyright © 1998-2019 OpenLink Software'; update WA_SETTINGS set WS_WELCOME_MESSAGE = diff --git a/appsrc/ODS-Framework/href_export.xml b/appsrc/ODS-Framework/href_export.xml index 5322da261c..2130e24c92 100644 --- a/appsrc/ODS-Framework/href_export.xml +++ b/appsrc/ODS-Framework/href_export.xml @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/image.vsp b/appsrc/ODS-Framework/image.vsp index 636e28013d..07214555bd 100644 --- a/appsrc/ODS-Framework/image.vsp +++ b/appsrc/ODS-Framework/image.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/images/yacutia_style_alt.htm b/appsrc/ODS-Framework/images/yacutia_style_alt.htm index 07ceb47eab..0176362401 100644 --- a/appsrc/ODS-Framework/images/yacutia_style_alt.htm +++ b/appsrc/ODS-Framework/images/yacutia_style_alt.htm @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/index.html b/appsrc/ODS-Framework/index.html index ba1c686321..2271129d7c 100644 --- a/appsrc/ODS-Framework/index.html +++ b/appsrc/ODS-Framework/index.html @@ -890,7 +890,7 @@

Search

Powered by OpenLink Virtuoso
- Copyright © 1998-2018 OpenLink Software
+ Copyright © 1998-2019 OpenLink Software
About Privacy FAQ Developers
diff --git a/appsrc/ODS-Framework/index.vsp b/appsrc/ODS-Framework/index.vsp index 98455a34f6..25d769721c 100644 --- a/appsrc/ODS-Framework/index.vsp +++ b/appsrc/ODS-Framework/index.vsp @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/index.vspx b/appsrc/ODS-Framework/index.vspx index f94644cc1a..0f1f19ddcd 100644 --- a/appsrc/ODS-Framework/index.vspx +++ b/appsrc/ODS-Framework/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/index.xsl b/appsrc/ODS-Framework/index.xsl index 542a23f179..ed8ac9bb9c 100644 --- a/appsrc/ODS-Framework/index.xsl +++ b/appsrc/ODS-Framework/index.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/index_inst.vspx b/appsrc/ODS-Framework/index_inst.vspx index dd9e45e9e4..caa74db3eb 100644 --- a/appsrc/ODS-Framework/index_inst.vspx +++ b/appsrc/ODS-Framework/index_inst.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/init.sql b/appsrc/ODS-Framework/init.sql index e7d08fb125..887d86e52d 100644 --- a/appsrc/ODS-Framework/init.sql +++ b/appsrc/ODS-Framework/init.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/inst.vspx b/appsrc/ODS-Framework/inst.vspx index 4875fe2d70..9d3da1d054 100644 --- a/appsrc/ODS-Framework/inst.vspx +++ b/appsrc/ODS-Framework/inst.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/inst_ping.vspx b/appsrc/ODS-Framework/inst_ping.vspx index b67bdd0272..f06ac1b59d 100644 --- a/appsrc/ODS-Framework/inst_ping.vspx +++ b/appsrc/ODS-Framework/inst_ping.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/join.vspx b/appsrc/ODS-Framework/join.vspx index 02cbab6518..a2c3930301 100644 --- a/appsrc/ODS-Framework/join.vspx +++ b/appsrc/ODS-Framework/join.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/ldap.sql b/appsrc/ODS-Framework/ldap.sql index 232caa742e..fab2941d93 100644 --- a/appsrc/ODS-Framework/ldap.sql +++ b/appsrc/ODS-Framework/ldap.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/ldap_search.vspx b/appsrc/ODS-Framework/ldap_search.vspx index 1510ab6cc3..46bbb82b4d 100644 --- a/appsrc/ODS-Framework/ldap_search.vspx +++ b/appsrc/ODS-Framework/ldap_search.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/login.js b/appsrc/ODS-Framework/login.js index 3db21dcf76..ad67bc0622 100644 --- a/appsrc/ODS-Framework/login.js +++ b/appsrc/ODS-Framework/login.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/login.vspx b/appsrc/ODS-Framework/login.vspx index 380a17b1f7..5c316a2235 100644 --- a/appsrc/ODS-Framework/login.vspx +++ b/appsrc/ODS-Framework/login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/login_keys.vspx b/appsrc/ODS-Framework/login_keys.vspx index 60a138753f..b7e8206524 100644 --- a/appsrc/ODS-Framework/login_keys.vspx +++ b/appsrc/ODS-Framework/login_keys.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/mail.vspx b/appsrc/ODS-Framework/mail.vspx index 91eef1f54d..343eba3b63 100644 --- a/appsrc/ODS-Framework/mail.vspx +++ b/appsrc/ODS-Framework/mail.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/mail_preview.vspx b/appsrc/ODS-Framework/mail_preview.vspx index 0b35bd72bd..f6eb90809e 100644 --- a/appsrc/ODS-Framework/mail_preview.vspx +++ b/appsrc/ODS-Framework/mail_preview.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/make_vad.sh b/appsrc/ODS-Framework/make_vad.sh index 99c5f15eed..739d03ed1a 100755 --- a/appsrc/ODS-Framework/make_vad.sh +++ b/appsrc/ODS-Framework/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -344,7 +344,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-Framework/map_svc.vspx b/appsrc/ODS-Framework/map_svc.vspx index 5161dcfef6..bfb64bb83f 100644 --- a/appsrc/ODS-Framework/map_svc.vspx +++ b/appsrc/ODS-Framework/map_svc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/member.vspx b/appsrc/ODS-Framework/member.vspx index cad03754ed..4a6364b449 100644 --- a/appsrc/ODS-Framework/member.vspx +++ b/appsrc/ODS-Framework/member.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/member_edit.vspx b/appsrc/ODS-Framework/member_edit.vspx index 5bfc639717..f2fe16db2e 100644 --- a/appsrc/ODS-Framework/member_edit.vspx +++ b/appsrc/ODS-Framework/member_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/members.vspx b/appsrc/ODS-Framework/members.vspx index 17f85af721..4ca4180301 100644 --- a/appsrc/ODS-Framework/members.vspx +++ b/appsrc/ODS-Framework/members.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/members_inv.vspx b/appsrc/ODS-Framework/members_inv.vspx index 477381c04e..e408117d90 100644 --- a/appsrc/ODS-Framework/members_inv.vspx +++ b/appsrc/ODS-Framework/members_inv.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/moat_ruleset_tags.vspx b/appsrc/ODS-Framework/moat_ruleset_tags.vspx index 8c16a22298..e5ec0a0619 100644 --- a/appsrc/ODS-Framework/moat_ruleset_tags.vspx +++ b/appsrc/ODS-Framework/moat_ruleset_tags.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/moat_tags.vspx b/appsrc/ODS-Framework/moat_tags.vspx index 0445c98822..494a8c7ea3 100644 --- a/appsrc/ODS-Framework/moat_tags.vspx +++ b/appsrc/ODS-Framework/moat_tags.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/mv.vsp b/appsrc/ODS-Framework/mv.vsp index 1603fa2499..8b0617bdbe 100644 --- a/appsrc/ODS-Framework/mv.vsp +++ b/appsrc/ODS-Framework/mv.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/myhome.vspx b/appsrc/ODS-Framework/myhome.vspx index 11b674b4cd..4d63775b32 100644 --- a/appsrc/ODS-Framework/myhome.vspx +++ b/appsrc/ODS-Framework/myhome.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/nav_framework.js b/appsrc/ODS-Framework/nav_framework.js index a023a381dd..cea0235761 100644 --- a/appsrc/ODS-Framework/nav_framework.js +++ b/appsrc/ODS-Framework/nav_framework.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/nav_framework_api.sql b/appsrc/ODS-Framework/nav_framework_api.sql index 3ced876271..6021594a27 100644 --- a/appsrc/ODS-Framework/nav_framework_api.sql +++ b/appsrc/ODS-Framework/nav_framework_api.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/new_inst.vspx b/appsrc/ODS-Framework/new_inst.vspx index 5b2d4147e3..05faf221e6 100644 --- a/appsrc/ODS-Framework/new_inst.vspx +++ b/appsrc/ODS-Framework/new_inst.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/oauth/default.css b/appsrc/ODS-Framework/oauth/default.css index df9e281452..840eae10f9 100644 --- a/appsrc/ODS-Framework/oauth/default.css +++ b/appsrc/ODS-Framework/oauth/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/oauth/error.vspx b/appsrc/ODS-Framework/oauth/error.vspx index 3de7581f6e..55951d1ba1 100644 --- a/appsrc/ODS-Framework/oauth/error.vspx +++ b/appsrc/ODS-Framework/oauth/error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/oauth/login.vspx b/appsrc/ODS-Framework/oauth/login.vspx index 6724403221..7ea5f48c36 100644 --- a/appsrc/ODS-Framework/oauth/login.vspx +++ b/appsrc/ODS-Framework/oauth/login.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/oauth/make_vad.sh b/appsrc/ODS-Framework/oauth/make_vad.sh index 42b430dc60..41f93e5029 100755 --- a/appsrc/ODS-Framework/oauth/make_vad.sh +++ b/appsrc/ODS-Framework/oauth/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -252,7 +252,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-Framework/oauth/oauth.sql b/appsrc/ODS-Framework/oauth/oauth.sql index 7492466ef4..e786e2dd69 100644 --- a/appsrc/ODS-Framework/oauth/oauth.sql +++ b/appsrc/ODS-Framework/oauth/oauth.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/oauth/oauth_apps.vspx b/appsrc/ODS-Framework/oauth/oauth_apps.vspx index 771c520211..fe602f4718 100644 --- a/appsrc/ODS-Framework/oauth/oauth_apps.vspx +++ b/appsrc/ODS-Framework/oauth/oauth_apps.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/oauth/oauth_authorize.vspx b/appsrc/ODS-Framework/oauth/oauth_authorize.vspx index 6edfe78397..c8e2b6d037 100644 --- a/appsrc/ODS-Framework/oauth/oauth_authorize.vspx +++ b/appsrc/ODS-Framework/oauth/oauth_authorize.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/oauth/oauth_error.vspx b/appsrc/ODS-Framework/oauth/oauth_error.vspx index 7bd615d5bb..07718e93c6 100644 --- a/appsrc/ODS-Framework/oauth/oauth_error.vspx +++ b/appsrc/ODS-Framework/oauth/oauth_error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/oauth/sel_user.vspx b/appsrc/ODS-Framework/oauth/sel_user.vspx index 97cd1217e2..e19e629686 100644 --- a/appsrc/ODS-Framework/oauth/sel_user.vspx +++ b/appsrc/ODS-Framework/oauth/sel_user.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/oauth/sparql_acl.vspx b/appsrc/ODS-Framework/oauth/sparql_acl.vspx index bab43ad9bb..08a18ec9a4 100644 --- a/appsrc/ODS-Framework/oauth/sparql_acl.vspx +++ b/appsrc/ODS-Framework/oauth/sparql_acl.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/oauth_apps.vspx b/appsrc/ODS-Framework/oauth_apps.vspx index 3ab8c09e5e..44336315f8 100644 --- a/appsrc/ODS-Framework/oauth_apps.vspx +++ b/appsrc/ODS-Framework/oauth_apps.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/oauth_authorize.vspx b/appsrc/ODS-Framework/oauth_authorize.vspx index 915ecd2326..9ca8a82a76 100644 --- a/appsrc/ODS-Framework/oauth_authorize.vspx +++ b/appsrc/ODS-Framework/oauth_authorize.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -285,7 +285,7 @@ Privacy | Report Abuse
- Copyright © 1999-2018 OpenLink Software + Copyright © 1999-2019 OpenLink Software
diff --git a/appsrc/ODS-Framework/oauth_sid.vsp b/appsrc/ODS-Framework/oauth_sid.vsp index 5e2e6f8ad5..ef5eb78356 100644 --- a/appsrc/ODS-Framework/oauth_sid.vsp +++ b/appsrc/ODS-Framework/oauth_sid.vsp @@ -146,7 +146,7 @@ Privacy | Report Abuse
- Copyright © 1998-2018 OpenLink Software + Copyright © 1998-2019 OpenLink Software
diff --git a/appsrc/ODS-Framework/ods_bar.vspx b/appsrc/ODS-Framework/ods_bar.vspx index 51b2139952..d8f58bc7cd 100644 --- a/appsrc/ODS-Framework/ods_bar.vspx +++ b/appsrc/ODS-Framework/ods_bar.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/ods_controllers.sql b/appsrc/ODS-Framework/ods_controllers.sql index 0f3b16988b..6b9653e8b6 100644 --- a/appsrc/ODS-Framework/ods_controllers.sql +++ b/appsrc/ODS-Framework/ods_controllers.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/ods_ubiquity.html b/appsrc/ODS-Framework/ods_ubiquity.html index 30dcd903b5..7d63761b47 100644 --- a/appsrc/ODS-Framework/ods_ubiquity.html +++ b/appsrc/ODS-Framework/ods_ubiquity.html @@ -18,7 +18,7 @@

Ubiquity Commands for ODS<

diff --git a/appsrc/ODS-Framework/pass_recovery.vspx b/appsrc/ODS-Framework/pass_recovery.vspx index 5f04417231..6490f613e3 100644 --- a/appsrc/ODS-Framework/pass_recovery.vspx +++ b/appsrc/ODS-Framework/pass_recovery.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/ping_log.vspx b/appsrc/ODS-Framework/ping_log.vspx index e17d3157a0..93b04bb498 100644 --- a/appsrc/ODS-Framework/ping_log.vspx +++ b/appsrc/ODS-Framework/ping_log.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/ping_svc.vspx b/appsrc/ODS-Framework/ping_svc.vspx index 60453b370c..4099d45219 100644 --- a/appsrc/ODS-Framework/ping_svc.vspx +++ b/appsrc/ODS-Framework/ping_svc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/popup_browser.vspx b/appsrc/ODS-Framework/popup_browser.vspx index e902229ba8..62eb04d704 100644 --- a/appsrc/ODS-Framework/popup_browser.vspx +++ b/appsrc/ODS-Framework/popup_browser.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/privacy.html b/appsrc/ODS-Framework/privacy.html index 985f9414ef..07fab72b9b 100644 --- a/appsrc/ODS-Framework/privacy.html +++ b/appsrc/ODS-Framework/privacy.html @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/provinces.sql b/appsrc/ODS-Framework/provinces.sql index fc9bb2d8fe..3e81479d0e 100644 --- a/appsrc/ODS-Framework/provinces.sql +++ b/appsrc/ODS-Framework/provinces.sql @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/rabuse.vspx b/appsrc/ODS-Framework/rabuse.vspx index 4a2c80e7b1..d953d28811 100644 --- a/appsrc/ODS-Framework/rabuse.vspx +++ b/appsrc/ODS-Framework/rabuse.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/rdf_storage.vspx b/appsrc/ODS-Framework/rdf_storage.vspx index cf2864f460..d180246ea0 100644 --- a/appsrc/ODS-Framework/rdf_storage.vspx +++ b/appsrc/ODS-Framework/rdf_storage.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/rdfb.css b/appsrc/ODS-Framework/rdfb.css index fc3edbfda7..c897437999 100644 --- a/appsrc/ODS-Framework/rdfb.css +++ b/appsrc/ODS-Framework/rdfb.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * -* Copyright (C) 2005-2018 OpenLink Software +* Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/appsrc/ODS-Framework/rdfb.js b/appsrc/ODS-Framework/rdfb.js index 9cc98867ee..b18a725b0e 100644 --- a/appsrc/ODS-Framework/rdfb.js +++ b/appsrc/ODS-Framework/rdfb.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/appsrc/ODS-Framework/register.js b/appsrc/ODS-Framework/register.js index 1ea58d219a..e33ef11a26 100644 --- a/appsrc/ODS-Framework/register.js +++ b/appsrc/ODS-Framework/register.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/register.vspx b/appsrc/ODS-Framework/register.vspx index 2d9a6c3eee..de30db82bd 100644 --- a/appsrc/ODS-Framework/register.vspx +++ b/appsrc/ODS-Framework/register.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/registration_xml.sql b/appsrc/ODS-Framework/registration_xml.sql index 33ab7e990f..6d1933f6ed 100644 --- a/appsrc/ODS-Framework/registration_xml.sql +++ b/appsrc/ODS-Framework/registration_xml.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/related_apps.vspx b/appsrc/ODS-Framework/related_apps.vspx index e30f2a18e0..a896388167 100644 --- a/appsrc/ODS-Framework/related_apps.vspx +++ b/appsrc/ODS-Framework/related_apps.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/scot.sql b/appsrc/ODS-Framework/scot.sql index e1ec13c8f3..be95a8b3aa 100644 --- a/appsrc/ODS-Framework/scot.sql +++ b/appsrc/ODS-Framework/scot.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/search.vspx b/appsrc/ODS-Framework/search.vspx index 2d20d01317..e6f53fca25 100644 --- a/appsrc/ODS-Framework/search.vspx +++ b/appsrc/ODS-Framework/search.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -1675,7 +1675,7 @@ if (self.on_type = 'discussion' or self.on_type = 'nntpf') end) ?> OpenLink Software OpenLink Software - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software open false </OpenSearchDescription>X.509 Certificates

FAQ | Privacy | Report Abuse
- Copyright © 1999-2018 OpenLink Software + Copyright © 1999-2019 OpenLink Software
diff --git a/appsrc/ODS-Framework/users/users.jsp b/appsrc/ODS-Framework/users/users.jsp index 9c3d97d6b5..77311f965f 100644 --- a/appsrc/ODS-Framework/users/users.jsp +++ b/appsrc/ODS-Framework/users/users.jsp @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -3875,7 +3875,7 @@
FAQ | Privacy | Report Abuse
- Copyright © 1999-2018 OpenLink Software + Copyright © 1999-2019 OpenLink Software
diff --git a/appsrc/ODS-Framework/users/users.php b/appsrc/ODS-Framework/users/users.php index 3a3a88e5f3..1bec73c101 100644 --- a/appsrc/ODS-Framework/users/users.php +++ b/appsrc/ODS-Framework/users/users.php @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -3725,7 +3725,7 @@ function categoryCombo ()
FAQ | Privacy | Report Abuse
- Copyright © 1999-2018 OpenLink Software + Copyright © 1999-2019 OpenLink Software
diff --git a/appsrc/ODS-Framework/users/users.rb b/appsrc/ODS-Framework/users/users.rb index 61e4714411..520fbabe75 100644 --- a/appsrc/ODS-Framework/users/users.rb +++ b/appsrc/ODS-Framework/users/users.rb @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -1012,7 +1012,7 @@ def main()
FAQ | Privacy | Report Abuse
- Copyright © 1999-2018 OpenLink Software + Copyright © 1999-2019 OpenLink Software
diff --git a/appsrc/ODS-Framework/users/users.vsp b/appsrc/ODS-Framework/users/users.vsp index d87a43f57e..88e63ba055 100644 --- a/appsrc/ODS-Framework/users/users.vsp +++ b/appsrc/ODS-Framework/users/users.vsp @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -3867,7 +3867,7 @@
FAQ | Privacy | Report Abuse
- Copyright © 1999-2018 OpenLink Software + Copyright © 1999-2019 OpenLink Software
diff --git a/appsrc/ODS-Framework/users/users.xsl b/appsrc/ODS-Framework/users/users.xsl index 378bdc7d17..f9a35d609b 100644 --- a/appsrc/ODS-Framework/users/users.xsl +++ b/appsrc/ODS-Framework/users/users.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/users_select.js b/appsrc/ODS-Framework/users_select.js index 344e71826e..9298e4dff8 100644 --- a/appsrc/ODS-Framework/users_select.js +++ b/appsrc/ODS-Framework/users_select.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/users_select.vspx b/appsrc/ODS-Framework/users_select.vspx index 34d4106227..028e8a209b 100644 --- a/appsrc/ODS-Framework/users_select.vspx +++ b/appsrc/ODS-Framework/users_select.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/vad_version b/appsrc/ODS-Framework/vad_version index ac4af1714e..c495b6fb8b 100644 --- a/appsrc/ODS-Framework/vad_version +++ b/appsrc/ODS-Framework/vad_version @@ -1 +1 @@ -1.89.47 +1.89.48 diff --git a/appsrc/ODS-Framework/validate.js b/appsrc/ODS-Framework/validate.js index d16e001c73..e6ccfc2125 100644 --- a/appsrc/ODS-Framework/validate.js +++ b/appsrc/ODS-Framework/validate.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/vhost.vspx b/appsrc/ODS-Framework/vhost.vspx index 029a249dd6..58eacd0031 100644 --- a/appsrc/ODS-Framework/vhost.vspx +++ b/appsrc/ODS-Framework/vhost.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/vhost_simple.vspx b/appsrc/ODS-Framework/vhost_simple.vspx index e18763f227..e7905c936b 100644 --- a/appsrc/ODS-Framework/vhost_simple.vspx +++ b/appsrc/ODS-Framework/vhost_simple.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/view.vspx b/appsrc/ODS-Framework/view.vspx index 3369070d66..a733230d5e 100644 --- a/appsrc/ODS-Framework/view.vspx +++ b/appsrc/ODS-Framework/view.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/view_file.vspx b/appsrc/ODS-Framework/view_file.vspx index 345dc7372a..0304bfc206 100644 --- a/appsrc/ODS-Framework/view_file.vspx +++ b/appsrc/ODS-Framework/view_file.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/wa_login.vspx b/appsrc/ODS-Framework/wa_login.vspx index 3a7fad1b51..dd97136ba8 100644 --- a/appsrc/ODS-Framework/wa_login.vspx +++ b/appsrc/ODS-Framework/wa_login.vspx @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/wa_maps.sql b/appsrc/ODS-Framework/wa_maps.sql index 63f62fd59a..54cf8dae0a 100644 --- a/appsrc/ODS-Framework/wa_maps.sql +++ b/appsrc/ODS-Framework/wa_maps.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/wa_maps.vspx b/appsrc/ODS-Framework/wa_maps.vspx index 8c5e9065d8..0b60b2d82e 100644 --- a/appsrc/ODS-Framework/wa_maps.vspx +++ b/appsrc/ODS-Framework/wa_maps.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/wa_search_procs.sql b/appsrc/ODS-Framework/wa_search_procs.sql index 2efc22a976..7fd815711a 100644 --- a/appsrc/ODS-Framework/wa_search_procs.sql +++ b/appsrc/ODS-Framework/wa_search_procs.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/wa_template.sql b/appsrc/ODS-Framework/wa_template.sql index b35aa1a57c..0addebb344 100644 --- a/appsrc/ODS-Framework/wa_template.sql +++ b/appsrc/ODS-Framework/wa_template.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/web_header.vspx b/appsrc/ODS-Framework/web_header.vspx index 9bddc42a89..9e9cae7a3e 100644 --- a/appsrc/ODS-Framework/web_header.vspx +++ b/appsrc/ODS-Framework/web_header.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/web_svc.sql b/appsrc/ODS-Framework/web_svc.sql index 4ba1b60b4a..0653628307 100644 --- a/appsrc/ODS-Framework/web_svc.sql +++ b/appsrc/ODS-Framework/web_svc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/webfinger.sql b/appsrc/ODS-Framework/webfinger.sql index 9023e18b7b..741e9be448 100644 --- a/appsrc/ODS-Framework/webfinger.sql +++ b/appsrc/ODS-Framework/webfinger.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Framework/webid_select.vspx b/appsrc/ODS-Framework/webid_select.vspx index 4cbae71ec9..bd4fcb7ad9 100644 --- a/appsrc/ODS-Framework/webid_select.vspx +++ b/appsrc/ODS-Framework/webid_select.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/Makefile.am b/appsrc/ODS-Gallery/Makefile.am index 460ce1e722..1e753cb15f 100644 --- a/appsrc/ODS-Gallery/Makefile.am +++ b/appsrc/ODS-Gallery/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/make_vad.sh b/appsrc/ODS-Gallery/make_vad.sh index fe8d35edd6..b8b569ff96 100755 --- a/appsrc/ODS-Gallery/make_vad.sh +++ b/appsrc/ODS-Gallery/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -251,7 +251,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-Gallery/sql/create_tables.sql b/appsrc/ODS-Gallery/sql/create_tables.sql index 2e49a17909..93bfad7338 100644 --- a/appsrc/ODS-Gallery/sql/create_tables.sql +++ b/appsrc/ODS-Gallery/sql/create_tables.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/create_triggers.sql b/appsrc/ODS-Gallery/sql/create_triggers.sql index 2b962461bf..5810efcbe4 100644 --- a/appsrc/ODS-Gallery/sql/create_triggers.sql +++ b/appsrc/ODS-Gallery/sql/create_triggers.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/photo-wa-install.sql b/appsrc/ODS-Gallery/sql/photo-wa-install.sql index 3018a6d3cf..a6067b47f9 100644 --- a/appsrc/ODS-Gallery/sql/photo-wa-install.sql +++ b/appsrc/ODS-Gallery/sql/photo-wa-install.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/photo-wa-uninstall.sql b/appsrc/ODS-Gallery/sql/photo-wa-uninstall.sql index 71e702bd99..5f8322b17c 100644 --- a/appsrc/ODS-Gallery/sql/photo-wa-uninstall.sql +++ b/appsrc/ODS-Gallery/sql/photo-wa-uninstall.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/procedures/comments.sql b/appsrc/ODS-Gallery/sql/procedures/comments.sql index 52e054217b..d87a4431ef 100644 --- a/appsrc/ODS-Gallery/sql/procedures/comments.sql +++ b/appsrc/ODS-Gallery/sql/procedures/comments.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/procedures/common.sql b/appsrc/ODS-Gallery/sql/procedures/common.sql index 97aed90aab..e54d53a678 100644 --- a/appsrc/ODS-Gallery/sql/procedures/common.sql +++ b/appsrc/ODS-Gallery/sql/procedures/common.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/procedures/dav_api.sql b/appsrc/ODS-Gallery/sql/procedures/dav_api.sql index 08a0eed3b1..d4c6e560e4 100644 --- a/appsrc/ODS-Gallery/sql/procedures/dav_api.sql +++ b/appsrc/ODS-Gallery/sql/procedures/dav_api.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/procedures/exec_no_error.sql b/appsrc/ODS-Gallery/sql/procedures/exec_no_error.sql index 42067664fd..372528fd72 100644 --- a/appsrc/ODS-Gallery/sql/procedures/exec_no_error.sql +++ b/appsrc/ODS-Gallery/sql/procedures/exec_no_error.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/procedures/images.sql b/appsrc/ODS-Gallery/sql/procedures/images.sql index 100246a89f..7ef078e65a 100644 --- a/appsrc/ODS-Gallery/sql/procedures/images.sql +++ b/appsrc/ODS-Gallery/sql/procedures/images.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/procedures/nntp.sql b/appsrc/ODS-Gallery/sql/procedures/nntp.sql index 01b1fb0bd3..0fa0a55c31 100644 --- a/appsrc/ODS-Gallery/sql/procedures/nntp.sql +++ b/appsrc/ODS-Gallery/sql/procedures/nntp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/procedures/photo_api.sql b/appsrc/ODS-Gallery/sql/procedures/photo_api.sql index 46bd2d0013..52017c8059 100644 --- a/appsrc/ODS-Gallery/sql/procedures/photo_api.sql +++ b/appsrc/ODS-Gallery/sql/procedures/photo_api.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/procedures/procedures.sql b/appsrc/ODS-Gallery/sql/procedures/procedures.sql index de410a6072..27e6c30d3a 100644 --- a/appsrc/ODS-Gallery/sql/procedures/procedures.sql +++ b/appsrc/ODS-Gallery/sql/procedures/procedures.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/procedures/rss.sql b/appsrc/ODS-Gallery/sql/procedures/rss.sql index 22c9db2db6..2402a739eb 100644 --- a/appsrc/ODS-Gallery/sql/procedures/rss.sql +++ b/appsrc/ODS-Gallery/sql/procedures/rss.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/procedures/sioc.sql b/appsrc/ODS-Gallery/sql/procedures/sioc.sql index 37b522251c..58a7cee68c 100644 --- a/appsrc/ODS-Gallery/sql/procedures/sioc.sql +++ b/appsrc/ODS-Gallery/sql/procedures/sioc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/sql/procedures/types.sql b/appsrc/ODS-Gallery/sql/procedures/types.sql index 1a6a718e5d..2606cf614c 100644 --- a/appsrc/ODS-Gallery/sql/procedures/types.sql +++ b/appsrc/ODS-Gallery/sql/procedures/types.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/www-root/css/gallery.css b/appsrc/ODS-Gallery/www-root/css/gallery.css index 377d84fc9f..a009dac1ef 100644 --- a/appsrc/ODS-Gallery/www-root/css/gallery.css +++ b/appsrc/ODS-Gallery/www-root/css/gallery.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/www-root/css/timeline.css b/appsrc/ODS-Gallery/www-root/css/timeline.css index 8aec17280b..79299c7d68 100644 --- a/appsrc/ODS-Gallery/www-root/css/timeline.css +++ b/appsrc/ODS-Gallery/www-root/css/timeline.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/appsrc/ODS-Gallery/www-root/css/upload.css b/appsrc/ODS-Gallery/www-root/css/upload.css index 1ca4f5a01d..11d6267457 100644 --- a/appsrc/ODS-Gallery/www-root/css/upload.css +++ b/appsrc/ODS-Gallery/www-root/css/upload.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/www-root/image.vsp b/appsrc/ODS-Gallery/www-root/image.vsp index 26d3699f61..b6ee1bb3fe 100644 --- a/appsrc/ODS-Gallery/www-root/image.vsp +++ b/appsrc/ODS-Gallery/www-root/image.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/www-root/index.vspx b/appsrc/ODS-Gallery/www-root/index.vspx index 1f21989c04..be197a73f1 100644 --- a/appsrc/ODS-Gallery/www-root/index.vspx +++ b/appsrc/ODS-Gallery/www-root/index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/www-root/js/calendar.js b/appsrc/ODS-Gallery/www-root/js/calendar.js index 0623e67f54..49723ceb68 100644 --- a/appsrc/ODS-Gallery/www-root/js/calendar.js +++ b/appsrc/ODS-Gallery/www-root/js/calendar.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/www-root/js/dataset.js b/appsrc/ODS-Gallery/www-root/js/dataset.js index c3c9ecaae9..1820e08b41 100644 --- a/appsrc/ODS-Gallery/www-root/js/dataset.js +++ b/appsrc/ODS-Gallery/www-root/js/dataset.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/www-root/js/gallery.js b/appsrc/ODS-Gallery/www-root/js/gallery.js index 89e5a11f7d..2281666dd3 100644 --- a/appsrc/ODS-Gallery/www-root/js/gallery.js +++ b/appsrc/ODS-Gallery/www-root/js/gallery.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/www-root/js/map.js b/appsrc/ODS-Gallery/www-root/js/map.js index d900490d6b..619c783363 100644 --- a/appsrc/ODS-Gallery/www-root/js/map.js +++ b/appsrc/ODS-Gallery/www-root/js/map.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/www-root/js/ui.js b/appsrc/ODS-Gallery/www-root/js/ui.js index ba9655aa23..002967fa09 100644 --- a/appsrc/ODS-Gallery/www-root/js/ui.js +++ b/appsrc/ODS-Gallery/www-root/js/ui.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/www-root/portal/index.vsp b/appsrc/ODS-Gallery/www-root/portal/index.vsp index 8fe28eee67..710e739089 100644 --- a/appsrc/ODS-Gallery/www-root/portal/index.vsp +++ b/appsrc/ODS-Gallery/www-root/portal/index.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/www-root/proxy.vsp b/appsrc/ODS-Gallery/www-root/proxy.vsp index 7bbd71f704..23edc4009c 100644 --- a/appsrc/ODS-Gallery/www-root/proxy.vsp +++ b/appsrc/ODS-Gallery/www-root/proxy.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/www-root/upload.vspx b/appsrc/ODS-Gallery/www-root/upload.vspx index 1cb82302c9..56a61d97d6 100644 --- a/appsrc/ODS-Gallery/www-root/upload.vspx +++ b/appsrc/ODS-Gallery/www-root/upload.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/xslt/index.xsl b/appsrc/ODS-Gallery/xslt/index.xsl index ea58a95f66..f75402fb6a 100644 --- a/appsrc/ODS-Gallery/xslt/index.xsl +++ b/appsrc/ODS-Gallery/xslt/index.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/xslt/rss11.xsl b/appsrc/ODS-Gallery/xslt/rss11.xsl index 884a3ba82c..d3814ba614 100644 --- a/appsrc/ODS-Gallery/xslt/rss11.xsl +++ b/appsrc/ODS-Gallery/xslt/rss11.xsl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/xslt/rss2atom.xsl b/appsrc/ODS-Gallery/xslt/rss2atom.xsl index 6b1603e9d5..423ae02c74 100644 --- a/appsrc/ODS-Gallery/xslt/rss2atom.xsl +++ b/appsrc/ODS-Gallery/xslt/rss2atom.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/xslt/rss2atom03.xsl b/appsrc/ODS-Gallery/xslt/rss2atom03.xsl index c6fb984bfd..4505afba5d 100644 --- a/appsrc/ODS-Gallery/xslt/rss2atom03.xsl +++ b/appsrc/ODS-Gallery/xslt/rss2atom03.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/xslt/rss2mrss.xsl b/appsrc/ODS-Gallery/xslt/rss2mrss.xsl index 8a2e2f4b87..51376a6930 100644 --- a/appsrc/ODS-Gallery/xslt/rss2mrss.xsl +++ b/appsrc/ODS-Gallery/xslt/rss2mrss.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/xslt/rss2rdf.xsl b/appsrc/ODS-Gallery/xslt/rss2rdf.xsl index 2491114481..7f5e84358d 100644 --- a/appsrc/ODS-Gallery/xslt/rss2rdf.xsl +++ b/appsrc/ODS-Gallery/xslt/rss2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/xslt/rss2wml.xsl b/appsrc/ODS-Gallery/xslt/rss2wml.xsl index 988c7f7e67..6d8fec3eaf 100644 --- a/appsrc/ODS-Gallery/xslt/rss2wml.xsl +++ b/appsrc/ODS-Gallery/xslt/rss2wml.xsl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/xslt/rss2xbel.xsl b/appsrc/ODS-Gallery/xslt/rss2xbel.xsl index 468dc2652b..a6d7cc805f 100644 --- a/appsrc/ODS-Gallery/xslt/rss2xbel.xsl +++ b/appsrc/ODS-Gallery/xslt/rss2xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/xslt/upload.xsl b/appsrc/ODS-Gallery/xslt/upload.xsl index 13586fc44f..5df1d3c3f4 100644 --- a/appsrc/ODS-Gallery/xslt/upload.xsl +++ b/appsrc/ODS-Gallery/xslt/upload.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Gallery/xslt/wsdl2js.xsl b/appsrc/ODS-Gallery/xslt/wsdl2js.xsl index 5d2815b847..2cca644cb9 100644 --- a/appsrc/ODS-Gallery/xslt/wsdl2js.xsl +++ b/appsrc/ODS-Gallery/xslt/wsdl2js.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/Makefile.am b/appsrc/ODS-Polls/Makefile.am index 6864a103a9..c0f3679688 100644 --- a/appsrc/ODS-Polls/Makefile.am +++ b/appsrc/ODS-Polls/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/make_vad.sh b/appsrc/ODS-Polls/make_vad.sh index 322716a3a8..65d535f179 100755 --- a/appsrc/ODS-Polls/make_vad.sh +++ b/appsrc/ODS-Polls/make_vad.sh @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -259,7 +259,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-Polls/sql/polls-a-api.sql b/appsrc/ODS-Polls/sql/polls-a-api.sql index 6c0aaf357c..0e9b5dfd49 100644 --- a/appsrc/ODS-Polls/sql/polls-a-api.sql +++ b/appsrc/ODS-Polls/sql/polls-a-api.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/sql/polls-a-code.sql b/appsrc/ODS-Polls/sql/polls-a-code.sql index f77464bcb7..719de269fb 100644 --- a/appsrc/ODS-Polls/sql/polls-a-code.sql +++ b/appsrc/ODS-Polls/sql/polls-a-code.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/sql/polls-a-table.sql b/appsrc/ODS-Polls/sql/polls-a-table.sql index 1b63a659f0..9280c2abb5 100644 --- a/appsrc/ODS-Polls/sql/polls-a-table.sql +++ b/appsrc/ODS-Polls/sql/polls-a-table.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/sql/polls-a-wa.sql b/appsrc/ODS-Polls/sql/polls-a-wa.sql index 5270f11c89..261d27f31c 100644 --- a/appsrc/ODS-Polls/sql/polls-a-wa.sql +++ b/appsrc/ODS-Polls/sql/polls-a-wa.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/sql/polls-d.sql b/appsrc/ODS-Polls/sql/polls-d.sql index f3fe2da5f9..288b8ec7f2 100644 --- a/appsrc/ODS-Polls/sql/polls-d.sql +++ b/appsrc/ODS-Polls/sql/polls-d.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/sql/sioc_polls.sql b/appsrc/ODS-Polls/sql/sioc_polls.sql index 94d47b85ab..2d8b77e173 100644 --- a/appsrc/ODS-Polls/sql/sioc_polls.sql +++ b/appsrc/ODS-Polls/sql/sioc_polls.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/ajax.vsp b/appsrc/ODS-Polls/www/ajax.vsp index 52f6f96415..5ad2a0b404 100644 --- a/appsrc/ODS-Polls/www/ajax.vsp +++ b/appsrc/ODS-Polls/www/ajax.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/conversation.vspx b/appsrc/ODS-Polls/www/conversation.vspx index 987c5e431b..d5be42d3f8 100644 --- a/appsrc/ODS-Polls/www/conversation.vspx +++ b/appsrc/ODS-Polls/www/conversation.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/css/style.css b/appsrc/ODS-Polls/www/css/style.css index d4dcd7360f..3d00e8f02f 100644 --- a/appsrc/ODS-Polls/www/css/style.css +++ b/appsrc/ODS-Polls/www/css/style.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/error.vspx b/appsrc/ODS-Polls/www/error.vspx index 97381f1c37..3102ea09ba 100644 --- a/appsrc/ODS-Polls/www/error.vspx +++ b/appsrc/ODS-Polls/www/error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/export.vspx b/appsrc/ODS-Polls/www/export.vspx index bdd5ba69ec..9f044aab71 100644 --- a/appsrc/ODS-Polls/www/export.vspx +++ b/appsrc/ODS-Polls/www/export.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/gems.vsp b/appsrc/ODS-Polls/www/gems.vsp index 6244a91870..15f0ef8822 100644 --- a/appsrc/ODS-Polls/www/gems.vsp +++ b/appsrc/ODS-Polls/www/gems.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/js/polls.js b/appsrc/ODS-Polls/www/js/polls.js index 8797f93f04..3b671ee7f6 100644 --- a/appsrc/ODS-Polls/www/js/polls.js +++ b/appsrc/ODS-Polls/www/js/polls.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/polls.vspx b/appsrc/ODS-Polls/www/polls.vspx index 3f99c402a4..56656f1824 100644 --- a/appsrc/ODS-Polls/www/polls.vspx +++ b/appsrc/ODS-Polls/www/polls.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/polls_login.vspx b/appsrc/ODS-Polls/www/polls_login.vspx index 4ca3d49868..0e10f91a40 100644 --- a/appsrc/ODS-Polls/www/polls_login.vspx +++ b/appsrc/ODS-Polls/www/polls_login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/search.vspx b/appsrc/ODS-Polls/www/search.vspx index f2fad83e25..319eb3b2f2 100644 --- a/appsrc/ODS-Polls/www/search.vspx +++ b/appsrc/ODS-Polls/www/search.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/settings.vspx b/appsrc/ODS-Polls/www/settings.vspx index 7d472d0469..6464ed7c4e 100644 --- a/appsrc/ODS-Polls/www/settings.vspx +++ b/appsrc/ODS-Polls/www/settings.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/tags.vspx b/appsrc/ODS-Polls/www/tags.vspx index 42c5c0ef98..df0d6bb969 100644 --- a/appsrc/ODS-Polls/www/tags.vspx +++ b/appsrc/ODS-Polls/www/tags.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/template/popup.vspx b/appsrc/ODS-Polls/www/template/popup.vspx index ad6e35a6e8..91372f0df7 100644 --- a/appsrc/ODS-Polls/www/template/popup.vspx +++ b/appsrc/ODS-Polls/www/template/popup.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/template/template.vspx b/appsrc/ODS-Polls/www/template/template.vspx index 667a1a3ffa..da6dd51a4b 100644 --- a/appsrc/ODS-Polls/www/template/template.vspx +++ b/appsrc/ODS-Polls/www/template/template.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/www/template/template.xsl b/appsrc/ODS-Polls/www/template/template.xsl index 953728ef38..9f483df5a0 100644 --- a/appsrc/ODS-Polls/www/template/template.xsl +++ b/appsrc/ODS-Polls/www/template/template.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/xslt/rss2atom.xsl b/appsrc/ODS-Polls/xslt/rss2atom.xsl index f742cf5f60..fe6ab15f68 100644 --- a/appsrc/ODS-Polls/xslt/rss2atom.xsl +++ b/appsrc/ODS-Polls/xslt/rss2atom.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/xslt/rss2atom03.xsl b/appsrc/ODS-Polls/xslt/rss2atom03.xsl index c6fb984bfd..4505afba5d 100644 --- a/appsrc/ODS-Polls/xslt/rss2atom03.xsl +++ b/appsrc/ODS-Polls/xslt/rss2atom03.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/xslt/rss2rdf.xsl b/appsrc/ODS-Polls/xslt/rss2rdf.xsl index 39d99f5311..d70a92b47c 100644 --- a/appsrc/ODS-Polls/xslt/rss2rdf.xsl +++ b/appsrc/ODS-Polls/xslt/rss2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Polls/xslt/rss2xbel.xsl b/appsrc/ODS-Polls/xslt/rss2xbel.xsl index ec892f065b..0b11836016 100644 --- a/appsrc/ODS-Polls/xslt/rss2xbel.xsl +++ b/appsrc/ODS-Polls/xslt/rss2xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/Makefile.am b/appsrc/ODS-WebMail/Makefile.am index ec319f9978..ae7afb8210 100644 --- a/appsrc/ODS-WebMail/Makefile.am +++ b/appsrc/ODS-WebMail/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/install/odbc_mail.ini b/appsrc/ODS-WebMail/install/odbc_mail.ini index 877bf6cbcb..8433a311c7 100644 --- a/appsrc/ODS-WebMail/install/odbc_mail.ini +++ b/appsrc/ODS-WebMail/install/odbc_mail.ini @@ -3,7 +3,7 @@ ; ; Configuration file for the ODBC Mail Delivery Agent ; -; Copyright (C) 1998-2018 OpenLink Software. +; Copyright (C) 1998-2019 OpenLink Software. ; ; To learn more about this product, or any other product in our ; portfolio, please check out our web site at: diff --git a/appsrc/ODS-WebMail/make_vad.sh b/appsrc/ODS-WebMail/make_vad.sh index b1cd65d88e..762e2ef130 100755 --- a/appsrc/ODS-WebMail/make_vad.sh +++ b/appsrc/ODS-WebMail/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -270,7 +270,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-WebMail/sql/DET_oMail.sql b/appsrc/ODS-WebMail/sql/DET_oMail.sql index 43ea0dc661..894e20a909 100644 --- a/appsrc/ODS-WebMail/sql/DET_oMail.sql +++ b/appsrc/ODS-WebMail/sql/DET_oMail.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/sql/eml/eml-create-code.sql b/appsrc/ODS-WebMail/sql/eml/eml-create-code.sql index 34059ee9f8..168bba19b2 100644 --- a/appsrc/ODS-WebMail/sql/eml/eml-create-code.sql +++ b/appsrc/ODS-WebMail/sql/eml/eml-create-code.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/sql/eml/eml-create-tables.sql b/appsrc/ODS-WebMail/sql/eml/eml-create-tables.sql index fc0cc9d0d9..61dd34897c 100644 --- a/appsrc/ODS-WebMail/sql/eml/eml-create-tables.sql +++ b/appsrc/ODS-WebMail/sql/eml/eml-create-tables.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/sql/eml/eml-dev-code.sql b/appsrc/ODS-WebMail/sql/eml/eml-dev-code.sql index 92b9e0fa01..53424a24d9 100644 --- a/appsrc/ODS-WebMail/sql/eml/eml-dev-code.sql +++ b/appsrc/ODS-WebMail/sql/eml/eml-dev-code.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/sql/omail-api.sql b/appsrc/ODS-WebMail/sql/omail-api.sql index 0f1227cdf9..421a91f579 100644 --- a/appsrc/ODS-WebMail/sql/omail-api.sql +++ b/appsrc/ODS-WebMail/sql/omail-api.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/sql/omail-wa-install.sql b/appsrc/ODS-WebMail/sql/omail-wa-install.sql index e6cdfd7324..fb26894866 100644 --- a/appsrc/ODS-WebMail/sql/omail-wa-install.sql +++ b/appsrc/ODS-WebMail/sql/omail-wa-install.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/sql/omail-wa-uninstall.sql b/appsrc/ODS-WebMail/sql/omail-wa-uninstall.sql index e88041cb7b..95665ea919 100644 --- a/appsrc/ODS-WebMail/sql/omail-wa-uninstall.sql +++ b/appsrc/ODS-WebMail/sql/omail-wa-uninstall.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/sql/res/res-create-code-data.sql b/appsrc/ODS-WebMail/sql/res/res-create-code-data.sql index 2202c74b8d..57b8b2fa96 100644 --- a/appsrc/ODS-WebMail/sql/res/res-create-code-data.sql +++ b/appsrc/ODS-WebMail/sql/res/res-create-code-data.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/sql/res/res-create-code.sql b/appsrc/ODS-WebMail/sql/res/res-create-code.sql index 2181868123..d25c08c447 100644 --- a/appsrc/ODS-WebMail/sql/res/res-create-code.sql +++ b/appsrc/ODS-WebMail/sql/res/res-create-code.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/sql/res/res-create-tables.sql b/appsrc/ODS-WebMail/sql/res/res-create-tables.sql index 4d0eeed116..890f41a7a7 100644 --- a/appsrc/ODS-WebMail/sql/res/res-create-tables.sql +++ b/appsrc/ODS-WebMail/sql/res/res-create-tables.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/sql/sioc_mail.sql b/appsrc/ODS-WebMail/sql/sioc_mail.sql index df792931b6..953af950f6 100644 --- a/appsrc/ODS-WebMail/sql/sioc_mail.sql +++ b/appsrc/ODS-WebMail/sql/sioc_mail.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/sql/utl/utl-create-code.sql b/appsrc/ODS-WebMail/sql/utl/utl-create-code.sql index 9583e76ece..1402530ceb 100644 --- a/appsrc/ODS-WebMail/sql/utl/utl-create-code.sql +++ b/appsrc/ODS-WebMail/sql/utl/utl-create-code.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/sql/wa_search_mail.sql b/appsrc/ODS-WebMail/sql/wa_search_mail.sql index 865a410ec0..7ca3884db5 100644 --- a/appsrc/ODS-WebMail/sql/wa_search_mail.sql +++ b/appsrc/ODS-WebMail/sql/wa_search_mail.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/www-root/mail/i/css/print.css b/appsrc/ODS-WebMail/www-root/mail/i/css/print.css index 5f1f1336d2..303f7532e5 100644 --- a/appsrc/ODS-WebMail/www-root/mail/i/css/print.css +++ b/appsrc/ODS-WebMail/www-root/mail/i/css/print.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/www-root/mail/i/css/styles.css b/appsrc/ODS-WebMail/www-root/mail/i/css/styles.css index 604de863c7..dfc9d949c0 100644 --- a/appsrc/ODS-WebMail/www-root/mail/i/css/styles.css +++ b/appsrc/ODS-WebMail/www-root/mail/i/css/styles.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/www-root/mail/i/js/script.js b/appsrc/ODS-WebMail/www-root/mail/i/js/script.js index 5abe28f9b8..21d51e966e 100644 --- a/appsrc/ODS-WebMail/www-root/mail/i/js/script.js +++ b/appsrc/ODS-WebMail/www-root/mail/i/js/script.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/www-root/mail/i/js/tbl.js b/appsrc/ODS-WebMail/www-root/mail/i/js/tbl.js index f2b79032d8..2b2941efd4 100644 --- a/appsrc/ODS-WebMail/www-root/mail/i/js/tbl.js +++ b/appsrc/ODS-WebMail/www-root/mail/i/js/tbl.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/www-root/mail/p/p.vsp b/appsrc/ODS-WebMail/www-root/mail/p/p.vsp index 541d40c17a..2461166aa5 100644 --- a/appsrc/ODS-WebMail/www-root/mail/p/p.vsp +++ b/appsrc/ODS-WebMail/www-root/mail/p/p.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/www-root/mail/p/tags.xml b/appsrc/ODS-WebMail/www-root/mail/p/tags.xml index a76356748f..831ffdae92 100644 --- a/appsrc/ODS-WebMail/www-root/mail/p/tags.xml +++ b/appsrc/ODS-WebMail/www-root/mail/p/tags.xml @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/www-root/mail/p/tags.xsl b/appsrc/ODS-WebMail/www-root/mail/p/tags.xsl index 03dc63a03a..1ba81b2c98 100644 --- a/appsrc/ODS-WebMail/www-root/mail/p/tags.xsl +++ b/appsrc/ODS-WebMail/www-root/mail/p/tags.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/www-root/portal.vsp b/appsrc/ODS-WebMail/www-root/portal.vsp index 0d67b870b5..b1139b1af5 100644 --- a/appsrc/ODS-WebMail/www-root/portal.vsp +++ b/appsrc/ODS-WebMail/www-root/portal.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/www-root/res/export.vsp b/appsrc/ODS-WebMail/www-root/res/export.vsp index 3a9d282650..645efaaaed 100644 --- a/appsrc/ODS-WebMail/www-root/res/export.vsp +++ b/appsrc/ODS-WebMail/www-root/res/export.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/www-root/res/flush.vsp b/appsrc/ODS-WebMail/www-root/res/flush.vsp index bc12065c56..06ee9df02e 100644 --- a/appsrc/ODS-WebMail/www-root/res/flush.vsp +++ b/appsrc/ODS-WebMail/www-root/res/flush.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/www-root/res/image.vsp b/appsrc/ODS-WebMail/www-root/res/image.vsp index b01bb9db84..81a3fbaf3a 100644 --- a/appsrc/ODS-WebMail/www-root/res/image.vsp +++ b/appsrc/ODS-WebMail/www-root/res/image.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/addr.xsl b/appsrc/ODS-WebMail/xslt/addr.xsl index 299c555b05..124d733061 100644 --- a/appsrc/ODS-WebMail/xslt/addr.xsl +++ b/appsrc/ODS-WebMail/xslt/addr.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/attach.xsl b/appsrc/ODS-WebMail/xslt/attach.xsl index 7e5f88dab5..3798b4757d 100644 --- a/appsrc/ODS-WebMail/xslt/attach.xsl +++ b/appsrc/ODS-WebMail/xslt/attach.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/base.xsl b/appsrc/ODS-WebMail/xslt/base.xsl index 49bc9195ba..cc8c4664df 100644 --- a/appsrc/ODS-WebMail/xslt/base.xsl +++ b/appsrc/ODS-WebMail/xslt/base.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/box.xsl b/appsrc/ODS-WebMail/xslt/box.xsl index ba18f9f8bb..c02a470f6c 100644 --- a/appsrc/ODS-WebMail/xslt/box.xsl +++ b/appsrc/ODS-WebMail/xslt/box.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/ch_pop3.xsl b/appsrc/ODS-WebMail/xslt/ch_pop3.xsl index c7f7718b8c..53a530b627 100644 --- a/appsrc/ODS-WebMail/xslt/ch_pop3.xsl +++ b/appsrc/ODS-WebMail/xslt/ch_pop3.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/common.xsl b/appsrc/ODS-WebMail/xslt/common.xsl index aab07dd003..e748442078 100644 --- a/appsrc/ODS-WebMail/xslt/common.xsl +++ b/appsrc/ODS-WebMail/xslt/common.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/common_folders.xsl b/appsrc/ODS-WebMail/xslt/common_folders.xsl index 12dd911439..1d0aef6351 100644 --- a/appsrc/ODS-WebMail/xslt/common_folders.xsl +++ b/appsrc/ODS-WebMail/xslt/common_folders.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/construct_body.xsl b/appsrc/ODS-WebMail/xslt/construct_body.xsl index c86c98f0c6..e0c04a28b4 100644 --- a/appsrc/ODS-WebMail/xslt/construct_body.xsl +++ b/appsrc/ODS-WebMail/xslt/construct_body.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/construct_mail.xsl b/appsrc/ODS-WebMail/xslt/construct_mail.xsl index 6b36a4c08b..832d65352e 100644 --- a/appsrc/ODS-WebMail/xslt/construct_mail.xsl +++ b/appsrc/ODS-WebMail/xslt/construct_mail.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/construct_mail_pop3.xsl b/appsrc/ODS-WebMail/xslt/construct_mail_pop3.xsl index e64893c89a..b53efde7f6 100644 --- a/appsrc/ODS-WebMail/xslt/construct_mail_pop3.xsl +++ b/appsrc/ODS-WebMail/xslt/construct_mail_pop3.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/construct_recip.xsl b/appsrc/ODS-WebMail/xslt/construct_recip.xsl index 49304082eb..cecd6f0f5f 100644 --- a/appsrc/ODS-WebMail/xslt/construct_recip.xsl +++ b/appsrc/ODS-WebMail/xslt/construct_recip.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/date_time.xsl b/appsrc/ODS-WebMail/xslt/date_time.xsl index 05204dd726..91a2278f57 100644 --- a/appsrc/ODS-WebMail/xslt/date_time.xsl +++ b/appsrc/ODS-WebMail/xslt/date_time.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/err.xsl b/appsrc/ODS-WebMail/xslt/err.xsl index 6e5ce77345..83c51fa4f3 100644 --- a/appsrc/ODS-WebMail/xslt/err.xsl +++ b/appsrc/ODS-WebMail/xslt/err.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/errors.xml b/appsrc/ODS-WebMail/xslt/errors.xml index a2c8dc8e8c..8df0ec0ab6 100644 --- a/appsrc/ODS-WebMail/xslt/errors.xml +++ b/appsrc/ODS-WebMail/xslt/errors.xml @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/export/rss2atom.xsl b/appsrc/ODS-WebMail/xslt/export/rss2atom.xsl index f742cf5f60..fe6ab15f68 100644 --- a/appsrc/ODS-WebMail/xslt/export/rss2atom.xsl +++ b/appsrc/ODS-WebMail/xslt/export/rss2atom.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/export/rss2atom03.xsl b/appsrc/ODS-WebMail/xslt/export/rss2atom03.xsl index c6fb984bfd..4505afba5d 100644 --- a/appsrc/ODS-WebMail/xslt/export/rss2atom03.xsl +++ b/appsrc/ODS-WebMail/xslt/export/rss2atom03.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/export/rss2rdf.xsl b/appsrc/ODS-WebMail/xslt/export/rss2rdf.xsl index 6fc704ae5c..e1d88e4cf2 100644 --- a/appsrc/ODS-WebMail/xslt/export/rss2rdf.xsl +++ b/appsrc/ODS-WebMail/xslt/export/rss2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/export/rss2xbel.xsl b/appsrc/ODS-WebMail/xslt/export/rss2xbel.xsl index 468dc2652b..a6d7cc805f 100644 --- a/appsrc/ODS-WebMail/xslt/export/rss2xbel.xsl +++ b/appsrc/ODS-WebMail/xslt/export/rss2xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/filters.xsl b/appsrc/ODS-WebMail/xslt/filters.xsl index ac598e3e0a..127b838e89 100644 --- a/appsrc/ODS-WebMail/xslt/filters.xsl +++ b/appsrc/ODS-WebMail/xslt/filters.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/folders.xsl b/appsrc/ODS-WebMail/xslt/folders.xsl index 9bb312b1d4..091b65ecda 100644 --- a/appsrc/ODS-WebMail/xslt/folders.xsl +++ b/appsrc/ODS-WebMail/xslt/folders.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/handlers.xsl b/appsrc/ODS-WebMail/xslt/handlers.xsl index 94af785bbd..4d20d43428 100644 --- a/appsrc/ODS-WebMail/xslt/handlers.xsl +++ b/appsrc/ODS-WebMail/xslt/handlers.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/html_parse.xsl b/appsrc/ODS-WebMail/xslt/html_parse.xsl index 688f6a7a4a..683f101542 100644 --- a/appsrc/ODS-WebMail/xslt/html_parse.xsl +++ b/appsrc/ODS-WebMail/xslt/html_parse.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/html_parse2.xsl b/appsrc/ODS-WebMail/xslt/html_parse2.xsl index 28b2b58fb8..c93e980354 100644 --- a/appsrc/ODS-WebMail/xslt/html_parse2.xsl +++ b/appsrc/ODS-WebMail/xslt/html_parse2.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/mails.xsl b/appsrc/ODS-WebMail/xslt/mails.xsl index 568b0aa1fc..43b7e8f6c0 100644 --- a/appsrc/ODS-WebMail/xslt/mails.xsl +++ b/appsrc/ODS-WebMail/xslt/mails.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/open.xsl b/appsrc/ODS-WebMail/xslt/open.xsl index b4dea83b61..64c39fda99 100644 --- a/appsrc/ODS-WebMail/xslt/open.xsl +++ b/appsrc/ODS-WebMail/xslt/open.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/search.xsl b/appsrc/ODS-WebMail/xslt/search.xsl index 67849061f8..d3570b885f 100644 --- a/appsrc/ODS-WebMail/xslt/search.xsl +++ b/appsrc/ODS-WebMail/xslt/search.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/sendok.xsl b/appsrc/ODS-WebMail/xslt/sendok.xsl index 05f0d15126..cd3761726e 100644 --- a/appsrc/ODS-WebMail/xslt/sendok.xsl +++ b/appsrc/ODS-WebMail/xslt/sendok.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/set_mail.xsl b/appsrc/ODS-WebMail/xslt/set_mail.xsl index ddfe3f80b9..5157f6e88b 100644 --- a/appsrc/ODS-WebMail/xslt/set_mail.xsl +++ b/appsrc/ODS-WebMail/xslt/set_mail.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/tools.xsl b/appsrc/ODS-WebMail/xslt/tools.xsl index 2726267e7f..07b9174eeb 100644 --- a/appsrc/ODS-WebMail/xslt/tools.xsl +++ b/appsrc/ODS-WebMail/xslt/tools.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-WebMail/xslt/write.xsl b/appsrc/ODS-WebMail/xslt/write.xsl index 6aff539102..df81dec22f 100644 --- a/appsrc/ODS-WebMail/xslt/write.xsl +++ b/appsrc/ODS-WebMail/xslt/write.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/Makefile.am b/appsrc/ODS-Wiki/Makefile.am index 602380a934..bc3e6a0118 100644 --- a/appsrc/ODS-Wiki/Makefile.am +++ b/appsrc/ODS-Wiki/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/Skins/default/PostProcess.xslt b/appsrc/ODS-Wiki/Skins/default/PostProcess.xslt index dbfd231f4c..abc78772fb 100644 --- a/appsrc/ODS-Wiki/Skins/default/PostProcess.xslt +++ b/appsrc/ODS-Wiki/Skins/default/PostProcess.xslt @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/Skins/default/default.css b/appsrc/ODS-Wiki/Skins/default/default.css index b8aceb9696..09bcce1032 100644 --- a/appsrc/ODS-Wiki/Skins/default/default.css +++ b/appsrc/ODS-Wiki/Skins/default/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/atom.sql b/appsrc/ODS-Wiki/atom.sql index 4db61e7710..73c48c8664 100644 --- a/appsrc/ODS-Wiki/atom.sql +++ b/appsrc/ODS-Wiki/atom.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/conv.sql b/appsrc/ODS-Wiki/conv.sql index c0a6bb0165..a829ec6fc5 100644 --- a/appsrc/ODS-Wiki/conv.sql +++ b/appsrc/ODS-Wiki/conv.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/drop.sql b/appsrc/ODS-Wiki/drop.sql index 2705b7e1bb..10f779f815 100644 --- a/appsrc/ODS-Wiki/drop.sql +++ b/appsrc/ODS-Wiki/drop.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/export.sql b/appsrc/ODS-Wiki/export.sql index b7f340773a..99ea2f73bf 100644 --- a/appsrc/ODS-Wiki/export.sql +++ b/appsrc/ODS-Wiki/export.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/generate_drop_proc.sh b/appsrc/ODS-Wiki/generate_drop_proc.sh index ac7bf4df00..2665603955 100755 --- a/appsrc/ODS-Wiki/generate_drop_proc.sh +++ b/appsrc/ODS-Wiki/generate_drop_proc.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/HTMLtoWiki.xslt b/appsrc/ODS-Wiki/http/HTMLtoWiki.xslt index a6b27c0fbb..679e3ca8c9 100644 --- a/appsrc/ODS-Wiki/http/HTMLtoWiki.xslt +++ b/appsrc/ODS-Wiki/http/HTMLtoWiki.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspAttachmentDeleteConfirm.xslt b/appsrc/ODS-Wiki/http/VspAttachmentDeleteConfirm.xslt index 3d17c4723b..95f24afb43 100644 --- a/appsrc/ODS-Wiki/http/VspAttachmentDeleteConfirm.xslt +++ b/appsrc/ODS-Wiki/http/VspAttachmentDeleteConfirm.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspChangeLog.xslt b/appsrc/ODS-Wiki/http/VspChangeLog.xslt index d0ef56e235..c3745d1eca 100644 --- a/appsrc/ODS-Wiki/http/VspChangeLog.xslt +++ b/appsrc/ODS-Wiki/http/VspChangeLog.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspMail.xslt b/appsrc/ODS-Wiki/http/VspMail.xslt index 7103f5c8ce..add0a9829c 100644 --- a/appsrc/ODS-Wiki/http/VspMail.xslt +++ b/appsrc/ODS-Wiki/http/VspMail.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspNoteCompile.xslt b/appsrc/ODS-Wiki/http/VspNoteCompile.xslt index 51683cbc9c..bc853f6d3f 100644 --- a/appsrc/ODS-Wiki/http/VspNoteCompile.xslt +++ b/appsrc/ODS-Wiki/http/VspNoteCompile.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspReportError.xslt b/appsrc/ODS-Wiki/http/VspReportError.xslt index 55ba931f32..b6a9e95adb 100644 --- a/appsrc/ODS-Wiki/http/VspReportError.xslt +++ b/appsrc/ODS-Wiki/http/VspReportError.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspSearch.xslt b/appsrc/ODS-Wiki/http/VspSearch.xslt index 3085128267..54086ec17a 100644 --- a/appsrc/ODS-Wiki/http/VspSearch.xslt +++ b/appsrc/ODS-Wiki/http/VspSearch.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspTopicAttach.xslt b/appsrc/ODS-Wiki/http/VspTopicAttach.xslt index a1c22adbbf..b57ef2b744 100644 --- a/appsrc/ODS-Wiki/http/VspTopicAttach.xslt +++ b/appsrc/ODS-Wiki/http/VspTopicAttach.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspTopicAttachManage.xslt b/appsrc/ODS-Wiki/http/VspTopicAttachManage.xslt index 78b6dcb6f9..8e9e9043f4 100644 --- a/appsrc/ODS-Wiki/http/VspTopicAttachManage.xslt +++ b/appsrc/ODS-Wiki/http/VspTopicAttachManage.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspTopicCreate.xslt b/appsrc/ODS-Wiki/http/VspTopicCreate.xslt index d2f71e9911..16416774b0 100644 --- a/appsrc/ODS-Wiki/http/VspTopicCreate.xslt +++ b/appsrc/ODS-Wiki/http/VspTopicCreate.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspTopicDelete.xslt b/appsrc/ODS-Wiki/http/VspTopicDelete.xslt index 029c9c4d53..cc33b19e7b 100644 --- a/appsrc/ODS-Wiki/http/VspTopicDelete.xslt +++ b/appsrc/ODS-Wiki/http/VspTopicDelete.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspTopicEdit.xslt b/appsrc/ODS-Wiki/http/VspTopicEdit.xslt index d65b5a811c..2c3493b889 100644 --- a/appsrc/ODS-Wiki/http/VspTopicEdit.xslt +++ b/appsrc/ODS-Wiki/http/VspTopicEdit.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspTopicHistory.xslt b/appsrc/ODS-Wiki/http/VspTopicHistory.xslt index bc94a4e0cd..fac226d67f 100644 --- a/appsrc/ODS-Wiki/http/VspTopicHistory.xslt +++ b/appsrc/ODS-Wiki/http/VspTopicHistory.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspTopicMoreOps.xslt b/appsrc/ODS-Wiki/http/VspTopicMoreOps.xslt index 46c3c00656..8152e07d74 100644 --- a/appsrc/ODS-Wiki/http/VspTopicMoreOps.xslt +++ b/appsrc/ODS-Wiki/http/VspTopicMoreOps.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspTopicRename.xslt b/appsrc/ODS-Wiki/http/VspTopicRename.xslt index 691e77630f..af30d5f738 100644 --- a/appsrc/ODS-Wiki/http/VspTopicRename.xslt +++ b/appsrc/ODS-Wiki/http/VspTopicRename.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspTopicReports.xslt b/appsrc/ODS-Wiki/http/VspTopicReports.xslt index 57e6fc8a9d..e97e04e7bb 100644 --- a/appsrc/ODS-Wiki/http/VspTopicReports.xslt +++ b/appsrc/ODS-Wiki/http/VspTopicReports.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/VspTopicView.xslt b/appsrc/ODS-Wiki/http/VspTopicView.xslt index d763368fe3..e0c73fd375 100644 --- a/appsrc/ODS-Wiki/http/VspTopicView.xslt +++ b/appsrc/ODS-Wiki/http/VspTopicView.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/XmlAtomFeed.xslt b/appsrc/ODS-Wiki/http/XmlAtomFeed.xslt index 3d2a0e9da7..0cef53c9b5 100644 --- a/appsrc/ODS-Wiki/http/XmlAtomFeed.xslt +++ b/appsrc/ODS-Wiki/http/XmlAtomFeed.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -41,7 +41,7 @@ oWiki <xsl:value-of select="@cluster"/> Weblog - Copyright (c) 1998-2018 OpenLink Software + Copyright (c) 1998-2019 OpenLink Software diff --git a/appsrc/ODS-Wiki/http/XmlRDFFeed.xslt b/appsrc/ODS-Wiki/http/XmlRDFFeed.xslt index 7c7c0fe341..642d1fedaa 100644 --- a/appsrc/ODS-Wiki/http/XmlRDFFeed.xslt +++ b/appsrc/ODS-Wiki/http/XmlRDFFeed.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/XmlRssFeed.xslt b/appsrc/ODS-Wiki/http/XmlRssFeed.xslt index bbd549100a..6baa6b4b9d 100644 --- a/appsrc/ODS-Wiki/http/XmlRssFeed.xslt +++ b/appsrc/ODS-Wiki/http/XmlRssFeed.xslt @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/advanced_search.vspx b/appsrc/ODS-Wiki/http/advanced_search.vspx index 065e014b24..53c26eea67 100644 --- a/appsrc/ODS-Wiki/http/advanced_search.vspx +++ b/appsrc/ODS-Wiki/http/advanced_search.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/attachment.vsp b/appsrc/ODS-Wiki/http/attachment.vsp index 940bfe3a05..cdb91584cf 100644 --- a/appsrc/ODS-Wiki/http/attachment.vsp +++ b/appsrc/ODS-Wiki/http/attachment.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/common.css b/appsrc/ODS-Wiki/http/common.css index b4d11a6bce..82c7baf7c2 100644 --- a/appsrc/ODS-Wiki/http/common.css +++ b/appsrc/ODS-Wiki/http/common.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/common.xsl b/appsrc/ODS-Wiki/http/common.xsl index 64ddc94123..b38019cb00 100644 --- a/appsrc/ODS-Wiki/http/common.xsl +++ b/appsrc/ODS-Wiki/http/common.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/comp.xsl b/appsrc/ODS-Wiki/http/comp.xsl index e608db0785..e4b029f755 100644 --- a/appsrc/ODS-Wiki/http/comp.xsl +++ b/appsrc/ODS-Wiki/http/comp.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/conversation.vspx b/appsrc/ODS-Wiki/http/conversation.vspx index 067a280f15..9411e19b5e 100644 --- a/appsrc/ODS-Wiki/http/conversation.vspx +++ b/appsrc/ODS-Wiki/http/conversation.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/default.css b/appsrc/ODS-Wiki/http/default.css index d25151a503..67759c2176 100644 --- a/appsrc/ODS-Wiki/http/default.css +++ b/appsrc/ODS-Wiki/http/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/export.vspx b/appsrc/ODS-Wiki/http/export.vspx index 03456a379b..f4cb8d6dfd 100644 --- a/appsrc/ODS-Wiki/http/export.vspx +++ b/appsrc/ODS-Wiki/http/export.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/export.xsl b/appsrc/ODS-Wiki/http/export.xsl index cd658607bd..f2b0d98608 100644 --- a/appsrc/ODS-Wiki/http/export.xsl +++ b/appsrc/ODS-Wiki/http/export.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/fault.vspx b/appsrc/ODS-Wiki/http/fault.vspx index 4010a83244..1896800074 100644 --- a/appsrc/ODS-Wiki/http/fault.vspx +++ b/appsrc/ODS-Wiki/http/fault.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/gems.vsp b/appsrc/ODS-Wiki/http/gems.vsp index 954a686974..dc3d9fb90d 100644 --- a/appsrc/ODS-Wiki/http/gems.vsp +++ b/appsrc/ODS-Wiki/http/gems.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/history.vspx b/appsrc/ODS-Wiki/http/history.vspx index 918fa3ed66..edfdc29976 100644 --- a/appsrc/ODS-Wiki/http/history.vspx +++ b/appsrc/ODS-Wiki/http/history.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/html2docbook.xsl b/appsrc/ODS-Wiki/http/html2docbook.xsl index 8432d42e26..1df95a1fbc 100644 --- a/appsrc/ODS-Wiki/http/html2docbook.xsl +++ b/appsrc/ODS-Wiki/http/html2docbook.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/login.vsp b/appsrc/ODS-Wiki/http/login.vsp index 5bb54c7ca2..09680a3dd1 100644 --- a/appsrc/ODS-Wiki/http/login.vsp +++ b/appsrc/ODS-Wiki/http/login.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/login.vspx b/appsrc/ODS-Wiki/http/login.vspx index 642d081152..680ae0f764 100644 --- a/appsrc/ODS-Wiki/http/login.vspx +++ b/appsrc/ODS-Wiki/http/login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/macros.xml b/appsrc/ODS-Wiki/http/macros.xml index 9d4a6ddda9..04c5708b3e 100644 --- a/appsrc/ODS-Wiki/http/macros.xml +++ b/appsrc/ODS-Wiki/http/macros.xml @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/main.vsp b/appsrc/ODS-Wiki/http/main.vsp index 8f13309bc3..3fca3d7347 100644 --- a/appsrc/ODS-Wiki/http/main.vsp +++ b/appsrc/ODS-Wiki/http/main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/ops.vspx b/appsrc/ODS-Wiki/http/ops.vspx index d47c1e97b2..a7d85ff10a 100644 --- a/appsrc/ODS-Wiki/http/ops.vspx +++ b/appsrc/ODS-Wiki/http/ops.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/owiki.css b/appsrc/ODS-Wiki/http/owiki.css index 5cf78bf486..0a02918109 100644 --- a/appsrc/ODS-Wiki/http/owiki.css +++ b/appsrc/ODS-Wiki/http/owiki.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/permissions.vspx b/appsrc/ODS-Wiki/http/permissions.vspx index 860496f530..115c463b5c 100644 --- a/appsrc/ODS-Wiki/http/permissions.vspx +++ b/appsrc/ODS-Wiki/http/permissions.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/redirect.vsp b/appsrc/ODS-Wiki/http/redirect.vsp index f903cf0e52..0371b2636d 100644 --- a/appsrc/ODS-Wiki/http/redirect.vsp +++ b/appsrc/ODS-Wiki/http/redirect.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/remove_tag.vspx b/appsrc/ODS-Wiki/http/remove_tag.vspx index ce26abf99e..11d1c729a1 100644 --- a/appsrc/ODS-Wiki/http/remove_tag.vspx +++ b/appsrc/ODS-Wiki/http/remove_tag.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/revision_delete.vspx b/appsrc/ODS-Wiki/http/revision_delete.vspx index 5118aae26f..64f65de84e 100644 --- a/appsrc/ODS-Wiki/http/revision_delete.vspx +++ b/appsrc/ODS-Wiki/http/revision_delete.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/revision_rollback.vspx b/appsrc/ODS-Wiki/http/revision_rollback.vspx index a0708ad1e3..ec6dfcfac9 100644 --- a/appsrc/ODS-Wiki/http/revision_rollback.vspx +++ b/appsrc/ODS-Wiki/http/revision_rollback.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/search.vsp b/appsrc/ODS-Wiki/http/search.vsp index b9aa80616e..002eb59bf8 100644 --- a/appsrc/ODS-Wiki/http/search.vsp +++ b/appsrc/ODS-Wiki/http/search.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/search.vspx b/appsrc/ODS-Wiki/http/search.vspx index 27fe970c5f..d3fdd7bc79 100644 --- a/appsrc/ODS-Wiki/http/search.vspx +++ b/appsrc/ODS-Wiki/http/search.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/settings.vspx b/appsrc/ODS-Wiki/http/settings.vspx index 701e7b22aa..b3947ca11e 100644 --- a/appsrc/ODS-Wiki/http/settings.vspx +++ b/appsrc/ODS-Wiki/http/settings.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/tag.vspx b/appsrc/ODS-Wiki/http/tag.vspx index e4002df253..3533a503d5 100644 --- a/appsrc/ODS-Wiki/http/tag.vspx +++ b/appsrc/ODS-Wiki/http/tag.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/tags.vspx b/appsrc/ODS-Wiki/http/tags.vspx index 63ec0d4e74..86c7fc21ea 100644 --- a/appsrc/ODS-Wiki/http/tags.vspx +++ b/appsrc/ODS-Wiki/http/tags.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/template.xsl b/appsrc/ODS-Wiki/http/template.xsl index f297e06b41..d18507eeb9 100644 --- a/appsrc/ODS-Wiki/http/template.xsl +++ b/appsrc/ODS-Wiki/http/template.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/toolbar.vspx b/appsrc/ODS-Wiki/http/toolbar.vspx index f9dfeb54d2..3a65a3c28e 100644 --- a/appsrc/ODS-Wiki/http/toolbar.vspx +++ b/appsrc/ODS-Wiki/http/toolbar.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/wiki_decor.vspx b/appsrc/ODS-Wiki/http/wiki_decor.vspx index 48b0e14560..fcdb69cbf4 100644 --- a/appsrc/ODS-Wiki/http/wiki_decor.vspx +++ b/appsrc/ODS-Wiki/http/wiki_decor.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/http/wiki_style.xsl b/appsrc/ODS-Wiki/http/wiki_style.xsl index e2fa70fbac..7fdecdf973 100644 --- a/appsrc/ODS-Wiki/http/wiki_style.xsl +++ b/appsrc/ODS-Wiki/http/wiki_style.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -107,7 +107,7 @@ -
Copyright &copy; 1998-2018 OpenLink Software
--> +
Copyright &copy; 1998-2019 OpenLink Software
--> declare ht_stat varchar; ht_stat := http_request_status_get (); diff --git a/appsrc/ODS-Wiki/http/wikiview.vsp b/appsrc/ODS-Wiki/http/wikiview.vsp index d6a418050e..ab34d06237 100644 --- a/appsrc/ODS-Wiki/http/wikiview.vsp +++ b/appsrc/ODS-Wiki/http/wikiview.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/make_vad.sh b/appsrc/ODS-Wiki/make_vad.sh index f678597fb3..c6b9ed3153 100755 --- a/appsrc/ODS-Wiki/make_vad.sh +++ b/appsrc/ODS-Wiki/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -256,7 +256,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/appsrc/ODS-Wiki/plugin/Makefile.am b/appsrc/ODS-Wiki/plugin/Makefile.am index 3bd075adaa..cfc514f38f 100644 --- a/appsrc/ODS-Wiki/plugin/Makefile.am +++ b/appsrc/ODS-Wiki/plugin/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/plugin/creole_maclex.l b/appsrc/ODS-Wiki/plugin/creole_maclex.l index 6a6714f81a..2e92c34b97 100644 --- a/appsrc/ODS-Wiki/plugin/creole_maclex.l +++ b/appsrc/ODS-Wiki/plugin/creole_maclex.l @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/plugin/creole_wikilex.l b/appsrc/ODS-Wiki/plugin/creole_wikilex.l index 5aaa3e20ac..8ef324f701 100644 --- a/appsrc/ODS-Wiki/plugin/creole_wikilex.l +++ b/appsrc/ODS-Wiki/plugin/creole_wikilex.l @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/plugin/creolewiki.c b/appsrc/ODS-Wiki/plugin/creolewiki.c index 7e266f928f..ebcf728ede 100644 --- a/appsrc/ODS-Wiki/plugin/creolewiki.c +++ b/appsrc/ODS-Wiki/plugin/creolewiki.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/plugin/maclex.l b/appsrc/ODS-Wiki/plugin/maclex.l index ad1276501a..bcfc650dd3 100644 --- a/appsrc/ODS-Wiki/plugin/maclex.l +++ b/appsrc/ODS-Wiki/plugin/maclex.l @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/plugin/media_maclex.l b/appsrc/ODS-Wiki/plugin/media_maclex.l index 3d4dfb577b..7759fe7e9d 100644 --- a/appsrc/ODS-Wiki/plugin/media_maclex.l +++ b/appsrc/ODS-Wiki/plugin/media_maclex.l @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/plugin/media_wikilex.l b/appsrc/ODS-Wiki/plugin/media_wikilex.l index 1dda685dd4..8745e8f878 100644 --- a/appsrc/ODS-Wiki/plugin/media_wikilex.l +++ b/appsrc/ODS-Wiki/plugin/media_wikilex.l @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/plugin/mediawiki.c b/appsrc/ODS-Wiki/plugin/mediawiki.c index 9cea479440..0f7274d036 100644 --- a/appsrc/ODS-Wiki/plugin/mediawiki.c +++ b/appsrc/ODS-Wiki/plugin/mediawiki.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/plugin/wikilex.l b/appsrc/ODS-Wiki/plugin/wikilex.l index 442c03a167..8da4c939c6 100644 --- a/appsrc/ODS-Wiki/plugin/wikilex.l +++ b/appsrc/ODS-Wiki/plugin/wikilex.l @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/plugin/wikiv.c b/appsrc/ODS-Wiki/plugin/wikiv.c index b3ae51671e..ce4c22621f 100644 --- a/appsrc/ODS-Wiki/plugin/wikiv.c +++ b/appsrc/ODS-Wiki/plugin/wikiv.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/plugins.sql b/appsrc/ODS-Wiki/plugins.sql index 3332afad6f..ff0db07230 100644 --- a/appsrc/ODS-Wiki/plugins.sql +++ b/appsrc/ODS-Wiki/plugins.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/postinstall.sql b/appsrc/ODS-Wiki/postinstall.sql index b8e263f475..a76285ae5f 100644 --- a/appsrc/ODS-Wiki/postinstall.sql +++ b/appsrc/ODS-Wiki/postinstall.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/proc_on.sql b/appsrc/ODS-Wiki/proc_on.sql index 6fbf7bc8f6..e0175778e6 100644 --- a/appsrc/ODS-Wiki/proc_on.sql +++ b/appsrc/ODS-Wiki/proc_on.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/proc_on_api.sql b/appsrc/ODS-Wiki/proc_on_api.sql index 19baf38332..a05d006551 100644 --- a/appsrc/ODS-Wiki/proc_on_api.sql +++ b/appsrc/ODS-Wiki/proc_on_api.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/proc_on_macro.sql b/appsrc/ODS-Wiki/proc_on_macro.sql index 57c4ad2e97..31c3383ac2 100644 --- a/appsrc/ODS-Wiki/proc_on_macro.sql +++ b/appsrc/ODS-Wiki/proc_on_macro.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -914,7 +914,7 @@ create function WV.WIKI.MACRO_COMMUNITYTABS (inout _data varchar, inout _context }; create function WV.WIKI.MACRO_BLOGNAV (inout _data varchar, inout _context any, inout _env any) { - return '
Copyright (C) 1998-2018 [[http://www.openlinksw.com/][OpenLink Software]]
'; + return '
Copyright (C) 1998-2019 [[http://www.openlinksw.com/][OpenLink Software]]
'; }; create function WV.WIKI.MACRO_VSREALM (inout _data varchar, inout _context any, inout _env any) { diff --git a/appsrc/ODS-Wiki/proc_on_vsp.sql b/appsrc/ODS-Wiki/proc_on_vsp.sql index 75ca95f2fb..9d9bd97698 100644 --- a/appsrc/ODS-Wiki/proc_on_vsp.sql +++ b/appsrc/ODS-Wiki/proc_on_vsp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/proc_tmp.sql b/appsrc/ODS-Wiki/proc_tmp.sql index d08730f049..51d69a5cb0 100644 --- a/appsrc/ODS-Wiki/proc_tmp.sql +++ b/appsrc/ODS-Wiki/proc_tmp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/retry.sh b/appsrc/ODS-Wiki/retry.sh index b153e98342..99a5a2dc2c 100755 --- a/appsrc/ODS-Wiki/retry.sh +++ b/appsrc/ODS-Wiki/retry.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/schema_on.sql b/appsrc/ODS-Wiki/schema_on.sql index c7753678ce..622b3e676e 100644 --- a/appsrc/ODS-Wiki/schema_on.sql +++ b/appsrc/ODS-Wiki/schema_on.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/semantics.sql b/appsrc/ODS-Wiki/semantics.sql index 1996a33f06..e1fa547cea 100644 --- a/appsrc/ODS-Wiki/semantics.sql +++ b/appsrc/ODS-Wiki/semantics.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/setup.isql b/appsrc/ODS-Wiki/setup.isql index 4a0580576a..98946397ce 100644 --- a/appsrc/ODS-Wiki/setup.isql +++ b/appsrc/ODS-Wiki/setup.isql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/setup_vad.sql b/appsrc/ODS-Wiki/setup_vad.sql index 5547baf26e..918bbb292d 100644 --- a/appsrc/ODS-Wiki/setup_vad.sql +++ b/appsrc/ODS-Wiki/setup_vad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/sioc.sql b/appsrc/ODS-Wiki/sioc.sql index 41490c9a74..6772614402 100644 --- a/appsrc/ODS-Wiki/sioc.sql +++ b/appsrc/ODS-Wiki/sioc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/upstream.sql b/appsrc/ODS-Wiki/upstream.sql index 20c49d745d..010cb093d2 100644 --- a/appsrc/ODS-Wiki/upstream.sql +++ b/appsrc/ODS-Wiki/upstream.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/wa_integration.sql b/appsrc/ODS-Wiki/wa_integration.sql index 10581a4f3e..20ef8cf00d 100644 --- a/appsrc/ODS-Wiki/wa_integration.sql +++ b/appsrc/ODS-Wiki/wa_integration.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/wa_search_wiki.sql b/appsrc/ODS-Wiki/wa_search_wiki.sql index f07fec28f9..b288530cdf 100644 --- a/appsrc/ODS-Wiki/wa_search_wiki.sql +++ b/appsrc/ODS-Wiki/wa_search_wiki.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/appsrc/ODS-Wiki/webmail.sql b/appsrc/ODS-Wiki/webmail.sql index df4199b90a..0fe40b1976 100644 --- a/appsrc/ODS-Wiki/webmail.sql +++ b/appsrc/ODS-Wiki/webmail.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/autogen.sh b/autogen.sh index a8c66ff4b8..aa7024a7ed 100755 --- a/autogen.sh +++ b/autogen.sh @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/bin/generate b/bin/generate index 6a95db8244..db68cacccc 100755 --- a/bin/generate +++ b/bin/generate @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/bin/makever b/bin/makever index e2d7c31f83..1cab0466d1 100755 --- a/bin/makever +++ b/bin/makever @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -93,7 +93,7 @@ then OpenLink Version Information Version $PRODUCT_VERSION as of $DATE. Compiled for $UNAME_SYSTEM $UNAME_RELEASE - Copyright (C) 1998-2018 OpenLink Software. + Copyright (C) 1998-2019 OpenLink Software. Usage: makever [OPTIONS] @@ -118,7 +118,7 @@ cat >$OUTPUT_FILE <<-EOF_VERSION $PRODUCT_NAME\\n\\ Version $PRODUCT_VERSION as of $DATE.\\n\\ Compiled for $UNAME_SYSTEM $UNAME_RELEASE\\n\\ - Copyright (C) 1998-2018 OpenLink Software.\\n"; + Copyright (C) 1998-2019 OpenLink Software.\\n"; EOF_VERSION exit 0 diff --git a/binsrc/Makefile.am b/binsrc/Makefile.am index 75679fd70e..9722b01e24 100644 --- a/binsrc/Makefile.am +++ b/binsrc/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -19,7 +19,7 @@ # # -SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel b3s tutorial yacutia samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena jena2 jena3 sesame sesame2 sesame3 sesame4 redland hibernate dbpedia rdb2rdf rdf4j +SUBDIRS = dav mono virtuoso tests rdf_mappers driver maildrop sqldoc hosting bpel fct tutorial conductor samples vsp ws sync vspx vad cached_resources virtodbc virtoledb virtuoso_sink xddl VirtuosoClient.Net oat isparql jena jena2 jena3 sesame sesame2 sesame3 sesame4 redland hibernate dbpedia rdb2rdf rdf4j # ---------------------------------------------------------------------- diff --git a/binsrc/VirtuosoClient.Net/ArrayOfLongPacked.cs b/binsrc/VirtuosoClient.Net/ArrayOfLongPacked.cs index 4eb65106aa..b7221fb721 100644 --- a/binsrc/VirtuosoClient.Net/ArrayOfLongPacked.cs +++ b/binsrc/VirtuosoClient.Net/ArrayOfLongPacked.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/AssemblyInfo.cs b/binsrc/VirtuosoClient.Net/AssemblyInfo.cs index c5c48882cb..f20d257c9b 100644 --- a/binsrc/VirtuosoClient.Net/AssemblyInfo.cs +++ b/binsrc/VirtuosoClient.Net/AssemblyInfo.cs @@ -25,7 +25,7 @@ #endif [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("OpenLink Software")] -[assembly: AssemblyCopyright("Copyright (C) 1998-2018 OpenLink Software. All rights reserved.")] +[assembly: AssemblyCopyright("Copyright (C) 1998-2019 OpenLink Software. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/binsrc/VirtuosoClient.Net/BlobHandle.cs b/binsrc/VirtuosoClient.Net/BlobHandle.cs index 613cf8600b..25d1b16749 100644 --- a/binsrc/VirtuosoClient.Net/BlobHandle.cs +++ b/binsrc/VirtuosoClient.Net/BlobHandle.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/BufferType.cs b/binsrc/VirtuosoClient.Net/BufferType.cs index 66c3fb1956..5e0a12082b 100644 --- a/binsrc/VirtuosoClient.Net/BufferType.cs +++ b/binsrc/VirtuosoClient.Net/BufferType.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/CLI.cs b/binsrc/VirtuosoClient.Net/CLI.cs index 414526d619..fb6d304cdd 100644 --- a/binsrc/VirtuosoClient.Net/CLI.cs +++ b/binsrc/VirtuosoClient.Net/CLI.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/ConnectionOptions.cs b/binsrc/VirtuosoClient.Net/ConnectionOptions.cs index d4b18f9569..3e122a4fbf 100644 --- a/binsrc/VirtuosoClient.Net/ConnectionOptions.cs +++ b/binsrc/VirtuosoClient.Net/ConnectionOptions.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/ConnectionPool.cs b/binsrc/VirtuosoClient.Net/ConnectionPool.cs index 2bf1b3bffe..cb5b158141 100644 --- a/binsrc/VirtuosoClient.Net/ConnectionPool.cs +++ b/binsrc/VirtuosoClient.Net/ConnectionPool.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/ConnectionStringParser.cs b/binsrc/VirtuosoClient.Net/ConnectionStringParser.cs index 001d812bc4..338921e8f6 100644 --- a/binsrc/VirtuosoClient.Net/ConnectionStringParser.cs +++ b/binsrc/VirtuosoClient.Net/ConnectionStringParser.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/DTC.cs b/binsrc/VirtuosoClient.Net/DTC.cs index da6d69192a..ff9c456b48 100644 --- a/binsrc/VirtuosoClient.Net/DTC.cs +++ b/binsrc/VirtuosoClient.Net/DTC.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/DataType.cs b/binsrc/VirtuosoClient.Net/DataType.cs index f59f02741c..67ce7e1814 100644 --- a/binsrc/VirtuosoClient.Net/DataType.cs +++ b/binsrc/VirtuosoClient.Net/DataType.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/DateTimeMarshaler.cs b/binsrc/VirtuosoClient.Net/DateTimeMarshaler.cs index b6d8020ad0..88820c3bef 100644 --- a/binsrc/VirtuosoClient.Net/DateTimeMarshaler.cs +++ b/binsrc/VirtuosoClient.Net/DateTimeMarshaler.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/Diagnostics.cs b/binsrc/VirtuosoClient.Net/Diagnostics.cs index e9d85c9991..aee5203d08 100644 --- a/binsrc/VirtuosoClient.Net/Diagnostics.cs +++ b/binsrc/VirtuosoClient.Net/Diagnostics.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/Era.cs b/binsrc/VirtuosoClient.Net/Era.cs index 5f23717830..f61b16ee70 100644 --- a/binsrc/VirtuosoClient.Net/Era.cs +++ b/binsrc/VirtuosoClient.Net/Era.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/ExplicitString.cs b/binsrc/VirtuosoClient.Net/ExplicitString.cs index 53967c4096..9de2245cd0 100644 --- a/binsrc/VirtuosoClient.Net/ExplicitString.cs +++ b/binsrc/VirtuosoClient.Net/ExplicitString.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/Future.cs b/binsrc/VirtuosoClient.Net/Future.cs index a1a2405d18..bb61bf3baa 100644 --- a/binsrc/VirtuosoClient.Net/Future.cs +++ b/binsrc/VirtuosoClient.Net/Future.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/FutureList.cs b/binsrc/VirtuosoClient.Net/FutureList.cs index 9b1c5486e0..2bb070760f 100644 --- a/binsrc/VirtuosoClient.Net/FutureList.cs +++ b/binsrc/VirtuosoClient.Net/FutureList.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/IConvertData.cs b/binsrc/VirtuosoClient.Net/IConvertData.cs index c3c0bab2d6..860b487f60 100644 --- a/binsrc/VirtuosoClient.Net/IConvertData.cs +++ b/binsrc/VirtuosoClient.Net/IConvertData.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/ICreateErrors.cs b/binsrc/VirtuosoClient.Net/ICreateErrors.cs index 78f0c3a075..de860bcebb 100644 --- a/binsrc/VirtuosoClient.Net/ICreateErrors.cs +++ b/binsrc/VirtuosoClient.Net/ICreateErrors.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/IInnerCommand.cs b/binsrc/VirtuosoClient.Net/IInnerCommand.cs index e8fae48ad3..29b67807c6 100644 --- a/binsrc/VirtuosoClient.Net/IInnerCommand.cs +++ b/binsrc/VirtuosoClient.Net/IInnerCommand.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/IInnerConnection.cs b/binsrc/VirtuosoClient.Net/IInnerConnection.cs index 00c4e9b004..9e73519d6b 100644 --- a/binsrc/VirtuosoClient.Net/IInnerConnection.cs +++ b/binsrc/VirtuosoClient.Net/IInnerConnection.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/IMarshal.cs b/binsrc/VirtuosoClient.Net/IMarshal.cs index e87bc39c10..9d00eadf53 100644 --- a/binsrc/VirtuosoClient.Net/IMarshal.cs +++ b/binsrc/VirtuosoClient.Net/IMarshal.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/ISession.cs b/binsrc/VirtuosoClient.Net/ISession.cs index c27ff00f6d..4b33a5ecce 100644 --- a/binsrc/VirtuosoClient.Net/ISession.cs +++ b/binsrc/VirtuosoClient.Net/ISession.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/IVirtuosoError.cs b/binsrc/VirtuosoClient.Net/IVirtuosoError.cs index 5cfabdba62..4ef8c5fadf 100644 --- a/binsrc/VirtuosoClient.Net/IVirtuosoError.cs +++ b/binsrc/VirtuosoClient.Net/IVirtuosoError.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/InnerConnectionBase.cs b/binsrc/VirtuosoClient.Net/InnerConnectionBase.cs index 240e85f783..9ced66ec1a 100644 --- a/binsrc/VirtuosoClient.Net/InnerConnectionBase.cs +++ b/binsrc/VirtuosoClient.Net/InnerConnectionBase.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/MD5.cs b/binsrc/VirtuosoClient.Net/MD5.cs index cabffdc391..666cb2be95 100644 --- a/binsrc/VirtuosoClient.Net/MD5.cs +++ b/binsrc/VirtuosoClient.Net/MD5.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/Makefile.am b/binsrc/VirtuosoClient.Net/Makefile.am index 669bc55fb6..95e7f5e95b 100644 --- a/binsrc/VirtuosoClient.Net/Makefile.am +++ b/binsrc/VirtuosoClient.Net/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/ManagedCommand.cs b/binsrc/VirtuosoClient.Net/ManagedCommand.cs index a9e514bf90..6dcae3c056 100644 --- a/binsrc/VirtuosoClient.Net/ManagedCommand.cs +++ b/binsrc/VirtuosoClient.Net/ManagedCommand.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/ManagedConnection.cs b/binsrc/VirtuosoClient.Net/ManagedConnection.cs index e6a5ee09bc..48f1196295 100644 --- a/binsrc/VirtuosoClient.Net/ManagedConnection.cs +++ b/binsrc/VirtuosoClient.Net/ManagedConnection.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/ManagedErrors.cs b/binsrc/VirtuosoClient.Net/ManagedErrors.cs index 41d5115fef..992cad760b 100644 --- a/binsrc/VirtuosoClient.Net/ManagedErrors.cs +++ b/binsrc/VirtuosoClient.Net/ManagedErrors.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/Marshaler.cs b/binsrc/VirtuosoClient.Net/Marshaler.cs index 30af0ad687..8cf5f531e0 100644 --- a/binsrc/VirtuosoClient.Net/Marshaler.cs +++ b/binsrc/VirtuosoClient.Net/Marshaler.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/MemoryHandle.cs b/binsrc/VirtuosoClient.Net/MemoryHandle.cs index 0629d38b1b..cf6b5866eb 100644 --- a/binsrc/VirtuosoClient.Net/MemoryHandle.cs +++ b/binsrc/VirtuosoClient.Net/MemoryHandle.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/OdbcCommand.cs b/binsrc/VirtuosoClient.Net/OdbcCommand.cs index cdb69c7ca1..d3a7754c53 100644 --- a/binsrc/VirtuosoClient.Net/OdbcCommand.cs +++ b/binsrc/VirtuosoClient.Net/OdbcCommand.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/OdbcConnection.cs b/binsrc/VirtuosoClient.Net/OdbcConnection.cs index 43ba49a16b..8388007ba4 100644 --- a/binsrc/VirtuosoClient.Net/OdbcConnection.cs +++ b/binsrc/VirtuosoClient.Net/OdbcConnection.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/OdbcErrors.cs b/binsrc/VirtuosoClient.Net/OdbcErrors.cs index cce79c6a6c..fd7c2669a0 100644 --- a/binsrc/VirtuosoClient.Net/OdbcErrors.cs +++ b/binsrc/VirtuosoClient.Net/OdbcErrors.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/ParameterData.cs b/binsrc/VirtuosoClient.Net/ParameterData.cs index 601f313e01..19472b1685 100644 --- a/binsrc/VirtuosoClient.Net/ParameterData.cs +++ b/binsrc/VirtuosoClient.Net/ParameterData.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/Platform.cs b/binsrc/VirtuosoClient.Net/Platform.cs index 88fd6c3310..0c2f4ae25d 100644 --- a/binsrc/VirtuosoClient.Net/Platform.cs +++ b/binsrc/VirtuosoClient.Net/Platform.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/RPC.cs b/binsrc/VirtuosoClient.Net/RPC.cs index d59c96d1f0..0f7ef983f8 100644 --- a/binsrc/VirtuosoClient.Net/RPC.cs +++ b/binsrc/VirtuosoClient.Net/RPC.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/Service.cs b/binsrc/VirtuosoClient.Net/Service.cs index 60cd038972..bfd51334af 100644 --- a/binsrc/VirtuosoClient.Net/Service.cs +++ b/binsrc/VirtuosoClient.Net/Service.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/SqlExtendedString.cs b/binsrc/VirtuosoClient.Net/SqlExtendedString.cs index 4136f823e7..49758526b6 100644 --- a/binsrc/VirtuosoClient.Net/SqlExtendedString.cs +++ b/binsrc/VirtuosoClient.Net/SqlExtendedString.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/SqlRdfBox.cs b/binsrc/VirtuosoClient.Net/SqlRdfBox.cs index 15a9028f0c..3679747042 100644 --- a/binsrc/VirtuosoClient.Net/SqlRdfBox.cs +++ b/binsrc/VirtuosoClient.Net/SqlRdfBox.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/SqlXml.cs b/binsrc/VirtuosoClient.Net/SqlXml.cs index a04d16eea6..ca29640657 100644 --- a/binsrc/VirtuosoClient.Net/SqlXml.cs +++ b/binsrc/VirtuosoClient.Net/SqlXml.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/StatementList.cs b/binsrc/VirtuosoClient.Net/StatementList.cs index 4c638bd8d1..f9b2a87c54 100644 --- a/binsrc/VirtuosoClient.Net/StatementList.cs +++ b/binsrc/VirtuosoClient.Net/StatementList.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/TcpConnection.cs b/binsrc/VirtuosoClient.Net/TcpConnection.cs index 9c3ccc3ecb..f68e4a1c35 100644 --- a/binsrc/VirtuosoClient.Net/TcpConnection.cs +++ b/binsrc/VirtuosoClient.Net/TcpConnection.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/TcpSession.cs b/binsrc/VirtuosoClient.Net/TcpSession.cs index c6dc4e712a..bb211fa1e5 100644 --- a/binsrc/VirtuosoClient.Net/TcpSession.cs +++ b/binsrc/VirtuosoClient.Net/TcpSession.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/Unix.cs b/binsrc/VirtuosoClient.Net/Unix.cs index 33c97e3ae6..2ab428663a 100644 --- a/binsrc/VirtuosoClient.Net/Unix.cs +++ b/binsrc/VirtuosoClient.Net/Unix.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtDbType.cs b/binsrc/VirtuosoClient.Net/VirtDbType.cs index 5149ebb5b0..ec4486de49 100644 --- a/binsrc/VirtuosoClient.Net/VirtDbType.cs +++ b/binsrc/VirtuosoClient.Net/VirtDbType.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoClient.NET.vc2005.csproj b/binsrc/VirtuosoClient.Net/VirtuosoClient.NET.vc2005.csproj index 2a15cbbdbf..c55bf78b80 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoClient.NET.vc2005.csproj +++ b/binsrc/VirtuosoClient.Net/VirtuosoClient.NET.vc2005.csproj @@ -267,9 +267,7 @@ Component - - Component - + Code diff --git a/binsrc/VirtuosoClient.Net/VirtuosoClientFactory.cs b/binsrc/VirtuosoClient.Net/VirtuosoClientFactory.cs index a458ddea6f..b1d68c5e7b 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoClientFactory.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoClientFactory.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoCodeAccessPermission.cs b/binsrc/VirtuosoClient.Net/VirtuosoCodeAccessPermission.cs index 6ac3b522d9..9abf845589 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoCodeAccessPermission.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoCodeAccessPermission.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoCommand.cs b/binsrc/VirtuosoClient.Net/VirtuosoCommand.cs index 9782263416..8a711c121f 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoCommand.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoCommand.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoCommandBuilder.cs b/binsrc/VirtuosoClient.Net/VirtuosoCommandBuilder.cs index 3042e718e3..fc1447a213 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoCommandBuilder.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoCommandBuilder.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoConnection.cs b/binsrc/VirtuosoClient.Net/VirtuosoConnection.cs index d41d29e40e..6d1a6d20c5 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoConnection.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoConnection.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoConnectionStringBuilder.cs b/binsrc/VirtuosoClient.Net/VirtuosoConnectionStringBuilder.cs index a9afde9b1a..be43880892 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoConnectionStringBuilder.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoConnectionStringBuilder.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoDataAdapter.cs b/binsrc/VirtuosoClient.Net/VirtuosoDataAdapter.cs index abe0f0eace..251c0d7355 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoDataAdapter.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoDataAdapter.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoDataReader.cs b/binsrc/VirtuosoClient.Net/VirtuosoDataReader.cs index 7e4237d191..c84f3839b8 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoDataReader.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoDataReader.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoDateTime.cs b/binsrc/VirtuosoClient.Net/VirtuosoDateTime.cs index 206a5db1b9..120ff6f68a 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoDateTime.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoDateTime.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoDateTimeOffset.cs b/binsrc/VirtuosoClient.Net/VirtuosoDateTimeOffset.cs index f0d4c028f6..8e94d9a777 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoDateTimeOffset.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoDateTimeOffset.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoError.cs b/binsrc/VirtuosoClient.Net/VirtuosoError.cs index 24f2edb7d7..91fbb44114 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoError.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoError.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoErrorCollection.cs b/binsrc/VirtuosoClient.Net/VirtuosoErrorCollection.cs index b8736284fe..982f85ef1b 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoErrorCollection.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoErrorCollection.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoException.cs b/binsrc/VirtuosoClient.Net/VirtuosoException.cs index 57eaae4b9d..0eae9bbc93 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoException.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoException.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoInfoMessage.cs b/binsrc/VirtuosoClient.Net/VirtuosoInfoMessage.cs index 770d3da32e..d33e272813 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoInfoMessage.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoInfoMessage.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoParameter.cs b/binsrc/VirtuosoClient.Net/VirtuosoParameter.cs index 6870f53ff3..b04895798e 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoParameter.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoParameter.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoParameterCollection.cs b/binsrc/VirtuosoClient.Net/VirtuosoParameterCollection.cs index 1ce4c11cc9..36f9943e55 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoParameterCollection.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoParameterCollection.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoPermission.cs b/binsrc/VirtuosoClient.Net/VirtuosoPermission.cs index dbef709a75..31edc3cf1a 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoPermission.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoPermission.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoPermissionAttribute.cs b/binsrc/VirtuosoClient.Net/VirtuosoPermissionAttribute.cs index 27cf12b70a..2e648c786d 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoPermissionAttribute.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoPermissionAttribute.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoTimeSpan.cs b/binsrc/VirtuosoClient.Net/VirtuosoTimeSpan.cs index fdf581b392..3e61e7d37c 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoTimeSpan.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoTimeSpan.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoTransaction.cs b/binsrc/VirtuosoClient.Net/VirtuosoTransaction.cs index e18710fd53..88e4abf556 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoTransaction.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoTransaction.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/VirtuosoWarning.cs b/binsrc/VirtuosoClient.Net/VirtuosoWarning.cs index b4653558f5..385e98f72f 100644 --- a/binsrc/VirtuosoClient.Net/VirtuosoWarning.cs +++ b/binsrc/VirtuosoClient.Net/VirtuosoWarning.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/Win32.cs b/binsrc/VirtuosoClient.Net/Win32.cs index 002ca0bfc6..4c354a8651 100644 --- a/binsrc/VirtuosoClient.Net/Win32.cs +++ b/binsrc/VirtuosoClient.Net/Win32.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/design/AssemblyInfo.cs b/binsrc/VirtuosoClient.Net/design/AssemblyInfo.cs index 7ba2fc1b31..701cbdaa75 100644 --- a/binsrc/VirtuosoClient.Net/design/AssemblyInfo.cs +++ b/binsrc/VirtuosoClient.Net/design/AssemblyInfo.cs @@ -25,7 +25,7 @@ #endif [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("OpenLink Software")] -[assembly: AssemblyCopyright("Copyright (C) 1998-2018 OpenLink Software. All rights reserved.")] +[assembly: AssemblyCopyright("Copyright (C) 1998-2019 OpenLink Software. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/binsrc/VirtuosoClient.Net/design/VirtuosoConnectionStringEditor.cs b/binsrc/VirtuosoClient.Net/design/VirtuosoConnectionStringEditor.cs index e44dae081f..9ab866d5a8 100644 --- a/binsrc/VirtuosoClient.Net/design/VirtuosoConnectionStringEditor.cs +++ b/binsrc/VirtuosoClient.Net/design/VirtuosoConnectionStringEditor.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/design/VirtuosoDataAdapterDesigner.cs b/binsrc/VirtuosoClient.Net/design/VirtuosoDataAdapterDesigner.cs index 8d61ef42e8..9ce846a390 100644 --- a/binsrc/VirtuosoClient.Net/design/VirtuosoDataAdapterDesigner.cs +++ b/binsrc/VirtuosoClient.Net/design/VirtuosoDataAdapterDesigner.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/design/VirtuosoDotNetDSNForm.cs b/binsrc/VirtuosoClient.Net/design/VirtuosoDotNetDSNForm.cs index 93f352f5ff..65dfa00273 100644 --- a/binsrc/VirtuosoClient.Net/design/VirtuosoDotNetDSNForm.cs +++ b/binsrc/VirtuosoClient.Net/design/VirtuosoDotNetDSNForm.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/VirtuosoClient.Net/design/VirtuosoGenerateDataSet.cs b/binsrc/VirtuosoClient.Net/design/VirtuosoGenerateDataSet.cs index c670c3ab26..c9615869cc 100644 --- a/binsrc/VirtuosoClient.Net/design/VirtuosoGenerateDataSet.cs +++ b/binsrc/VirtuosoClient.Net/design/VirtuosoGenerateDataSet.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/vad_version b/binsrc/b3s/vad_version deleted file mode 100644 index 18c64dbad2..0000000000 --- a/binsrc/b3s/vad_version +++ /dev/null @@ -1 +0,0 @@ -1.13.91 diff --git a/binsrc/bpel/101.HelloWorld/HelloWorld.bpel b/binsrc/bpel/101.HelloWorld/HelloWorld.bpel index ba3c6816d6..7beddf3002 100644 --- a/binsrc/bpel/101.HelloWorld/HelloWorld.bpel +++ b/binsrc/bpel/101.HelloWorld/HelloWorld.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/101.HelloWorld/HelloWorld.wsdl b/binsrc/bpel/101.HelloWorld/HelloWorld.wsdl index d9f7df7f5e..1d8d00eb73 100644 --- a/binsrc/bpel/101.HelloWorld/HelloWorld.wsdl +++ b/binsrc/bpel/101.HelloWorld/HelloWorld.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/101.HelloWorld/HelloWorld.xml b/binsrc/bpel/101.HelloWorld/HelloWorld.xml index 6524f8d0c8..d1ec45fdd7 100644 --- a/binsrc/bpel/101.HelloWorld/HelloWorld.xml +++ b/binsrc/bpel/101.HelloWorld/HelloWorld.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/101.HelloWorld/build.xml b/binsrc/bpel/101.HelloWorld/build.xml index 63b9f22cb2..022e75acc8 100644 --- a/binsrc/bpel/101.HelloWorld/build.xml +++ b/binsrc/bpel/101.HelloWorld/build.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/106.ParallelFlows/FlowSample.bpel b/binsrc/bpel/106.ParallelFlows/FlowSample.bpel index 580d26bbe9..f18c07d99a 100644 --- a/binsrc/bpel/106.ParallelFlows/FlowSample.bpel +++ b/binsrc/bpel/106.ParallelFlows/FlowSample.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/106.ParallelFlows/FlowSample.wsdl b/binsrc/bpel/106.ParallelFlows/FlowSample.wsdl index 96e8a0e201..d9683ed19f 100644 --- a/binsrc/bpel/106.ParallelFlows/FlowSample.wsdl +++ b/binsrc/bpel/106.ParallelFlows/FlowSample.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/106.ParallelFlows/bpel.xml b/binsrc/bpel/106.ParallelFlows/bpel.xml index f2f4be68b3..12200468f0 100644 --- a/binsrc/bpel/106.ParallelFlows/bpel.xml +++ b/binsrc/bpel/106.ParallelFlows/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/106.ParallelFlows/build.xml b/binsrc/bpel/106.ParallelFlows/build.xml index 3c40c69cd3..2b33605b6d 100644 --- a/binsrc/bpel/106.ParallelFlows/build.xml +++ b/binsrc/bpel/106.ParallelFlows/build.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.bpel b/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.bpel index 8a04a7dd79..af766d4b81 100644 --- a/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.bpel +++ b/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.wsdl b/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.wsdl index c9997577b9..540b685730 100644 --- a/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.wsdl +++ b/binsrc/bpel/109.CorrelationSets/Buyer/Buyer.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/bpel.xml b/binsrc/bpel/109.CorrelationSets/Buyer/bpel.xml index 81a67af04a..cb0cb71ad5 100644 --- a/binsrc/bpel/109.CorrelationSets/Buyer/bpel.xml +++ b/binsrc/bpel/109.CorrelationSets/Buyer/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/build.xml b/binsrc/bpel/109.CorrelationSets/Buyer/build.xml index cbc4101193..a54d1513ab 100644 --- a/binsrc/bpel/109.CorrelationSets/Buyer/build.xml +++ b/binsrc/bpel/109.CorrelationSets/Buyer/build.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/supplyCorrelation.wsdl b/binsrc/bpel/109.CorrelationSets/Buyer/supplyCorrelation.wsdl index 98aa9d58f0..1bf895090f 100644 --- a/binsrc/bpel/109.CorrelationSets/Buyer/supplyCorrelation.wsdl +++ b/binsrc/bpel/109.CorrelationSets/Buyer/supplyCorrelation.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/Buyer/supplyMessages.wsdl b/binsrc/bpel/109.CorrelationSets/Buyer/supplyMessages.wsdl index c21c33f194..4db9adf724 100644 --- a/binsrc/bpel/109.CorrelationSets/Buyer/supplyMessages.wsdl +++ b/binsrc/bpel/109.CorrelationSets/Buyer/supplyMessages.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/Seller/Seller.bpel b/binsrc/bpel/109.CorrelationSets/Seller/Seller.bpel index b866fbc3c3..acc16c1ba5 100644 --- a/binsrc/bpel/109.CorrelationSets/Seller/Seller.bpel +++ b/binsrc/bpel/109.CorrelationSets/Seller/Seller.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/Seller/Seller.wsdl b/binsrc/bpel/109.CorrelationSets/Seller/Seller.wsdl index ec7d307dc2..2db726d9bc 100644 --- a/binsrc/bpel/109.CorrelationSets/Seller/Seller.wsdl +++ b/binsrc/bpel/109.CorrelationSets/Seller/Seller.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/Seller/bpel.xml b/binsrc/bpel/109.CorrelationSets/Seller/bpel.xml index 7be5f31fcc..25dbe8ea8c 100644 --- a/binsrc/bpel/109.CorrelationSets/Seller/bpel.xml +++ b/binsrc/bpel/109.CorrelationSets/Seller/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/Seller/build.xml b/binsrc/bpel/109.CorrelationSets/Seller/build.xml index 037bf6eda2..2fb1f92800 100644 --- a/binsrc/bpel/109.CorrelationSets/Seller/build.xml +++ b/binsrc/bpel/109.CorrelationSets/Seller/build.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/Seller/supplyCorrelation.wsdl b/binsrc/bpel/109.CorrelationSets/Seller/supplyCorrelation.wsdl index 98aa9d58f0..1bf895090f 100644 --- a/binsrc/bpel/109.CorrelationSets/Seller/supplyCorrelation.wsdl +++ b/binsrc/bpel/109.CorrelationSets/Seller/supplyCorrelation.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/Seller/supplyMessages.wsdl b/binsrc/bpel/109.CorrelationSets/Seller/supplyMessages.wsdl index c21c33f194..4db9adf724 100644 --- a/binsrc/bpel/109.CorrelationSets/Seller/supplyMessages.wsdl +++ b/binsrc/bpel/109.CorrelationSets/Seller/supplyMessages.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/build.xml b/binsrc/bpel/109.CorrelationSets/build.xml index caa7c34e27..e143fdf17a 100644 --- a/binsrc/bpel/109.CorrelationSets/build.xml +++ b/binsrc/bpel/109.CorrelationSets/build.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/supplyCorrelation.wsdl b/binsrc/bpel/109.CorrelationSets/supplyCorrelation.wsdl index 98aa9d58f0..1bf895090f 100644 --- a/binsrc/bpel/109.CorrelationSets/supplyCorrelation.wsdl +++ b/binsrc/bpel/109.CorrelationSets/supplyCorrelation.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/109.CorrelationSets/supplyMessages.wsdl b/binsrc/bpel/109.CorrelationSets/supplyMessages.wsdl index c21c33f194..4db9adf724 100644 --- a/binsrc/bpel/109.CorrelationSets/supplyMessages.wsdl +++ b/binsrc/bpel/109.CorrelationSets/supplyMessages.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/Makefile.am b/binsrc/bpel/Makefile.am index 9549cd1f01..b227ab4e94 100644 --- a/binsrc/bpel/Makefile.am +++ b/binsrc/bpel/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/activity.vspx b/binsrc/bpel/activity.vspx index d2c1be62a4..df1cb2fc23 100644 --- a/binsrc/bpel/activity.vspx +++ b/binsrc/bpel/activity.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/activity.xsl b/binsrc/bpel/activity.xsl index 33d564575d..2038a2fb08 100644 --- a/binsrc/bpel/activity.xsl +++ b/binsrc/bpel/activity.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/asyncall.vsp b/binsrc/bpel/asyncall.vsp index 434a1b9bfb..32b2592a01 100644 --- a/binsrc/bpel/asyncall.vsp +++ b/binsrc/bpel/asyncall.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel.vsp b/binsrc/bpel/bpel.vsp index e8654476de..13a79f9f24 100644 --- a/binsrc/bpel/bpel.vsp +++ b/binsrc/bpel/bpel.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel.xsd b/binsrc/bpel/bpel.xsd index b130a3f12a..bcf856dfe4 100644 --- a/binsrc/bpel/bpel.xsd +++ b/binsrc/bpel/bpel.xsd @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_adaptor.cs b/binsrc/bpel/bpel_adaptor.cs index fd59cce1a2..5656eee697 100644 --- a/binsrc/bpel/bpel_adaptor.cs +++ b/binsrc/bpel/bpel_adaptor.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_confirm.vspx b/binsrc/bpel/bpel_confirm.vspx index 80028428c3..0dcc897997 100644 --- a/binsrc/bpel/bpel_confirm.vspx +++ b/binsrc/bpel/bpel_confirm.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_ddl.sql b/binsrc/bpel/bpel_ddl.sql index 85132fff42..3cf5ee9a9f 100644 --- a/binsrc/bpel/bpel_ddl.sql +++ b/binsrc/bpel/bpel_ddl.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_decor.vspx b/binsrc/bpel/bpel_decor.vspx index 9302600c1a..8d2ba5e8f1 100644 --- a/binsrc/bpel/bpel_decor.vspx +++ b/binsrc/bpel/bpel_decor.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_eng.sql b/binsrc/bpel/bpel_eng.sql index 11e4fbe7a1..54cba7bac2 100644 --- a/binsrc/bpel/bpel_eng.sql +++ b/binsrc/bpel/bpel_eng.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_intrp.sql b/binsrc/bpel/bpel_intrp.sql index 040468b974..b409adb248 100644 --- a/binsrc/bpel/bpel_intrp.sql +++ b/binsrc/bpel/bpel_intrp.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_login.vspx b/binsrc/bpel/bpel_login.vspx index b9bc11a471..973fbc5ea5 100644 --- a/binsrc/bpel/bpel_login.vspx +++ b/binsrc/bpel/bpel_login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_login_new.vspx b/binsrc/bpel/bpel_login_new.vspx index 9c516d378d..3725ac82b0 100644 --- a/binsrc/bpel/bpel_login_new.vspx +++ b/binsrc/bpel/bpel_login_new.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_navigation_bar.vspx b/binsrc/bpel/bpel_navigation_bar.vspx index 78cd427f59..7888f82bc0 100644 --- a/binsrc/bpel/bpel_navigation_bar.vspx +++ b/binsrc/bpel/bpel_navigation_bar.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_plinks.xsl b/binsrc/bpel/bpel_plinks.xsl index 8877de90b3..b2a3561fcf 100644 --- a/binsrc/bpel/bpel_plinks.xsl +++ b/binsrc/bpel/bpel_plinks.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_style.xsl b/binsrc/bpel/bpel_style.xsl index cd0bd5f967..7aaa45fcbc 100644 --- a/binsrc/bpel/bpel_style.xsl +++ b/binsrc/bpel/bpel_style.xsl @@ -7,7 +7,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_style_new.xsl b/binsrc/bpel/bpel_style_new.xsl index e57da8faa1..87ff6069c1 100644 --- a/binsrc/bpel/bpel_style_new.xsl +++ b/binsrc/bpel/bpel_style_new.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_ui_bpelwsdl_edit.vspx b/binsrc/bpel/bpel_ui_bpelwsdl_edit.vspx index 302ed365a5..18d886e570 100644 --- a/binsrc/bpel/bpel_ui_bpelwsdl_edit.vspx +++ b/binsrc/bpel/bpel_ui_bpelwsdl_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_ui_bpelwsdl_register.vspx b/binsrc/bpel/bpel_ui_bpelwsdl_register.vspx index b992cf41ec..75541cc2c0 100644 --- a/binsrc/bpel/bpel_ui_bpelwsdl_register.vspx +++ b/binsrc/bpel/bpel_ui_bpelwsdl_register.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_ui_import.vspx b/binsrc/bpel/bpel_ui_import.vspx index cbe34f88a6..f9669b97f4 100644 --- a/binsrc/bpel/bpel_ui_import.vspx +++ b/binsrc/bpel/bpel_ui_import.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpel_ui_import2.vspx b/binsrc/bpel/bpel_ui_import2.vspx index e945ac273c..3910f4290d 100644 --- a/binsrc/bpel/bpel_ui_import2.vspx +++ b/binsrc/bpel/bpel_ui_import2.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpelcomp.xsl b/binsrc/bpel/bpelcomp.xsl index c8c12d3dae..a7918676c7 100644 --- a/binsrc/bpel/bpelcomp.xsl +++ b/binsrc/bpel/bpelcomp.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpelexpn.xsl b/binsrc/bpel/bpelexpn.xsl index 8c298d75bd..c9107c4c32 100644 --- a/binsrc/bpel/bpelexpn.xsl +++ b/binsrc/bpel/bpelexpn.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpelimport.xsl b/binsrc/bpel/bpelimport.xsl index 91aace46df..62520ccc7c 100644 --- a/binsrc/bpel/bpelimport.xsl +++ b/binsrc/bpel/bpelimport.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpelmsg.xsl b/binsrc/bpel/bpelmsg.xsl index 80426b845c..618d23716c 100644 --- a/binsrc/bpel/bpelmsg.xsl +++ b/binsrc/bpel/bpelmsg.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpelmsgen.xsl b/binsrc/bpel/bpelmsgen.xsl index 0952fb36bf..7e1b7f6f9d 100644 --- a/binsrc/bpel/bpelmsgen.xsl +++ b/binsrc/bpel/bpelmsgen.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpeloper.xsl b/binsrc/bpel/bpeloper.xsl index 037b18ebaf..90f5a1bf66 100644 --- a/binsrc/bpel/bpeloper.xsl +++ b/binsrc/bpel/bpeloper.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpelstatus.xsl b/binsrc/bpel/bpelstatus.xsl index afd0e8ddec..823eb1434a 100644 --- a/binsrc/bpel/bpelstatus.xsl +++ b/binsrc/bpel/bpelstatus.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpelv.xsd b/binsrc/bpel/bpelv.xsd index 58e2926dca..028b70d659 100644 --- a/binsrc/bpel/bpelv.xsd +++ b/binsrc/bpel/bpelv.xsd @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpelwsdl.xsl b/binsrc/bpel/bpelwsdl.xsl index 641dfcc995..9af33554a0 100644 --- a/binsrc/bpel/bpelwsdl.xsl +++ b/binsrc/bpel/bpelwsdl.xsl @@ -10,7 +10,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/bpelx.xsd b/binsrc/bpel/bpelx.xsd index 442df56070..2b85eaa507 100644 --- a/binsrc/bpel/bpelx.xsd +++ b/binsrc/bpel/bpelx.xsd @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/browser.vspx b/binsrc/bpel/browser.vspx index 7a64e6a598..273173f12c 100644 --- a/binsrc/bpel/browser.vspx +++ b/binsrc/bpel/browser.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/common.xsl b/binsrc/bpel/common.xsl index a7a5daf60c..8f80960ebf 100644 --- a/binsrc/bpel/common.xsl +++ b/binsrc/bpel/common.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/configure.vspx b/binsrc/bpel/configure.vspx index 6ae7a5be36..22d1e8952e 100644 --- a/binsrc/bpel/configure.vspx +++ b/binsrc/bpel/configure.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/debug.vsp b/binsrc/bpel/debug.vsp index 2ef6a8cb5f..450b84e6d4 100644 --- a/binsrc/bpel/debug.vsp +++ b/binsrc/bpel/debug.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/default.css b/binsrc/bpel/default.css index 6341d031b9..043184bf6d 100644 --- a/binsrc/bpel/default.css +++ b/binsrc/bpel/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/drop.sql b/binsrc/bpel/drop.sql index 2ed7b75266..8cdc091ef8 100644 --- a/binsrc/bpel/drop.sql +++ b/binsrc/bpel/drop.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/drop_prc.sql b/binsrc/bpel/drop_prc.sql index be844b0235..babdb18baf 100644 --- a/binsrc/bpel/drop_prc.sql +++ b/binsrc/bpel/drop_prc.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/error.vspx b/binsrc/bpel/error.vspx index 0536ab083a..30d6df8c28 100644 --- a/binsrc/bpel/error.vspx +++ b/binsrc/bpel/error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/filesystem.sql b/binsrc/bpel/filesystem.sql index 6d340cd95a..be8ea2b8a5 100644 --- a/binsrc/bpel/filesystem.sql +++ b/binsrc/bpel/filesystem.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/genwsdl.xsl b/binsrc/bpel/genwsdl.xsl index 79349a2cd1..07e64d5c9e 100644 --- a/binsrc/bpel/genwsdl.xsl +++ b/binsrc/bpel/genwsdl.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help.vspx b/binsrc/bpel/help.vspx index a2c540bcad..c32205523a 100644 --- a/binsrc/bpel/help.vspx +++ b/binsrc/bpel/help.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help.xsl b/binsrc/bpel/help.xsl index 1fdd40cb6e..8326e2b9dc 100644 --- a/binsrc/bpel/help.xsl +++ b/binsrc/bpel/help.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/browser.xml b/binsrc/bpel/help/browser.xml index 4bb2a1b583..94b0f4658c 100644 --- a/binsrc/bpel/help/browser.xml +++ b/binsrc/bpel/help/browser.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/configure.xml b/binsrc/bpel/help/configure.xml index d0b49af6c5..4e676e7fbe 100644 --- a/binsrc/bpel/help/configure.xml +++ b/binsrc/bpel/help/configure.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/confirm.xml b/binsrc/bpel/help/confirm.xml index f53497e3ac..7a34f5c511 100644 --- a/binsrc/bpel/help/confirm.xml +++ b/binsrc/bpel/help/confirm.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/imsgpr.xml b/binsrc/bpel/help/imsgpr.xml index 874327ae71..52d76a4876 100644 --- a/binsrc/bpel/help/imsgpr.xml +++ b/binsrc/bpel/help/imsgpr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/incoming.xml b/binsrc/bpel/help/incoming.xml index f00801550e..36092679d9 100644 --- a/binsrc/bpel/help/incoming.xml +++ b/binsrc/bpel/help/incoming.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/instances.xml b/binsrc/bpel/help/instances.xml index 95dc02d233..5f19707d91 100644 --- a/binsrc/bpel/help/instances.xml +++ b/binsrc/bpel/help/instances.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/message.xml b/binsrc/bpel/help/message.xml index 558fd912ae..ceb500f7ee 100644 --- a/binsrc/bpel/help/message.xml +++ b/binsrc/bpel/help/message.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/omsgpr.xml b/binsrc/bpel/help/omsgpr.xml index 07e2dd6b58..1709a761a3 100644 --- a/binsrc/bpel/help/omsgpr.xml +++ b/binsrc/bpel/help/omsgpr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/plinks.xml b/binsrc/bpel/help/plinks.xml index 9f760edea6..7817e220dd 100644 --- a/binsrc/bpel/help/plinks.xml +++ b/binsrc/bpel/help/plinks.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/plinks_props.xml b/binsrc/bpel/help/plinks_props.xml index a1174d9d17..9b11af04c3 100644 --- a/binsrc/bpel/help/plinks_props.xml +++ b/binsrc/bpel/help/plinks_props.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/process_activity.xml b/binsrc/bpel/help/process_activity.xml index de67130eff..a7378b2f6a 100644 --- a/binsrc/bpel/help/process_activity.xml +++ b/binsrc/bpel/help/process_activity.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/process_audit.xml b/binsrc/bpel/help/process_audit.xml index a18073be01..32e8c90b08 100644 --- a/binsrc/bpel/help/process_audit.xml +++ b/binsrc/bpel/help/process_audit.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/process_graph.xml b/binsrc/bpel/help/process_graph.xml index 9020d652eb..5063e6f04a 100644 --- a/binsrc/bpel/help/process_graph.xml +++ b/binsrc/bpel/help/process_graph.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/process_list.xml b/binsrc/bpel/help/process_list.xml index 496a944084..5d529f86f8 100644 --- a/binsrc/bpel/help/process_list.xml +++ b/binsrc/bpel/help/process_list.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/process_redef.xml b/binsrc/bpel/help/process_redef.xml index 458a3e0993..ed07f59552 100644 --- a/binsrc/bpel/help/process_redef.xml +++ b/binsrc/bpel/help/process_redef.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/process_redefine.xml b/binsrc/bpel/help/process_redefine.xml index a14c780e35..87387d21a4 100644 --- a/binsrc/bpel/help/process_redefine.xml +++ b/binsrc/bpel/help/process_redefine.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/process_status.xml b/binsrc/bpel/help/process_status.xml index a641f42810..9b96c333be 100644 --- a/binsrc/bpel/help/process_status.xml +++ b/binsrc/bpel/help/process_status.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/process_upload.xml b/binsrc/bpel/help/process_upload.xml index 881f0dc3f0..e48c63d785 100644 --- a/binsrc/bpel/help/process_upload.xml +++ b/binsrc/bpel/help/process_upload.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/processes_list.xml b/binsrc/bpel/help/processes_list.xml index ca61ca037d..a7dee03690 100644 --- a/binsrc/bpel/help/processes_list.xml +++ b/binsrc/bpel/help/processes_list.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/reports.xml b/binsrc/bpel/help/reports.xml index d64fe04a0d..ff83379f0d 100644 --- a/binsrc/bpel/help/reports.xml +++ b/binsrc/bpel/help/reports.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/rmsgpr.xml b/binsrc/bpel/help/rmsgpr.xml index 1ae84fc340..45464e536c 100644 --- a/binsrc/bpel/help/rmsgpr.xml +++ b/binsrc/bpel/help/rmsgpr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/statendp.xml b/binsrc/bpel/help/statendp.xml index c68bff8cb0..b63b9b35f1 100644 --- a/binsrc/bpel/help/statendp.xml +++ b/binsrc/bpel/help/statendp.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/statproc.xml b/binsrc/bpel/help/statproc.xml index b317de3ffc..e9403e27a3 100644 --- a/binsrc/bpel/help/statproc.xml +++ b/binsrc/bpel/help/statproc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/help/wss_keys.xml b/binsrc/bpel/help/wss_keys.xml index 6106a09ecb..975060f341 100644 --- a/binsrc/bpel/help/wss_keys.xml +++ b/binsrc/bpel/help/wss_keys.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/home.vspx b/binsrc/bpel/home.vspx index 14f3962fc8..eeea3b7857 100644 --- a/binsrc/bpel/home.vspx +++ b/binsrc/bpel/home.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/imsgpr.vspx b/binsrc/bpel/imsgpr.vspx index 5d3db9c19c..c7d6349f07 100644 --- a/binsrc/bpel/imsgpr.vspx +++ b/binsrc/bpel/imsgpr.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/incoming.vspx b/binsrc/bpel/incoming.vspx index afb9eda0cd..44b48d5969 100644 --- a/binsrc/bpel/incoming.vspx +++ b/binsrc/bpel/incoming.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/install.sql b/binsrc/bpel/install.sql index 86c25c5e15..6b1ccc06a3 100644 --- a/binsrc/bpel/install.sql +++ b/binsrc/bpel/install.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/instances.vspx b/binsrc/bpel/instances.vspx index 2892ce8ec2..d6f020d3e3 100644 --- a/binsrc/bpel/instances.vspx +++ b/binsrc/bpel/instances.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/main_tabs.vspx b/binsrc/bpel/main_tabs.vspx index a4d26ab175..6e78f7c067 100644 --- a/binsrc/bpel/main_tabs.vspx +++ b/binsrc/bpel/main_tabs.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/make_vad.sh b/binsrc/bpel/make_vad.sh index 8adf3e14b2..8ae01a3bf1 100755 --- a/binsrc/bpel/make_vad.sh +++ b/binsrc/bpel/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -318,7 +318,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/binsrc/bpel/message.vspx b/binsrc/bpel/message.vspx index 6bdcb190b2..10cdb0bbb9 100644 --- a/binsrc/bpel/message.vspx +++ b/binsrc/bpel/message.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/omsgpr.vspx b/binsrc/bpel/omsgpr.vspx index afbc3964bc..e129b1fff1 100644 --- a/binsrc/bpel/omsgpr.vspx +++ b/binsrc/bpel/omsgpr.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/plinks.vspx b/binsrc/bpel/plinks.vspx index 44379ae64d..2557d38f81 100644 --- a/binsrc/bpel/plinks.vspx +++ b/binsrc/bpel/plinks.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/plinks_props.vspx b/binsrc/bpel/plinks_props.vspx index f4b641d968..6c37fa51ec 100644 --- a/binsrc/bpel/plinks_props.vspx +++ b/binsrc/bpel/plinks_props.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/process.sql b/binsrc/bpel/process.sql index 58ffdf3c8f..f608786dff 100644 --- a/binsrc/bpel/process.sql +++ b/binsrc/bpel/process.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/process.vspx b/binsrc/bpel/process.vspx index d9328262d2..a5391c3216 100644 --- a/binsrc/bpel/process.vspx +++ b/binsrc/bpel/process.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/process.xsl b/binsrc/bpel/process.xsl index cf2dee15b0..d517b2f06d 100644 --- a/binsrc/bpel/process.xsl +++ b/binsrc/bpel/process.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/raw.xsl b/binsrc/bpel/raw.xsl index b4f44cf8c0..e5ccfc030b 100644 --- a/binsrc/bpel/raw.xsl +++ b/binsrc/bpel/raw.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/reports.vspx b/binsrc/bpel/reports.vspx index 9770b0479a..939cfd3863 100644 --- a/binsrc/bpel/reports.vspx +++ b/binsrc/bpel/reports.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/rmsgpr.vspx b/binsrc/bpel/rmsgpr.vspx index 884bbc213d..b9a2567563 100644 --- a/binsrc/bpel/rmsgpr.vspx +++ b/binsrc/bpel/rmsgpr.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/script.vspx b/binsrc/bpel/script.vspx index 370d224246..33cb8cde7c 100644 --- a/binsrc/bpel/script.vspx +++ b/binsrc/bpel/script.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/script.xsl b/binsrc/bpel/script.xsl index bc2ccdd8a3..7aead5d8c3 100644 --- a/binsrc/bpel/script.xsl +++ b/binsrc/bpel/script.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/start.vsp b/binsrc/bpel/start.vsp index 8acf3751d3..fa261f03bf 100644 --- a/binsrc/bpel/start.vsp +++ b/binsrc/bpel/start.vsp @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/statendp.vspx b/binsrc/bpel/statendp.vspx index b4a28b8b54..86e33f20cb 100644 --- a/binsrc/bpel/statendp.vspx +++ b/binsrc/bpel/statendp.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/statproc.vspx b/binsrc/bpel/statproc.vspx index d7cc5f7403..b18ab6d756 100644 --- a/binsrc/bpel/statproc.vspx +++ b/binsrc/bpel/statproc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/status.vspx b/binsrc/bpel/status.vspx index bd5ba21702..678f7ec35d 100644 --- a/binsrc/bpel/status.vspx +++ b/binsrc/bpel/status.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/system/bpel/bpel.xsd b/binsrc/bpel/system/bpel/bpel.xsd index 1c724dcc4c..a020ff50ef 100644 --- a/binsrc/bpel/system/bpel/bpel.xsd +++ b/binsrc/bpel/system/bpel/bpel.xsd @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/Flow/Flow.bpel b/binsrc/bpel/tests/Flow/Flow.bpel index 8cdea3133d..c416002fd8 100644 --- a/binsrc/bpel/tests/Flow/Flow.bpel +++ b/binsrc/bpel/tests/Flow/Flow.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/Flow/Flow.wsdl b/binsrc/bpel/tests/Flow/Flow.wsdl index 58b4799988..e8eb9fff2a 100644 --- a/binsrc/bpel/tests/Flow/Flow.wsdl +++ b/binsrc/bpel/tests/Flow/Flow.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/Flow/bpel.xml b/binsrc/bpel/tests/Flow/bpel.xml index 56b680706b..5134ac335f 100644 --- a/binsrc/bpel/tests/Flow/bpel.xml +++ b/binsrc/bpel/tests/Flow/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/Flow/build.xml b/binsrc/bpel/tests/Flow/build.xml index 0d683def43..c13947b837 100644 --- a/binsrc/bpel/tests/Flow/build.xml +++ b/binsrc/bpel/tests/Flow/build.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/Flow/ini.sql b/binsrc/bpel/tests/Flow/ini.sql index 2bcac0d3a5..d07cc1af94 100644 --- a/binsrc/bpel/tests/Flow/ini.sql +++ b/binsrc/bpel/tests/Flow/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/Flow/test_tutorial.sql b/binsrc/bpel/tests/Flow/test_tutorial.sql index 737f94c0d7..bdb2f731fc 100644 --- a/binsrc/bpel/tests/Flow/test_tutorial.sql +++ b/binsrc/bpel/tests/Flow/test_tutorial.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/LoanFlow/CreditRating.vsp b/binsrc/bpel/tests/LoanFlow/CreditRating.vsp index face246320..ae20a01597 100644 --- a/binsrc/bpel/tests/LoanFlow/CreditRating.vsp +++ b/binsrc/bpel/tests/LoanFlow/CreditRating.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.bpel b/binsrc/bpel/tests/LoanFlow/LoanFlow.bpel index 9331de143a..fd9aca5989 100644 --- a/binsrc/bpel/tests/LoanFlow/LoanFlow.bpel +++ b/binsrc/bpel/tests/LoanFlow/LoanFlow.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.sql b/binsrc/bpel/tests/LoanFlow/LoanFlow.sql index 154ee6cefa..dbff0793d7 100644 --- a/binsrc/bpel/tests/LoanFlow/LoanFlow.sql +++ b/binsrc/bpel/tests/LoanFlow/LoanFlow.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.vsp b/binsrc/bpel/tests/LoanFlow/LoanFlow.vsp index 506e1dbadb..49007b35b0 100644 --- a/binsrc/bpel/tests/LoanFlow/LoanFlow.vsp +++ b/binsrc/bpel/tests/LoanFlow/LoanFlow.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.wsdl b/binsrc/bpel/tests/LoanFlow/LoanFlow.wsdl index d620d2cf50..3fa95ba3e4 100644 --- a/binsrc/bpel/tests/LoanFlow/LoanFlow.wsdl +++ b/binsrc/bpel/tests/LoanFlow/LoanFlow.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlow.xml b/binsrc/bpel/tests/LoanFlow/LoanFlow.xml index 350ee4c9b9..a4efdcbed8 100644 --- a/binsrc/bpel/tests/LoanFlow/LoanFlow.xml +++ b/binsrc/bpel/tests/LoanFlow/LoanFlow.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/LoanFlow/LoanFlowUI.vsp b/binsrc/bpel/tests/LoanFlow/LoanFlowUI.vsp index de1076b865..66269791b1 100644 --- a/binsrc/bpel/tests/LoanFlow/LoanFlowUI.vsp +++ b/binsrc/bpel/tests/LoanFlow/LoanFlowUI.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/LoanFlow/StarLoan.vsp b/binsrc/bpel/tests/LoanFlow/StarLoan.vsp index 5e76892a94..be70f67aca 100644 --- a/binsrc/bpel/tests/LoanFlow/StarLoan.vsp +++ b/binsrc/bpel/tests/LoanFlow/StarLoan.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/LoanFlow/UnitedLoan.vsp b/binsrc/bpel/tests/LoanFlow/UnitedLoan.vsp index 6a0c99a212..68d005ad38 100644 --- a/binsrc/bpel/tests/LoanFlow/UnitedLoan.vsp +++ b/binsrc/bpel/tests/LoanFlow/UnitedLoan.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/LoanFlow/bpel.xml b/binsrc/bpel/tests/LoanFlow/bpel.xml index 6fe1a553c5..70f233dcc4 100644 --- a/binsrc/bpel/tests/LoanFlow/bpel.xml +++ b/binsrc/bpel/tests/LoanFlow/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/LoanFlow/options.xml b/binsrc/bpel/tests/LoanFlow/options.xml index e13128e1d6..73839f4e91 100644 --- a/binsrc/bpel/tests/LoanFlow/options.xml +++ b/binsrc/bpel/tests/LoanFlow/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/bpel_engines/Twister/new-def.xml b/binsrc/bpel/tests/bpel_engines/Twister/new-def.xml index 6b7180e488..fef1fcf6e8 100644 --- a/binsrc/bpel/tests/bpel_engines/Twister/new-def.xml +++ b/binsrc/bpel/tests/bpel_engines/Twister/new-def.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/bpel_engines/Twister/new.xml b/binsrc/bpel/tests/bpel_engines/Twister/new.xml index 7250d89283..755aca723d 100644 --- a/binsrc/bpel/tests/bpel_engines/Twister/new.xml +++ b/binsrc/bpel/tests/bpel_engines/Twister/new.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/bpel.xml b/binsrc/bpel/tests/echo/bpel.xml index 93b118440f..5e8a468f17 100644 --- a/binsrc/bpel/tests/echo/bpel.xml +++ b/binsrc/bpel/tests/echo/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/build.xml b/binsrc/bpel/tests/echo/build.xml index 2a39297b18..a5ce78cf0d 100644 --- a/binsrc/bpel/tests/echo/build.xml +++ b/binsrc/bpel/tests/echo/build.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/doc.bpel b/binsrc/bpel/tests/echo/doc.bpel index b312738732..9f9d04e249 100644 --- a/binsrc/bpel/tests/echo/doc.bpel +++ b/binsrc/bpel/tests/echo/doc.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/doc.wsdl b/binsrc/bpel/tests/echo/doc.wsdl index 2cd9f6c48d..9419961543 100644 --- a/binsrc/bpel/tests/echo/doc.wsdl +++ b/binsrc/bpel/tests/echo/doc.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/echo.bpel b/binsrc/bpel/tests/echo/echo.bpel index fd5cca25b6..1db9b8beac 100644 --- a/binsrc/bpel/tests/echo/echo.bpel +++ b/binsrc/bpel/tests/echo/echo.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/echo.vsp b/binsrc/bpel/tests/echo/echo.vsp index 8bdb527de5..cd9fbdfdeb 100644 --- a/binsrc/bpel/tests/echo/echo.vsp +++ b/binsrc/bpel/tests/echo/echo.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/echo.wsdl b/binsrc/bpel/tests/echo/echo.wsdl index a653d67ec4..6b9f916d6d 100644 --- a/binsrc/bpel/tests/echo/echo.wsdl +++ b/binsrc/bpel/tests/echo/echo.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/echo.xml b/binsrc/bpel/tests/echo/echo.xml index 54e17592c8..e94686ea98 100644 --- a/binsrc/bpel/tests/echo/echo.xml +++ b/binsrc/bpel/tests/echo/echo.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/ini.sh b/binsrc/bpel/tests/echo/ini.sh index effd1bc9be..158b6d8394 100755 --- a/binsrc/bpel/tests/echo/ini.sh +++ b/binsrc/bpel/tests/echo/ini.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/ini.sql b/binsrc/bpel/tests/echo/ini.sql index 24eab31a47..1fc4c68887 100644 --- a/binsrc/bpel/tests/echo/ini.sql +++ b/binsrc/bpel/tests/echo/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/options.xml b/binsrc/bpel/tests/echo/options.xml index 988ec71cc5..b0524fc21f 100644 --- a/binsrc/bpel/tests/echo/options.xml +++ b/binsrc/bpel/tests/echo/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/sdoc.wsdl b/binsrc/bpel/tests/echo/sdoc.wsdl index c074f70ddc..607d674d16 100644 --- a/binsrc/bpel/tests/echo/sdoc.wsdl +++ b/binsrc/bpel/tests/echo/sdoc.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/svc.sql b/binsrc/bpel/tests/echo/svc.sql index 465730b76c..b31403a5c3 100644 --- a/binsrc/bpel/tests/echo/svc.sql +++ b/binsrc/bpel/tests/echo/svc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echo/synsvc.wsdl b/binsrc/bpel/tests/echo/synsvc.wsdl index 3b97e88fd9..69a28e5eaa 100644 --- a/binsrc/bpel/tests/echo/synsvc.wsdl +++ b/binsrc/bpel/tests/echo/synsvc.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echovirt/bpel.xml b/binsrc/bpel/tests/echovirt/bpel.xml index d68703a4d3..f40cfcbc11 100644 --- a/binsrc/bpel/tests/echovirt/bpel.xml +++ b/binsrc/bpel/tests/echovirt/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echovirt/build.xml b/binsrc/bpel/tests/echovirt/build.xml index ef0a586d25..4d8a798557 100644 --- a/binsrc/bpel/tests/echovirt/build.xml +++ b/binsrc/bpel/tests/echovirt/build.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echovirt/echovirt.bpel b/binsrc/bpel/tests/echovirt/echovirt.bpel index acf7bbae1d..342ee6452f 100644 --- a/binsrc/bpel/tests/echovirt/echovirt.bpel +++ b/binsrc/bpel/tests/echovirt/echovirt.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echovirt/echovirt.wsdl b/binsrc/bpel/tests/echovirt/echovirt.wsdl index 14534543f4..d102c6c806 100644 --- a/binsrc/bpel/tests/echovirt/echovirt.wsdl +++ b/binsrc/bpel/tests/echovirt/echovirt.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echovirt/echovirtNew.bpel b/binsrc/bpel/tests/echovirt/echovirtNew.bpel index f349a6fb16..1a6d23e54a 100644 --- a/binsrc/bpel/tests/echovirt/echovirtNew.bpel +++ b/binsrc/bpel/tests/echovirt/echovirtNew.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/echovirt/ini.sql b/binsrc/bpel/tests/echovirt/ini.sql index 307bf8aeba..6d2455b372 100644 --- a/binsrc/bpel/tests/echovirt/ini.sql +++ b/binsrc/bpel/tests/echovirt/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/Restart.bpel b/binsrc/bpel/tests/fault1/Restart.bpel index f393d6ab6a..2cbaeb34dc 100644 --- a/binsrc/bpel/tests/fault1/Restart.bpel +++ b/binsrc/bpel/tests/fault1/Restart.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/Restart.wsdl b/binsrc/bpel/tests/fault1/Restart.wsdl index 35361d3ead..05470ef891 100644 --- a/binsrc/bpel/tests/fault1/Restart.wsdl +++ b/binsrc/bpel/tests/fault1/Restart.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/UseStockReviewSheet.bpel b/binsrc/bpel/tests/fault1/UseStockReviewSheet.bpel index a86f6028ac..da75d9a1f4 100644 --- a/binsrc/bpel/tests/fault1/UseStockReviewSheet.bpel +++ b/binsrc/bpel/tests/fault1/UseStockReviewSheet.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/UseStockReviewSheet.wsdl b/binsrc/bpel/tests/fault1/UseStockReviewSheet.wsdl index 645a128704..d9353edc71 100644 --- a/binsrc/bpel/tests/fault1/UseStockReviewSheet.wsdl +++ b/binsrc/bpel/tests/fault1/UseStockReviewSheet.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/While.bpel b/binsrc/bpel/tests/fault1/While.bpel index fed8faed24..cb501b380c 100644 --- a/binsrc/bpel/tests/fault1/While.bpel +++ b/binsrc/bpel/tests/fault1/While.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/While.wsdl b/binsrc/bpel/tests/fault1/While.wsdl index 0968f1bd6f..8e86512537 100644 --- a/binsrc/bpel/tests/fault1/While.wsdl +++ b/binsrc/bpel/tests/fault1/While.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/check.sql b/binsrc/bpel/tests/fault1/check.sql index e4e8a3b893..bd508eb969 100644 --- a/binsrc/bpel/tests/fault1/check.sql +++ b/binsrc/bpel/tests/fault1/check.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/check2.sql b/binsrc/bpel/tests/fault1/check2.sql index 36cdccb868..e3ad26017a 100644 --- a/binsrc/bpel/tests/fault1/check2.sql +++ b/binsrc/bpel/tests/fault1/check2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/clr.sql b/binsrc/bpel/tests/fault1/clr.sql index b519fe813e..f9dd8104ee 100644 --- a/binsrc/bpel/tests/fault1/clr.sql +++ b/binsrc/bpel/tests/fault1/clr.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/clr_exec.bpel b/binsrc/bpel/tests/fault1/clr_exec.bpel index 95c8c5676c..57da86e07e 100644 --- a/binsrc/bpel/tests/fault1/clr_exec.bpel +++ b/binsrc/bpel/tests/fault1/clr_exec.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/clr_exec.vsp b/binsrc/bpel/tests/fault1/clr_exec.vsp index 8bdb527de5..cd9fbdfdeb 100644 --- a/binsrc/bpel/tests/fault1/clr_exec.vsp +++ b/binsrc/bpel/tests/fault1/clr_exec.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/clr_exec.wsdl b/binsrc/bpel/tests/fault1/clr_exec.wsdl index 60f2a0f14e..43de1e69a3 100644 --- a/binsrc/bpel/tests/fault1/clr_exec.wsdl +++ b/binsrc/bpel/tests/fault1/clr_exec.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/clr_exec.xml b/binsrc/bpel/tests/fault1/clr_exec.xml index 4f98d419e7..18feab3a7e 100644 --- a/binsrc/bpel/tests/fault1/clr_exec.xml +++ b/binsrc/bpel/tests/fault1/clr_exec.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/clr_exec_bpel.xml b/binsrc/bpel/tests/fault1/clr_exec_bpel.xml index 9e5c8c8c08..269d87bf07 100644 --- a/binsrc/bpel/tests/fault1/clr_exec_bpel.xml +++ b/binsrc/bpel/tests/fault1/clr_exec_bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/clr_exec_desc.xml b/binsrc/bpel/tests/fault1/clr_exec_desc.xml index 48d9255f60..5d39ac0fb9 100644 --- a/binsrc/bpel/tests/fault1/clr_exec_desc.xml +++ b/binsrc/bpel/tests/fault1/clr_exec_desc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/comp1.bpel b/binsrc/bpel/tests/fault1/comp1.bpel index 39fb40a7a9..4215ded193 100644 --- a/binsrc/bpel/tests/fault1/comp1.bpel +++ b/binsrc/bpel/tests/fault1/comp1.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/fault.bpel b/binsrc/bpel/tests/fault1/fault.bpel index b837cb9ecb..a3d2019d18 100644 --- a/binsrc/bpel/tests/fault1/fault.bpel +++ b/binsrc/bpel/tests/fault1/fault.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/fault.wsdl b/binsrc/bpel/tests/fault1/fault.wsdl index 4d96408301..73bfad7b7e 100644 --- a/binsrc/bpel/tests/fault1/fault.wsdl +++ b/binsrc/bpel/tests/fault1/fault.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/fault2.bpel b/binsrc/bpel/tests/fault1/fault2.bpel index 6480ace34b..c012772281 100644 --- a/binsrc/bpel/tests/fault1/fault2.bpel +++ b/binsrc/bpel/tests/fault1/fault2.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/fault3.bpel b/binsrc/bpel/tests/fault1/fault3.bpel index 27ff7704e3..7b89226224 100644 --- a/binsrc/bpel/tests/fault1/fault3.bpel +++ b/binsrc/bpel/tests/fault1/fault3.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/faultHTCLI.bpel b/binsrc/bpel/tests/fault1/faultHTCLI.bpel index 0a059ac103..2d176f389d 100644 --- a/binsrc/bpel/tests/fault1/faultHTCLI.bpel +++ b/binsrc/bpel/tests/fault1/faultHTCLI.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/incsvcwsdl.vsp b/binsrc/bpel/tests/fault1/incsvcwsdl.vsp index e67b171241..f5db674f38 100644 --- a/binsrc/bpel/tests/fault1/incsvcwsdl.vsp +++ b/binsrc/bpel/tests/fault1/incsvcwsdl.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/ini.sql b/binsrc/bpel/tests/fault1/ini.sql index 39e78f4742..22c7592609 100644 --- a/binsrc/bpel/tests/fault1/ini.sql +++ b/binsrc/bpel/tests/fault1/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/ini2.sql b/binsrc/bpel/tests/fault1/ini2.sql index 0bda414fee..af4f5572ff 100644 --- a/binsrc/bpel/tests/fault1/ini2.sql +++ b/binsrc/bpel/tests/fault1/ini2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/inv.sql b/binsrc/bpel/tests/fault1/inv.sql index 58a26e71c2..28930388ac 100644 --- a/binsrc/bpel/tests/fault1/inv.sql +++ b/binsrc/bpel/tests/fault1/inv.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/java.sql b/binsrc/bpel/tests/fault1/java.sql index 17de731ab7..d937b24e08 100644 --- a/binsrc/bpel/tests/fault1/java.sql +++ b/binsrc/bpel/tests/fault1/java.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/java_exec.bpel b/binsrc/bpel/tests/fault1/java_exec.bpel index 24b59a64d4..53d4cd511a 100644 --- a/binsrc/bpel/tests/fault1/java_exec.bpel +++ b/binsrc/bpel/tests/fault1/java_exec.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/java_exec.vsp b/binsrc/bpel/tests/fault1/java_exec.vsp index 8bdb527de5..cd9fbdfdeb 100644 --- a/binsrc/bpel/tests/fault1/java_exec.vsp +++ b/binsrc/bpel/tests/fault1/java_exec.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/java_exec.wsdl b/binsrc/bpel/tests/fault1/java_exec.wsdl index 6eda70b778..5333cd6a48 100644 --- a/binsrc/bpel/tests/fault1/java_exec.wsdl +++ b/binsrc/bpel/tests/fault1/java_exec.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/java_exec.xml b/binsrc/bpel/tests/fault1/java_exec.xml index cdd5491102..f3ef2c0f97 100644 --- a/binsrc/bpel/tests/fault1/java_exec.xml +++ b/binsrc/bpel/tests/fault1/java_exec.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/java_exec_bpel.xml b/binsrc/bpel/tests/fault1/java_exec_bpel.xml index f00fe49814..bced6106f7 100644 --- a/binsrc/bpel/tests/fault1/java_exec_bpel.xml +++ b/binsrc/bpel/tests/fault1/java_exec_bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/java_exec_desc.xml b/binsrc/bpel/tests/fault1/java_exec_desc.xml index e80dcc5394..99cb31fe4c 100644 --- a/binsrc/bpel/tests/fault1/java_exec_desc.xml +++ b/binsrc/bpel/tests/fault1/java_exec_desc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/servicewsdl.vsp b/binsrc/bpel/tests/fault1/servicewsdl.vsp index ce1a7f3310..f9c11de00f 100644 --- a/binsrc/bpel/tests/fault1/servicewsdl.vsp +++ b/binsrc/bpel/tests/fault1/servicewsdl.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/sql_exec.bpel b/binsrc/bpel/tests/fault1/sql_exec.bpel index 4e1d743d2c..329214fcd3 100644 --- a/binsrc/bpel/tests/fault1/sql_exec.bpel +++ b/binsrc/bpel/tests/fault1/sql_exec.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fault1/sql_exec.wsdl b/binsrc/bpel/tests/fault1/sql_exec.wsdl index f163f27470..f34cecebe5 100644 --- a/binsrc/bpel/tests/fault1/sql_exec.wsdl +++ b/binsrc/bpel/tests/fault1/sql_exec.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/bpel.xml b/binsrc/bpel/tests/fi/bpel.xml index 5da582d0e1..36f864e4e3 100644 --- a/binsrc/bpel/tests/fi/bpel.xml +++ b/binsrc/bpel/tests/fi/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/fi.bpel b/binsrc/bpel/tests/fi/fi.bpel index 254b53b277..cc167cc568 100644 --- a/binsrc/bpel/tests/fi/fi.bpel +++ b/binsrc/bpel/tests/fi/fi.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/fi.vsp b/binsrc/bpel/tests/fi/fi.vsp index 506e1dbadb..49007b35b0 100644 --- a/binsrc/bpel/tests/fi/fi.vsp +++ b/binsrc/bpel/tests/fi/fi.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/fi.wsdl b/binsrc/bpel/tests/fi/fi.wsdl index 71031010b3..3c7848ac65 100644 --- a/binsrc/bpel/tests/fi/fi.wsdl +++ b/binsrc/bpel/tests/fi/fi.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/fi.xml b/binsrc/bpel/tests/fi/fi.xml index fe515bf336..97e2f514b9 100644 --- a/binsrc/bpel/tests/fi/fi.xml +++ b/binsrc/bpel/tests/fi/fi.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/fi_wsdl.vsp b/binsrc/bpel/tests/fi/fi_wsdl.vsp index ac368da9bc..fe347fcc15 100644 --- a/binsrc/bpel/tests/fi/fi_wsdl.vsp +++ b/binsrc/bpel/tests/fi/fi_wsdl.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/fia.bpel b/binsrc/bpel/tests/fi/fia.bpel index 39a7348549..3f7c10ca9c 100644 --- a/binsrc/bpel/tests/fi/fia.bpel +++ b/binsrc/bpel/tests/fi/fia.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/fia.wsdl b/binsrc/bpel/tests/fi/fia.wsdl index 8ee185ec79..4dd88b6ffe 100644 --- a/binsrc/bpel/tests/fi/fia.wsdl +++ b/binsrc/bpel/tests/fi/fia.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/fib.bpel b/binsrc/bpel/tests/fi/fib.bpel index cf9c53e0aa..037bb67a05 100644 --- a/binsrc/bpel/tests/fi/fib.bpel +++ b/binsrc/bpel/tests/fi/fib.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/fib.wsdl b/binsrc/bpel/tests/fi/fib.wsdl index 4f5899868f..bfff110584 100644 --- a/binsrc/bpel/tests/fi/fib.wsdl +++ b/binsrc/bpel/tests/fi/fib.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/ini.sql b/binsrc/bpel/tests/fi/ini.sql index ad3bf4d883..13f172ea27 100644 --- a/binsrc/bpel/tests/fi/ini.sql +++ b/binsrc/bpel/tests/fi/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/inv.sql b/binsrc/bpel/tests/fi/inv.sql index 79c02b07f2..c39fcf774f 100644 --- a/binsrc/bpel/tests/fi/inv.sql +++ b/binsrc/bpel/tests/fi/inv.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/options.xml b/binsrc/bpel/tests/fi/options.xml index 91b0eeb3d6..5b479fcf7d 100644 --- a/binsrc/bpel/tests/fi/options.xml +++ b/binsrc/bpel/tests/fi/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/fi/service.vsp b/binsrc/bpel/tests/fi/service.vsp index ac368da9bc..fe347fcc15 100644 --- a/binsrc/bpel/tests/fi/service.vsp +++ b/binsrc/bpel/tests/fi/service.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/index.vsp b/binsrc/bpel/tests/index.vsp index 42e4ee3d7b..088d45dafc 100644 --- a/binsrc/bpel/tests/index.vsp +++ b/binsrc/bpel/tests/index.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/index.xml b/binsrc/bpel/tests/index.xml index e67ba6e2ed..86f41b620a 100644 --- a/binsrc/bpel/tests/index.xml +++ b/binsrc/bpel/tests/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-1.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-1.bpel index 678a918679..49267a28bb 100644 --- a/binsrc/bpel/tests/interop/UseCases/MS01-1.bpel +++ b/binsrc/bpel/tests/interop/UseCases/MS01-1.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-2.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-2.bpel index 9ac90a19c6..9bb6952235 100644 --- a/binsrc/bpel/tests/interop/UseCases/MS01-2.bpel +++ b/binsrc/bpel/tests/interop/UseCases/MS01-2.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-3.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-3.bpel index dd6c9371f5..afbf9a9163 100644 --- a/binsrc/bpel/tests/interop/UseCases/MS01-3.bpel +++ b/binsrc/bpel/tests/interop/UseCases/MS01-3.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-4.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-4.bpel index 12d6d8a7ec..55385c97ba 100644 --- a/binsrc/bpel/tests/interop/UseCases/MS01-4.bpel +++ b/binsrc/bpel/tests/interop/UseCases/MS01-4.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-5.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-5.bpel index bfcca460b6..999871577a 100644 --- a/binsrc/bpel/tests/interop/UseCases/MS01-5.bpel +++ b/binsrc/bpel/tests/interop/UseCases/MS01-5.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/UseCases/MS01-6.bpel b/binsrc/bpel/tests/interop/UseCases/MS01-6.bpel index a7dcd0f41d..60e5a26a79 100644 --- a/binsrc/bpel/tests/interop/UseCases/MS01-6.bpel +++ b/binsrc/bpel/tests/interop/UseCases/MS01-6.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/UseCases/MS01.sql b/binsrc/bpel/tests/interop/UseCases/MS01.sql index 7cc62d2c65..4089aa80cb 100644 --- a/binsrc/bpel/tests/interop/UseCases/MS01.sql +++ b/binsrc/bpel/tests/interop/UseCases/MS01.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/UseCases/MS01.wsdl b/binsrc/bpel/tests/interop/UseCases/MS01.wsdl index 2c7c82342c..99a56946a4 100644 --- a/binsrc/bpel/tests/interop/UseCases/MS01.wsdl +++ b/binsrc/bpel/tests/interop/UseCases/MS01.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/UseCases/UseCases.vsp b/binsrc/bpel/tests/interop/UseCases/UseCases.vsp index 8bdb527de5..cd9fbdfdeb 100644 --- a/binsrc/bpel/tests/interop/UseCases/UseCases.vsp +++ b/binsrc/bpel/tests/interop/UseCases/UseCases.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/UseCases/UseCases.xml b/binsrc/bpel/tests/interop/UseCases/UseCases.xml index fbf7fac681..5e4108dafa 100644 --- a/binsrc/bpel/tests/interop/UseCases/UseCases.xml +++ b/binsrc/bpel/tests/interop/UseCases/UseCases.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/WSE2.0/Sec.bpel b/binsrc/bpel/tests/interop/WSE2.0/Sec.bpel index 84fa2c9327..82bd189305 100644 --- a/binsrc/bpel/tests/interop/WSE2.0/Sec.bpel +++ b/binsrc/bpel/tests/interop/WSE2.0/Sec.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/WSE2.0/Sec.sql b/binsrc/bpel/tests/interop/WSE2.0/Sec.sql index 97b54e4755..04c21b9c52 100644 --- a/binsrc/bpel/tests/interop/WSE2.0/Sec.sql +++ b/binsrc/bpel/tests/interop/WSE2.0/Sec.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/WSE2.0/Sec.wsdl b/binsrc/bpel/tests/interop/WSE2.0/Sec.wsdl index 2cd9f6c48d..9419961543 100644 --- a/binsrc/bpel/tests/interop/WSE2.0/Sec.wsdl +++ b/binsrc/bpel/tests/interop/WSE2.0/Sec.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/WSE2.0/SecClient/SecClient.cs b/binsrc/bpel/tests/interop/WSE2.0/SecClient/SecClient.cs index 98f3bcd942..b8532e8747 100644 --- a/binsrc/bpel/tests/interop/WSE2.0/SecClient/SecClient.cs +++ b/binsrc/bpel/tests/interop/WSE2.0/SecClient/SecClient.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/WSE2.0/SecSvc.wsdl b/binsrc/bpel/tests/interop/WSE2.0/SecSvc.wsdl index 9c972bf154..fbd52efd48 100644 --- a/binsrc/bpel/tests/interop/WSE2.0/SecSvc.wsdl +++ b/binsrc/bpel/tests/interop/WSE2.0/SecSvc.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/WSE2.0/SecSvc/SecSvc.asmx.cs b/binsrc/bpel/tests/interop/WSE2.0/SecSvc/SecSvc.asmx.cs index adaec20f3b..707c7cbf4a 100644 --- a/binsrc/bpel/tests/interop/WSE2.0/SecSvc/SecSvc.asmx.cs +++ b/binsrc/bpel/tests/interop/WSE2.0/SecSvc/SecSvc.asmx.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/Aecho/bpel.xml b/binsrc/bpel/tests/interop/site/Aecho/bpel.xml index 04cae7921a..2f4892eac2 100644 --- a/binsrc/bpel/tests/interop/site/Aecho/bpel.xml +++ b/binsrc/bpel/tests/interop/site/Aecho/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/Aecho/desc.xml b/binsrc/bpel/tests/interop/site/Aecho/desc.xml index a13e140562..eaf2352daa 100644 --- a/binsrc/bpel/tests/interop/site/Aecho/desc.xml +++ b/binsrc/bpel/tests/interop/site/Aecho/desc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/Aecho/echo.bpel b/binsrc/bpel/tests/interop/site/Aecho/echo.bpel index 3220d170ad..672fb2a78d 100644 --- a/binsrc/bpel/tests/interop/site/Aecho/echo.bpel +++ b/binsrc/bpel/tests/interop/site/Aecho/echo.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/Aecho/echo.sql b/binsrc/bpel/tests/interop/site/Aecho/echo.sql index c29111912e..75c959ce45 100644 --- a/binsrc/bpel/tests/interop/site/Aecho/echo.sql +++ b/binsrc/bpel/tests/interop/site/Aecho/echo.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/Aecho/echo.wsdl b/binsrc/bpel/tests/interop/site/Aecho/echo.wsdl index 73f6d24b73..1a42885151 100644 --- a/binsrc/bpel/tests/interop/site/Aecho/echo.wsdl +++ b/binsrc/bpel/tests/interop/site/Aecho/echo.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMLoan/CreditRating.vsp b/binsrc/bpel/tests/interop/site/RMLoan/CreditRating.vsp index c18bd96d6a..c5c5fc4826 100644 --- a/binsrc/bpel/tests/interop/site/RMLoan/CreditRating.vsp +++ b/binsrc/bpel/tests/interop/site/RMLoan/CreditRating.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.bpel b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.bpel index 51765aa30a..79cf77a111 100644 --- a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.bpel +++ b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.sql b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.sql index 04a3c0eaa4..80d7e8c21c 100644 --- a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.sql +++ b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.wsdl b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.wsdl index d620d2cf50..3fa95ba3e4 100644 --- a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.wsdl +++ b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlow.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlowDemo.sql b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlowDemo.sql index b4b3880b9b..6dd7286916 100644 --- a/binsrc/bpel/tests/interop/site/RMLoan/LoanFlowDemo.sql +++ b/binsrc/bpel/tests/interop/site/RMLoan/LoanFlowDemo.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.vsp b/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.vsp index 8bdb527de5..cd9fbdfdeb 100644 --- a/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.vsp +++ b/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.xml b/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.xml index d7970858ed..3e4a9d4f4f 100644 --- a/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.xml +++ b/binsrc/bpel/tests/interop/site/RMLoan/RMLoan.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMLoan/StarLoan.vsp b/binsrc/bpel/tests/interop/site/RMLoan/StarLoan.vsp index 13e593dd1b..902e455304 100644 --- a/binsrc/bpel/tests/interop/site/RMLoan/StarLoan.vsp +++ b/binsrc/bpel/tests/interop/site/RMLoan/StarLoan.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMLoan/UnitedLoan.vsp b/binsrc/bpel/tests/interop/site/RMLoan/UnitedLoan.vsp index 96ea941e8f..31683da8b5 100644 --- a/binsrc/bpel/tests/interop/site/RMLoan/UnitedLoan.vsp +++ b/binsrc/bpel/tests/interop/site/RMLoan/UnitedLoan.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMLoan/bpel.xml b/binsrc/bpel/tests/interop/site/RMLoan/bpel.xml index 6fe1a553c5..70f233dcc4 100644 --- a/binsrc/bpel/tests/interop/site/RMLoan/bpel.xml +++ b/binsrc/bpel/tests/interop/site/RMLoan/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMLoan/desc.xml b/binsrc/bpel/tests/interop/site/RMLoan/desc.xml index f65a1e60e0..89e3aaff49 100644 --- a/binsrc/bpel/tests/interop/site/RMLoan/desc.xml +++ b/binsrc/bpel/tests/interop/site/RMLoan/desc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMLoan/options.xml b/binsrc/bpel/tests/interop/site/RMLoan/options.xml index 714e7b68b3..cdf48357ee 100644 --- a/binsrc/bpel/tests/interop/site/RMLoan/options.xml +++ b/binsrc/bpel/tests/interop/site/RMLoan/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMecho/bpel.xml b/binsrc/bpel/tests/interop/site/RMecho/bpel.xml index 49dd0713cb..dd141659ff 100644 --- a/binsrc/bpel/tests/interop/site/RMecho/bpel.xml +++ b/binsrc/bpel/tests/interop/site/RMecho/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMecho/desc.xml b/binsrc/bpel/tests/interop/site/RMecho/desc.xml index a4b729a49b..cf355dd43d 100644 --- a/binsrc/bpel/tests/interop/site/RMecho/desc.xml +++ b/binsrc/bpel/tests/interop/site/RMecho/desc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMecho/echo.bpel b/binsrc/bpel/tests/interop/site/RMecho/echo.bpel index f8932dc6a3..9b534a8aea 100644 --- a/binsrc/bpel/tests/interop/site/RMecho/echo.bpel +++ b/binsrc/bpel/tests/interop/site/RMecho/echo.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMecho/echo.sql b/binsrc/bpel/tests/interop/site/RMecho/echo.sql index fa0d5a49ba..b0c99dd6f1 100644 --- a/binsrc/bpel/tests/interop/site/RMecho/echo.sql +++ b/binsrc/bpel/tests/interop/site/RMecho/echo.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/RMecho/echo.wsdl b/binsrc/bpel/tests/interop/site/RMecho/echo.wsdl index 8c122ecc09..2765ff6416 100644 --- a/binsrc/bpel/tests/interop/site/RMecho/echo.wsdl +++ b/binsrc/bpel/tests/interop/site/RMecho/echo.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecAecho/bpel.xml b/binsrc/bpel/tests/interop/site/SecAecho/bpel.xml index 107612ba03..7f15bc9745 100644 --- a/binsrc/bpel/tests/interop/site/SecAecho/bpel.xml +++ b/binsrc/bpel/tests/interop/site/SecAecho/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecAecho/desc.xml b/binsrc/bpel/tests/interop/site/SecAecho/desc.xml index 42a54cb2e2..ce1d983143 100644 --- a/binsrc/bpel/tests/interop/site/SecAecho/desc.xml +++ b/binsrc/bpel/tests/interop/site/SecAecho/desc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecAecho/echo.bpel b/binsrc/bpel/tests/interop/site/SecAecho/echo.bpel index 037bf73102..62b517b90a 100644 --- a/binsrc/bpel/tests/interop/site/SecAecho/echo.bpel +++ b/binsrc/bpel/tests/interop/site/SecAecho/echo.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecAecho/echo.sql b/binsrc/bpel/tests/interop/site/SecAecho/echo.sql index 04871faf67..b8df191ca8 100644 --- a/binsrc/bpel/tests/interop/site/SecAecho/echo.sql +++ b/binsrc/bpel/tests/interop/site/SecAecho/echo.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecAecho/echo.wsdl b/binsrc/bpel/tests/interop/site/SecAecho/echo.wsdl index 73f6d24b73..1a42885151 100644 --- a/binsrc/bpel/tests/interop/site/SecAecho/echo.wsdl +++ b/binsrc/bpel/tests/interop/site/SecAecho/echo.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecLoan/CreditRating.vsp b/binsrc/bpel/tests/interop/site/SecLoan/CreditRating.vsp index 84719949ce..53ef9fdf7a 100644 --- a/binsrc/bpel/tests/interop/site/SecLoan/CreditRating.vsp +++ b/binsrc/bpel/tests/interop/site/SecLoan/CreditRating.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.bpel b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.bpel index 51765aa30a..79cf77a111 100644 --- a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.bpel +++ b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.sql b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.sql index e2eab6991e..65d43ea4b7 100644 --- a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.sql +++ b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.wsdl b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.wsdl index d620d2cf50..3fa95ba3e4 100644 --- a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.wsdl +++ b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlow.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlowDemo.sql b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlowDemo.sql index 89ef8aeba1..1f8ebc39b4 100644 --- a/binsrc/bpel/tests/interop/site/SecLoan/LoanFlowDemo.sql +++ b/binsrc/bpel/tests/interop/site/SecLoan/LoanFlowDemo.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.vsp b/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.vsp index 506e1dbadb..49007b35b0 100644 --- a/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.vsp +++ b/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.xml b/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.xml index 9faf269c4c..d610b3ea60 100644 --- a/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.xml +++ b/binsrc/bpel/tests/interop/site/SecLoan/SecLoan.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecLoan/StarLoan.vsp b/binsrc/bpel/tests/interop/site/SecLoan/StarLoan.vsp index 51f56f1161..4e30e783aa 100644 --- a/binsrc/bpel/tests/interop/site/SecLoan/StarLoan.vsp +++ b/binsrc/bpel/tests/interop/site/SecLoan/StarLoan.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecLoan/UnitedLoan.vsp b/binsrc/bpel/tests/interop/site/SecLoan/UnitedLoan.vsp index eaaea90745..dd1c089013 100644 --- a/binsrc/bpel/tests/interop/site/SecLoan/UnitedLoan.vsp +++ b/binsrc/bpel/tests/interop/site/SecLoan/UnitedLoan.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecLoan/bpel.xml b/binsrc/bpel/tests/interop/site/SecLoan/bpel.xml index 6fe1a553c5..70f233dcc4 100644 --- a/binsrc/bpel/tests/interop/site/SecLoan/bpel.xml +++ b/binsrc/bpel/tests/interop/site/SecLoan/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecLoan/desc.xml b/binsrc/bpel/tests/interop/site/SecLoan/desc.xml index 4b1c8dcfd9..eabfe3f646 100644 --- a/binsrc/bpel/tests/interop/site/SecLoan/desc.xml +++ b/binsrc/bpel/tests/interop/site/SecLoan/desc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecLoan/options.xml b/binsrc/bpel/tests/interop/site/SecLoan/options.xml index 714e7b68b3..cdf48357ee 100644 --- a/binsrc/bpel/tests/interop/site/SecLoan/options.xml +++ b/binsrc/bpel/tests/interop/site/SecLoan/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/CreditRating.vsp b/binsrc/bpel/tests/interop/site/SecRMLoan/CreditRating.vsp index 84719949ce..53ef9fdf7a 100644 --- a/binsrc/bpel/tests/interop/site/SecRMLoan/CreditRating.vsp +++ b/binsrc/bpel/tests/interop/site/SecRMLoan/CreditRating.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.bpel b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.bpel index 51765aa30a..79cf77a111 100644 --- a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.bpel +++ b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.sql b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.sql index f13e8d7bdd..6fcfd2f368 100644 --- a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.sql +++ b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.wsdl b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.wsdl index d620d2cf50..3fa95ba3e4 100644 --- a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.wsdl +++ b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlow.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlowDemo.sql b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlowDemo.sql index beb5177067..adf82d3789 100644 --- a/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlowDemo.sql +++ b/binsrc/bpel/tests/interop/site/SecRMLoan/LoanFlowDemo.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.vsp b/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.vsp index 8bdb527de5..cd9fbdfdeb 100644 --- a/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.vsp +++ b/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.xml b/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.xml index df37926447..41802160d6 100644 --- a/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.xml +++ b/binsrc/bpel/tests/interop/site/SecRMLoan/SecRMLoan.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/StarLoan.vsp b/binsrc/bpel/tests/interop/site/SecRMLoan/StarLoan.vsp index 84ee1aae57..75a2ed176a 100644 --- a/binsrc/bpel/tests/interop/site/SecRMLoan/StarLoan.vsp +++ b/binsrc/bpel/tests/interop/site/SecRMLoan/StarLoan.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/UnitedLoan.vsp b/binsrc/bpel/tests/interop/site/SecRMLoan/UnitedLoan.vsp index 3070514c5c..9abb877083 100644 --- a/binsrc/bpel/tests/interop/site/SecRMLoan/UnitedLoan.vsp +++ b/binsrc/bpel/tests/interop/site/SecRMLoan/UnitedLoan.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/bpel.xml b/binsrc/bpel/tests/interop/site/SecRMLoan/bpel.xml index 6fe1a553c5..70f233dcc4 100644 --- a/binsrc/bpel/tests/interop/site/SecRMLoan/bpel.xml +++ b/binsrc/bpel/tests/interop/site/SecRMLoan/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/desc.xml b/binsrc/bpel/tests/interop/site/SecRMLoan/desc.xml index 8e3ee2654e..786800134c 100644 --- a/binsrc/bpel/tests/interop/site/SecRMLoan/desc.xml +++ b/binsrc/bpel/tests/interop/site/SecRMLoan/desc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/SecRMLoan/options.xml b/binsrc/bpel/tests/interop/site/SecRMLoan/options.xml index 714e7b68b3..cdf48357ee 100644 --- a/binsrc/bpel/tests/interop/site/SecRMLoan/options.xml +++ b/binsrc/bpel/tests/interop/site/SecRMLoan/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/about.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/about.vsp index dbb87d0062..45fb60799f 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/about.vsp +++ b/binsrc/bpel/tests/interop/site/bpel4ws/about.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/about.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/about.vspx index 113da8d6cc..4a5c39d57a 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/about.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/about.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/about.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/about.xsl index 28a3742c4c..cbd47aa5e1 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/about.xsl +++ b/binsrc/bpel/tests/interop/site/bpel4ws/about.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vsp index f7c8725802..fb8d385142 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vsp +++ b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vspx index 65ea2aa375..3c05f7fd8f 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.xsl index cf8a6bc613..7c3a8672af 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.xsl +++ b/binsrc/bpel/tests/interop/site/bpel4ws/bpelrsc.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/bpeluct.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/bpeluct.vspx index d745c44a02..caa9ffa03e 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/bpeluct.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/bpeluct.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/aechoUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/aechoUI.vspx index bed9b9acb4..812558c4f9 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/aechoUI.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/aechoUI.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/echoUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/echoUI.vspx index a245b1500d..bd8b5fb155 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/echoUI.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/echoUI.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmechoUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmechoUI.vspx index 28af0ede46..d133b74b9c 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmechoUI.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmechoUI.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmloanUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmloanUI.vspx index be99d890ec..040e5b4b87 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmloanUI.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/rmloanUI.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secechoUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secechoUI.vspx index 2faf4f5fe9..e6475ffb9c 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secechoUI.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secechoUI.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secloanUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secloanUI.vspx index 401366aa9e..5019dbab83 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secloanUI.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secloanUI.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secrmloanUI.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secrmloanUI.vspx index decaedfc77..68ba30cefb 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/secrmloanUI.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/secrmloanUI.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/clients/viewres.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/clients/viewres.vspx index c89e7e706d..1f28edde7a 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/clients/viewres.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/clients/viewres.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/common.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/common.xsl index 0a54741db6..c7e22c1bfb 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/common.xsl +++ b/binsrc/bpel/tests/interop/site/bpel4ws/common.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/default.css b/binsrc/bpel/tests/interop/site/bpel4ws/default.css index 33ff2176d1..d757d52dad 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/default.css +++ b/binsrc/bpel/tests/interop/site/bpel4ws/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/error.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/error.vspx index 3882dd78f3..3d1a2b2dee 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/error.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/home.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/home.vspx index 3af1ba143d..190ffd114b 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/home.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/home.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/interop.vsp index b42b8b24f0..83e407e604 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/interop.vsp +++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/interop.xsl index 8319bedf8c..23aa3c5003 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/interop.xsl +++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop.xsl @@ -155,7 +155,7 @@ Privacy
- Copyright &copy; 1998-2018 OpenLink Software + Copyright &copy; 1998-2019 OpenLink Software
diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_decor.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/interop_decor.vspx index 4d9f26f7f9..47ba415726 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_decor.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_decor.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_install.sql b/binsrc/bpel/tests/interop/site/bpel4ws/interop_install.sql index 38ac71d342..546e87f51d 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_install.sql +++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_install.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_main.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/interop_main.vspx index 54c871c131..8f12a3cc40 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_main.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_main.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_navigation_bar.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/interop_navigation_bar.vspx index 770ff2fa36..18aa2094a7 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_navigation_bar.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_navigation_bar.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl index b4a2d27e76..13aa47ecfb 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl +++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_style.xsl @@ -9,7 +9,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/interop_vhost.sql b/binsrc/bpel/tests/interop/site/bpel4ws/interop_vhost.sql index 8fd52dbb26..26e608ab32 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/interop_vhost.sql +++ b/binsrc/bpel/tests/interop/site/bpel4ws/interop_vhost.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/intest.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/intest.vspx index 702c5ef5e1..398948416a 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/intest.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/intest.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vsp index b3c143333a..883c93bef1 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vsp +++ b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vspx index 9c19f8ed9e..cd0f540b3b 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.xsl index cedf027d32..355af21315 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.xsl +++ b/binsrc/bpel/tests/interop/site/bpel4ws/mgrsum.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/post.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/post.vsp index 4454f8ef88..f521c0df11 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/post.vsp +++ b/binsrc/bpel/tests/interop/site/bpel4ws/post.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/post.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/post.vspx index 415d66bc80..98661c5915 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/post.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/post.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/post.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/post.xsl index a3a318bfe4..83fa3427a4 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/post.xsl +++ b/binsrc/bpel/tests/interop/site/bpel4ws/post.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vsp index ae030075a2..f44dc0f80a 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vsp +++ b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vspx index 726a1cf0f7..494cde9f98 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xml b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xml index 032821116d..f8ec2c304b 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xml +++ b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xsl index 5113822deb..6ba981b332 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xsl +++ b/binsrc/bpel/tests/interop/site/bpel4ws/protocols.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/reply.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/reply.vsp index 4aa1c6313f..619bc59eab 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/reply.vsp +++ b/binsrc/bpel/tests/interop/site/bpel4ws/reply.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/results.xml b/binsrc/bpel/tests/interop/site/bpel4ws/results.xml index dc58c54795..ba8af599f6 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/results.xml +++ b/binsrc/bpel/tests/interop/site/bpel4ws/results.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/tables.sql b/binsrc/bpel/tests/interop/site/bpel4ws/tables.sql index f218513a8f..f9b60fa1e5 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/tables.sql +++ b/binsrc/bpel/tests/interop/site/bpel4ws/tables.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vsp index 0872f235d2..df62d1c5fc 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vsp +++ b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vspx index 302e334842..81ff9655e9 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.xsl index ef9063e41b..a33b28b57a 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.xsl +++ b/binsrc/bpel/tests/interop/site/bpel4ws/tstsum.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/view.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/view.vsp index c795b8762a..9576fa6f49 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/view.vsp +++ b/binsrc/bpel/tests/interop/site/bpel4ws/view.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/view.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/view.vspx index d3fbb7272a..c3dc94aaf2 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/view.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/view.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/view.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/view.xsl index e1d2c7287f..50f1d6c13b 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/view.xsl +++ b/binsrc/bpel/tests/interop/site/bpel4ws/view.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vsp b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vsp index da70cd206c..5bfe4a94b3 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vsp +++ b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vspx b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vspx index c01393882e..c1a7dd2f2e 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vspx +++ b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.xsl b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.xsl index 6e7269da47..21e2b9c1e3 100644 --- a/binsrc/bpel/tests/interop/site/bpel4ws/wsa.xsl +++ b/binsrc/bpel/tests/interop/site/bpel4ws/wsa.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/echo/bpel.xml b/binsrc/bpel/tests/interop/site/echo/bpel.xml index 93b118440f..5e8a468f17 100644 --- a/binsrc/bpel/tests/interop/site/echo/bpel.xml +++ b/binsrc/bpel/tests/interop/site/echo/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/echo/desc.xml b/binsrc/bpel/tests/interop/site/echo/desc.xml index 15138ca91d..b30c9a0ace 100644 --- a/binsrc/bpel/tests/interop/site/echo/desc.xml +++ b/binsrc/bpel/tests/interop/site/echo/desc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/echo/echo.bpel b/binsrc/bpel/tests/interop/site/echo/echo.bpel index fd5cca25b6..1db9b8beac 100644 --- a/binsrc/bpel/tests/interop/site/echo/echo.bpel +++ b/binsrc/bpel/tests/interop/site/echo/echo.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/echo/echo.sql b/binsrc/bpel/tests/interop/site/echo/echo.sql index 8d314feb1b..f26c6687d1 100644 --- a/binsrc/bpel/tests/interop/site/echo/echo.sql +++ b/binsrc/bpel/tests/interop/site/echo/echo.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/echo/echo.wsdl b/binsrc/bpel/tests/interop/site/echo/echo.wsdl index a653d67ec4..6b9f916d6d 100644 --- a/binsrc/bpel/tests/interop/site/echo/echo.wsdl +++ b/binsrc/bpel/tests/interop/site/echo/echo.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/index.html b/binsrc/bpel/tests/interop/site/index.html index f498ada982..f667375589 100644 --- a/binsrc/bpel/tests/interop/site/index.html +++ b/binsrc/bpel/tests/interop/site/index.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/interop/site/setup.sql b/binsrc/bpel/tests/interop/site/setup.sql index 3382c7c853..7903191e9a 100644 --- a/binsrc/bpel/tests/interop/site/setup.sql +++ b/binsrc/bpel/tests/interop/site/setup.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/cmpflow.bpel b/binsrc/bpel/tests/mix/cmpflow.bpel index 352832f803..20a7d850fc 100644 --- a/binsrc/bpel/tests/mix/cmpflow.bpel +++ b/binsrc/bpel/tests/mix/cmpflow.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/cmpflow.wsdl b/binsrc/bpel/tests/mix/cmpflow.wsdl index 7e8ebcce8b..38400641ce 100644 --- a/binsrc/bpel/tests/mix/cmpflow.wsdl +++ b/binsrc/bpel/tests/mix/cmpflow.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/comp.sql b/binsrc/bpel/tests/mix/comp.sql index 9cc838f84a..abfd70ea68 100644 --- a/binsrc/bpel/tests/mix/comp.sql +++ b/binsrc/bpel/tests/mix/comp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/comp2.bpel b/binsrc/bpel/tests/mix/comp2.bpel index df0ef92ad9..b313960cae 100644 --- a/binsrc/bpel/tests/mix/comp2.bpel +++ b/binsrc/bpel/tests/mix/comp2.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/comp2.sql b/binsrc/bpel/tests/mix/comp2.sql index f84e85dacd..9705e49f8d 100644 --- a/binsrc/bpel/tests/mix/comp2.sql +++ b/binsrc/bpel/tests/mix/comp2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/comp3.bpel b/binsrc/bpel/tests/mix/comp3.bpel index 4f2fd0a732..96d1dc0d58 100644 --- a/binsrc/bpel/tests/mix/comp3.bpel +++ b/binsrc/bpel/tests/mix/comp3.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/comp4.bpel b/binsrc/bpel/tests/mix/comp4.bpel index cfd88c7602..507354d6b2 100644 --- a/binsrc/bpel/tests/mix/comp4.bpel +++ b/binsrc/bpel/tests/mix/comp4.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/comp5.bpel b/binsrc/bpel/tests/mix/comp5.bpel index 7e4f23f57c..cc88e956e7 100644 --- a/binsrc/bpel/tests/mix/comp5.bpel +++ b/binsrc/bpel/tests/mix/comp5.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/comp6.bpel b/binsrc/bpel/tests/mix/comp6.bpel index 4ed8ec9ea3..b5006700ef 100644 --- a/binsrc/bpel/tests/mix/comp6.bpel +++ b/binsrc/bpel/tests/mix/comp6.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/evcomp.bpel b/binsrc/bpel/tests/mix/evcomp.bpel index c577554f4b..15c3417850 100644 --- a/binsrc/bpel/tests/mix/evcomp.bpel +++ b/binsrc/bpel/tests/mix/evcomp.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/evcomp.wsdl b/binsrc/bpel/tests/mix/evcomp.wsdl index 064c013e46..fb7239425a 100644 --- a/binsrc/bpel/tests/mix/evcomp.wsdl +++ b/binsrc/bpel/tests/mix/evcomp.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/fault.wsdl b/binsrc/bpel/tests/mix/fault.wsdl index 5a6e1c8d95..2e830fb177 100644 --- a/binsrc/bpel/tests/mix/fault.wsdl +++ b/binsrc/bpel/tests/mix/fault.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/fault4.bpel b/binsrc/bpel/tests/mix/fault4.bpel index 35137972b0..7056c372a8 100644 --- a/binsrc/bpel/tests/mix/fault4.bpel +++ b/binsrc/bpel/tests/mix/fault4.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/ini.sql b/binsrc/bpel/tests/mix/ini.sql index d0cfdd64b5..876b956153 100644 --- a/binsrc/bpel/tests/mix/ini.sql +++ b/binsrc/bpel/tests/mix/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/ol.bpel b/binsrc/bpel/tests/mix/ol.bpel index 123eaf6b45..f2ec7d4e94 100644 --- a/binsrc/bpel/tests/mix/ol.bpel +++ b/binsrc/bpel/tests/mix/ol.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/ol.wsdl b/binsrc/bpel/tests/mix/ol.wsdl index c95bf4a626..404a5b6c25 100644 --- a/binsrc/bpel/tests/mix/ol.wsdl +++ b/binsrc/bpel/tests/mix/ol.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/olservice.wsdl b/binsrc/bpel/tests/mix/olservice.wsdl index 58865102ee..8215eac96e 100644 --- a/binsrc/bpel/tests/mix/olservice.wsdl +++ b/binsrc/bpel/tests/mix/olservice.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/recovery_test.sql b/binsrc/bpel/tests/mix/recovery_test.sql index d985fa855c..a4274e2a52 100644 --- a/binsrc/bpel/tests/mix/recovery_test.sql +++ b/binsrc/bpel/tests/mix/recovery_test.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/sw.bpel b/binsrc/bpel/tests/mix/sw.bpel index 188e66f662..d09181f850 100644 --- a/binsrc/bpel/tests/mix/sw.bpel +++ b/binsrc/bpel/tests/mix/sw.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/sw.wsdl b/binsrc/bpel/tests/mix/sw.wsdl index 1c188ff7cb..982998fa4c 100644 --- a/binsrc/bpel/tests/mix/sw.wsdl +++ b/binsrc/bpel/tests/mix/sw.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/testsvc.sql b/binsrc/bpel/tests/mix/testsvc.sql index 69e63c8df7..26cc1a6b1b 100644 --- a/binsrc/bpel/tests/mix/testsvc.sql +++ b/binsrc/bpel/tests/mix/testsvc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/timesvc.wsdl b/binsrc/bpel/tests/mix/timesvc.wsdl index e690e11eab..02563ed59d 100644 --- a/binsrc/bpel/tests/mix/timesvc.wsdl +++ b/binsrc/bpel/tests/mix/timesvc.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/tsvc.wsdl b/binsrc/bpel/tests/mix/tsvc.wsdl index a10a8a11ae..cc3ffd9528 100644 --- a/binsrc/bpel/tests/mix/tsvc.wsdl +++ b/binsrc/bpel/tests/mix/tsvc.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/while1.bpel b/binsrc/bpel/tests/mix/while1.bpel index c8c3790af4..cabdafecb6 100644 --- a/binsrc/bpel/tests/mix/while1.bpel +++ b/binsrc/bpel/tests/mix/while1.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/mix/while1.wsdl b/binsrc/bpel/tests/mix/while1.wsdl index 046bdda715..38cb2d4499 100644 --- a/binsrc/bpel/tests/mix/while1.wsdl +++ b/binsrc/bpel/tests/mix/while1.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/order/input.xml b/binsrc/bpel/tests/order/input.xml index bb33ae5a8a..0e490f9929 100644 --- a/binsrc/bpel/tests/order/input.xml +++ b/binsrc/bpel/tests/order/input.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/order/invoke.sql b/binsrc/bpel/tests/order/invoke.sql index 45eabe74a2..b9960ba3f8 100644 --- a/binsrc/bpel/tests/order/invoke.sql +++ b/binsrc/bpel/tests/order/invoke.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/order/load_all.sql b/binsrc/bpel/tests/order/load_all.sql index 3b45e6fef6..5b2ca2353d 100644 --- a/binsrc/bpel/tests/order/load_all.sql +++ b/binsrc/bpel/tests/order/load_all.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/order/order.bpel b/binsrc/bpel/tests/order/order.bpel index 591c1bae04..5712c2ed65 100644 --- a/binsrc/bpel/tests/order/order.bpel +++ b/binsrc/bpel/tests/order/order.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/order/order.sql b/binsrc/bpel/tests/order/order.sql index 9dc84c58d8..a9404f282c 100644 --- a/binsrc/bpel/tests/order/order.sql +++ b/binsrc/bpel/tests/order/order.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/order/order.wsdl b/binsrc/bpel/tests/order/order.wsdl index ba122309c4..f668354e3c 100644 --- a/binsrc/bpel/tests/order/order.wsdl +++ b/binsrc/bpel/tests/order/order.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/order/order_svc.sql b/binsrc/bpel/tests/order/order_svc.sql index 00b7c85385..c31665c228 100644 --- a/binsrc/bpel/tests/order/order_svc.sql +++ b/binsrc/bpel/tests/order/order_svc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/order/servicewsdl.vsp b/binsrc/bpel/tests/order/servicewsdl.vsp index 4e1fba2d5e..fa41c59729 100644 --- a/binsrc/bpel/tests/order/servicewsdl.vsp +++ b/binsrc/bpel/tests/order/servicewsdl.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/pick/async_svc.sql b/binsrc/bpel/tests/pick/async_svc.sql index ad14eb86f8..dde0d73c5d 100644 --- a/binsrc/bpel/tests/pick/async_svc.sql +++ b/binsrc/bpel/tests/pick/async_svc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/pick/ini.sql b/binsrc/bpel/tests/pick/ini.sql index 3308d72992..2ef447c1dd 100644 --- a/binsrc/bpel/tests/pick/ini.sql +++ b/binsrc/bpel/tests/pick/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/pick/inv.sql b/binsrc/bpel/tests/pick/inv.sql index 33105f8b75..c7832dc93b 100644 --- a/binsrc/bpel/tests/pick/inv.sql +++ b/binsrc/bpel/tests/pick/inv.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/pick/pick.bpel b/binsrc/bpel/tests/pick/pick.bpel index 7931aa79c0..2b1946a8c7 100644 --- a/binsrc/bpel/tests/pick/pick.bpel +++ b/binsrc/bpel/tests/pick/pick.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/pick/pick.wsdl b/binsrc/bpel/tests/pick/pick.wsdl index 6268c8777f..a7436e8e83 100644 --- a/binsrc/bpel/tests/pick/pick.wsdl +++ b/binsrc/bpel/tests/pick/pick.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/pick/service.wsdl b/binsrc/bpel/tests/pick/service.wsdl index e4946a2295..2c6a560edf 100644 --- a/binsrc/bpel/tests/pick/service.wsdl +++ b/binsrc/bpel/tests/pick/service.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/pick1/bpel.xml b/binsrc/bpel/tests/pick1/bpel.xml index c8c144d50b..95d2dc927d 100644 --- a/binsrc/bpel/tests/pick1/bpel.xml +++ b/binsrc/bpel/tests/pick1/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/pick1/build.xml b/binsrc/bpel/tests/pick1/build.xml index 37fe9fd862..07c1f12706 100644 --- a/binsrc/bpel/tests/pick1/build.xml +++ b/binsrc/bpel/tests/pick1/build.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/pick1/ini.sql b/binsrc/bpel/tests/pick1/ini.sql index 68b67b32ef..088f1c536f 100644 --- a/binsrc/bpel/tests/pick1/ini.sql +++ b/binsrc/bpel/tests/pick1/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/pick1/pick1.bpel b/binsrc/bpel/tests/pick1/pick1.bpel index 82e4df8ddf..c4afe3f22a 100644 --- a/binsrc/bpel/tests/pick1/pick1.bpel +++ b/binsrc/bpel/tests/pick1/pick1.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/pick1/pick1.wsdl b/binsrc/bpel/tests/pick1/pick1.wsdl index a038871f04..1c7ac1dfd6 100644 --- a/binsrc/bpel/tests/pick1/pick1.wsdl +++ b/binsrc/bpel/tests/pick1/pick1.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/post/bpel.xml b/binsrc/bpel/tests/post/bpel.xml index a0fb86f41c..a440c6e049 100644 --- a/binsrc/bpel/tests/post/bpel.xml +++ b/binsrc/bpel/tests/post/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/post/build.xml b/binsrc/bpel/tests/post/build.xml index 13c243bc5a..9d554630f5 100644 --- a/binsrc/bpel/tests/post/build.xml +++ b/binsrc/bpel/tests/post/build.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/post/ini.sql b/binsrc/bpel/tests/post/ini.sql index 30e5d641a7..11a3c96cd7 100644 --- a/binsrc/bpel/tests/post/ini.sql +++ b/binsrc/bpel/tests/post/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/post/post.bpel b/binsrc/bpel/tests/post/post.bpel index 7c28b8e985..4457989608 100644 --- a/binsrc/bpel/tests/post/post.bpel +++ b/binsrc/bpel/tests/post/post.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/post/post.wsdl b/binsrc/bpel/tests/post/post.wsdl index f821b07b58..03efe939c9 100644 --- a/binsrc/bpel/tests/post/post.wsdl +++ b/binsrc/bpel/tests/post/post.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXQuery/XQuerySample.bpel b/binsrc/bpel/tests/processXQuery/XQuerySample.bpel index f421ac1125..b68fa57048 100644 --- a/binsrc/bpel/tests/processXQuery/XQuerySample.bpel +++ b/binsrc/bpel/tests/processXQuery/XQuerySample.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXQuery/XQuerySample.wsdl b/binsrc/bpel/tests/processXQuery/XQuerySample.wsdl index 0975806e9c..8d00df22b4 100644 --- a/binsrc/bpel/tests/processXQuery/XQuerySample.wsdl +++ b/binsrc/bpel/tests/processXQuery/XQuerySample.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXQuery/books.xq b/binsrc/bpel/tests/processXQuery/books.xq index d19f07fb99..74181c358c 100644 --- a/binsrc/bpel/tests/processXQuery/books.xq +++ b/binsrc/bpel/tests/processXQuery/books.xq @@ -3,7 +3,7 @@ : This file is part of the OpenLink Software Virtuoso Open-Source (VOS) : project. : - : Copyright (C) 1998-2018 OpenLink Software + : Copyright (C) 1998-2019 OpenLink Software : : This project is free software; you can redistribute it and/or modify it : under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXQuery/bpel.xml b/binsrc/bpel/tests/processXQuery/bpel.xml index de240f7011..3a17577eda 100644 --- a/binsrc/bpel/tests/processXQuery/bpel.xml +++ b/binsrc/bpel/tests/processXQuery/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXQuery/ini.sql b/binsrc/bpel/tests/processXQuery/ini.sql index 820eed2060..305643c650 100644 --- a/binsrc/bpel/tests/processXQuery/ini.sql +++ b/binsrc/bpel/tests/processXQuery/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXQuery/invoice.xq b/binsrc/bpel/tests/processXQuery/invoice.xq index 6ecbb8be1b..a0b3ffd9b3 100644 --- a/binsrc/bpel/tests/processXQuery/invoice.xq +++ b/binsrc/bpel/tests/processXQuery/invoice.xq @@ -3,7 +3,7 @@ : This file is part of the OpenLink Software Virtuoso Open-Source (VOS) : project. : - : Copyright (C) 1998-2018 OpenLink Software + : Copyright (C) 1998-2019 OpenLink Software : : This project is free software; you can redistribute it and/or modify it : under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXQuery/options.xml b/binsrc/bpel/tests/processXQuery/options.xml index 84a029483e..07bbe1ce75 100644 --- a/binsrc/bpel/tests/processXQuery/options.xml +++ b/binsrc/bpel/tests/processXQuery/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXQuery/processXQuery.vsp b/binsrc/bpel/tests/processXQuery/processXQuery.vsp index 8bdb527de5..cd9fbdfdeb 100644 --- a/binsrc/bpel/tests/processXQuery/processXQuery.vsp +++ b/binsrc/bpel/tests/processXQuery/processXQuery.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXQuery/processXQuery.xml b/binsrc/bpel/tests/processXQuery/processXQuery.xml index 845d582080..8bf88bde4e 100644 --- a/binsrc/bpel/tests/processXQuery/processXQuery.xml +++ b/binsrc/bpel/tests/processXQuery/processXQuery.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSLT/CreditRating.vsp b/binsrc/bpel/tests/processXSLT/CreditRating.vsp index 43e828c773..06726ba78a 100644 --- a/binsrc/bpel/tests/processXSLT/CreditRating.vsp +++ b/binsrc/bpel/tests/processXSLT/CreditRating.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSLT/InvToPo.xslt b/binsrc/bpel/tests/processXSLT/InvToPo.xslt index 5bc910357b..c6394a4a1b 100644 --- a/binsrc/bpel/tests/processXSLT/InvToPo.xslt +++ b/binsrc/bpel/tests/processXSLT/InvToPo.xslt @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSLT/XSLTSample.bpel b/binsrc/bpel/tests/processXSLT/XSLTSample.bpel index 7b044e636a..5928c0a916 100644 --- a/binsrc/bpel/tests/processXSLT/XSLTSample.bpel +++ b/binsrc/bpel/tests/processXSLT/XSLTSample.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSLT/XSLTSample.wsdl b/binsrc/bpel/tests/processXSLT/XSLTSample.wsdl index 721d9f384f..6097c8c03c 100644 --- a/binsrc/bpel/tests/processXSLT/XSLTSample.wsdl +++ b/binsrc/bpel/tests/processXSLT/XSLTSample.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSLT/XSLTSample.xslt b/binsrc/bpel/tests/processXSLT/XSLTSample.xslt index 8e9aaff7b7..c487723450 100644 --- a/binsrc/bpel/tests/processXSLT/XSLTSample.xslt +++ b/binsrc/bpel/tests/processXSLT/XSLTSample.xslt @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSLT/bpel.xml b/binsrc/bpel/tests/processXSLT/bpel.xml index c239a509ae..d9b7f93fa4 100644 --- a/binsrc/bpel/tests/processXSLT/bpel.xml +++ b/binsrc/bpel/tests/processXSLT/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSLT/ini.sql b/binsrc/bpel/tests/processXSLT/ini.sql index b60ce0ff03..15b6f07fe6 100644 --- a/binsrc/bpel/tests/processXSLT/ini.sql +++ b/binsrc/bpel/tests/processXSLT/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSLT/options.xml b/binsrc/bpel/tests/processXSLT/options.xml index 893887922d..af07d50ac1 100644 --- a/binsrc/bpel/tests/processXSLT/options.xml +++ b/binsrc/bpel/tests/processXSLT/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSLT/processXSLT.sql b/binsrc/bpel/tests/processXSLT/processXSLT.sql index 1d0f973d73..f02a65d687 100644 --- a/binsrc/bpel/tests/processXSLT/processXSLT.sql +++ b/binsrc/bpel/tests/processXSLT/processXSLT.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSLT/processXSLT.vsp b/binsrc/bpel/tests/processXSLT/processXSLT.vsp index 8bdb527de5..cd9fbdfdeb 100644 --- a/binsrc/bpel/tests/processXSLT/processXSLT.vsp +++ b/binsrc/bpel/tests/processXSLT/processXSLT.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSLT/processXSLT.xml b/binsrc/bpel/tests/processXSLT/processXSLT.xml index 735cf6e5f4..341211b4d3 100644 --- a/binsrc/bpel/tests/processXSLT/processXSLT.xml +++ b/binsrc/bpel/tests/processXSLT/processXSLT.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSQL/XSQLSample.bpel b/binsrc/bpel/tests/processXSQL/XSQLSample.bpel index 0ff8820b3f..49309db166 100644 --- a/binsrc/bpel/tests/processXSQL/XSQLSample.bpel +++ b/binsrc/bpel/tests/processXSQL/XSQLSample.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSQL/XSQLSample.wsdl b/binsrc/bpel/tests/processXSQL/XSQLSample.wsdl index 7b396255ec..46ae9b7471 100644 --- a/binsrc/bpel/tests/processXSQL/XSQLSample.wsdl +++ b/binsrc/bpel/tests/processXSQL/XSQLSample.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSQL/bpel.xml b/binsrc/bpel/tests/processXSQL/bpel.xml index c6672528c1..47ac07f280 100644 --- a/binsrc/bpel/tests/processXSQL/bpel.xml +++ b/binsrc/bpel/tests/processXSQL/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSQL/ini.sql b/binsrc/bpel/tests/processXSQL/ini.sql index ff122705f6..16dbee5b0b 100644 --- a/binsrc/bpel/tests/processXSQL/ini.sql +++ b/binsrc/bpel/tests/processXSQL/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSQL/options.xml b/binsrc/bpel/tests/processXSQL/options.xml index 951154cded..3bdc8acff3 100644 --- a/binsrc/bpel/tests/processXSQL/options.xml +++ b/binsrc/bpel/tests/processXSQL/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSQL/processXSQL.vsp b/binsrc/bpel/tests/processXSQL/processXSQL.vsp index 8bdb527de5..cd9fbdfdeb 100644 --- a/binsrc/bpel/tests/processXSQL/processXSQL.vsp +++ b/binsrc/bpel/tests/processXSQL/processXSQL.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSQL/processXSQL.xml b/binsrc/bpel/tests/processXSQL/processXSQL.xml index e3f2cf7a6c..5c711c6750 100644 --- a/binsrc/bpel/tests/processXSQL/processXSQL.xml +++ b/binsrc/bpel/tests/processXSQL/processXSQL.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSQL/processXSQL_ini.sql b/binsrc/bpel/tests/processXSQL/processXSQL_ini.sql index 19eeddd99a..4eea221ffc 100644 --- a/binsrc/bpel/tests/processXSQL/processXSQL_ini.sql +++ b/binsrc/bpel/tests/processXSQL/processXSQL_ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSQL/selectCustomer.xsql b/binsrc/bpel/tests/processXSQL/selectCustomer.xsql index c1d8d88be5..c0270f15f4 100644 --- a/binsrc/bpel/tests/processXSQL/selectCustomer.xsql +++ b/binsrc/bpel/tests/processXSQL/selectCustomer.xsql @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/processXSQL/selectProduct.xsql b/binsrc/bpel/tests/processXSQL/selectProduct.xsql index 5a0181537c..d988dd1808 100644 --- a/binsrc/bpel/tests/processXSQL/selectProduct.xsql +++ b/binsrc/bpel/tests/processXSQL/selectProduct.xsql @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/sqlexec/bpel.xml b/binsrc/bpel/tests/sqlexec/bpel.xml index f1db4cabd8..4040d9b08b 100644 --- a/binsrc/bpel/tests/sqlexec/bpel.xml +++ b/binsrc/bpel/tests/sqlexec/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/sqlexec/inventory.bpel b/binsrc/bpel/tests/sqlexec/inventory.bpel index ca826005a8..067c27a208 100644 --- a/binsrc/bpel/tests/sqlexec/inventory.bpel +++ b/binsrc/bpel/tests/sqlexec/inventory.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/sqlexec/inventory.wsdl b/binsrc/bpel/tests/sqlexec/inventory.wsdl index 99fd271cf8..c4e78ce899 100644 --- a/binsrc/bpel/tests/sqlexec/inventory.wsdl +++ b/binsrc/bpel/tests/sqlexec/inventory.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/sqlexec/options.xml b/binsrc/bpel/tests/sqlexec/options.xml index d55f565659..67a94b203c 100644 --- a/binsrc/bpel/tests/sqlexec/options.xml +++ b/binsrc/bpel/tests/sqlexec/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/sqlexec/sqlexec.vsp b/binsrc/bpel/tests/sqlexec/sqlexec.vsp index 8bdb527de5..cd9fbdfdeb 100644 --- a/binsrc/bpel/tests/sqlexec/sqlexec.vsp +++ b/binsrc/bpel/tests/sqlexec/sqlexec.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/sqlexec/sqlexec.xml b/binsrc/bpel/tests/sqlexec/sqlexec.xml index 31048eb6f0..ddac07d9cb 100644 --- a/binsrc/bpel/tests/sqlexec/sqlexec.xml +++ b/binsrc/bpel/tests/sqlexec/sqlexec.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/sqlexec/store.sql b/binsrc/bpel/tests/sqlexec/store.sql index aec7718df2..d3f40d8e5f 100644 --- a/binsrc/bpel/tests/sqlexec/store.sql +++ b/binsrc/bpel/tests/sqlexec/store.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/sqlexec/store.vsp b/binsrc/bpel/tests/sqlexec/store.vsp index f7d918c927..0a7f25b1a8 100644 --- a/binsrc/bpel/tests/sqlexec/store.vsp +++ b/binsrc/bpel/tests/sqlexec/store.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t1/buyer/Buyer.bpel b/binsrc/bpel/tests/t1/buyer/Buyer.bpel index 8a04a7dd79..af766d4b81 100644 --- a/binsrc/bpel/tests/t1/buyer/Buyer.bpel +++ b/binsrc/bpel/tests/t1/buyer/Buyer.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t1/buyer/Buyer.wsdl b/binsrc/bpel/tests/t1/buyer/Buyer.wsdl index fc6acebbba..ed732a7f9d 100644 --- a/binsrc/bpel/tests/t1/buyer/Buyer.wsdl +++ b/binsrc/bpel/tests/t1/buyer/Buyer.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t1/buyer/ini.sql b/binsrc/bpel/tests/t1/buyer/ini.sql index 30ddf2e63a..ad3e8041d0 100644 --- a/binsrc/bpel/tests/t1/buyer/ini.sql +++ b/binsrc/bpel/tests/t1/buyer/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t1/buyer/supplyCorrelation.wsdl b/binsrc/bpel/tests/t1/buyer/supplyCorrelation.wsdl index 98aa9d58f0..1bf895090f 100644 --- a/binsrc/bpel/tests/t1/buyer/supplyCorrelation.wsdl +++ b/binsrc/bpel/tests/t1/buyer/supplyCorrelation.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t1/buyer/supplyMessages.wsdl b/binsrc/bpel/tests/t1/buyer/supplyMessages.wsdl index c21c33f194..4db9adf724 100644 --- a/binsrc/bpel/tests/t1/buyer/supplyMessages.wsdl +++ b/binsrc/bpel/tests/t1/buyer/supplyMessages.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t1/seller/Seller.bpel b/binsrc/bpel/tests/t1/seller/Seller.bpel index a89c7f7585..a1ffb67ec5 100644 --- a/binsrc/bpel/tests/t1/seller/Seller.bpel +++ b/binsrc/bpel/tests/t1/seller/Seller.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t1/seller/Seller.wsdl b/binsrc/bpel/tests/t1/seller/Seller.wsdl index 47c1dddde2..a07758f929 100644 --- a/binsrc/bpel/tests/t1/seller/Seller.wsdl +++ b/binsrc/bpel/tests/t1/seller/Seller.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t1/seller/ini.sql b/binsrc/bpel/tests/t1/seller/ini.sql index 00a7a27a5f..d4d018b06e 100644 --- a/binsrc/bpel/tests/t1/seller/ini.sql +++ b/binsrc/bpel/tests/t1/seller/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t1/seller/supplyCorrelation.wsdl b/binsrc/bpel/tests/t1/seller/supplyCorrelation.wsdl index 98aa9d58f0..1bf895090f 100644 --- a/binsrc/bpel/tests/t1/seller/supplyCorrelation.wsdl +++ b/binsrc/bpel/tests/t1/seller/supplyCorrelation.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t1/seller/supplyMessages.wsdl b/binsrc/bpel/tests/t1/seller/supplyMessages.wsdl index c21c33f194..4db9adf724 100644 --- a/binsrc/bpel/tests/t1/seller/supplyMessages.wsdl +++ b/binsrc/bpel/tests/t1/seller/supplyMessages.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t2/FlowSample.bpel b/binsrc/bpel/tests/t2/FlowSample.bpel index 1f4a507042..a8bfe1c614 100644 --- a/binsrc/bpel/tests/t2/FlowSample.bpel +++ b/binsrc/bpel/tests/t2/FlowSample.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t2/FlowSample.wsdl b/binsrc/bpel/tests/t2/FlowSample.wsdl index 96e8a0e201..d9683ed19f 100644 --- a/binsrc/bpel/tests/t2/FlowSample.wsdl +++ b/binsrc/bpel/tests/t2/FlowSample.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t2/bpel.xml b/binsrc/bpel/tests/t2/bpel.xml index f2f4be68b3..12200468f0 100644 --- a/binsrc/bpel/tests/t2/bpel.xml +++ b/binsrc/bpel/tests/t2/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t2/build.xml b/binsrc/bpel/tests/t2/build.xml index 3c40c69cd3..2b33605b6d 100644 --- a/binsrc/bpel/tests/t2/build.xml +++ b/binsrc/bpel/tests/t2/build.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/t2/ini.sql b/binsrc/bpel/tests/t2/ini.sql index b0e61d6400..4431fed46b 100644 --- a/binsrc/bpel/tests/t2/ini.sql +++ b/binsrc/bpel/tests/t2/ini.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tevent/AsyncBPELService.wsdl b/binsrc/bpel/tests/tevent/AsyncBPELService.wsdl index d2ab30a992..936c48a40f 100644 --- a/binsrc/bpel/tests/tevent/AsyncBPELService.wsdl +++ b/binsrc/bpel/tests/tevent/AsyncBPELService.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.bpel b/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.bpel index d690e8f359..732eca08cc 100644 --- a/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.bpel +++ b/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.wsdl b/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.wsdl index a288a0d31f..c2b363423d 100644 --- a/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.wsdl +++ b/binsrc/bpel/tests/tevent/AsyncBPELService/AsyncBPELService.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tevent/AsyncBPELService/bpel.xml b/binsrc/bpel/tests/tevent/AsyncBPELService/bpel.xml index ac39ac35b2..197b2d7c4f 100644 --- a/binsrc/bpel/tests/tevent/AsyncBPELService/bpel.xml +++ b/binsrc/bpel/tests/tevent/AsyncBPELService/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tevent/Event.bpel b/binsrc/bpel/tests/tevent/Event.bpel index 27bebe66dc..b5f4430f9e 100644 --- a/binsrc/bpel/tests/tevent/Event.bpel +++ b/binsrc/bpel/tests/tevent/Event.bpel @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tevent/Event.wsdl b/binsrc/bpel/tests/tevent/Event.wsdl index 2fcffcc90c..ba9cf688c9 100644 --- a/binsrc/bpel/tests/tevent/Event.wsdl +++ b/binsrc/bpel/tests/tevent/Event.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tevent/bpel.xml b/binsrc/bpel/tests/tevent/bpel.xml index a388cdf8af..6f8036e4eb 100644 --- a/binsrc/bpel/tests/tevent/bpel.xml +++ b/binsrc/bpel/tests/tevent/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tevent/tevent.sql b/binsrc/bpel/tests/tevent/tevent.sql index c607849cc3..00cd5a481e 100644 --- a/binsrc/bpel/tests/tevent/tevent.sql +++ b/binsrc/bpel/tests/tevent/tevent.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/Sut.bpel b/binsrc/bpel/tests/tpcc/Sut.bpel index e1eb043f95..ed32e87f60 100644 --- a/binsrc/bpel/tests/tpcc/Sut.bpel +++ b/binsrc/bpel/tests/tpcc/Sut.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/Sut.wsdl b/binsrc/bpel/tests/tpcc/Sut.wsdl index da890bcd9b..cdf51b0541 100644 --- a/binsrc/bpel/tests/tpcc/Sut.wsdl +++ b/binsrc/bpel/tests/tpcc/Sut.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/chk.sql b/binsrc/bpel/tests/tpcc/chk.sql index 49fc277151..4459e10a04 100644 --- a/binsrc/bpel/tests/tpcc/chk.sql +++ b/binsrc/bpel/tests/tpcc/chk.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/dbservices.wsdl b/binsrc/bpel/tests/tpcc/dbservices.wsdl index 218ca5964b..479e094cfa 100644 --- a/binsrc/bpel/tests/tpcc/dbservices.wsdl +++ b/binsrc/bpel/tests/tpcc/dbservices.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/delqr.sql b/binsrc/bpel/tests/tpcc/delqr.sql index d65cdfe0a7..01f0ebe028 100644 --- a/binsrc/bpel/tests/tpcc/delqr.sql +++ b/binsrc/bpel/tests/tpcc/delqr.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/endp.sql b/binsrc/bpel/tests/tpcc/endp.sql index 7bd79b9f9e..5bdd1a951b 100644 --- a/binsrc/bpel/tests/tpcc/endp.sql +++ b/binsrc/bpel/tests/tpcc/endp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/load.sql b/binsrc/bpel/tests/tpcc/load.sql index 2c8f9925a2..5f29c80407 100644 --- a/binsrc/bpel/tests/tpcc/load.sql +++ b/binsrc/bpel/tests/tpcc/load.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/procedures-list-DB.sql b/binsrc/bpel/tests/tpcc/procedures-list-DB.sql index 179710903d..393fa7516f 100644 --- a/binsrc/bpel/tests/tpcc/procedures-list-DB.sql +++ b/binsrc/bpel/tests/tpcc/procedures-list-DB.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/procedures-list-TD.sql b/binsrc/bpel/tests/tpcc/procedures-list-TD.sql index 01f34aa03f..1cf562aed7 100644 --- a/binsrc/bpel/tests/tpcc/procedures-list-TD.sql +++ b/binsrc/bpel/tests/tpcc/procedures-list-TD.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/qr.sql b/binsrc/bpel/tests/tpcc/qr.sql index 5014d4a079..084271d876 100644 --- a/binsrc/bpel/tests/tpcc/qr.sql +++ b/binsrc/bpel/tests/tpcc/qr.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/run.sh b/binsrc/bpel/tests/tpcc/run.sh index 11230ebfd3..e92854134c 100755 --- a/binsrc/bpel/tests/tpcc/run.sh +++ b/binsrc/bpel/tests/tpcc/run.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/tdservices.wsdl b/binsrc/bpel/tests/tpcc/tdservices.wsdl index 11312c8f86..95471285b4 100644 --- a/binsrc/bpel/tests/tpcc/tdservices.wsdl +++ b/binsrc/bpel/tests/tpcc/tdservices.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/test.sql b/binsrc/bpel/tests/tpcc/test.sql index f5a6334bc1..4033df9cdc 100644 --- a/binsrc/bpel/tests/tpcc/test.sql +++ b/binsrc/bpel/tests/tpcc/test.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tpcc/test1.sql b/binsrc/bpel/tests/tpcc/test1.sql index 8ffaa704dc..828cc168d3 100644 --- a/binsrc/bpel/tests/tpcc/test1.sql +++ b/binsrc/bpel/tests/tpcc/test1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tver/service.wsdl b/binsrc/bpel/tests/tver/service.wsdl index b3154567f3..f72b082a4e 100644 --- a/binsrc/bpel/tests/tver/service.wsdl +++ b/binsrc/bpel/tests/tver/service.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tver/tver.bpel b/binsrc/bpel/tests/tver/tver.bpel index 5962d4eea1..b6bcde411d 100644 --- a/binsrc/bpel/tests/tver/tver.bpel +++ b/binsrc/bpel/tests/tver/tver.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tver/tver.sql b/binsrc/bpel/tests/tver/tver.sql index 918611287a..7cc193e67d 100644 --- a/binsrc/bpel/tests/tver/tver.sql +++ b/binsrc/bpel/tests/tver/tver.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tver/tver.wsdl b/binsrc/bpel/tests/tver/tver.wsdl index dc184bb07e..ddaee3a8d3 100644 --- a/binsrc/bpel/tests/tver/tver.wsdl +++ b/binsrc/bpel/tests/tver/tver.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tver/tvernew1.bpel b/binsrc/bpel/tests/tver/tvernew1.bpel index 2f03791fdb..9550b0fba1 100644 --- a/binsrc/bpel/tests/tver/tvernew1.bpel +++ b/binsrc/bpel/tests/tver/tvernew1.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/tver/tvernew2.bpel b/binsrc/bpel/tests/tver/tvernew2.bpel index 10aa2d1db9..2c0f90ec57 100644 --- a/binsrc/bpel/tests/tver/tvernew2.bpel +++ b/binsrc/bpel/tests/tver/tvernew2.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/wsrm/doc.bpel b/binsrc/bpel/tests/wsrm/doc.bpel index 91e78b69ff..88f72cb9d4 100644 --- a/binsrc/bpel/tests/wsrm/doc.bpel +++ b/binsrc/bpel/tests/wsrm/doc.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/wsrm/doc.wsdl b/binsrc/bpel/tests/wsrm/doc.wsdl index 2cd9f6c48d..9419961543 100644 --- a/binsrc/bpel/tests/wsrm/doc.wsdl +++ b/binsrc/bpel/tests/wsrm/doc.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/wsrm/wsrmdoc.sql b/binsrc/bpel/tests/wsrm/wsrmdoc.sql index 6859be3c5a..ff0a296e27 100644 --- a/binsrc/bpel/tests/wsrm/wsrmdoc.sql +++ b/binsrc/bpel/tests/wsrm/wsrmdoc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/wsrm/wsrmsvc.wsdl b/binsrc/bpel/tests/wsrm/wsrmsvc.wsdl index 3818f00d3d..a7c8b00480 100644 --- a/binsrc/bpel/tests/wsrm/wsrmsvc.wsdl +++ b/binsrc/bpel/tests/wsrm/wsrmsvc.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/wss/doc.bpel b/binsrc/bpel/tests/wss/doc.bpel index f95c48c93b..9a18251fed 100644 --- a/binsrc/bpel/tests/wss/doc.bpel +++ b/binsrc/bpel/tests/wss/doc.bpel @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/wss/doc.wsdl b/binsrc/bpel/tests/wss/doc.wsdl index 2cd9f6c48d..9419961543 100644 --- a/binsrc/bpel/tests/wss/doc.wsdl +++ b/binsrc/bpel/tests/wss/doc.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/wss/secdoc.sql b/binsrc/bpel/tests/wss/secdoc.sql index 0b2d736cd2..148342b541 100644 --- a/binsrc/bpel/tests/wss/secdoc.sql +++ b/binsrc/bpel/tests/wss/secdoc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/tests/wss/secsvc.wsdl b/binsrc/bpel/tests/wss/secsvc.wsdl index e8e23a9c82..b81932644b 100644 --- a/binsrc/bpel/tests/wss/secsvc.wsdl +++ b/binsrc/bpel/tests/wss/secsvc.wsdl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/time.vsp b/binsrc/bpel/time.vsp index 3001e5d85c..40d32a5022 100644 --- a/binsrc/bpel/time.vsp +++ b/binsrc/bpel/time.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/upload_new.vspx b/binsrc/bpel/upload_new.vspx index a9738f1c1d..0544be14fb 100644 --- a/binsrc/bpel/upload_new.vspx +++ b/binsrc/bpel/upload_new.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/view.vspx b/binsrc/bpel/view.vspx index c3c2a3d9ab..ed4a602b62 100644 --- a/binsrc/bpel/view.vspx +++ b/binsrc/bpel/view.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/virtuoso_splash.vspx b/binsrc/bpel/virtuoso_splash.vspx index b7e9cd7a99..2ab68db38b 100644 --- a/binsrc/bpel/virtuoso_splash.vspx +++ b/binsrc/bpel/virtuoso_splash.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/wsdl.xsd b/binsrc/bpel/wsdl.xsd index e62c7db74a..55f8b8f5ae 100644 --- a/binsrc/bpel/wsdl.xsd +++ b/binsrc/bpel/wsdl.xsd @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/wss_keys.vspx b/binsrc/bpel/wss_keys.vspx index 6a2eefe5e8..8d056833a7 100644 --- a/binsrc/bpel/wss_keys.vspx +++ b/binsrc/bpel/wss_keys.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/xsql.sql b/binsrc/bpel/xsql.sql index cf037d2ce2..2088c760a6 100644 --- a/binsrc/bpel/xsql.sql +++ b/binsrc/bpel/xsql.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/xsql.xsd b/binsrc/bpel/xsql.xsd index 2341288962..7def354f55 100644 --- a/binsrc/bpel/xsql.xsd +++ b/binsrc/bpel/xsql.xsd @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/bpel/xsql2virtPL.xsl b/binsrc/bpel/xsql2virtPL.xsl index 7e517c0dd5..8dd26a42e5 100644 --- a/binsrc/bpel/xsql2virtPL.xsl +++ b/binsrc/bpel/xsql2virtPL.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/cached_resources/Makefile.am b/binsrc/cached_resources/Makefile.am index 5580b38fcd..3efb8e0210 100644 --- a/binsrc/cached_resources/Makefile.am +++ b/binsrc/cached_resources/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/cached_resources/cache_gen.sh b/binsrc/cached_resources/cache_gen.sh index ad89fa4d27..004d49e952 100755 --- a/binsrc/cached_resources/cache_gen.sh +++ b/binsrc/cached_resources/cache_gen.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/cached_resources/openlinksw-sparql/virtrdf-data-formats.ttl b/binsrc/cached_resources/openlinksw-sparql/virtrdf-data-formats.ttl index 8d318ab11d..95f53efd9e 100644 --- a/binsrc/cached_resources/openlinksw-sparql/virtrdf-data-formats.ttl +++ b/binsrc/cached_resources/openlinksw-sparql/virtrdf-data-formats.ttl @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/cached_resources/openlinksw-sparql/virtrdf-quad-storages.ttl b/binsrc/cached_resources/openlinksw-sparql/virtrdf-quad-storages.ttl index 1455230418..95a32108ce 100644 --- a/binsrc/cached_resources/openlinksw-sparql/virtrdf-quad-storages.ttl +++ b/binsrc/cached_resources/openlinksw-sparql/virtrdf-quad-storages.ttl @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/cached_resources/res_to_c.awk b/binsrc/cached_resources/res_to_c.awk index f8ae285de2..70cc2106bd 100644 --- a/binsrc/cached_resources/res_to_c.awk +++ b/binsrc/cached_resources/res_to_c.awk @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/.gitignore b/binsrc/conductor/.gitignore similarity index 100% rename from binsrc/yacutia/.gitignore rename to binsrc/conductor/.gitignore diff --git a/binsrc/yacutia/INSTALL b/binsrc/conductor/INSTALL similarity index 100% rename from binsrc/yacutia/INSTALL rename to binsrc/conductor/INSTALL diff --git a/binsrc/yacutia/Makefile.am b/binsrc/conductor/Makefile.am similarity index 97% rename from binsrc/yacutia/Makefile.am rename to binsrc/conductor/Makefile.am index 4638b3845c..d9679c9e6b 100644 --- a/binsrc/yacutia/Makefile.am +++ b/binsrc/conductor/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/README b/binsrc/conductor/README similarity index 100% rename from binsrc/yacutia/README rename to binsrc/conductor/README diff --git a/binsrc/yacutia/account_create.vspx b/binsrc/conductor/account_create.vspx similarity index 99% rename from binsrc/yacutia/account_create.vspx rename to binsrc/conductor/account_create.vspx index b175cb35ea..ce8b43e426 100644 --- a/binsrc/yacutia/account_create.vspx +++ b/binsrc/conductor/account_create.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -88,12 +88,9 @@ } ]]> - +
- -
- - -
@@ -112,7 +109,7 @@ -   + &nbsp;
@@ -1170,9 +1167,6 @@
-
diff --git a/binsrc/yacutia/account_remove.vspx b/binsrc/conductor/account_remove.vspx similarity index 98% rename from binsrc/yacutia/account_remove.vspx rename to binsrc/conductor/account_remove.vspx index cdcc682377..6255c74f99 100644 --- a/binsrc/yacutia/account_remove.vspx +++ b/binsrc/conductor/account_remove.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/accounts.vspx b/binsrc/conductor/accounts.vspx similarity index 99% rename from binsrc/yacutia/accounts.vspx rename to binsrc/conductor/accounts.vspx index e31a275e7c..0c2d3c7912 100644 --- a/binsrc/yacutia/accounts.vspx +++ b/binsrc/conductor/accounts.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/accounts_page.vspx b/binsrc/conductor/accounts_page.vspx similarity index 96% rename from binsrc/yacutia/accounts_page.vspx rename to binsrc/conductor/accounts_page.vspx index fc44ecf01f..9eabd109e6 100644 --- a/binsrc/yacutia/accounts_page.vspx +++ b/binsrc/conductor/accounts_page.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -20,7 +20,8 @@ - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - --> - -   + &nbsp; diff --git a/binsrc/yacutia/adm_login.vspx b/binsrc/conductor/adm_login.vspx similarity index 97% rename from binsrc/yacutia/adm_login.vspx rename to binsrc/conductor/adm_login.vspx index ba6031f80d..9121841456 100644 --- a/binsrc/yacutia/adm_login.vspx +++ b/binsrc/conductor/adm_login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -61,6 +61,7 @@ } if (is_https_ctx () and __proc_exists ('DB.DBA.FOAF_SSL_AUTH_ACL')) { + commit work; if (FOAF_SSL_AUTH_ACL ('CONDUCTOR', 'virtuoso_admin')) { declare pars, fing any; @@ -121,19 +122,19 @@ -   + &nbsp; -   + &nbsp; -   + &nbsp; diff --git a/binsrc/yacutia/adm_navigation_bar.vspx b/binsrc/conductor/adm_navigation_bar.vspx similarity index 99% rename from binsrc/yacutia/adm_navigation_bar.vspx rename to binsrc/conductor/adm_navigation_bar.vspx index 4ad94ba56c..7f76d4af6b 100644 --- a/binsrc/yacutia/adm_navigation_bar.vspx +++ b/binsrc/conductor/adm_navigation_bar.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/admin_utils.js b/binsrc/conductor/admin_utils.js similarity index 99% rename from binsrc/yacutia/admin_utils.js rename to binsrc/conductor/admin_utils.js index 3d52d2989d..c6e7d69753 100644 --- a/binsrc/yacutia/admin_utils.js +++ b/binsrc/conductor/admin_utils.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/back_nav.vspx b/binsrc/conductor/back_nav.vspx similarity index 97% rename from binsrc/yacutia/back_nav.vspx rename to binsrc/conductor/back_nav.vspx index 3a49e56280..e5ac8965fc 100644 --- a/binsrc/yacutia/back_nav.vspx +++ b/binsrc/conductor/back_nav.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/bpel_service.vspx b/binsrc/conductor/bpel_service.vspx similarity index 97% rename from binsrc/yacutia/bpel_service.vspx rename to binsrc/conductor/bpel_service.vspx index 7e13d86db1..994e6cee1a 100644 --- a/binsrc/yacutia/bpel_service.vspx +++ b/binsrc/conductor/bpel_service.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/capabilities.vspx b/binsrc/conductor/capabilities.vspx similarity index 99% rename from binsrc/yacutia/capabilities.vspx rename to binsrc/conductor/capabilities.vspx index dfea7254b7..9bbd27389d 100644 --- a/binsrc/yacutia/capabilities.vspx +++ b/binsrc/conductor/capabilities.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/caps_browser.vspx b/binsrc/conductor/caps_browser.vspx similarity index 99% rename from binsrc/yacutia/caps_browser.vspx rename to binsrc/conductor/caps_browser.vspx index c4ea568861..3b4dc62cc7 100644 --- a/binsrc/yacutia/caps_browser.vspx +++ b/binsrc/conductor/caps_browser.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -90,7 +90,7 @@ -   + &nbsp; diff --git a/binsrc/yacutia/caps_cols_browser.vspx b/binsrc/conductor/caps_cols_browser.vspx similarity index 99% rename from binsrc/yacutia/caps_cols_browser.vspx rename to binsrc/conductor/caps_cols_browser.vspx index a3f830292a..6ef62fecce 100644 --- a/binsrc/yacutia/caps_cols_browser.vspx +++ b/binsrc/conductor/caps_cols_browser.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -81,7 +81,7 @@ -   + &nbsp; diff --git a/binsrc/yacutia/cond_common.js b/binsrc/conductor/cond_common.js similarity index 98% rename from binsrc/yacutia/cond_common.js rename to binsrc/conductor/cond_common.js index adc02dc707..954c723b57 100644 --- a/binsrc/yacutia/cond_common.js +++ b/binsrc/conductor/cond_common.js @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/cond_help.css b/binsrc/conductor/cond_help.css similarity index 96% rename from binsrc/yacutia/cond_help.css rename to binsrc/conductor/cond_help.css index 0dbbfc2491..0af597b1e4 100644 --- a/binsrc/yacutia/cond_help.css +++ b/binsrc/conductor/cond_help.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/cond_help.html b/binsrc/conductor/cond_help.html similarity index 96% rename from binsrc/yacutia/cond_help.html rename to binsrc/conductor/cond_help.html index f16af5c7c7..ad1a3a2a7b 100644 --- a/binsrc/yacutia/cond_help.html +++ b/binsrc/conductor/cond_help.html @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/cond_help.js b/binsrc/conductor/cond_help.js similarity index 98% rename from binsrc/yacutia/cond_help.js rename to binsrc/conductor/cond_help.js index 67fca4d741..ae1d18b232 100644 --- a/binsrc/yacutia/cond_help.js +++ b/binsrc/conductor/cond_help.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/cond_help.xsl b/binsrc/conductor/cond_help.xsl similarity index 99% rename from binsrc/yacutia/cond_help.xsl rename to binsrc/conductor/cond_help.xsl index dbfb0eb32d..7a0803dddf 100644 --- a/binsrc/yacutia/cond_help.xsl +++ b/binsrc/conductor/cond_help.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/conductor.list b/binsrc/conductor/conductor.list similarity index 98% rename from binsrc/yacutia/conductor.list rename to binsrc/conductor/conductor.list index f930270f90..7f64b0576d 100644 --- a/binsrc/yacutia/conductor.list +++ b/binsrc/conductor/conductor.list @@ -56,8 +56,12 @@ conductor/dav/image/bmklet_32.png conductor/dav/image/c.gif conductor/dav/image/close_16.png conductor/dav/image/copy_32.png +conductor/dav/image/dav/addressbook_16.png conductor/dav/image/dav/blog_16.png +conductor/dav/image/dav/bookmarks_16.png +conductor/dav/image/dav/calendar_16.png conductor/dav/image/dav/category_16.png +conductor/dav/image/dav/discussion_16.png conductor/dav/image/dav/enews_16.png conductor/dav/image/dav/foldr_16.png conductor/dav/image/dav/generic_file.png @@ -348,7 +352,6 @@ conductor/logging_tab.vspx conductor/logging_tab.xsl conductor/logging_view.vspx conductor/logging.vspx -conductor/login_keys.vspx conductor/main_tabs.vspx conductor/make.xsl conductor/mapped_schema_xml.vspx @@ -407,7 +410,6 @@ conductor/sec_pki_3.vspx conductor/sec_pki_4.vspx conductor/sec_pki_download.vsp conductor/sec_pki_drop.vspx -conductor/sec_pki_val.vspx conductor/site.vspx conductor/soap_del_path.vspx conductor/soap_options_edit.vspx diff --git a/binsrc/yacutia/cont_management.vspx b/binsrc/conductor/cont_management.vspx similarity index 85% rename from binsrc/yacutia/cont_management.vspx rename to binsrc/conductor/cont_management.vspx index 8192513a8b..aa6f6b8111 100644 --- a/binsrc/yacutia/cont_management.vspx +++ b/binsrc/conductor/cont_management.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -73,6 +73,20 @@ setFooter(); window.onresize = function() {setFooter();} } + + document.onkeydown = function(e) { + e = e || window.event; + if (e.keyCode == 27) { + var v = $$('WEBDAV_formFooter', 'RC', 'div'); + for (var i = 0; i < v.length; i++) { + var vv = v[i].getElementsByTagName('input'); + for (var j = 0; j < vv.length; j++) { + if (vv[j].value == 'Cancel') + vv[j].click(); + } + } + } + }; ]]> diff --git a/binsrc/yacutia/cont_management_types.vspx b/binsrc/conductor/cont_management_types.vspx similarity index 99% rename from binsrc/yacutia/cont_management_types.vspx rename to binsrc/conductor/cont_management_types.vspx index 14d54c0f89..0597b23857 100644 --- a/binsrc/yacutia/cont_management_types.vspx +++ b/binsrc/conductor/cont_management_types.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/conductor/cont_page.vspx b/binsrc/conductor/cont_page.vspx new file mode 100644 index 0000000000..bac1f1a740 --- /dev/null +++ b/binsrc/conductor/cont_page.vspx @@ -0,0 +1,86 @@ + + + + doctype="-//W3C//DTD XHTML 1.0 Transitional//EN" + doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + + WebDAV Content Management + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + +
+ + + + +
+ + + + + + + + + + + + +
+
+ + + diff --git a/binsrc/conductor/cont_type_edit.vspx b/binsrc/conductor/cont_type_edit.vspx new file mode 100644 index 0000000000..9508fe67ac --- /dev/null +++ b/binsrc/conductor/cont_type_edit.vspx @@ -0,0 +1,261 @@ + + + + + WebDAV Content Management + + + + + + + + + +

+ +

+ + + + + - - - - + + + +
+ + + + + + + + +
+ + + + + + + Resource Types + + &nbsp; +
+ + + + +
+ + + +
+ + + + + + + + + + + + + + + + +
File Extension + + + + + + + +
MIME Type + + + + + + + +
Description + + + + + +
+ + + + + + 'edit') + { + ?> + + + + + '') + { + goto endp; + } + _extension := ''; + _type := ''; + _descr := ''; + _extension := get_keyword('extension', params, ''); + _extension := rtrim(_extension); + _extension := ltrim(_extension); + _type := get_keyword('type', params, ''); + _descr := get_keyword('descr', params, ''); + if (strchr(_extension, '*') is not null) + { + self.vc_error_message := 'Please, enter correct file extenstion (example: txt or doc)'; + self.vc_is_valid := 0; + return; + } + if (_extension is null or _extension = '') + { + self.vc_error_message := 'Please, enter the File Extension'; + self.vc_is_valid := 0; + return; + } + if (_type = '' or _type is null or _type = '*') + { + self.vc_error_message := 'Please, enter correct MIME Type'; + self.vc_is_valid := 0; + return; + } + if (strchr(_extension, '.') = 0) + _extension := right(_extension, length(_extension) - 1); + if (get_keyword('mode', params) = 'create') + { + insert soft WS.WS.SYS_DAV_RES_TYPES (T_EXT, T_TYPE, T_DESCRIPTION) values (_extension, _type, _descr); + } + else if (get_keyword('mode', params) = 'edit') + { + if (exists(select 1 from WS.WS.SYS_DAV_RES_TYPES where T_EXT = _extension)) + { + update WS.WS.SYS_DAV_RES_TYPES set T_TYPE = _type, T_DESCRIPTION = _descr where T_EXT = _extension; + } + else + { + insert soft WS.WS.SYS_DAV_RES_TYPES (T_EXT, T_TYPE, T_DESCRIPTION) values (_extension, _type, _descr); + } + } + endp: + self.vc_redirect ('cont_page.vspx?page=4'); + ]]> + + +
+ '' and self.error_str1 is not null) + http(sprintf('', self.error_str1)); + self.error_str1 := ''; + ?> + + + +
%s
+
+ + + diff --git a/binsrc/yacutia/cont_type_remove.vspx b/binsrc/conductor/cont_type_remove.vspx similarity index 98% rename from binsrc/yacutia/cont_type_remove.vspx rename to binsrc/conductor/cont_type_remove.vspx index 7b2a4cb262..a9d82b05c8 100644 --- a/binsrc/yacutia/cont_type_remove.vspx +++ b/binsrc/conductor/cont_type_remove.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/conductor/csv_patterns.vspx b/binsrc/conductor/csv_patterns.vspx new file mode 100644 index 0000000000..abe65a55b5 --- /dev/null +++ b/binsrc/conductor/csv_patterns.vspx @@ -0,0 +1,247 @@ + + + + CSV Patterns configuration + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + Stylesheets + + + + + + + + &nbsp; +
+ + + + +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DescriptionPatternTargetAction
+ + + ' || (control.vc_parent as vspx_row_template).te_rowset[0]; + ]]> + + + + + + + + + + + + + Delete'; + ]]> + + + + + +
+ + + +
+
+ + + + (ID: ) + +
+ + +
+ + +
+ + + + + + + + + + if (not self.vc_is_valid) + return; + + declare exit handler for sqlstate '23000' + { + rollback work; + self.vc_is_valid := 0; + self.vc_error_message := 'The values entered conflict with other CSV patters. Please supply correct values.'; + return; + }; + + self.desc1.ufl_value := trim (self.desc1.ufl_value); + self.patt1.ufl_value := trim (self.patt1.ufl_value); + self.tgt1.ufl_value := trim (self.tgt1.ufl_value); + + if (not length (self.desc1.ufl_value) or not length (self.tgt1.ufl_value)) + { + rollback work; + self.vc_is_valid := 0; + self.vc_error_message := 'The description value cannot be empty.'; + return; + } + + if (self.c_mode = 'C/add') + { + insert into DB.DBA.CSV_HEADER_PATTERNS (CSV_DESCRIPTION, CSV_PATTERN, CSV_TARGET, CSV_ID) + values (self.desc1.ufl_value, self.patt1.ufl_value, self.tgt1.ufl_value, sequence_next('DB.DBA.CSV_HEADER_PATTERNS.CSV_ID')); + } + else + { + update DB.DBA.CSV_HEADER_PATTERNS + set CSV_DESCRIPTION = self.desc1.ufl_value, + CSV_PATTERN = self.patt1.ufl_value, + CSV_TARGET = self.tgt1.ufl_value + where CSV_ID = self.c_id; + } + + self.c_mode := 'C/browse'; + self.vc_data_bind (e); + + + +
+
+ + +
+
+ +
+ + + diff --git a/binsrc/yacutia/dashboard.vspx b/binsrc/conductor/dashboard.vspx similarity index 99% rename from binsrc/yacutia/dashboard.vspx rename to binsrc/conductor/dashboard.vspx index 95d14f62bc..e6abccd657 100644 --- a/binsrc/yacutia/dashboard.vspx +++ b/binsrc/conductor/dashboard.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/dashboard_item.vspx b/binsrc/conductor/dashboard_item.vspx similarity index 97% rename from binsrc/yacutia/dashboard_item.vspx rename to binsrc/conductor/dashboard_item.vspx index fa49ab723c..e2f526b29d 100644 --- a/binsrc/yacutia/dashboard_item.vspx +++ b/binsrc/conductor/dashboard_item.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/dashboard_item_show.vspx b/binsrc/conductor/dashboard_item_show.vspx similarity index 97% rename from binsrc/yacutia/dashboard_item_show.vspx rename to binsrc/conductor/dashboard_item_show.vspx index e48f6c3c1e..9e25aff575 100644 --- a/binsrc/yacutia/dashboard_item_show.vspx +++ b/binsrc/conductor/dashboard_item_show.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/dashboard_item_show.xsl b/binsrc/conductor/dashboard_item_show.xsl similarity index 96% rename from binsrc/yacutia/dashboard_item_show.xsl rename to binsrc/conductor/dashboard_item_show.xsl index 40fe73a04d..931068dcf0 100644 --- a/binsrc/yacutia/dashboard_item_show.xsl +++ b/binsrc/conductor/dashboard_item_show.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/databases.vspx b/binsrc/conductor/databases.vspx similarity index 99% rename from binsrc/yacutia/databases.vspx rename to binsrc/conductor/databases.vspx index 5bbb7868b7..6e64130760 100644 --- a/binsrc/yacutia/databases.vspx +++ b/binsrc/conductor/databases.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/databases_drop.vspx b/binsrc/conductor/databases_drop.vspx similarity index 99% rename from binsrc/yacutia/databases_drop.vspx rename to binsrc/conductor/databases_drop.vspx index e9c1dc74f4..81458dce86 100644 --- a/binsrc/yacutia/databases_drop.vspx +++ b/binsrc/conductor/databases_drop.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/databases_export.vspx b/binsrc/conductor/databases_export.vspx similarity index 99% rename from binsrc/yacutia/databases_export.vspx rename to binsrc/conductor/databases_export.vspx index 044cfac9b0..3a1fe09c16 100644 --- a/binsrc/yacutia/databases_export.vspx +++ b/binsrc/conductor/databases_export.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/databases_grants.vspx b/binsrc/conductor/databases_grants.vspx similarity index 99% rename from binsrc/yacutia/databases_grants.vspx rename to binsrc/conductor/databases_grants.vspx index 95f882f6b6..3f341a30ad 100644 --- a/binsrc/yacutia/databases_grants.vspx +++ b/binsrc/conductor/databases_grants.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/databases_proc_edit.vspx b/binsrc/conductor/databases_proc_edit.vspx similarity index 99% rename from binsrc/yacutia/databases_proc_edit.vspx rename to binsrc/conductor/databases_proc_edit.vspx index b2b302f16e..18df6c8bd6 100644 --- a/binsrc/yacutia/databases_proc_edit.vspx +++ b/binsrc/conductor/databases_proc_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/databases_table_constraints.vspx b/binsrc/conductor/databases_table_constraints.vspx similarity index 99% rename from binsrc/yacutia/databases_table_constraints.vspx rename to binsrc/conductor/databases_table_constraints.vspx index 436f3e63f7..702a98392d 100644 --- a/binsrc/yacutia/databases_table_constraints.vspx +++ b/binsrc/conductor/databases_table_constraints.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/databases_table_edit.vspx b/binsrc/conductor/databases_table_edit.vspx similarity index 99% rename from binsrc/yacutia/databases_table_edit.vspx rename to binsrc/conductor/databases_table_edit.vspx index 75f780361c..b6fbe011bf 100644 --- a/binsrc/yacutia/databases_table_edit.vspx +++ b/binsrc/conductor/databases_table_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/databases_udt_custom.vspx b/binsrc/conductor/databases_udt_custom.vspx similarity index 99% rename from binsrc/yacutia/databases_udt_custom.vspx rename to binsrc/conductor/databases_udt_custom.vspx index 03ea2ef98c..bc2d409823 100644 --- a/binsrc/yacutia/databases_udt_custom.vspx +++ b/binsrc/conductor/databases_udt_custom.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/conductor/databases_udt_edit.vspx b/binsrc/conductor/databases_udt_edit.vspx new file mode 100644 index 0000000000..80f78918fb --- /dev/null +++ b/binsrc/conductor/databases_udt_edit.vspx @@ -0,0 +1,106 @@ + + + + Create New User Defined Type + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ Create UDT + + + + + + &nbsp; + + + + Create UDT from WSDL + + + + &nbsp; + + + + + + Create UDT from .NET Assembly or Java Class + + &nbsp; +
+ + + + +
+ + + + + + + + + +
+
+ + + diff --git a/binsrc/yacutia/databases_view_edit.vspx b/binsrc/conductor/databases_view_edit.vspx similarity index 99% rename from binsrc/yacutia/databases_view_edit.vspx rename to binsrc/conductor/databases_view_edit.vspx index 632d6774cd..53feb3288e 100644 --- a/binsrc/yacutia/databases_view_edit.vspx +++ b/binsrc/conductor/databases_view_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/dav/dav_browser.css b/binsrc/conductor/dav/dav_browser.css similarity index 98% rename from binsrc/yacutia/dav/dav_browser.css rename to binsrc/conductor/dav/dav_browser.css index 52f9450f30..e4a1a3ea81 100644 --- a/binsrc/yacutia/dav/dav_browser.css +++ b/binsrc/conductor/dav/dav_browser.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -41,6 +41,11 @@ a:hover { text-decoration: underline; } +.link { + color: blue; + cursor: pointer; +} + /* Fields */ .field-text { width: 500px; @@ -89,6 +94,7 @@ div.c1 { div.tabs { top: 0px; + margin-top: 0; font-size: 100%; padding: 0px 0px 3px 0px; } diff --git a/binsrc/yacutia/dav/dav_browser.js b/binsrc/conductor/dav/dav_browser.js similarity index 98% rename from binsrc/yacutia/dav/dav_browser.js rename to binsrc/conductor/dav/dav_browser.js index c781810875..ea40711fb8 100644 --- a/binsrc/yacutia/dav/dav_browser.js +++ b/binsrc/conductor/dav/dav_browser.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -386,6 +386,24 @@ WEBDAV.updateLabel = function(value) } else { OAT.Dom.show('tr_dav_ldp'); } + if ($('dav_det')) { + if (['', 'Versioning'].indexOf(value) === -1) { + OAT.Dom.hide('davRow_version'); + } else { + OAT.Dom.show('davRow_version'); + var av = $('dav_autoversion'); + var o = av.options; + if ((value == 'Versioning') && (o.length !== 4)) { + o.remove(0); + } + else if ((value !== 'Versioning') && (o.length == 4)) { + var item = document.createElement('option'); + item.text = 'No'; + item.value = ''; + o.add(item, 0); + } + } + } if (!value) return; @@ -715,6 +733,9 @@ WEBDAV.davSelect = function (fld, mode) { var callback = function() { var pathHome = $v(fld); + if (!pathHome) + pathHome = $v('dirPath'); + var options = { "mode": 'browser', "pathDefault": pathHome, diff --git a/binsrc/yacutia/dav/dav_browser.sql b/binsrc/conductor/dav/dav_browser.sql similarity index 89% rename from binsrc/yacutia/dav/dav_browser.sql rename to binsrc/conductor/dav/dav_browser.sql index 006aa737af..943aed1255 100644 --- a/binsrc/yacutia/dav/dav_browser.sql +++ b/binsrc/conductor/dav/dav_browser.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -160,186 +160,6 @@ create procedure WEBDAV.DBA.exec ( } ; ------------------------------------------------------------------------------ --- -create procedure WEBDAV.DBA.jsonObject () -{ - return subseq (soap_box_structure ('x', 1), 0, 2); -} -; - ------------------------------------------------------------------------------ --- -create procedure WEBDAV.DBA.obj2json ( - in o any, - in d integer := 10, - in nsArray any := null, - in attributePrefix varchar := null) -{ - declare N, M integer; - declare R, T any; - declare S, retValue any; - - if (d = 0) - return '[maximum depth achieved]'; - - T := vector ('\b', '\\b', '\t', '\\t', '\n', '\\n', '\f', '\\f', '\r', '\\r', '"', '\\"', '\\', '\\\\'); - retValue := ''; - if (isnull (o)) - { - retValue := 'null'; - } - else if (isnumeric (o)) - { - retValue := cast (o as varchar); - } - else if (isstring (o)) - { - for (N := 0; N < length(o); N := N + 1) - { - R := chr (o[N]); - for (M := 0; M < length(T); M := M + 2) - { - if (R = T[M]) - R := T[M+1]; - } - retValue := retValue || R; - } - retValue := '"' || retValue || '"'; - } - else if (isarray (o) and (length (o) > 1) and ((__tag (o[0]) = 255) or (o[0] is null and (o[1] = '' or o[1] = 'structure')))) - { - retValue := '{'; - for (N := 2; N < length (o); N := N + 2) - { - S := o[N]; - if (chr (S[0]) = attributePrefix) - S := subseq (S, length (attributePrefix)); - if (not isnull (nsArray)) - { - for (M := 0; M < length (nsArray); M := M + 1) - { - if (S like nsArray[M]||':%') - S := subseq (S, length (nsArray[M])+1); - } - } - retValue := retValue || '"' || S || '":' || WEBDAV.DBA.obj2json (o[N+1], d-1, nsArray, attributePrefix); - if (N <> length(o)-2) - retValue := retValue || ', '; - } - retValue := retValue || '}'; - } - else if (isarray (o)) - { - retValue := '['; - for (N := 0; N < length(o); N := N + 1) - { - retValue := retValue || WEBDAV.DBA.obj2json (o[N], d-1, nsArray, attributePrefix); - if (N <> length(o)-1) - retValue := retValue || ',\n'; - } - retValue := retValue || ']'; - } - return retValue; -} -; - ------------------------------------------------------------------------------------------ --- -create procedure WEBDAV.DBA.obj2xml ( - in o any, - in d integer := 10, - in tag varchar := null, - in nsArray any := null, - in attributePrefix varchar := '') -{ - declare N, M integer; - declare R, T any; - declare S, nsValue, retValue any; - - if (d = 0) - return '[maximum depth achieved]'; - - nsValue := ''; - if (not isnull (nsArray)) - { - for (N := 0; N < length(nsArray); N := N + 2) - nsValue := sprintf ('%s xmlns%s="%s"', nsValue, case when nsArray[N]='' then '' else ':'||nsArray[N] end, nsArray[N+1]); - } - retValue := ''; - if (isnumeric (o)) - { - retValue := cast (o as varchar); - } - else if (isstring (o)) - { - retValue := sprintf ('%V', o); - } - else if (__tag (o) = 211) - { - retValue := datestring (o); - } - else if (isJsonObject (o)) - { - for (N := 2; N < length(o); N := N + 2) - { - if (not isJsonObject (o[N+1]) and isarray (o[N+1]) and not isstring (o[N+1])) - { - retValue := retValue || obj2xml (o[N+1], d-1, o[N], nsArray, attributePrefix); - } else { - if (chr (o[N][0]) <> attributePrefix) - { - nsArray := null; - S := ''; - if ((attributePrefix <> '') and isJsonObject (o[N+1])) - { - for (M := 2; M < length(o[N+1]); M := M + 2) - { - if (chr (o[N+1][M][0]) = attributePrefix) - S := sprintf ('%s %s="%s"', S, subseq (o[N+1][M], length (attributePrefix)), obj2xml (o[N+1][M+1])); - } - } - retValue := retValue || sprintf ('<%s%s%s>%s\n', o[N], S, nsValue, obj2xml (o[N+1], d-1, null, nsArray, attributePrefix), o[N]); - } - } - } - } - else if (isarray (o)) - { - for (N := 0; N < length(o); N := N + 1) - { - if (isnull (tag)) - { - retValue := retValue || obj2xml (o[N], d-1, tag, nsArray, attributePrefix); - } else { - nsArray := null; - S := ''; - if (not isnull (attributePrefix) and isJsonObject (o[N])) - { - for (M := 2; M < length(o[N]); M := M + 2) - { - if (chr (o[N][M][0]) = attributePrefix) - S := sprintf ('%s %s="%s"', S, subseq (o[N][M], length (attributePrefix)), obj2xml (o[N][M+1])); - } - } - retValue := retValue || sprintf ('<%s%s%s>%s\n', tag, S, nsValue, obj2xml (o[N], d-1, null, nsArray, attributePrefix), tag); - } - } - } - return retValue; -} -; - - ------------------------------------------------------------------------------ --- -create procedure WEBDAV.DBA.json2obj ( - in o any) -{ - return json_parse (o); -} -; - ----------------------------------------------------------------------------- -- create procedure WEBDAV.DBA.dc_xml () @@ -700,7 +520,7 @@ create procedure WEBDAV.DBA.dc_filter_check ( { declare exit handler for SQLSTATE '*' { - return WEBDAV.DBA.test_clear (__SQL_MESSAGE); + return VALIDATE.DBA.clear (__SQL_MESSAGE); }; declare aValue, aFilter any; @@ -995,7 +815,7 @@ create procedure WEBDAV.DBA.dt_reformat( create procedure WEBDAV.DBA.dt_rfc1123 ( in dt datetime) { - return soap_print_box (dt, '', 1); + return soap_print_box (WEBDAV.DBA.dt_timezone_set (dt), '', 1); } ; @@ -1004,7 +824,22 @@ create procedure WEBDAV.DBA.dt_rfc1123 ( create procedure WEBDAV.DBA.dt_iso8601 ( in dt datetime) { - return soap_print_box (dt, '', 0); + return soap_print_box (WEBDAV.DBA.dt_timezone_set (dt), '', 0); +} +; + +----------------------------------------------------------------------------------------- +-- +create procedure WEBDAV.DBA.dt_timezone_set ( + in dt datetime) +{ + declare tz integer; + + if (not is_timezoneless (dt)) + return dt; + + tz := timezone (curdatetime_tz (), 1); + return dt_set_tz (dateadd ('minute', -tz, dt), tz); } ; @@ -1494,10 +1329,11 @@ create procedure WEBDAV.DBA.proc ( in dir_params any := null, in dir_hiddens any := null, in dir_account any := null, - in dir_password any := null) returns any + in dir_password any := null, + in dir_options any := null) returns any { - -- dbg_obj_princ ('WEBDAV.DBA.proc (', path, dir_mode, dir_params, dir_hiddens, dir_account, dir_password, ')'); - declare dirListTmp, detCategory, dateAdded, dirFilter, dirHiddens, dirList any; + -- dbg_obj_princ ('WEBDAV.DBA.proc (', path, dir_mode, dir_params, dir_hiddens, dir_account, dir_password, dir_options, ')'); + declare dirListTmp, detCategory, dateAdded, dirFilter, dirLikeFilter, dirHiddens, dirList any; declare dir_account_name, creator_iri, user_name, group_name varchar; declare path_parent varchar; declare creator_id, user_id, group_id integer; @@ -1505,7 +1341,7 @@ create procedure WEBDAV.DBA.proc ( declare c0, c1, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12 varchar; declare exit handler for SQLSTATE '*' { - -- dbg_obj_print ('', __SQL_STATE, __SQL_MESSAGE); + --dbg_obj_print ('', __SQL_STATE, __SQL_MESSAGE); result (__SQL_STATE, VALIDATE.DBA.clear (__SQL_MESSAGE), 0, '', '', '', '', '', '', '', ''); return; }; @@ -1515,35 +1351,54 @@ create procedure WEBDAV.DBA.proc ( return; dirList := vector (); - if (dir_mode = 0) + dirLikeFilter := '%'; + if ((dir_mode = 0) or (dir_mode = 1)) { - -- standard list + if (not isnull (dir_options)) + { + declare dir_order, dir_order_ndx, dir_fields any; + + dir_order := get_keyword ('order', dir_options, ''); + if (dir_order <> '') + { + dir_order_ndx := atoi (subseq (dir_order, 1)); + dir_order := ''; + dir_fields := vector ('FULL_PATH', 'KIND', 'LENGTH', 'MOD_TIME', 'ID', 'PERMS', 'GROUP', 'OWNER', 'CR_TIME', 'TYPE', 'NAME', 'ADD_TIME', 'CREATOR'); + if (dir_order_ndx < length (dir_fields)) + dir_order := dir_fields[dir_order_ndx]; + + if (dir_order = '') + { + dir_options := WEBDAV.DBA.remove_keyword ('order', dir_options); + } + else + { + dir_options := WEBDAV.DBA.set_keyword ('order', dir_options, dir_order); + } + } + } + path := WEBDAV.DBA.real_path (path); - dirList := WEBDAV.DBA.DAV_DIR_LIST (path, 0, dir_account, dir_password); - dirFilter := '%'; - } - else if (dir_mode = 1) + if (dir_mode = 1) { -- standard list with filter - path := WEBDAV.DBA.real_path (path); - dirList := WEBDAV.DBA.DAV_DIR_LIST (path, 0, dir_account, dir_password); - dirFilter := WEBDAV.DBA.dc_search_like_fix (dir_params); + dirLikeFilter := WEBDAV.DBA.dc_search_like_fix (dir_params); + } + dirList := WEBDAV.DBA.DAV_DIR_LIST (path, 0, dir_account, dir_password, dirLikeFilter, dir_options); } else if (dir_mode = 2) { -- simple search path := WEBDAV.DBA.real_path (path); dirFilter := vector (vector ('RES_NAME', 'like', WEBDAV.DBA.dc_search_like_fix (dir_params))); - dirList := WEBDAV.DBA.DAV_DIR_FILTER(path, 1, dirFilter); - dirFilter := '%'; + dirList := WEBDAV.DBA.DAV_DIR_FILTER (path, 1, dirFilter); } else if (dir_mode = 3) { -- advanced search path := WEBDAV.DBA.real_path (WEBDAV.DBA.dc_get (dir_params, 'base', 'path', '/DAV/')); dirFilter := WEBDAV.DBA.dc_filter (dir_params); - dirList := WEBDAV.DBA.DAV_DIR_FILTER(path, 1, dirFilter); - dirFilter := '%'; + dirList := WEBDAV.DBA.DAV_DIR_FILTER (path, 1, dirFilter); } else if (dir_mode = 4) { @@ -1563,28 +1418,24 @@ create procedure WEBDAV.DBA.proc ( } } dir_mode := 0; - dirFilter := '%'; } else if (dir_mode = 10) { dirFilter := vector (); WEBDAV.DBA.dc_subfilter(dirFilter, 'RES_NAME', 'like', dir_params); dirList := DB.DBA.DAV_DIR_FILTER (path, 1, dirFilter, dir_account, dir_password); - dirFilter := '%'; } else if (dir_mode = 11) { path := WEBDAV.DBA.real_path (WEBDAV.DBA.dc_get (dir_params, 'base', 'path', '/DAV/')); dirFilter := WEBDAV.DBA.dc_filter (dir_params); dirList := DB.DBA.DAV_DIR_FILTER (path, 1, dirFilter, dir_account, dir_password); - dirFilter := '%'; } else if (dir_mode = 20) { path := WEBDAV.DBA.dc_get(dir_params, 'base', 'path', '/DAV/'); dirFilter := WEBDAV.DBA.dc_filter (dir_params); dirList := DB.DBA.DAV_DIR_FILTER (path, 1, dirFilter, dir_account, dir_password); - dirFilter := '%'; } -- Command error @@ -1629,7 +1480,7 @@ create procedure WEBDAV.DBA.proc ( { if (isarray(item) and not isnull (item[0])) { - if (((item[1] = 'C') or (item[10] like dirFilter)) and (WEBDAV.DBA.hiddens_check (dirHiddens, item[10]) = 0)) + if (((item[1] = 'C') or (item[10] like dirLikeFilter)) and (WEBDAV.DBA.hiddens_check (dirHiddens, item[10]) = 0)) { WEBDAV.DBA.proc_work (item, creator_id, creator_iri, user_id, user_name, group_id, group_name, detCategory, dateAdded); result (item[either (gte (dir_mode, 2),0,10)], item[1], item[2], left (cast (item[3] as varchar), 19), item[9], user_name, group_name, adm_dav_format_perms(item[5]), item[0], detCategory, left (cast (item[8] as varchar), 19), left (cast (dateAdded as varchar), 19), creator_iri); @@ -1652,18 +1503,36 @@ create procedure WEBDAV.DBA.proc_work ( { declare tmp any; + -- user + if (isinteger (item[7])) + { tmp := coalesce (item[7], -1); if (user_id <> tmp) { user_id := tmp; user_name := WEBDAV.DBA.user_name (user_id, ''); } + } + else + { + user_name := item[7]; + } + + -- group + if (isinteger (item[6])) + { tmp := coalesce (item[6], -1); if (group_id <> tmp) { group_id := tmp; group_name := WEBDAV.DBA.user_name (group_id, ''); } + } + else + { + group_name := item[6]; + } + tmp := coalesce (item[either (lte (length (item), 12),7,12)], coalesce (item[7], -1)); if (creator_id <> tmp) { @@ -1678,7 +1547,7 @@ create procedure WEBDAV.DBA.proc_work ( } else { - creator_iri := WEBDAV.DBA.user_iri (user_id); + creator_iri := WEBDAV.DBA.user_iri (user_name); } } detCategory := WEBDAV.DBA.det_category (item[4], item[0], item[1], item[9]); @@ -1981,9 +1850,12 @@ create procedure WEBDAV.DBA.user_id ( ----------------------------------------------------------------------------- -- create procedure WEBDAV.DBA.user_iri ( - in user_id integer) returns varchar + in usr any) returns varchar { - return sprintf ('http://%s/dataspace/person/%s#this', WEBDAV.DBA.host_url (0), WEBDAV.DBA.user_name (user_id, '')); + if (isinteger (usr)) + usr := WEBDAV.DBA.user_name (usr, ''); + + return sprintf ('http://%s/dataspace/person/%s#this', WEBDAV.DBA.host_url (0), usr); } ; @@ -2098,19 +1970,43 @@ _exit:; create procedure WEBDAV.DBA.dav_lpath ( in path varchar) returns varchar { - declare pref, ppref, lpath varchar; + declare path_domain, path_mounted varchar; - ppref := http_map_get ('mounted'); - if (ppref = '/DAV/VAD/conductor/') + path_mounted := http_map_get ('mounted'); + if (path_mounted = '/DAV/VAD/conductor/') return path; - if (path not like ppref || '%') + if (path_mounted like '/odrive/%') return path; - pref := http_map_get ('domain') || '/'; - lpath := subseq (path, length (ppref)); - lpath := pref || lpath; - return lpath; + if (path not like path_mounted || '%') + return path; + + path_domain := http_map_get ('domain') || '/'; + + return path_domain || subseq (path, length (path_mounted)); +} +; + +------------------------------------------------------------------------------- +-- +create procedure WEBDAV.DBA.dav_ppath ( + in path varchar) returns varchar +{ + declare path_domain, path_mounted varchar; + + path_mounted := http_map_get ('mounted'); + if (path_mounted = '/DAV/VAD/conductor/') + return path; + + if (path_mounted like '/odrive/%') + return path; + + path_domain := http_map_get ('domain') || '/'; + if (path not like path_domain || '%') + return path; + + return path_mounted || subseq (path, length (path_domain)); } ; @@ -2597,6 +2493,7 @@ create procedure WEBDAV.DBA.settings_init ( { WEBDAV.DBA.set_keyword ('chars', settings, WEBDAV.DBA.settings_chars (settings)); WEBDAV.DBA.set_keyword ('rows', settings, WEBDAV.DBA.settings_rows (settings)); + WEBDAV.DBA.set_keyword ('browserLines', settings, WEBDAV.DBA.settings_browserLines (settings)); WEBDAV.DBA.set_keyword ('tbLabels', settings, WEBDAV.DBA.settings_tbLabels (settings)); WEBDAV.DBA.set_keyword ('hiddens', settings, WEBDAV.DBA.settings_hiddens (settings)); WEBDAV.DBA.set_keyword ('fileSize', settings, WEBDAV.DBA.settings_fileSize (settings)); @@ -2640,6 +2537,15 @@ create procedure WEBDAV.DBA.settings_rows ( } ; +------------------------------------------------------------------------------- +-- +create procedure WEBDAV.DBA.settings_browserLines ( + inout settings any) +{ + return cast (get_keyword ('browserLines', settings, '100') as integer); +} +; + ------------------------------------------------------------------------------- -- create procedure WEBDAV.DBA.settings_tbLabels ( @@ -2781,16 +2687,13 @@ create procedure WEBDAV.DBA.det_type ( if (what = 'R') path := WEBDAV.DBA.path_parent (path, 1); - if (WEBDAV.DBA.path_name (path) = 'Attic') + if (WEBDAV.DBA.path_name (path) = 'VVC') detType := 'Versioning'; - else if (WEBDAV.DBA.path_name (path) = 'VVC') - detType := 'Versioning'; - - else if (WEBDAV.DBA.DAV_PROP_GET (path, 'virt:rdfSink-rdf', '') <> '') + else if (not WEBDAV.DBA.DAV_ERROR (DB.DBA.DAV_PROP_GET_INT (id, 'C', 'virt:rdfSink-rdf', 0))) detType := 'rdfSink'; - else if (WEBDAV.DBA.DAV_PROP_GET (path, 'virt:Versioning-History', '') <> '') + else if (not WEBDAV.DBA.DAV_ERROR (DB.DBA.DAV_PROP_GET_INT (id, 'C', 'virt:Versioning-History', 0))) detType := 'UnderVersioning'; else if (WEBDAV.DBA.syncml_detect (path)) @@ -2825,6 +2728,7 @@ create procedure WEBDAV.DBA.det_type_name ( 'DynaRes', 'Dynamic Resources', 'SyncML', 'SyncML', 'Versioning', 'Version Control', + 'UnderVersioning', 'Under Version Control', 'S3', 'Amazon S3', 'GDrive', 'Google Drive', 'Dropbox', 'Dropbox', @@ -2889,10 +2793,6 @@ create procedure WEBDAV.DBA.det_ownClass ( else if (isarray (id)) retValue := cast (id[0] as varchar); - - else if (WEBDAV.DBA.path_name (path) = 'Attic') - retValue := 'Versioning'; - else if (WEBDAV.DBA.path_name (path) = 'VVC') retValue := 'Versioning'; @@ -2922,19 +2822,16 @@ create procedure WEBDAV.DBA.det_subClass ( if (WEBDAV.DBA.DAV_ERROR (id)) retValue := null; - else if (WEBDAV.DBA.DAV_PROP_GET (path, 'DAV:version-history', '') <> '') - retValue := 'UnderVersioning'; + else if (WEBDAV.DBA.path_name (path) = 'VVC') + retValue := 'Versioning'; - else if (WEBDAV.DBA.DAV_PROP_GET (path, 'virt:Versioning-History', '') <> '') + else if (not WEBDAV.DBA.DAV_ERROR (DB.DBA.DAV_PROP_GET_INT (id, 'C', 'virt:Versioning-History', 0))) retValue := 'UnderVersioning'; - else if (WEBDAV.DBA.DAV_PROP_GET (path, 'virt:Versioning-Collection', '') <> '') + else if (not WEBDAV.DBA.DAV_ERROR (DB.DBA.DAV_PROP_GET_INT (id, 'C', 'virt:Versioning-Collection', 0))) retValue := 'Versioning'; - else if (WEBDAV.DBA.path_name (path) = 'Attic') - retValue := 'Versioning'; - - else if (WEBDAV.DBA.DAV_PROP_GET (path, 'virt:rdfSink-rdf', '') <> '') + else if (not WEBDAV.DBA.DAV_ERROR (DB.DBA.DAV_PROP_GET_INT (id, 'C', 'virt:rdfSink-rdf', 0))) retValue := 'rdfSink'; else if (WEBDAV.DBA.syncml_detect (path)) @@ -3041,29 +2938,34 @@ create procedure WEBDAV.DBA.DAV_GET_INFO ( if (info = 'vc') { - if (WEBDAV.DBA.DAV_GET_VERSION_CONTROL(path, auth_name, auth_pwd)) + if (WEBDAV.DBA.DAV_GET_VERSION_CONTROL (path, auth_name, auth_pwd)) return 'ON'; + return 'OFF'; } if (info = 'avcState') { - tmp := WEBDAV.DBA.DAV_GET_AUTOVERSION(path, auth_name, auth_pwd); + tmp := WEBDAV.DBA.DAV_GET_AUTOVERSION (path, auth_name, auth_pwd); if (tmp <> '') - return replace (WEBDAV.DBA.auto_version_full(tmp), 'DAV:', ''); + return replace (WEBDAV.DBA.auto_version_full (tmp), 'DAV:', ''); + return 'OFF'; } if (info = 'vcState') { - if (not is_empty_or_null(WEBDAV.DBA.DAV_PROP_GET (path, 'DAV:checked-in', '', auth_name, auth_pwd))) + if (not is_empty_or_null (WEBDAV.DBA.DAV_PROP_GET (path, 'DAV:checked-in', '', auth_name, auth_pwd))) return 'Check-In'; - if (not is_empty_or_null(WEBDAV.DBA.DAV_PROP_GET (path, 'DAV:checked-out', '', auth_name, auth_pwd))) + + if (not is_empty_or_null (WEBDAV.DBA.DAV_PROP_GET (path, 'DAV:checked-out', '', auth_name, auth_pwd))) return 'Check-Out'; + return 'Standard'; } if (info = 'lockState') { if (WEBDAV.DBA.DAV_IS_LOCKED (path)) return 'ON'; + return 'OFF'; } return ''; @@ -3116,11 +3018,20 @@ create procedure WEBDAV.DBA.DAV_VERSION_CONTROL ( -- create procedure WEBDAV.DBA.DAV_REMOVE_VERSION_CONTROL ( in path varchar, + in what varchar := 'C', in auth_name varchar := null, in auth_pwd varchar := null) { + declare id any; + WEBDAV.DBA.DAV_API_PARAMS (auth_name, auth_pwd); - return DB.DBA.DAV_REMOVE_VERSION_CONTROL (path, auth_name, auth_pwd); + if (what = 'C') + return DB.DBA.DAV_REMOVE_VERSIONING_CONTROL_INT (path, auth_name, auth_pwd); + + id := DB.DBA.DAV_SEARCH_ID (path, what); + delete from WS.WS.SYS_DAV_RES_DIFF where RD_RES_ID = id; + delete from WS.WS.SYS_DAV_RES_VERSION where RV_RES_ID = id; + return DB.DBA.Versioning_REMOVE_V_PROPERTIES (path); } ; @@ -3167,18 +3078,17 @@ create procedure WEBDAV.DBA.DAV_GET_AUTOVERSION ( in auth_name varchar := null, in auth_pwd varchar := null) { - --declare exit handler for SQLSTATE '*' {return '';}; - if (WEBDAV.DBA.DAV_ERROR (DB.DBA.DAV_SEARCH_ID (path, 'R'))) { declare id integer; - id := DAV_SEARCH_ID (path, 'C'); - if (not isinteger (id)) + id := DB.DBA.DAV_SEARCH_ID (path, 'C'); + if (WEBDAV.DBA.DAV_ERROR (id) or not isinteger (id)) return ''; - return coalesce ((select COL_AUTO_VERSIONING from WS.WS.SYS_DAV_COL where COL_ID = DAV_SEARCH_ID (path, 'C')), ''); + + return coalesce ((select COL_AUTO_VERSIONING from WS.WS.SYS_DAV_COL where COL_ID = id), ''); } - return WEBDAV.DBA.auto_version_short(WEBDAV.DBA.DAV_PROP_GET (path, 'DAV:auto-version')); + return WEBDAV.DBA.auto_version_short (WEBDAV.DBA.DAV_PROP_GET (path, 'DAV:auto-version', '', auth_name, auth_pwd)); } ; @@ -3193,10 +3103,13 @@ create procedure WEBDAV.DBA.DAV_GET_VERSION_CONTROL ( if (WEBDAV.DBA.DAV_ERROR (DB.DBA.DAV_SEARCH_ID (path, 'R'))) return 0; + if (WEBDAV.DBA.DAV_PROP_GET (path, 'DAV:checked-in', '', auth_name, auth_pwd) <> '') return 1; + if (WEBDAV.DBA.DAV_PROP_GET (path, 'DAV:checked-out', '', auth_name, auth_pwd) <> '') return 1; + return 0; } ; @@ -3244,6 +3157,21 @@ create procedure WEBDAV.DBA.path_type ( } ; +------------------------------------------------------------------------------- +-- +create procedure WEBDAV.DBA.path_extension ( + in path varchar) +{ + declare pos integer; + + pos := strrchr (path, '.'); + if (not isnull (pos)) + return right (path, length (path)-pos-1); + + return ''; +} +; + ------------------------------------------------------------------------------- -- create procedure WEBDAV.DBA.DAV_GET_VERSION_PATH ( @@ -3299,9 +3227,12 @@ create procedure WEBDAV.DBA.DAV_GET_VERSION_ROOT ( declare retValue any; retValue := WEBDAV.DBA.DAV_PROP_GET (WEBDAV.DBA.DAV_GET_VERSION_HISTORY_PATH (path), 'DAV:root-version', ''); - if (WEBDAV.DBA.DAV_ERROR (retValue)) { + if (WEBDAV.DBA.DAV_ERROR (retValue)) + { retValue := ''; - } else { + } + else + { retValue := cast (xpath_eval ('/href', xml_tree_doc(retValue)) as varchar); } return WEBDAV.DBA.show_text (retValue, 'root'); @@ -3338,28 +3269,38 @@ create procedure WEBDAV.DBA.DAV_GET_VERSION_SET ( -- create procedure WEBDAV.DBA.DAV_SET_AUTOVERSION ( in path varchar, - in value any) + in value any, + in auth_name varchar := null, + in auth_pwd varchar := null) { + --dbg_obj_princ ('WEBDAV.DBA.DAV_SET_AUTOVERSION (', path, value, ')'); declare retValue any; retValue := 0; if (WEBDAV.DBA.DAV_ERROR (DB.DBA.DAV_SEARCH_ID (path, 'R'))) { - retValue := WEBDAV.DBA.DAV_SET_VERSIONING_CONTROL (path, value); + if (value = '') + { + retValue := WEBDAV.DBA.DAV_REMOVE_VERSION_CONTROL (path, 'C', auth_name, auth_pwd); + } + else + { + retValue := WEBDAV.DBA.DAV_SET_VERSIONING_CONTROL (path, value, auth_name, auth_pwd); + } } else { value := WEBDAV.DBA.auto_version_full (value); if (value = '') { - retValue := WEBDAV.DBA.DAV_PROP_REMOVE (path, 'DAV:auto-version'); + retValue := WEBDAV.DBA.DAV_PROP_REMOVE (path, 'DAV:auto-version', auth_name, auth_pwd); } else { - if (not WEBDAV.DBA.DAV_GET_VERSION_CONTROL (path)) - WEBDAV.DBA.DAV_VERSION_CONTROL (path); + if (not WEBDAV.DBA.DAV_GET_VERSION_CONTROL (path, auth_name, auth_pwd)) + WEBDAV.DBA.DAV_VERSION_CONTROL (path, auth_name, auth_pwd); - retValue := WEBDAV.DBA.DAV_PROP_SET (path, 'DAV:auto-version', value); + retValue := WEBDAV.DBA.DAV_PROP_SET (path, 'DAV:auto-version', value, auth_name, auth_pwd); } } return retValue; @@ -3649,6 +3590,7 @@ create procedure WEBDAV.DBA.DAV_ERROR (in code any) { if (isinteger (code) and (code < 0)) return 1; + return 0; } ; @@ -3705,7 +3647,7 @@ create procedure WEBDAV.DBA.DAV_SET ( return WEBDAV.DBA.DAV_PROP_TAGS_SET (path, ':virtpublictags', value, auth_name, auth_pwd); if (property = 'autoversion') - return WEBDAV.DBA.DAV_SET_AUTOVERSION (path, value); + return WEBDAV.DBA.DAV_SET_AUTOVERSION (path, value, auth_name, auth_pwd); if (property = 'permissions-inheritance') { @@ -3829,16 +3771,21 @@ create procedure WEBDAV.DBA.DAV_DIR_LIST ( in path varchar := '/DAV/', in recursive integer := 0, in auth_name varchar := null, - in auth_pwd varchar := null) + in auth_pwd varchar := null, + in filter varchar := '%', + in options any := null) { declare auth_uid integer; auth_uid := null; WEBDAV.DBA.DAV_API_PARAMS (auth_name, auth_pwd); - return DB.DBA.DAV_DIR_LIST_INT (path, recursive, '%', auth_name, auth_pwd, auth_uid); + + if (WEBDAV.DBA.DAV_REQUIRE_VERSION ('1.1')) + return DB.DBA.DAV_DIR_LIST_INT (path, recursive, filter, auth_name, auth_pwd, auth_uid, options); + + return DB.DBA.DAV_DIR_LIST_INT (path, recursive, filter, auth_name, auth_pwd, auth_uid); } ; - ------------------------------------------------------------------------------- -- create procedure WEBDAV.DBA.DAV_DIR_FILTER ( @@ -3937,8 +3884,8 @@ create procedure WEBDAV.DBA.rdfSink_VERIFY ( return __SQL_MESSAGE; }; - WEBDAV.DBA.test (get_keyword ('graph', params), vector ('name', 'RDF Graph', 'class', 'varchar', 'minLength', 1, 'maxLength', 255)); - WEBDAV.DBA.test (get_keyword ('base', params), vector ('name', 'RDF Base URI', 'class', 'varchar', 'minLength', 0, 'maxLength', 255)); + VALIDATE.DBA.validate (get_keyword ('graph', params), vector ('name', 'RDF Graph', 'class', 'varchar', 'minLength', 1, 'maxLength', 255)); + VALIDATE.DBA.validate (get_keyword ('base', params), vector ('name', 'RDF Base URI', 'class', 'varchar', 'minLength', 0, 'maxLength', 255)); return null; } @@ -3989,7 +3936,6 @@ create procedure WEBDAV.DBA.DAV_DELETE ( in check_locks integer := 1) { -- dbg_obj_princ ('WEBDAV.DBA.DAV_DELETE (', path, ')'); - declare detType varchar; WEBDAV.DBA.DAV_API_PARAMS (auth_name, auth_pwd); if ((WEBDAV.DBA.path_type (path) = 'C') and (WEBDAV.DBA.det_type (path, 'C') = 'SyncML')) @@ -4335,297 +4281,108 @@ create procedure WEBDAV.DBA.get_rdf ( } ; ------------------------------------------------------------------------------------------ +------------------------------------------------------------------------------- -- -create procedure WEBDAV.DBA.test_clear ( - in S any) +create procedure WEBDAV.DBA.ui_image ( + in itemPath varchar, + in itemType varchar, + in itemMimeType varchar) returns varchar { - S := substring (S, 1, coalesce (strstr (S, '<>'), length (S))); - S := substring (S, 1, coalesce (strstr (S, '\nin'), length (S))); + declare imageFile varchar; - return S; -} -; + if (itemType = 'C') + { + declare det_type varchar; ------------------------------------------------------------------------------------------ --- -create procedure WEBDAV.DBA.test ( - in value any, - in params any := null) -{ - declare valueType, valueClass, valueName, valueMessage, tmp any; - - declare exit handler for SQLSTATE '*' { - if (not is_empty_or_null(valueMessage)) - signal ('TEST', valueMessage); - if (__SQL_STATE = 'EMPTY') - signal ('TEST', sprintf('Field ''%s'' cannot be empty!<>', valueName)); - if (__SQL_STATE = 'CLASS') { - if (valueType in ('free-text', 'tags')) { - signal ('TEST', sprintf('Field ''%s'' contains invalid characters or noise words!<>', valueName)); - } else { - signal ('TEST', sprintf('Field ''%s'' contains invalid characters!<>', valueName)); - } - } - if (__SQL_STATE = 'TYPE') - signal ('TEST', sprintf('Field ''%s'' contains invalid characters for \'%s\'!<>', valueName, valueType)); - if (__SQL_STATE = 'MIN') - signal ('TEST', sprintf('''%s'' value should be greater than %s!<>', valueName, cast (tmp as varchar))); - if (__SQL_STATE = 'MAX') - signal ('TEST', sprintf('''%s'' value should be less than %s!<>', valueName, cast (tmp as varchar))); - if (__SQL_STATE = 'MINLENGTH') - signal ('TEST', sprintf('The length of field ''%s'' should be greater than %s characters!<>', valueName, cast (tmp as varchar))); - if (__SQL_STATE = 'MAXLENGTH') - signal ('TEST', sprintf('The length of field ''%s'' should be less than %s characters!<>', valueName, cast (tmp as varchar))); - signal ('TEST', 'Unknown validation error!<>'); - --resignal; - }; + imageFile := 'foldr_16.png'; + det_type := WEBDAV.DBA.det_type (itemPath, itemType); + if (det_type <> '') + { + if (det_type = 'CatFilter') + imageFile := 'category_16.png'; - value := trim(value); - if (is_empty_or_null(params)) - return value; - - valueClass := coalesce (get_keyword ('class', params), get_keyword ('type', params)); - valueType := coalesce (get_keyword ('type', params), get_keyword ('class', params)); - valueName := get_keyword ('name', params, 'Field'); - valueMessage := get_keyword ('message', params, ''); - tmp := get_keyword ('canEmpty', params); - if (isnull (tmp)) - { - if (not isnull (get_keyword ('minValue', params))) { - tmp := 0; - } else if (get_keyword ('minLength', params, 0) <> 0) { - tmp := 0; - } - } - if (not isnull (tmp) and (tmp = 0) and is_empty_or_null(value)) { - signal('EMPTY', ''); - } else if (is_empty_or_null(value)) { - return value; - } + else if (det_type = 'PropFilter') + imageFile := 'property_16.png'; - value := WEBDAV.DBA.validate2 (valueClass, value); + else if (det_type = 'HostFs') + imageFile := 'hostfs_16.png'; - if (valueType = 'integer') { - tmp := get_keyword ('minValue', params); - if ((not isnull (tmp)) and (value < tmp)) - signal('MIN', cast (tmp as varchar)); + else if (det_type = 'Versioning') + imageFile := 'versions_16.png'; - tmp := get_keyword ('maxValue', params); - if (not isnull (tmp) and (value > tmp)) - signal('MAX', cast (tmp as varchar)); - } - else if (valueType = 'float') - { - tmp := get_keyword ('minValue', params); - if (not isnull (tmp) and (value < tmp)) - signal('MIN', cast (tmp as varchar)); + else if (det_type = 'News3') + imageFile := 'enews_16.png'; + + else if (det_type = 'Blog') + imageFile := 'blog_16.png'; + + else if (det_type = 'oMail') + imageFile := 'omail_16.png'; + + else if (det_type = 'CalDAV') + imageFile := 'calendar_16.png'; + + else if (det_type = 'calendar') + imageFile := 'calendar_16.png'; - tmp := get_keyword ('maxValue', params); - if (not isnull (tmp) and (value > tmp)) - signal('MAX', cast (tmp as varchar)); + else if (det_type = 'Bookmark') + imageFile := 'bookmarks_16.png'; + + else if (det_type = 'nntp') + imageFile := 'discussion_16.png'; + + else if (det_type = 'CardDAV') + imageFile := 'addressbook_16.png'; + } } - else if (valueType = 'varchar') + else { - tmp := get_keyword ('minLength', params); - if (not isnull (tmp) and (length (value) < tmp)) - signal('MINLENGTH', cast (tmp as varchar)); + if (itemMimeType = 'text/plain') + imageFile := 'text.gif'; - tmp := get_keyword ('maxLength', params); - if (not isnull (tmp) and (length (value) > tmp)) - signal('MAXLENGTH', cast (tmp as varchar)); - } - return value; -} -; + else if (itemMimeType like 'image/%') + imageFile := 'image.gif'; ------------------------------------------------------------------------------------------ --- -create procedure WEBDAV.DBA.validate2 ( - in propertyType varchar, - in propertyValue varchar) -{ - declare exit handler for SQLSTATE '*' { - if (__SQL_STATE = 'CLASS') - resignal; - signal('TYPE', propertyType); - return; - }; + else if (itemMimeType like 'audio/%') + imageFile := 'wave.gif'; - if (propertyType = 'boolean') { - if (propertyValue not in ('Yes', 'No')) - goto _error; - } else if (propertyType = 'integer') { - if (isnull (regexp_match('^[0-9]+\$', propertyValue))) - goto _error; - return cast (propertyValue as integer); - } else if (propertyType = 'float') { - if (isnull (regexp_match('^[-+]?([0-9]*\.)?[0-9]+([eE][-+]?[0-9]+)?\$', propertyValue))) - goto _error; - return cast (propertyValue as float); - } else if (propertyType = 'dateTime') { - if (isnull (regexp_match('^((?:19|20)[0-9][0-9])[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])\$', propertyValue))) - if (isnull (regexp_match('^((?:19|20)[0-9][0-9])[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01]) ([01]?[0-9]|[2][0-3])(:[0-5][0-9])?\$', propertyValue))) - goto _error; - return cast (propertyValue as datetime); - } else if (propertyType = 'dateTime2') { - if (isnull (regexp_match('^((?:19|20)[0-9][0-9])[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01]) ([01]?[0-9]|[2][0-3])(:[0-5][0-9])?\$', propertyValue))) - goto _error; - return cast (propertyValue as datetime); - } else if (propertyType = 'date') { - if (isnull (regexp_match('^((?:19|20)[0-9][0-9])[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])\$', propertyValue))) - goto _error; - return cast (propertyValue as datetime); - } else if (propertyType = 'date2') { - if (isnull (regexp_match('^(0[1-9]|[12][0-9]|3[01])[- /.](0[1-9]|1[012])[- /.]((?:19|20)[0-9][0-9])\$', propertyValue))) - goto _error; - return cast (propertyValue as datetime); - } else if (propertyType = 'time') { - if (isnull (regexp_match('^([01]?[0-9]|[2][0-3])(:[0-5][0-9])?\$', propertyValue))) - goto _error; - return cast (propertyValue as time); - } else if (propertyType = 'folder') { - if (isnull (regexp_match('^[^\\\/\?\*\"\'\>\<\:\|]*\$', propertyValue))) - goto _error; - } else if ((propertyType = 'uri') or (propertyType = 'anyuri')) { - if (isnull (regexp_match('^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_=:]*)?\$', propertyValue))) - goto _error; - } else if (propertyType = 'email') { - if (isnull (regexp_match('^([a-zA-Z0-9_\-])+(\.([a-zA-Z0-9_\-])+)*@((\[(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5])))\.(((([0-1])?([0-9])?[0-9])|(2[0-4][0-9])|(2[0-5][0-5]))\]))|((([a-zA-Z0-9])+(([\-])+([a-zA-Z0-9])+)*\.)+([a-zA-Z])+(([\-])+([a-zA-Z0-9])+)*))\$', propertyValue))) - goto _error; - } else if (propertyType = 'free-text') { - if (length (propertyValue)) - vt_parse(propertyValue); - } else if (propertyType = 'tags') { - if (not WEBDAV.DBA.validate_tags(propertyValue)) - goto _error; - } - return propertyValue; + else if (itemMimeType like 'video/%') + imageFile := 'video.gif'; -_error: - signal('CLASS', propertyType); -} -; + else + { + declare itemExtension varchar; ------------------------------------------------------------------------------------------ --- -create procedure WEBDAV.DBA.validate_ftext ( - in S varchar) -{ - declare st, msg varchar; + itemExtension := lcase (WEBDAV.DBA.path_extension (itemPath)); + if (itemExtension = 'txt') + imageFile := 'text.gif'; - st := '00000'; - exec ('vt_parse (?)', st, msg, vector (S)); - if ('00000' = st) - return 1; - return 0; -} -; + else if (itemExtension in ('html', 'htm', 'xhtml')) + imageFile := 'html.gif'; ------------------------------------------------------------------------------------------ --- -create procedure WEBDAV.DBA.validate_tag ( - in S varchar) -{ - S := replace (trim(S), '+', '_'); - S := replace (trim(S), ' ', '_'); - if (not WEBDAV.DBA.validate_ftext(S)) - return 0; - if (not isnull (strstr(S, '"'))) - return 0; - if (not isnull (strstr(S, ''''))) - return 0; - if (length (S) < 2) - return 0; - if (length (S) > 50) - return 0; - return 1; -} -; + else if (itemExtension in ('wav', 'mp3', 'ogg', 'aac', 'flac', 'm4a', 'wma')) + imageFile := 'wave.gif'; ------------------------------------------------------------------------------------------ --- -create procedure WEBDAV.DBA.validate_tags ( - in S varchar) -{ - declare N integer; - declare V any; + else if (itemExtension in ('wmv', 'mov', 'avi', 'mp4', 'm4v', 'ogv')) + imageFile := 'video.gif'; - if (is_empty_or_null(S)) - return 1; - V := WEBDAV.DBA.tags2vector (S); - if (is_empty_or_null(V)) - return 0; - if (length(V) <> length(WEBDAV.DBA.tags2unique(V))) - return 0; - for (N := 0; N < length(V); N := N + 1) - if (not WEBDAV.DBA.validate_tag(V[N])) - return 0; - return 1; -} -; + else if (itemExtension in ('doc', 'dot', 'odt')) + imageFile := 'msword.gif'; -------------------------------------------------------------------------------- --- -create procedure WEBDAV.DBA.ui_image ( - in itemPath varchar, - in itemType varchar, - in itemMimeType varchar) returns varchar -{ - if (itemType = 'C') - { - declare det_type varchar; + else if (itemExtension in ('xls', 'ods')) + imageFile := 'xls.gif'; - det_type := WEBDAV.DBA.det_type (itemPath, itemType); - if (det_type = 'CatFilter') - return 'dav/image/dav/category_16.png'; - if (det_type = 'PropFilter') - return 'dav/image/dav/property_16.png'; - if (det_type = 'HostFs') - return 'dav/image/dav/hostfs_16.png'; - if (det_type = 'Versioning') - return 'dav/image/dav/versions_16.png'; - if (det_type = 'News3') - return 'dav/image/dav/enews_16.png'; - if (det_type = 'Blog') - return 'dav/image/dav/blog_16.png'; - if (det_type = 'oMail') - return 'dav/image/dav/omail_16.png'; - return 'dav/image/dav/foldr_16.png'; - } - if (itemPath like '%.txt') - return 'dav/image/dav/text.gif'; - if (itemPath like '%.pdf') - return 'dav/image/dav/pdf.gif'; - if (itemPath like '%.html') - return 'dav/image/dav/html.gif'; - if (itemPath like '%.htm') - return 'dav/image/dav/html.gif'; - if (itemPath like '%.wav') - return 'dav/image/dav/wave.gif'; - if (itemPath like '%.ogg') - return 'dav/image/dav/wave.gif'; - if (itemPath like '%.flac') - return 'dav/image/dav/wave.gif'; - if (itemPath like '%.wma') - return 'dav/image/dav/wave.gif'; - if (itemPath like '%.wmv') - return 'dav/image/dav/video.gif'; - if (itemPath like '%.doc') - return 'dav/image/dav/msword.gif'; - if (itemPath like '%.dot') - return 'dav/image/dav/msword.gif'; - if (itemPath like '%.xls') - return 'dav/image/dav/xls.gif'; - if (itemPath like '%.zip') - return 'dav/image/dav/zip.gif'; - if (itemMimeType like 'audio/%') - return 'dav/image/dav/wave.gif'; - if (itemMimeType like 'video/%') - return 'dav/image/dav/video.gif'; - if (itemMimeType like 'image/%') - return 'dav/image/dav/image.gif'; - return 'dav/image/dav/generic_file.png'; + else if (itemExtension = 'pdf') + imageFile := 'pdf.gif'; + + else if (itemExtension in ('zip', 'rar', '7z', 'tar')) + imageFile := 'zip.gif'; + + else + imageFile := 'generic_file.png'; + } + } + return 'dav/image/dav/' || imageFile; } ; @@ -5046,7 +4803,7 @@ create procedure WEBDAV.DBA.acl_share_create ( if (exists (select 1 from WS.WS.SYS_DAV_COL where COL_PARENT = DAV_SEARCH_ID (_home, 'C') and COL_DET = 'Share')) return; - if (exists (select 1 from WS.WS.SYS_DAV_COL where WS.WS.COL_PATH (COL_ID) like (_home || '%') and COL_DET = 'Share')) + if (exists (select 1 from WS.WS.SYS_DAV_COL where DB.DBA.DAV_SEARCH_PATH (COL_ID, 'C') like (_home || '%') and COL_DET = 'Share')) return; for (select U_ID, U_PWD, U_GROUP, U_DEF_PERMS, U_HOME from WS.WS.SYS_DAV_USER where U_NAME = _user_name) do @@ -5549,15 +5306,15 @@ create procedure WEBDAV.DBA.aci_lines ( { if (_mode = 'view') { - http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("%s", {fld_1: {mode: 50, value: "%s"}, fld_2: {mode: 51, value: %s}, fld_3: {mode: 52, value: [%d, %d, %d], execute: \'%s\', tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}, fld_4: {value: "Inherited"}});});', _tbl, _acl[N][2], WEBDAV.DBA.obj2json (_acl[N][1]), _acl[N][3], _acl[N][4], _acl[N][5], _execute)); + http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("%s", {fld_1: {mode: 50, value: "%s"}, fld_2: {mode: 51, value: %s}, fld_3: {mode: 52, value: [%d, %d, %d], execute: \'%s\', tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}, fld_4: {value: "Inherited"}});});', _tbl, _acl[N][2], DB.DBA.obj2json (_acl[N][1]), _acl[N][3], _acl[N][4], _acl[N][5], _execute)); } else if (_mode = 'disabled') { - http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("%s", {fld_1: {mode: 50, value: "%s"}, fld_2: {mode: 51, value: %s}, fld_3: {mode: 52, value: [%d, %d, %d], execute: \'%s\', tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}, fld_4: {value: ""}});});', _tbl, _acl[N][2], WEBDAV.DBA.obj2json (_acl[N][1]), _acl[N][3], _acl[N][4], _acl[N][5], _execute)); + http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createViewRow("%s", {fld_1: {mode: 50, value: "%s"}, fld_2: {mode: 51, value: %s}, fld_3: {mode: 52, value: [%d, %d, %d], execute: \'%s\', tdCssText: "width: 1%%; white-space: nowrap; text-align: center;"}, fld_4: {value: ""}});});', _tbl, _acl[N][2], DB.DBA.obj2json (_acl[N][1]), _acl[N][3], _acl[N][4], _acl[N][5], _execute)); } else { - http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("%s", null, {fld_1: {mode: 50, value: "%s", noAdvanced: %s, onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, form: "F1", tdCssText: "white-space: nowrap;", className: "_validate_ _webid_", value: %s, readOnly: %s, imgCssText: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], execute: \'%s\', tdCssText: "width: 1%%; text-align: center;"}});});', _tbl, _acl[N][2], _advanced, WEBDAV.DBA.obj2json (_acl[N][1]), case when _acl[N][2] = 'public' then 'true' else 'false' end, case when _acl[N][2] = 'public' then 'display: none;' else '' end, _acl[N][3], _acl[N][4], _acl[N][5], _execute)); + http (sprintf ('OAT.MSG.attach(OAT, "PAGE_LOADED", function(){TBL.createRow("%s", null, {fld_1: {mode: 50, value: "%s", noAdvanced: %s, onchange: function(){TBL.changeCell50(this);}}, fld_2: {mode: 51, form: "F1", tdCssText: "white-space: nowrap;", className: "_validate_ _webid_", value: %s, readOnly: %s, imgCssText: "%s"}, fld_3: {mode: 52, value: [%d, %d, %d], execute: \'%s\', tdCssText: "width: 1%%; text-align: center;"}});});', _tbl, _acl[N][2], _advanced, DB.DBA.obj2json (_acl[N][1]), case when _acl[N][2] = 'public' then 'true' else 'false' end, case when _acl[N][2] = 'public' then 'display: none;' else '' end, _acl[N][3], _acl[N][4], _acl[N][5], _execute)); } } } @@ -5648,6 +5405,7 @@ create procedure WEBDAV.DBA.VAD_CHECK ( { if (isnull (VAD_CHECK_VERSION (vad_name))) return 0; + return 1; } ; @@ -5830,14 +5588,16 @@ create procedure WEBDAV.DBA.ldp_recovery_aq ( } for (select RES_CONTENT, RES_TYPE, RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_COL = work_id) do { - if (enabled and (RES_TYPE in ('text/turtle', 'application/ld+json'))) + if (enabled) { - ruri := WS.WS.DAV_IRI (RES_FULL_PATH); - TTLP (sprintf ('<%s> <%s> .', uri, ruri), uri, uri); - TTLP (sprintf ('<%s> , .', ruri), ruri, ruri); + DB.DBA.LDP_CREATE_RES (RES_FULL_PATH); + if (RES_TYPE in ('text/turtle', 'application/ld+json')) { - declare continue handler for sqlstate '*'; - TTLP (cast (RES_CONTENT as varchar), ruri, ruri, 255); + ruri := WS.WS.DAV_IRI (RES_FULL_PATH); + { + declare continue handler for sqlstate '*'; + TTLP (cast (RES_CONTENT as varchar), ruri, ruri, 255); + } } } else @@ -5854,6 +5614,7 @@ create procedure WEBDAV.DBA.ldp_recovery_aq ( for (select COL_NAME from WS.WS.SYS_DAV_COL where COL_PARENT = work_id and (COL_DET is null or DB.DBA.DAV_DET_IS_WEBDAV_BASED (COL_DET))) do { + commit work; WEBDAV.DBA.ldp_recovery_aq (path || COL_NAME || '/', enabled); } } @@ -5920,7 +5681,7 @@ create procedure WEBDAV.DBA.oauth_exist () { declare retValue any; - retValue := WEBDAV.DBA.exec ('select 1 from VAL.DBA.ODS_OAUTH_INSTANCES, OAUTH.DBA.APP_REG where A_NAME = OOI_NAME'); + retValue := WEBDAV.DBA.exec ('select TOP 1 1 from OAUTH.DBA.APP_REG where A_TYPE = 1'); if (WEBDAV.DBA.isVector (retValue) and (length (retValue) = 1)) return 1; @@ -5935,7 +5696,7 @@ create procedure WEBDAV.DBA.oauth_list () declare retValue, items any; retValue := vector (); - items := WEBDAV.DBA.exec ('select OOI_NAME, OOI_LABEL from VAL.DBA.ODS_OAUTH_INSTANCES, OAUTH.DBA.APP_REG where A_NAME = OOI_NAME'); + items := WEBDAV.DBA.exec ('select A_NAME, A_DESCR from OAUTH.DBA.APP_REG where A_TYPE = 1 order by A_NAME'); foreach (any item in items) do { retValue := vector_concat (retvalue, vector (vector (item[0], item[1]))); diff --git a/binsrc/yacutia/dav/dav_browser.xsl b/binsrc/conductor/dav/dav_browser.xsl similarity index 94% rename from binsrc/yacutia/dav/dav_browser.xsl rename to binsrc/conductor/dav/dav_browser.xsl index 24f036a2ef..de07f5835e 100644 --- a/binsrc/yacutia/dav/dav_browser.xsl +++ b/binsrc/conductor/dav/dav_browser.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -59,7 +59,7 @@ - + 'briefcase''webdav''conductor' ]]> - + @@ -2564,13 +2616,13 @@ File Content 		-
+
%V', get_keyword ('dav_content_plain', self.vc_page.vc_event.ve_params, ''))); ?>
-
+
%V', get_keyword ('dav_content_html', self.vc_page.vc_event.ve_params, ''))); ?> @@ -2586,13 +2638,10 @@
- +
@@ -2718,7 +2769,7 @@
- + @@ -2736,11 +2787,11 @@ - + - +
- + @@ -2781,11 +2832,11 @@ - + - +
- + @@ -2870,7 +2921,7 @@ @@ -3086,7 +3137,7 @@ @@ -4393,12 +4441,12 @@
- +
- +
- + @@ -3024,7 +3075,7 @@
- + @@ -3043,7 +3094,7 @@
- + @@ -3073,12 +3124,12 @@
- + - +
- + @@ -3105,7 +3156,7 @@
- + @@ -3384,9 +3435,9 @@ msg := ''; declare exit handler for SQLSTATE '*' { - if (__SQL_STATE = 'TEST') + if ((__SQL_STATE like 'NV%') or (__SQL_STATE = 'TEST')) { - self.vc_error_message := concat (msg, WEBDAV.DBA.test_clear (__SQL_MESSAGE)); + self.vc_error_message := concat (msg, VALIDATE.DBA.clear (__SQL_MESSAGE)); self.vc_is_valid := 0; return; } @@ -3435,7 +3486,7 @@ { dav_filename := get_keyword ('dav_url', params, ''); } - WEBDAV.DBA.test (dav_filename, vector ('name', 'Source', 'class', 'varchar', 'canEmpty', 0)); + VALIDATE.DBA.validate (dav_filename, vector ('name', 'Source', 'class', 'varchar', 'canEmpty', 0)); if (self.dav_source = 0) { if ((dav_filename like 'http://%') or (dav_filename like 'ftp://%')) @@ -3457,7 +3508,7 @@ rdf_type := http_mime_type (dav_filename); } rdf_graph := trim (get_keyword ('dav_name_rdf', params)); - WEBDAV.DBA.test (rdf_graph, vector ('name', 'Graph', 'class', 'varchar', 'canEmpty', 0)); + VALIDATE.DBA.validate (rdf_graph, vector ('name', 'Graph', 'class', 'varchar', 'canEmpty', 0)); retValue := WEBDAV.DBA.DAV_RDF_UPLOAD (rdf_data, rdf_type, rdf_graph); if (not retValue) { @@ -3545,7 +3596,7 @@ goto _test_2; dav_link := trim (get_keyword ('dav_link', params)); - WEBDAV.DBA.test (dav_link, vector ('name', 'Link To', 'class', 'varchar', 'minLength', 1)); + VALIDATE.DBA.validate (dav_link, vector ('name', 'Link To', 'class', 'varchar', 'minLength', 1)); tmp := DB.DBA.DAV_SEARCH_ID (dav_link, 'R'); if (WEBDAV.DBA.DAV_ERROR (tmp)) signal('TEST', 'File with such name does not exist!<>'); @@ -3556,7 +3607,7 @@ goto _test_3; self.dav_tags_public := trim (get_keyword ('f_tags_public', params, '')); - if (not WEBDAV.DBA.validate_tags (self.dav_tags_public)) + if (not VALIDATE.DBA.validate_tags (self.dav_tags_public)) signal('TEST', 'The expression contains no valid tag(s)!<>'); _test_3:; @@ -3565,7 +3616,7 @@ goto _test_4; self.dav_tags_private := trim (get_keyword ('f_tags_private', params, '')); - if (not WEBDAV.DBA.validate_tags (self.dav_tags_private)) + if (not VALIDATE.DBA.validate_tags (self.dav_tags_private)) signal('TEST', 'The expression contains no valid tag(s)!<>'); _test_4:; @@ -3608,7 +3659,7 @@ { dav_filename := get_keyword ('dav_rdf', params); } - WEBDAV.DBA.test (dav_filename, vector ('name', 'Source', 'class', 'varchar', 'canEmpty', 0)); + VALIDATE.DBA.validate (dav_filename, vector ('name', 'Source', 'class', 'varchar', 'canEmpty', 0)); if (self.dav_source = 0) { dav_file := get_keyword ('dav_file', params); @@ -3701,7 +3752,7 @@ dav_encryption_state := 1; self.dav_encryption_pwd := get_keyword ('dav_encryption_password', params); - WEBDAV.DBA.test (self.dav_encryption_pwd, vector ('name', 'SSE Password', 'class', 'varchar', 'minLength', 1, 'maxLength', 32)); + VALIDATE.DBA.validate (self.dav_encryption_pwd, vector ('name', 'SSE Password', 'class', 'varchar', 'minLength', 1, 'maxLength', 32)); if ((self.command_mode = 10) and (self.dav_encryption_pwd = '**********') and (get_keyword ('dav_encryption_password2', params) = '')) goto _test_10; @@ -3723,7 +3774,7 @@ -- validate tags self.dav_tags_public := trim (get_keyword ('f_tags_public', params, '')); - if (not WEBDAV.DBA.validate_tags (self.dav_tags_public)) + if (not VALIDATE.DBA.validate_tags (self.dav_tags_public)) signal('TEST', 'The expression contains no valid tag(s)!<>'); _test_12:; @@ -3731,14 +3782,14 @@ goto _test_13; self.dav_tags_private := trim (get_keyword ('f_tags_private', params, '')); - if (not WEBDAV.DBA.validate_tags (self.dav_tags_private)) + if (not VALIDATE.DBA.validate_tags (self.dav_tags_private)) signal('TEST', 'The expression contains no valid tag(s)!<>'); _test_13:; if ((self.command_mode = 10) and not self.editField ('expireDate')) goto _test_14; - dav_expireDate := WEBDAV.DBA.test (get_keyword ('dav_expireDate', params), vector('name', 'Expire date', 'class', 'date-yyyy.mm.dd', 'canEmpty', 1)); + dav_expireDate := VALIDATE.DBA.validate (get_keyword ('dav_expireDate', params), vector('name', 'Expire date', 'class', 'date-yyyy.mm.dd', 'canEmpty', 1)); _test_14:; if ((self.command_mode = 10) and not self.editField ('aci')) @@ -4103,17 +4154,11 @@ _exec_14:; -- Auto versioning - if ((self.dav_type = 'C') and (self.command_mode <> 10)) + if (WEBDAV.DBA.DAV_GET_AUTOVERSION (dav_fullPath) <> get_keyword ('dav_autoversion', params, '')) { - if (WEBDAV.DBA.DAV_GET_AUTOVERSION (dav_fullPath) <> get_keyword ('dav_autoversion', params, '')) - { - retValue := WEBDAV.DBA.DAV_SET (dav_fullPath, 'autoversion', get_keyword ('dav_autoversion', params, ''), self.account_name, self.account_password); - if (WEBDAV.DBA.DAV_ERROR (retValue)) - signal ('TEST', concat(WEBDAV.DBA.DAV_PERROR (retValue), '<>')); - - if ((self.dav_type = 'R') and (WEBDAV.DBA.DAV_GET_AUTOVERSION (dav_fullPath) = '')) - WEBDAV.DBA.DAV_REMOVE_VERSION_CONTROL (dav_fullPath); - } + retValue := WEBDAV.DBA.DAV_SET (dav_fullPath, 'autoversion', get_keyword ('dav_autoversion', params, ''), self.account_name, self.account_password); + if (WEBDAV.DBA.DAV_ERROR (retValue)) + signal ('TEST', concat(WEBDAV.DBA.DAV_PERROR (retValue), '<>')); } _exec_15:; @@ -4189,9 +4234,12 @@ WEBDAV.initTab(17, 1); destinationChange($('dav_turtleRedirect'), {'checked': {'show': ['ttl_enable_1', 'ttl_enable_2']}, 'unchecked': {'hide': ['ttl_enable_1', 'ttl_enable_2']}}); - var v = $('dav_name').value; - $('dav_name_save').value = v; - $('dav_name_save_mime').value = v; + var v = $('dav_name'); + if (!v.disabled) + v.focus(); + + $('dav_name_save').value = v.value; + $('dav_name_save_mime').value = v.value; ]]> @@ -4220,11 +4268,11 @@
- + &nbsp; - + &nbsp; - + &nbsp;
- &nbsp; + &nbsp;
- + - &nbsp; - + &nbsp; + @@ -4415,12 +4463,12 @@
- + &nbsp; - + @@ -4437,12 +4485,12 @@
- + &nbsp; - + @@ -4459,7 +4507,7 @@
- + @@ -4494,7 +4542,7 @@ @@ -4627,10 +4675,8 @@ @@ -4638,10 +4684,8 @@
- + @@ -4507,7 +4555,7 @@
- + @@ -4522,7 +4570,7 @@ - +
- - - - + &nbsp; +
- - - - + &nbsp; +
@@ -4886,7 +4930,7 @@
- + @@ -4895,7 +4939,7 @@
- + @@ -5045,9 +5089,9 @@ declare tmp, imap_filterName, imap_filterActive, imap_filterMode, imap_filterCriteria, imap_filterActions any; declare exit handler for SQLSTATE '*' { - if (__SQL_STATE = 'TEST') + if ((__SQL_STATE like 'NV%') or (__SQL_STATE = 'TEST')) { - self.vc_error_message := WEBDAV.DBA.test_clear (__SQL_MESSAGE); + self.vc_error_message := VALIDATE.DBA.clear (__SQL_MESSAGE); self.vc_is_valid := 0; return; } @@ -5061,9 +5105,7 @@ C := MAIL.WA.filter_params_criteria ('search_', params, imap_filterCriteria, tmp); A := MAIL.WA.filter_params_actions ('action_', params, imap_filterActions, tmp); if ((A = 0) or (C = 0)) - { - signal ('TEST', 'Filter must have at least one criteria and one action!'); - } + signal ('NV999', 'Filter must have at least one criteria and one action!'); MAIL.WA.filter_save (_owner, self.imap_filterId, imap_filterName, imap_filterActive, DB.DBA.IMAP__mea_id (_owner), imap_filterMode, imap_filterCriteria, imap_filterActions); @@ -5095,18 +5137,18 @@
- + Browse Path
- + &nbsp; - + Filter Cancel Filter @@ -5122,6 +5164,10 @@ '0') + { + limit_sql := 'TOP ' || dir_rows; + dir_options := vector ('limit', dir_rows); + } - control.ds_sql := 'select rs.* from WEBDAV.DBA.proc (rs0, rs1, rs2, rs3, rs4, rs5)(c0 varchar, c1 varchar, c2 integer, c3 varchar, c4 varchar, c5 varchar, c6 varchar, c7 varchar, c8 varchar, c9 varchar, c10 varchar, c11 varchar, c12 varchar) rs where rs0 = ? and rs1 = ? and rs2 = ? and rs3 = ? and rs4 = ? and rs5 = ?'; + control.ds_sql := 'select rs.* from WEBDAV.DBA.proc (rs0, rs1, rs2, rs3, rs4, rs5, rs6)(c0 varchar, c1 varchar, c2 integer, c3 varchar, c4 varchar, c5 varchar, c6 varchar, c7 varchar, c8 varchar, c9 varchar, c10 varchar, c11 varchar, c12 varchar) rs where rs0 = ? and rs1 = ? and rs2 = ? and rs3 = ? and rs4 = ? and rs5 = ? and rs6 = ?'; + control.ds_sql := replace (control.ds_sql, '', limit_sql); if (self.dir_details = 0) { declare dir_order, dir_grouping any; - dir_order := self.getColumn(self.dir_order); - dir_grouping := self.getColumn(self.dir_grouping); - if (not is_empty_or_null(dir_grouping)) - control.ds_sql := concat(control.ds_sql, ', ', dir_grouping[1]); + dir_order := self.getColumn (self.dir_order); + dir_grouping := self.getColumn (self.dir_grouping); + if (not is_empty_or_null (dir_grouping)) + control.ds_sql := concat (control.ds_sql, ', ', dir_grouping[1]); + if (not is_empty_or_null(dir_order)) - control.ds_sql := concat(control.ds_sql, ' order by ', dir_order[1], ' ', self.dir_direction); + { + control.ds_sql := concat (control.ds_sql, ' order by ', dir_order[1], ' ', self.dir_direction); + dir_options := vector_concat (dir_options, vector ('order', dir_order[1], 'direction', self.dir_direction)); + } } else { control.ds_sql := control.ds_sql || ' order by c0'; + dir_options := vector_concat (dir_options, vector ('order', 'c0')); } + control.add_parameter (dir_options); + self.dir_tags := vector (); if (self.dir_cloud = 1) { @@ -5359,7 +5421,7 @@ ?>
'') or (self.mode = 'webdav')) { http (sprintf( ' Update Properties', self.image_src ('dav/image/dav/item_prop.png'), WEBDAV.DBA.utf2wide (replace (path, '\'', '\\\'')))); @@ -5479,9 +5542,13 @@ (rowset[1] = 'R') and ( - (__tag (id) <> 193) + isinteger (id) + or + DB.DBA.DAV_DET_IS_WEBDAV_BASED (detType) or - (cast (id[0] as varchar) in ('Share', 'S3', 'GDrive', 'Dropbox', 'SkyDrive', 'Box', 'WebDAV', 'RACKSPACE', 'FTP', 'LDP')) + (detType = 'CalDAV') + or + (detType = 'CardDAV') or (rowset[0] like '%,acl') or @@ -5509,7 +5576,7 @@ not DB.DBA.IS_REDIRECT_REF (path) ) { - if ((rowset[0] like '%,acl') or (rowset[0] like '%,meta') or ((permission = 'R') and (self.mode <> 'webdav'))) + if ((rowset[0] like '%,acl') or (rowset[0] like '%,meta') or ((permission = 'R') and (self.mode <> 'webdav')) or (detType in ('CalDAV', 'CardDAV'))) { http (sprintf( ' View Content', self.image_src ('dav/image/docs_16.png'), WEBDAV.DBA.utf2wide (replace (path, '\'', '\\\'')))); } @@ -5578,7 +5645,7 @@
- +
Resource Name @@ -5591,7 +5658,7 @@ ]]> - +
@@ -5642,7 +5709,7 @@
- + @@ -5658,7 +5725,7 @@
- + @@ -5680,7 +5747,7 @@ - - - +
- + @@ -5694,7 +5761,7 @@
- + @@ -5709,7 +5776,7 @@
- + @@ -5732,7 +5799,7 @@
- +
- + ', WEBDAV.DBA.dc_get(self.search_dc, 'base', 'path', WEBDAV.DBA.path_show(self.dir_path)))); ?> @@ -5898,7 +5965,7 @@ @@ -5939,7 +6006,7 @@
- + %s, ', WEBDAV.DBA.DAV_GET_INFO (self.dav_path, 'lockState'))); - http (sprintf ('Version Control is %s, ', WEBDAV.DBA.DAV_GET_INFO (self.dav_path, 'vc'))); - http (sprintf ('Auto Versioning is %s, ', WEBDAV.DBA.DAV_GET_INFO (self.dav_path, 'avcState'))); - http (sprintf ('Version State is %s', WEBDAV.DBA.DAV_GET_INFO (self.dav_path, 'vcState'))); + http (sprintf ('Lock: %s, ', WEBDAV.DBA.DAV_GET_INFO (self.dav_path, 'lockState'))); + http (sprintf ('Version Control: %s, ', WEBDAV.DBA.DAV_GET_INFO (self.dav_path, 'vc'))); + http (sprintf ('Auto Versioning: %s, ', WEBDAV.DBA.DAV_GET_INFO (self.dav_path, 'avcState'))); + http (sprintf ('Version State: %s', WEBDAV.DBA.DAV_GET_INFO (self.dav_path, 'vcState'))); ?>
- + - + - + - + - + - + - +
- + - + '; @@ -6368,7 +6437,7 @@
- +
- +
- +
- +
- + + + + +
- +
- + @@ -6856,21 +6925,24 @@
- + Digest', case when _value not in ('WebID', 'oauth') then 'checked="checked"' else '' end)); - if (WEBDAV.DBA.keys_exist (_uname)) - http (sprintf ('', case when _value = 'WebID' then 'checked="checked"' else '' end)); - - if (WEBDAV.DBA.oauth_exist ()) - http (sprintf ('', case when _value = 'oauth' then 'checked="checked"' else '' end)); + http (sprintf ('', case when _value not in ('webid', 'webid-tls', 'webid-tls+delegation', 'oauth') then 'checked="checked"' else '' end)); + if (_keys) + { + http (sprintf ('', case when _value in ('webid', 'webid-tls') then 'checked="checked"' else '' end)); + http (sprintf ('', case when _value = 'webid-tls+delegation' then 'checked="checked"' else '' end)); + } + if (_oauth) + http (sprintf ('', case when _value = 'oauth' then 'checked="checked"' else '' end)); } else { @@ -6881,7 +6953,7 @@
- + @@ -6957,7 +7043,7 @@
- + @@ -6975,9 +7061,10 @@
- OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_WebDAV_authenticationType_0'), {checked: {show: ['tr_dav_WebDAV_user', 'tr_dav_WebDAV_password'], hide: ['tr_dav_WebDAV_key', 'tr_dav_WebDAV_oauth', 'tr_dav_WebDAV_display_name', 'tr_dav_WebDAV_email', 'tr_dav_WebDAV_authenticate']}})}); - OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_WebDAV_authenticationType_1'), {checked: {hide: ['tr_dav_WebDAV_user', 'tr_dav_WebDAV_password', 'tr_dav_WebDAV_oauth', 'tr_dav_WebDAV_display_name', 'tr_dav_WebDAV_email', 'tr_dav_WebDAV_authenticate'], show: ['tr_dav_WebDAV_key']}})}); - OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_WebDAV_authenticationType_2'), {checked: {hide: ['tr_dav_WebDAV_user', 'tr_dav_WebDAV_password', 'tr_dav_WebDAV_key'], show: ['tr_dav_WebDAV_oauth', 'tr_dav_WebDAV_authenticate'], exec: [oauthShowData]}})}); + OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_WebDAV_authenticationType_0'), {checked: {show: ['tr_dav_WebDAV_user', 'tr_dav_WebDAV_password'], hide: ['tr_dav_WebDAV_key', 'tr_dav_WebDAV_onBehalfOf', 'tr_dav_WebDAV_oauth', 'tr_dav_WebDAV_display_name', 'tr_dav_WebDAV_email', 'tr_dav_WebDAV_authenticate']}})}); + OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_WebDAV_authenticationType_1'), {checked: {hide: ['tr_dav_WebDAV_user', 'tr_dav_WebDAV_password', 'tr_dav_WebDAV_onBehalfOf', 'tr_dav_WebDAV_oauth', 'tr_dav_WebDAV_display_name', 'tr_dav_WebDAV_email', 'tr_dav_WebDAV_authenticate'], show: ['tr_dav_WebDAV_key']}})}); + OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_WebDAV_authenticationType_2'), {checked: {hide: ['tr_dav_WebDAV_user', 'tr_dav_WebDAV_password', 'tr_dav_WebDAV_oauth', 'tr_dav_WebDAV_display_name', 'tr_dav_WebDAV_email', 'tr_dav_WebDAV_authenticate'], show: ['tr_dav_WebDAV_key', 'tr_dav_WebDAV_onBehalfOf']}})}); + OAT.MSG.attach(OAT, "PAGE_LOADED", function(){destinationChange($('dav_WebDAV_authenticationType_3'), {checked: {hide: ['tr_dav_WebDAV_user', 'tr_dav_WebDAV_password', 'tr_dav_WebDAV_key', 'tr_dav_WebDAV_onBehalfOf'], show: ['tr_dav_WebDAV_oauth', 'tr_dav_WebDAV_authenticate'], exec: [oauthShowData]}})}); function oauthShowData (obj) { if (obj.checked) { @@ -6999,7 +7086,7 @@
- +
- + @@ -7042,7 +7129,7 @@
- + @@ -7056,7 +7143,7 @@
- + @@ -7070,7 +7157,7 @@
- + diff --git a/binsrc/yacutia/folder_error.vspx b/binsrc/conductor/folder_error.vspx similarity index 98% rename from binsrc/yacutia/folder_error.vspx rename to binsrc/conductor/folder_error.vspx index b03b160b1f..028f3f0d19 100644 --- a/binsrc/yacutia/folder_error.vspx +++ b/binsrc/conductor/folder_error.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/form.xsl b/binsrc/conductor/form.xsl similarity index 99% rename from binsrc/yacutia/form.xsl rename to binsrc/conductor/form.xsl index 79241bf31a..8aaf378fea 100644 --- a/binsrc/yacutia/form.xsl +++ b/binsrc/conductor/form.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/graphs_audit_security.vspx b/binsrc/conductor/graphs_audit_security.vspx similarity index 98% rename from binsrc/yacutia/graphs_audit_security.vspx rename to binsrc/conductor/graphs_audit_security.vspx index 4ae97a2012..f43d97cd67 100644 --- a/binsrc/yacutia/graphs_audit_security.vspx +++ b/binsrc/conductor/graphs_audit_security.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/graphs_page.vspx b/binsrc/conductor/graphs_page.vspx similarity index 99% rename from binsrc/yacutia/graphs_page.vspx rename to binsrc/conductor/graphs_page.vspx index 8085f31c49..3bc9bcf000 100644 --- a/binsrc/yacutia/graphs_page.vspx +++ b/binsrc/conductor/graphs_page.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/graphs_roles_security.vspx b/binsrc/conductor/graphs_roles_security.vspx similarity index 99% rename from binsrc/yacutia/graphs_roles_security.vspx rename to binsrc/conductor/graphs_roles_security.vspx index e882a651d0..5df3575137 100644 --- a/binsrc/yacutia/graphs_roles_security.vspx +++ b/binsrc/conductor/graphs_roles_security.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/graphs_users_security.vspx b/binsrc/conductor/graphs_users_security.vspx similarity index 99% rename from binsrc/yacutia/graphs_users_security.vspx rename to binsrc/conductor/graphs_users_security.vspx index 94380d83be..c59b6661de 100644 --- a/binsrc/yacutia/graphs_users_security.vspx +++ b/binsrc/conductor/graphs_users_security.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help.vspx b/binsrc/conductor/help.vspx similarity index 97% rename from binsrc/yacutia/help.vspx rename to binsrc/conductor/help.vspx index a20c127611..749a9147df 100644 --- a/binsrc/yacutia/help.vspx +++ b/binsrc/conductor/help.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help.xsl b/binsrc/conductor/help.xsl similarity index 99% rename from binsrc/yacutia/help.xsl rename to binsrc/conductor/help.xsl index 4cfbded125..e5a858310a 100644 --- a/binsrc/yacutia/help.xsl +++ b/binsrc/conductor/help.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help/account_create.xml b/binsrc/conductor/help/account_create.xml similarity index 98% rename from binsrc/yacutia/help/account_create.xml rename to binsrc/conductor/help/account_create.xml index 82157dd2ad..e277ad6f29 100644 --- a/binsrc/yacutia/help/account_create.xml +++ b/binsrc/conductor/help/account_create.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help/caps_browser.xml b/binsrc/conductor/help/caps_browser.xml similarity index 96% rename from binsrc/yacutia/help/caps_browser.xml rename to binsrc/conductor/help/caps_browser.xml index 2937d2925e..ff7ad45c90 100644 --- a/binsrc/yacutia/help/caps_browser.xml +++ b/binsrc/conductor/help/caps_browser.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help/dav_browser_search.xml b/binsrc/conductor/help/dav_browser_search.xml similarity index 96% rename from binsrc/yacutia/help/dav_browser_search.xml rename to binsrc/conductor/help/dav_browser_search.xml index d6ee351eba..b648f42246 100644 --- a/binsrc/yacutia/help/dav_browser_search.xml +++ b/binsrc/conductor/help/dav_browser_search.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help/http_server_management.xml b/binsrc/conductor/help/http_server_management.xml similarity index 97% rename from binsrc/yacutia/help/http_server_management.xml rename to binsrc/conductor/help/http_server_management.xml index c719609153..5ec2ce2efc 100644 --- a/binsrc/yacutia/help/http_server_management.xml +++ b/binsrc/conductor/help/http_server_management.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help/inifile.xml b/binsrc/conductor/help/inifile.xml similarity index 96% rename from binsrc/yacutia/help/inifile.xml rename to binsrc/conductor/help/inifile.xml index ee72dd6dd8..74290edf22 100644 --- a/binsrc/yacutia/help/inifile.xml +++ b/binsrc/conductor/help/inifile.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help/sec_auth_serv.xml b/binsrc/conductor/help/sec_auth_serv.xml similarity index 98% rename from binsrc/yacutia/help/sec_auth_serv.xml rename to binsrc/conductor/help/sec_auth_serv.xml index c9067a5ac5..fecd6cf98c 100644 --- a/binsrc/yacutia/help/sec_auth_serv.xml +++ b/binsrc/conductor/help/sec_auth_serv.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help/soap_services.xml b/binsrc/conductor/help/soap_services.xml similarity index 97% rename from binsrc/yacutia/help/soap_services.xml rename to binsrc/conductor/help/soap_services.xml index 433672f22b..ea7de2a7c0 100644 --- a/binsrc/yacutia/help/soap_services.xml +++ b/binsrc/conductor/help/soap_services.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help/soap_services_edit.xml b/binsrc/conductor/help/soap_services_edit.xml similarity index 98% rename from binsrc/yacutia/help/soap_services_edit.xml rename to binsrc/conductor/help/soap_services_edit.xml index 71fb60a1c5..b72dc6cbf8 100644 --- a/binsrc/yacutia/help/soap_services_edit.xml +++ b/binsrc/conductor/help/soap_services_edit.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help/url_rewrite.xml b/binsrc/conductor/help/url_rewrite.xml similarity index 98% rename from binsrc/yacutia/help/url_rewrite.xml rename to binsrc/conductor/help/url_rewrite.xml index bafa6b6773..78e59e7397 100644 --- a/binsrc/yacutia/help/url_rewrite.xml +++ b/binsrc/conductor/help/url_rewrite.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help/vdb_obj_link_opts.xml b/binsrc/conductor/help/vdb_obj_link_opts.xml similarity index 97% rename from binsrc/yacutia/help/vdb_obj_link_opts.xml rename to binsrc/conductor/help/vdb_obj_link_opts.xml index 62d266ed94..352e4c99b6 100644 --- a/binsrc/yacutia/help/vdb_obj_link_opts.xml +++ b/binsrc/conductor/help/vdb_obj_link_opts.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/help/xquery.xml b/binsrc/conductor/help/xquery.xml similarity index 98% rename from binsrc/yacutia/help/xquery.xml rename to binsrc/conductor/help/xquery.xml index a0bb27fd74..01db669e1f 100644 --- a/binsrc/yacutia/help/xquery.xml +++ b/binsrc/conductor/help/xquery.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/hosted_grant.vspx b/binsrc/conductor/hosted_grant.vspx similarity index 99% rename from binsrc/yacutia/hosted_grant.vspx rename to binsrc/conductor/hosted_grant.vspx index 109dcb6f29..a2669dc988 100644 --- a/binsrc/yacutia/hosted_grant.vspx +++ b/binsrc/conductor/hosted_grant.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/hosted_import.vspx b/binsrc/conductor/hosted_import.vspx similarity index 99% rename from binsrc/yacutia/hosted_import.vspx rename to binsrc/conductor/hosted_import.vspx index 7c1cd17587..f29917eb69 100644 --- a/binsrc/yacutia/hosted_import.vspx +++ b/binsrc/conductor/hosted_import.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/hosted_modules.vspx b/binsrc/conductor/hosted_modules.vspx similarity index 99% rename from binsrc/yacutia/hosted_modules.vspx rename to binsrc/conductor/hosted_modules.vspx index ffdfbabbce..c8428262fc 100644 --- a/binsrc/yacutia/hosted_modules.vspx +++ b/binsrc/conductor/hosted_modules.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/hosted_modules_load_results.vspx b/binsrc/conductor/hosted_modules_load_results.vspx similarity index 98% rename from binsrc/yacutia/hosted_modules_load_results.vspx rename to binsrc/conductor/hosted_modules_load_results.vspx index 8dae2ed903..d85750615b 100644 --- a/binsrc/yacutia/hosted_modules_load_results.vspx +++ b/binsrc/conductor/hosted_modules_load_results.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/hosted_modules_select.vspx b/binsrc/conductor/hosted_modules_select.vspx similarity index 98% rename from binsrc/yacutia/hosted_modules_select.vspx rename to binsrc/conductor/hosted_modules_select.vspx index f01346e3a0..e107ce05de 100644 --- a/binsrc/yacutia/hosted_modules_select.vspx +++ b/binsrc/conductor/hosted_modules_select.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/hosted_modules_select2.vspx b/binsrc/conductor/hosted_modules_select2.vspx similarity index 99% rename from binsrc/yacutia/hosted_modules_select2.vspx rename to binsrc/conductor/hosted_modules_select2.vspx index a862872a7d..99a8e443b0 100644 --- a/binsrc/yacutia/hosted_modules_select2.vspx +++ b/binsrc/conductor/hosted_modules_select2.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/hosted_modules_show_sql.vsp b/binsrc/conductor/hosted_modules_show_sql.vsp similarity index 97% rename from binsrc/yacutia/hosted_modules_show_sql.vsp rename to binsrc/conductor/hosted_modules_show_sql.vsp index a8d4d07fb2..a2dd0e4e96 100644 --- a/binsrc/yacutia/hosted_modules_show_sql.vsp +++ b/binsrc/conductor/hosted_modules_show_sql.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/conductor/hosted_page.vspx b/binsrc/conductor/hosted_page.vspx new file mode 100644 index 0000000000..6ec2530ca9 --- /dev/null +++ b/binsrc/conductor/hosted_page.vspx @@ -0,0 +1,80 @@ + + + + User Defined Types + + + + + + + + + + + + + + +
+ + + + + + + +
+ + + + + + + &nbsp; +
+ + + + +
+ + + + + + + + + +
+
+ + + diff --git a/binsrc/yacutia/http_add_path.vspx b/binsrc/conductor/http_add_path.vspx similarity index 99% rename from binsrc/yacutia/http_add_path.vspx rename to binsrc/conductor/http_add_path.vspx index 901d7177cd..177f4bb67e 100644 --- a/binsrc/yacutia/http_add_path.vspx +++ b/binsrc/conductor/http_add_path.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/http_del_path.vspx b/binsrc/conductor/http_del_path.vspx similarity index 99% rename from binsrc/yacutia/http_del_path.vspx rename to binsrc/conductor/http_del_path.vspx index cac9775ea5..d5c2755d1d 100644 --- a/binsrc/yacutia/http_del_path.vspx +++ b/binsrc/conductor/http_del_path.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/http_edit_paths.vspx b/binsrc/conductor/http_edit_paths.vspx similarity index 99% rename from binsrc/yacutia/http_edit_paths.vspx rename to binsrc/conductor/http_edit_paths.vspx index 547ce0a01c..1ea4e3eb24 100644 --- a/binsrc/yacutia/http_edit_paths.vspx +++ b/binsrc/conductor/http_edit_paths.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/http_host_clone.vspx b/binsrc/conductor/http_host_clone.vspx similarity index 99% rename from binsrc/yacutia/http_host_clone.vspx rename to binsrc/conductor/http_host_clone.vspx index 39a2f42f85..da2e53eb01 100644 --- a/binsrc/yacutia/http_host_clone.vspx +++ b/binsrc/conductor/http_host_clone.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/http_host_edit.vspx b/binsrc/conductor/http_host_edit.vspx similarity index 99% rename from binsrc/yacutia/http_host_edit.vspx rename to binsrc/conductor/http_host_edit.vspx index 9396f46deb..da49c4a973 100644 --- a/binsrc/yacutia/http_host_edit.vspx +++ b/binsrc/conductor/http_host_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/http_listeners.vspx b/binsrc/conductor/http_listeners.vspx similarity index 99% rename from binsrc/yacutia/http_listeners.vspx rename to binsrc/conductor/http_listeners.vspx index 59ffb341fb..2a13cce5cb 100644 --- a/binsrc/yacutia/http_listeners.vspx +++ b/binsrc/conductor/http_listeners.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/http_serv_mgmt.vspx b/binsrc/conductor/http_serv_mgmt.vspx similarity index 99% rename from binsrc/yacutia/http_serv_mgmt.vspx rename to binsrc/conductor/http_serv_mgmt.vspx index 4a5f4511c8..e3200b2155 100644 --- a/binsrc/yacutia/http_serv_mgmt.vspx +++ b/binsrc/conductor/http_serv_mgmt.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/http_serv_monitoring.vspx b/binsrc/conductor/http_serv_monitoring.vspx similarity index 99% rename from binsrc/yacutia/http_serv_monitoring.vspx rename to binsrc/conductor/http_serv_monitoring.vspx index 21311595df..ffdf516da4 100644 --- a/binsrc/yacutia/http_serv_monitoring.vspx +++ b/binsrc/conductor/http_serv_monitoring.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/http_tcn.vspx b/binsrc/conductor/http_tcn.vspx similarity index 99% rename from binsrc/yacutia/http_tcn.vspx rename to binsrc/conductor/http_tcn.vspx index 3042fb0e2a..1b1fa54d83 100644 --- a/binsrc/yacutia/http_tcn.vspx +++ b/binsrc/conductor/http_tcn.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -64,7 +64,7 @@ Content negotiation 		-   + &nbsp;
diff --git a/binsrc/yacutia/http_url_rewrite.vspx b/binsrc/conductor/http_url_rewrite.vspx similarity index 99% rename from binsrc/yacutia/http_url_rewrite.vspx rename to binsrc/conductor/http_url_rewrite.vspx index 9a9fdd84c0..f8893d4790 100644 --- a/binsrc/yacutia/http_url_rewrite.vspx +++ b/binsrc/conductor/http_url_rewrite.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -65,7 +65,7 @@ url="--sprintf ('http_tcn.vspx?vhost=%U&lhost=%U&lpath=%U&rule_list=%U', self.vhost, self.lhost, self.lpath, self.rulelist)"/> 		-   + &nbsp;
diff --git a/binsrc/conductor/ie.vspx b/binsrc/conductor/ie.vspx new file mode 100644 index 0000000000..936538885b --- /dev/null +++ b/binsrc/conductor/ie.vspx @@ -0,0 +1,77 @@ + + + + Virtuoso Data + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ Import + + + + &nbsp; + + + + Export + + &nbsp; +
+ + + + +
+ + + + + + +
+
+ + + diff --git a/binsrc/yacutia/ie_browser.vspx b/binsrc/conductor/ie_browser.vspx similarity index 99% rename from binsrc/yacutia/ie_browser.vspx rename to binsrc/conductor/ie_browser.vspx index d6f68e5ae7..621335f2c2 100644 --- a/binsrc/yacutia/ie_browser.vspx +++ b/binsrc/conductor/ie_browser.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/ie_export.vspx b/binsrc/conductor/ie_export.vspx similarity index 99% rename from binsrc/yacutia/ie_export.vspx rename to binsrc/conductor/ie_export.vspx index 67e1765f5a..46c3ca67ec 100644 --- a/binsrc/yacutia/ie_export.vspx +++ b/binsrc/conductor/ie_export.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/ie_import.vspx b/binsrc/conductor/ie_import.vspx similarity index 99% rename from binsrc/yacutia/ie_import.vspx rename to binsrc/conductor/ie_import.vspx index 276f32644a..f14dff7fe1 100644 --- a/binsrc/yacutia/ie_import.vspx +++ b/binsrc/conductor/ie_import.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/conductor/iengine.vspx b/binsrc/conductor/iengine.vspx new file mode 100644 index 0000000000..09f14780b9 --- /dev/null +++ b/binsrc/conductor/iengine.vspx @@ -0,0 +1,587 @@ + + + + + Inclusion Engine + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + +
+ + + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Path to primary XSLT in DAV + + +
+ URL to use when resource not found + + +
+ Internal debug level + + +
+ Allow internal edits + + +
+ Embed rdf data using JSON-LD in script tags + + + + + + +
+ Embed rdf data using Turtle in script tags + + + + + + +
+ + + + + + + + + + + +
+ + + + + + + +

+ + + + + +

+ + + + + +
+ + + + + where { + ?S a sioc:Site; + rdfs:label ?L; + foaf:homepage ?H; + ?P ?B. + filter (str (?P) like '%:p:webdav_base'). + } + ) do + { + self.sites_ds := vector_concat (self.sites_ds, vector (vector (cast (S as varchar), cast (L as varchar), cast (H as varchar), cast (B as varchar)))); + } + self.sites_ds_meta := vector (vector ('S', 182, 0, 256, 1, 0, 1, 0, 0, 0, 0, 0), vector ('L', 182, 0, 256, 1, 0, 1, 0, 0, 0, 0, 0), vector ('H', 182, 0, 256, 1, 0, 1, 0, 0, 0, 0, 0), vector ('B', 182, 0, 256, 1, 0, 1, 0, 0, 0, 0, 0)); + ]]> + + +
+

Sites

 +
+ + + Add'; + ]]> + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
SiteHome PageWebDAV BaseAction
+ + + + + + + + + Edit'; + ]]> + + + + + + + + Delete'; + ]]> + + + + + +
+
+ +
+
+

Rewrite rules

 +
+ + + Add'; + ]]> + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + +
SiteOld URLNew URLAction
+ + + + + + + + + Edit'; + ]]> + + + + + + + + Delete'; + ]]> + + + + + +
+
+ + + +
+ + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + + + + + + + + + +
+
+ + +
+ + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + + + + + + + + + +
+
+ + + +
+
+
+ + + diff --git a/binsrc/yacutia/images/Combolist_select.gif b/binsrc/conductor/images/Combolist_select.gif similarity index 100% rename from binsrc/yacutia/images/Combolist_select.gif rename to binsrc/conductor/images/Combolist_select.gif diff --git a/binsrc/yacutia/images/Empty-folder.gif b/binsrc/conductor/images/Empty-folder.gif similarity index 100% rename from binsrc/yacutia/images/Empty-folder.gif rename to binsrc/conductor/images/Empty-folder.gif diff --git a/binsrc/yacutia/images/Folder-full.gif b/binsrc/conductor/images/Folder-full.gif similarity index 100% rename from binsrc/yacutia/images/Folder-full.gif rename to binsrc/conductor/images/Folder-full.gif diff --git a/binsrc/yacutia/images/Folder-up.gif b/binsrc/conductor/images/Folder-up.gif similarity index 100% rename from binsrc/yacutia/images/Folder-up.gif rename to binsrc/conductor/images/Folder-up.gif diff --git a/binsrc/yacutia/images/Folder.gif b/binsrc/conductor/images/Folder.gif similarity index 100% rename from binsrc/yacutia/images/Folder.gif rename to binsrc/conductor/images/Folder.gif diff --git a/binsrc/yacutia/images/Open-folder.gif b/binsrc/conductor/images/Open-folder.gif similarity index 100% rename from binsrc/yacutia/images/Open-folder.gif rename to binsrc/conductor/images/Open-folder.gif diff --git a/binsrc/yacutia/images/binding.gif b/binsrc/conductor/images/binding.gif similarity index 100% rename from binsrc/yacutia/images/binding.gif rename to binsrc/conductor/images/binding.gif diff --git a/binsrc/yacutia/images/business.gif b/binsrc/conductor/images/business.gif similarity index 100% rename from binsrc/yacutia/images/business.gif rename to binsrc/conductor/images/business.gif diff --git a/binsrc/yacutia/images/buttons/next_16.png b/binsrc/conductor/images/buttons/next_16.png similarity index 100% rename from binsrc/yacutia/images/buttons/next_16.png rename to binsrc/conductor/images/buttons/next_16.png diff --git a/binsrc/yacutia/images/buttons/next_24.png b/binsrc/conductor/images/buttons/next_24.png similarity index 100% rename from binsrc/yacutia/images/buttons/next_24.png rename to binsrc/conductor/images/buttons/next_24.png diff --git a/binsrc/yacutia/images/buttons/next_32.png b/binsrc/conductor/images/buttons/next_32.png similarity index 100% rename from binsrc/yacutia/images/buttons/next_32.png rename to binsrc/conductor/images/buttons/next_32.png diff --git a/binsrc/yacutia/images/buttons/previous_16.png b/binsrc/conductor/images/buttons/previous_16.png similarity index 100% rename from binsrc/yacutia/images/buttons/previous_16.png rename to binsrc/conductor/images/buttons/previous_16.png diff --git a/binsrc/yacutia/images/buttons/previous_24.png b/binsrc/conductor/images/buttons/previous_24.png similarity index 100% rename from binsrc/yacutia/images/buttons/previous_24.png rename to binsrc/conductor/images/buttons/previous_24.png diff --git a/binsrc/yacutia/images/buttons/previous_32.png b/binsrc/conductor/images/buttons/previous_32.png similarity index 100% rename from binsrc/yacutia/images/buttons/previous_32.png rename to binsrc/conductor/images/buttons/previous_32.png diff --git a/binsrc/yacutia/images/con_banner.gif b/binsrc/conductor/images/con_banner.gif similarity index 100% rename from binsrc/yacutia/images/con_banner.gif rename to binsrc/conductor/images/con_banner.gif diff --git a/binsrc/yacutia/images/conduct01_01.gif b/binsrc/conductor/images/conduct01_01.gif similarity index 100% rename from binsrc/yacutia/images/conduct01_01.gif rename to binsrc/conductor/images/conduct01_01.gif diff --git a/binsrc/yacutia/images/conduct01_02.gif b/binsrc/conductor/images/conduct01_02.gif similarity index 100% rename from binsrc/yacutia/images/conduct01_02.gif rename to binsrc/conductor/images/conduct01_02.gif diff --git a/binsrc/yacutia/images/conduct01_03.gif b/binsrc/conductor/images/conduct01_03.gif similarity index 100% rename from binsrc/yacutia/images/conduct01_03.gif rename to binsrc/conductor/images/conduct01_03.gif diff --git a/binsrc/yacutia/images/conduct01_04.gif b/binsrc/conductor/images/conduct01_04.gif similarity index 100% rename from binsrc/yacutia/images/conduct01_04.gif rename to binsrc/conductor/images/conduct01_04.gif diff --git a/binsrc/yacutia/images/conduct01_05.gif b/binsrc/conductor/images/conduct01_05.gif similarity index 100% rename from binsrc/yacutia/images/conduct01_05.gif rename to binsrc/conductor/images/conduct01_05.gif diff --git a/binsrc/yacutia/images/conduct01_06.gif b/binsrc/conductor/images/conduct01_06.gif similarity index 100% rename from binsrc/yacutia/images/conduct01_06.gif rename to binsrc/conductor/images/conduct01_06.gif diff --git a/binsrc/yacutia/images/conduct01_07.gif b/binsrc/conductor/images/conduct01_07.gif similarity index 100% rename from binsrc/yacutia/images/conduct01_07.gif rename to binsrc/conductor/images/conduct01_07.gif diff --git a/binsrc/yacutia/images/conduct01_08.gif b/binsrc/conductor/images/conduct01_08.gif similarity index 100% rename from binsrc/yacutia/images/conduct01_08.gif rename to binsrc/conductor/images/conduct01_08.gif diff --git a/binsrc/yacutia/images/conducthi_01.gif b/binsrc/conductor/images/conducthi_01.gif similarity index 100% rename from binsrc/yacutia/images/conducthi_01.gif rename to binsrc/conductor/images/conducthi_01.gif diff --git a/binsrc/yacutia/images/conducthi_02.gif b/binsrc/conductor/images/conducthi_02.gif similarity index 100% rename from binsrc/yacutia/images/conducthi_02.gif rename to binsrc/conductor/images/conducthi_02.gif diff --git a/binsrc/yacutia/images/conducthi_03.gif b/binsrc/conductor/images/conducthi_03.gif similarity index 100% rename from binsrc/yacutia/images/conducthi_03.gif rename to binsrc/conductor/images/conducthi_03.gif diff --git a/binsrc/yacutia/images/conducthi_04.gif b/binsrc/conductor/images/conducthi_04.gif similarity index 100% rename from binsrc/yacutia/images/conducthi_04.gif rename to binsrc/conductor/images/conducthi_04.gif diff --git a/binsrc/yacutia/images/conducthi_05.gif b/binsrc/conductor/images/conducthi_05.gif similarity index 100% rename from binsrc/yacutia/images/conducthi_05.gif rename to binsrc/conductor/images/conducthi_05.gif diff --git a/binsrc/yacutia/images/conducthi_06.gif b/binsrc/conductor/images/conducthi_06.gif similarity index 100% rename from binsrc/yacutia/images/conducthi_06.gif rename to binsrc/conductor/images/conducthi_06.gif diff --git a/binsrc/yacutia/images/conducthi_07.gif b/binsrc/conductor/images/conducthi_07.gif similarity index 100% rename from binsrc/yacutia/images/conducthi_07.gif rename to binsrc/conductor/images/conducthi_07.gif diff --git a/binsrc/yacutia/images/conducthi_08.gif b/binsrc/conductor/images/conducthi_08.gif similarity index 100% rename from binsrc/yacutia/images/conducthi_08.gif rename to binsrc/conductor/images/conducthi_08.gif diff --git a/binsrc/yacutia/images/conductor_lg.gif b/binsrc/conductor/images/conductor_lg.gif similarity index 100% rename from binsrc/yacutia/images/conductor_lg.gif rename to binsrc/conductor/images/conductor_lg.gif diff --git a/binsrc/yacutia/images/contact.gif b/binsrc/conductor/images/contact.gif similarity index 100% rename from binsrc/yacutia/images/contact.gif rename to binsrc/conductor/images/contact.gif diff --git a/binsrc/yacutia/images/dav_browser/close_16.png b/binsrc/conductor/images/dav_browser/close_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/close_16.png rename to binsrc/conductor/images/dav_browser/close_16.png diff --git a/binsrc/yacutia/images/dav_browser/confg_16.png b/binsrc/conductor/images/dav_browser/confg_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/confg_16.png rename to binsrc/conductor/images/dav_browser/confg_16.png diff --git a/binsrc/yacutia/images/dav_browser/docs_16.png b/binsrc/conductor/images/dav_browser/docs_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/docs_16.png rename to binsrc/conductor/images/dav_browser/docs_16.png diff --git a/binsrc/yacutia/images/dav_browser/edit_16.png b/binsrc/conductor/images/dav_browser/edit_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/edit_16.png rename to binsrc/conductor/images/dav_browser/edit_16.png diff --git a/binsrc/yacutia/images/dav_browser/file_gen_16.png b/binsrc/conductor/images/dav_browser/file_gen_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/file_gen_16.png rename to binsrc/conductor/images/dav_browser/file_gen_16.png diff --git a/binsrc/yacutia/images/dav_browser/folder_16.png b/binsrc/conductor/images/dav_browser/folder_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/folder_16.png rename to binsrc/conductor/images/dav_browser/folder_16.png diff --git a/binsrc/yacutia/images/dav_browser/folder_new_16.png b/binsrc/conductor/images/dav_browser/folder_new_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/folder_new_16.png rename to binsrc/conductor/images/dav_browser/folder_new_16.png diff --git a/binsrc/yacutia/images/dav_browser/foldr_16.png b/binsrc/conductor/images/dav_browser/foldr_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/foldr_16.png rename to binsrc/conductor/images/dav_browser/foldr_16.png diff --git a/binsrc/yacutia/images/dav_browser/foldr_new_16.png b/binsrc/conductor/images/dav_browser/foldr_new_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/foldr_new_16.png rename to binsrc/conductor/images/dav_browser/foldr_new_16.png diff --git a/binsrc/yacutia/images/dav_browser/foldr_up_16.png b/binsrc/conductor/images/dav_browser/foldr_up_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/foldr_up_16.png rename to binsrc/conductor/images/dav_browser/foldr_up_16.png diff --git a/binsrc/yacutia/images/dav_browser/go_16.png b/binsrc/conductor/images/dav_browser/go_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/go_16.png rename to binsrc/conductor/images/dav_browser/go_16.png diff --git a/binsrc/yacutia/images/dav_browser/mime_16.png b/binsrc/conductor/images/dav_browser/mime_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/mime_16.png rename to binsrc/conductor/images/dav_browser/mime_16.png diff --git a/binsrc/yacutia/images/dav_browser/msword_16.png b/binsrc/conductor/images/dav_browser/msword_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/msword_16.png rename to binsrc/conductor/images/dav_browser/msword_16.png diff --git a/binsrc/yacutia/images/dav_browser/open_16.png b/binsrc/conductor/images/dav_browser/open_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/open_16.png rename to binsrc/conductor/images/dav_browser/open_16.png diff --git a/binsrc/yacutia/images/dav_browser/opnbr_16.png b/binsrc/conductor/images/dav_browser/opnbr_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/opnbr_16.png rename to binsrc/conductor/images/dav_browser/opnbr_16.png diff --git a/binsrc/yacutia/images/dav_browser/opts_16.png b/binsrc/conductor/images/dav_browser/opts_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/opts_16.png rename to binsrc/conductor/images/dav_browser/opts_16.png diff --git a/binsrc/yacutia/images/dav_browser/pdf_16.png b/binsrc/conductor/images/dav_browser/pdf_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/pdf_16.png rename to binsrc/conductor/images/dav_browser/pdf_16.png diff --git a/binsrc/yacutia/images/dav_browser/up_16.png b/binsrc/conductor/images/dav_browser/up_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/up_16.png rename to binsrc/conductor/images/dav_browser/up_16.png diff --git a/binsrc/yacutia/images/dav_browser/xls_16.png b/binsrc/conductor/images/dav_browser/xls_16.png similarity index 100% rename from binsrc/yacutia/images/dav_browser/xls_16.png rename to binsrc/conductor/images/dav_browser/xls_16.png diff --git a/binsrc/yacutia/images/document.gif b/binsrc/conductor/images/document.gif similarity index 100% rename from binsrc/yacutia/images/document.gif rename to binsrc/conductor/images/document.gif diff --git a/binsrc/yacutia/images/folder_full.gif b/binsrc/conductor/images/folder_full.gif similarity index 100% rename from binsrc/yacutia/images/folder_full.gif rename to binsrc/conductor/images/folder_full.gif diff --git a/binsrc/yacutia/images/folder_up.gif b/binsrc/conductor/images/folder_up.gif similarity index 100% rename from binsrc/yacutia/images/folder_up.gif rename to binsrc/conductor/images/folder_up.gif diff --git a/binsrc/yacutia/images/icons/about_32.png b/binsrc/conductor/images/icons/about_32.png similarity index 100% rename from binsrc/yacutia/images/icons/about_32.png rename to binsrc/conductor/images/icons/about_32.png diff --git a/binsrc/yacutia/images/icons/add_16.png b/binsrc/conductor/images/icons/add_16.png similarity index 100% rename from binsrc/yacutia/images/icons/add_16.png rename to binsrc/conductor/images/icons/add_16.png diff --git a/binsrc/yacutia/images/icons/add_32.png b/binsrc/conductor/images/icons/add_32.png similarity index 100% rename from binsrc/yacutia/images/icons/add_32.png rename to binsrc/conductor/images/icons/add_32.png diff --git a/binsrc/yacutia/images/icons/add_script_16.png b/binsrc/conductor/images/icons/add_script_16.png similarity index 100% rename from binsrc/yacutia/images/icons/add_script_16.png rename to binsrc/conductor/images/icons/add_script_16.png diff --git a/binsrc/yacutia/images/icons/add_table_16.png b/binsrc/conductor/images/icons/add_table_16.png similarity index 100% rename from binsrc/yacutia/images/icons/add_table_16.png rename to binsrc/conductor/images/icons/add_table_16.png diff --git a/binsrc/yacutia/images/icons/add_view_16.png b/binsrc/conductor/images/icons/add_view_16.png similarity index 100% rename from binsrc/yacutia/images/icons/add_view_16.png rename to binsrc/conductor/images/icons/add_view_16.png diff --git a/binsrc/yacutia/images/icons/alarm_16.png b/binsrc/conductor/images/icons/alarm_16.png similarity index 100% rename from binsrc/yacutia/images/icons/alarm_16.png rename to binsrc/conductor/images/icons/alarm_16.png diff --git a/binsrc/yacutia/images/icons/apps_16.png b/binsrc/conductor/images/icons/apps_16.png similarity index 100% rename from binsrc/yacutia/images/icons/apps_16.png rename to binsrc/conductor/images/icons/apps_16.png diff --git a/binsrc/yacutia/images/icons/close_16.png b/binsrc/conductor/images/icons/close_16.png similarity index 100% rename from binsrc/yacutia/images/icons/close_16.png rename to binsrc/conductor/images/icons/close_16.png diff --git a/binsrc/yacutia/images/icons/close_24.png b/binsrc/conductor/images/icons/close_24.png similarity index 100% rename from binsrc/yacutia/images/icons/close_24.png rename to binsrc/conductor/images/icons/close_24.png diff --git a/binsrc/yacutia/images/icons/confg_16.png b/binsrc/conductor/images/icons/confg_16.png similarity index 100% rename from binsrc/yacutia/images/icons/confg_16.png rename to binsrc/conductor/images/icons/confg_16.png diff --git a/binsrc/yacutia/images/icons/connect_16.png b/binsrc/conductor/images/icons/connect_16.png similarity index 100% rename from binsrc/yacutia/images/icons/connect_16.png rename to binsrc/conductor/images/icons/connect_16.png diff --git a/binsrc/yacutia/images/icons/connect_24.png b/binsrc/conductor/images/icons/connect_24.png similarity index 100% rename from binsrc/yacutia/images/icons/connect_24.png rename to binsrc/conductor/images/icons/connect_24.png diff --git a/binsrc/yacutia/images/icons/connect_32.png b/binsrc/conductor/images/icons/connect_32.png similarity index 100% rename from binsrc/yacutia/images/icons/connect_32.png rename to binsrc/conductor/images/icons/connect_32.png diff --git a/binsrc/yacutia/images/icons/copy_16.png b/binsrc/conductor/images/icons/copy_16.png similarity index 100% rename from binsrc/yacutia/images/icons/copy_16.png rename to binsrc/conductor/images/icons/copy_16.png diff --git a/binsrc/yacutia/images/icons/database_16.png b/binsrc/conductor/images/icons/database_16.png similarity index 100% rename from binsrc/yacutia/images/icons/database_16.png rename to binsrc/conductor/images/icons/database_16.png diff --git a/binsrc/yacutia/images/icons/del_16.png b/binsrc/conductor/images/icons/del_16.png similarity index 100% rename from binsrc/yacutia/images/icons/del_16.png rename to binsrc/conductor/images/icons/del_16.png diff --git a/binsrc/yacutia/images/icons/disconnect_16.png b/binsrc/conductor/images/icons/disconnect_16.png similarity index 100% rename from binsrc/yacutia/images/icons/disconnect_16.png rename to binsrc/conductor/images/icons/disconnect_16.png diff --git a/binsrc/yacutia/images/icons/disconnect_24.png b/binsrc/conductor/images/icons/disconnect_24.png similarity index 100% rename from binsrc/yacutia/images/icons/disconnect_24.png rename to binsrc/conductor/images/icons/disconnect_24.png diff --git a/binsrc/yacutia/images/icons/disconnect_32.png b/binsrc/conductor/images/icons/disconnect_32.png similarity index 100% rename from binsrc/yacutia/images/icons/disconnect_32.png rename to binsrc/conductor/images/icons/disconnect_32.png diff --git a/binsrc/yacutia/images/icons/docs_16.png b/binsrc/conductor/images/icons/docs_16.png similarity index 100% rename from binsrc/yacutia/images/icons/docs_16.png rename to binsrc/conductor/images/icons/docs_16.png diff --git a/binsrc/yacutia/images/icons/edit_16.png b/binsrc/conductor/images/icons/edit_16.png similarity index 100% rename from binsrc/yacutia/images/icons/edit_16.png rename to binsrc/conductor/images/icons/edit_16.png diff --git a/binsrc/yacutia/images/icons/fastf_16.png b/binsrc/conductor/images/icons/fastf_16.png similarity index 100% rename from binsrc/yacutia/images/icons/fastf_16.png rename to binsrc/conductor/images/icons/fastf_16.png diff --git a/binsrc/yacutia/images/icons/filter_16.png b/binsrc/conductor/images/icons/filter_16.png similarity index 100% rename from binsrc/yacutia/images/icons/filter_16.png rename to binsrc/conductor/images/icons/filter_16.png diff --git a/binsrc/yacutia/images/icons/filter_32.png b/binsrc/conductor/images/icons/filter_32.png similarity index 100% rename from binsrc/yacutia/images/icons/filter_32.png rename to binsrc/conductor/images/icons/filter_32.png diff --git a/binsrc/yacutia/images/icons/first_16.png b/binsrc/conductor/images/icons/first_16.png similarity index 100% rename from binsrc/yacutia/images/icons/first_16.png rename to binsrc/conductor/images/icons/first_16.png diff --git a/binsrc/yacutia/images/icons/foldr_16.png b/binsrc/conductor/images/icons/foldr_16.png similarity index 100% rename from binsrc/yacutia/images/icons/foldr_16.png rename to binsrc/conductor/images/icons/foldr_16.png diff --git a/binsrc/yacutia/images/icons/go_16.png b/binsrc/conductor/images/icons/go_16.png similarity index 100% rename from binsrc/yacutia/images/icons/go_16.png rename to binsrc/conductor/images/icons/go_16.png diff --git a/binsrc/conductor/images/icons/group_16.png b/binsrc/conductor/images/icons/group_16.png new file mode 100644 index 0000000000..7ad2e0c006 Binary files /dev/null and b/binsrc/conductor/images/icons/group_16.png differ diff --git a/binsrc/yacutia/images/icons/help_16.png b/binsrc/conductor/images/icons/help_16.png similarity index 100% rename from binsrc/yacutia/images/icons/help_16.png rename to binsrc/conductor/images/icons/help_16.png diff --git a/binsrc/yacutia/images/icons/help_24.png b/binsrc/conductor/images/icons/help_24.png similarity index 100% rename from binsrc/yacutia/images/icons/help_24.png rename to binsrc/conductor/images/icons/help_24.png diff --git a/binsrc/yacutia/images/icons/help_32.png b/binsrc/conductor/images/icons/help_32.png similarity index 100% rename from binsrc/yacutia/images/icons/help_32.png rename to binsrc/conductor/images/icons/help_32.png diff --git a/binsrc/yacutia/images/icons/home_16.png b/binsrc/conductor/images/icons/home_16.png similarity index 100% rename from binsrc/yacutia/images/icons/home_16.png rename to binsrc/conductor/images/icons/home_16.png diff --git a/binsrc/yacutia/images/icons/key_16.png b/binsrc/conductor/images/icons/key_16.png similarity index 100% rename from binsrc/yacutia/images/icons/key_16.png rename to binsrc/conductor/images/icons/key_16.png diff --git a/binsrc/yacutia/images/icons/last_16.png b/binsrc/conductor/images/icons/last_16.png similarity index 100% rename from binsrc/yacutia/images/icons/last_16.png rename to binsrc/conductor/images/icons/last_16.png diff --git a/binsrc/yacutia/images/icons/link_16.png b/binsrc/conductor/images/icons/link_16.png similarity index 100% rename from binsrc/yacutia/images/icons/link_16.png rename to binsrc/conductor/images/icons/link_16.png diff --git a/binsrc/yacutia/images/icons/lock_16.png b/binsrc/conductor/images/icons/lock_16.png similarity index 100% rename from binsrc/yacutia/images/icons/lock_16.png rename to binsrc/conductor/images/icons/lock_16.png diff --git a/binsrc/yacutia/images/icons/mime_16.png b/binsrc/conductor/images/icons/mime_16.png similarity index 100% rename from binsrc/yacutia/images/icons/mime_16.png rename to binsrc/conductor/images/icons/mime_16.png diff --git a/binsrc/yacutia/images/icons/next_16.png b/binsrc/conductor/images/icons/next_16.png similarity index 100% rename from binsrc/yacutia/images/icons/next_16.png rename to binsrc/conductor/images/icons/next_16.png diff --git a/binsrc/yacutia/images/icons/open_16.png b/binsrc/conductor/images/icons/open_16.png similarity index 100% rename from binsrc/yacutia/images/icons/open_16.png rename to binsrc/conductor/images/icons/open_16.png diff --git a/binsrc/yacutia/images/icons/prefs_16.png b/binsrc/conductor/images/icons/prefs_16.png similarity index 100% rename from binsrc/yacutia/images/icons/prefs_16.png rename to binsrc/conductor/images/icons/prefs_16.png diff --git a/binsrc/yacutia/images/icons/previous_16.png b/binsrc/conductor/images/icons/previous_16.png similarity index 100% rename from binsrc/yacutia/images/icons/previous_16.png rename to binsrc/conductor/images/icons/previous_16.png diff --git a/binsrc/yacutia/images/icons/ref_16.png b/binsrc/conductor/images/icons/ref_16.png similarity index 100% rename from binsrc/yacutia/images/icons/ref_16.png rename to binsrc/conductor/images/icons/ref_16.png diff --git a/binsrc/yacutia/images/icons/rewnd_16.png b/binsrc/conductor/images/icons/rewnd_16.png similarity index 100% rename from binsrc/yacutia/images/icons/rewnd_16.png rename to binsrc/conductor/images/icons/rewnd_16.png diff --git a/binsrc/yacutia/images/icons/script_16.png b/binsrc/conductor/images/icons/script_16.png similarity index 100% rename from binsrc/yacutia/images/icons/script_16.png rename to binsrc/conductor/images/icons/script_16.png diff --git a/binsrc/yacutia/images/icons/security_16.png b/binsrc/conductor/images/icons/security_16.png similarity index 100% rename from binsrc/yacutia/images/icons/security_16.png rename to binsrc/conductor/images/icons/security_16.png diff --git a/binsrc/yacutia/images/icons/security_24.png b/binsrc/conductor/images/icons/security_24.png similarity index 100% rename from binsrc/yacutia/images/icons/security_24.png rename to binsrc/conductor/images/icons/security_24.png diff --git a/binsrc/yacutia/images/icons/security_32.png b/binsrc/conductor/images/icons/security_32.png similarity index 100% rename from binsrc/yacutia/images/icons/security_32.png rename to binsrc/conductor/images/icons/security_32.png diff --git a/binsrc/yacutia/images/icons/select.gif b/binsrc/conductor/images/icons/select.gif similarity index 100% rename from binsrc/yacutia/images/icons/select.gif rename to binsrc/conductor/images/icons/select.gif diff --git a/binsrc/yacutia/images/icons/skipb_16.png b/binsrc/conductor/images/icons/skipb_16.png similarity index 100% rename from binsrc/yacutia/images/icons/skipb_16.png rename to binsrc/conductor/images/icons/skipb_16.png diff --git a/binsrc/yacutia/images/icons/skipf_16.png b/binsrc/conductor/images/icons/skipf_16.png similarity index 100% rename from binsrc/yacutia/images/icons/skipf_16.png rename to binsrc/conductor/images/icons/skipf_16.png diff --git a/binsrc/yacutia/images/icons/smarrblk.gif b/binsrc/conductor/images/icons/smarrblk.gif similarity index 100% rename from binsrc/yacutia/images/icons/smarrblk.gif rename to binsrc/conductor/images/icons/smarrblk.gif diff --git a/binsrc/yacutia/images/icons/stop_16.png b/binsrc/conductor/images/icons/stop_16.png similarity index 100% rename from binsrc/yacutia/images/icons/stop_16.png rename to binsrc/conductor/images/icons/stop_16.png diff --git a/binsrc/yacutia/images/icons/stop_32.png b/binsrc/conductor/images/icons/stop_32.png similarity index 100% rename from binsrc/yacutia/images/icons/stop_32.png rename to binsrc/conductor/images/icons/stop_32.png diff --git a/binsrc/yacutia/images/icons/table_16.png b/binsrc/conductor/images/icons/table_16.png similarity index 100% rename from binsrc/yacutia/images/icons/table_16.png rename to binsrc/conductor/images/icons/table_16.png diff --git a/binsrc/yacutia/images/icons/tour_16.png b/binsrc/conductor/images/icons/tour_16.png similarity index 100% rename from binsrc/yacutia/images/icons/tour_16.png rename to binsrc/conductor/images/icons/tour_16.png diff --git a/binsrc/yacutia/images/icons/trash_16.png b/binsrc/conductor/images/icons/trash_16.png similarity index 100% rename from binsrc/yacutia/images/icons/trash_16.png rename to binsrc/conductor/images/icons/trash_16.png diff --git a/binsrc/yacutia/images/icons/up_16.png b/binsrc/conductor/images/icons/up_16.png similarity index 100% rename from binsrc/yacutia/images/icons/up_16.png rename to binsrc/conductor/images/icons/up_16.png diff --git a/binsrc/yacutia/images/icons/user_16.png b/binsrc/conductor/images/icons/user_16.png similarity index 100% rename from binsrc/yacutia/images/icons/user_16.png rename to binsrc/conductor/images/icons/user_16.png diff --git a/binsrc/yacutia/images/icons/view_16.png b/binsrc/conductor/images/icons/view_16.png similarity index 100% rename from binsrc/yacutia/images/icons/view_16.png rename to binsrc/conductor/images/icons/view_16.png diff --git a/binsrc/yacutia/images/icons/web_16.png b/binsrc/conductor/images/icons/web_16.png similarity index 100% rename from binsrc/yacutia/images/icons/web_16.png rename to binsrc/conductor/images/icons/web_16.png diff --git a/binsrc/yacutia/images/open_folder.gif b/binsrc/conductor/images/open_folder.gif similarity index 100% rename from binsrc/yacutia/images/open_folder.gif rename to binsrc/conductor/images/open_folder.gif diff --git a/binsrc/yacutia/images/opl.jpg b/binsrc/conductor/images/opl.jpg similarity index 100% rename from binsrc/yacutia/images/opl.jpg rename to binsrc/conductor/images/opl.jpg diff --git a/binsrc/yacutia/images/sel_nav2_grad2.gif b/binsrc/conductor/images/sel_nav2_grad2.gif similarity index 100% rename from binsrc/yacutia/images/sel_nav2_grad2.gif rename to binsrc/conductor/images/sel_nav2_grad2.gif diff --git a/binsrc/yacutia/images/sel_nav_grad2.gif b/binsrc/conductor/images/sel_nav_grad2.gif similarity index 100% rename from binsrc/yacutia/images/sel_nav_grad2.gif rename to binsrc/conductor/images/sel_nav_grad2.gif diff --git a/binsrc/yacutia/images/service.gif b/binsrc/conductor/images/service.gif similarity index 100% rename from binsrc/yacutia/images/service.gif rename to binsrc/conductor/images/service.gif diff --git a/binsrc/yacutia/images/sky_blu_grad.gif b/binsrc/conductor/images/sky_blu_grad.gif similarity index 100% rename from binsrc/yacutia/images/sky_blu_grad.gif rename to binsrc/conductor/images/sky_blu_grad.gif diff --git a/binsrc/yacutia/images/sky_blu_grad.jpg b/binsrc/conductor/images/sky_blu_grad.jpg similarity index 100% rename from binsrc/yacutia/images/sky_blu_grad.jpg rename to binsrc/conductor/images/sky_blu_grad.jpg diff --git a/binsrc/yacutia/images/slnav2.jpg b/binsrc/conductor/images/slnav2.jpg similarity index 100% rename from binsrc/yacutia/images/slnav2.jpg rename to binsrc/conductor/images/slnav2.jpg diff --git a/binsrc/yacutia/images/slvnav.jpg b/binsrc/conductor/images/slvnav.jpg similarity index 100% rename from binsrc/yacutia/images/slvnav.jpg rename to binsrc/conductor/images/slvnav.jpg diff --git a/binsrc/yacutia/images/slvnav3.gif b/binsrc/conductor/images/slvnav3.gif similarity index 100% rename from binsrc/yacutia/images/slvnav3.gif rename to binsrc/conductor/images/slvnav3.gif diff --git a/binsrc/yacutia/images/stl_blu1_grad.gif b/binsrc/conductor/images/stl_blu1_grad.gif similarity index 100% rename from binsrc/yacutia/images/stl_blu1_grad.gif rename to binsrc/conductor/images/stl_blu1_grad.gif diff --git a/binsrc/yacutia/images/stl_blu2_grad.gif b/binsrc/conductor/images/stl_blu2_grad.gif similarity index 100% rename from binsrc/yacutia/images/stl_blu2_grad.gif rename to binsrc/conductor/images/stl_blu2_grad.gif diff --git a/binsrc/yacutia/images/vert-line.gif b/binsrc/conductor/images/vert-line.gif similarity index 100% rename from binsrc/yacutia/images/vert-line.gif rename to binsrc/conductor/images/vert-line.gif diff --git a/binsrc/yacutia/images/vglobe_16.png b/binsrc/conductor/images/vglobe_16.png similarity index 100% rename from binsrc/yacutia/images/vglobe_16.png rename to binsrc/conductor/images/vglobe_16.png diff --git a/binsrc/yacutia/images/vgress.gif b/binsrc/conductor/images/vgress.gif similarity index 100% rename from binsrc/yacutia/images/vgress.gif rename to binsrc/conductor/images/vgress.gif diff --git a/binsrc/yacutia/images/virt.gif b/binsrc/conductor/images/virt.gif similarity index 100% rename from binsrc/yacutia/images/virt.gif rename to binsrc/conductor/images/virt.gif diff --git a/binsrc/yacutia/images/virtuosologo.jpg b/binsrc/conductor/images/virtuosologo.jpg similarity index 100% rename from binsrc/yacutia/images/virtuosologo.jpg rename to binsrc/conductor/images/virtuosologo.jpg diff --git a/binsrc/yacutia/images/virtuosologo.png b/binsrc/conductor/images/virtuosologo.png similarity index 100% rename from binsrc/yacutia/images/virtuosologo.png rename to binsrc/conductor/images/virtuosologo.png diff --git a/binsrc/yacutia/images/yac_banner.gif b/binsrc/conductor/images/yac_banner.gif similarity index 100% rename from binsrc/yacutia/images/yac_banner.gif rename to binsrc/conductor/images/yac_banner.gif diff --git a/binsrc/yacutia/images/yac_banner.jpg b/binsrc/conductor/images/yac_banner.jpg similarity index 100% rename from binsrc/yacutia/images/yac_banner.jpg rename to binsrc/conductor/images/yac_banner.jpg diff --git a/binsrc/yacutia/images/yac_splash.jpg b/binsrc/conductor/images/yac_splash.jpg similarity index 100% rename from binsrc/yacutia/images/yac_splash.jpg rename to binsrc/conductor/images/yac_splash.jpg diff --git a/binsrc/yacutia/import_csv.vspx b/binsrc/conductor/import_csv.vspx similarity index 99% rename from binsrc/yacutia/import_csv.vspx rename to binsrc/conductor/import_csv.vspx index 674dbe597f..59a3b9b8ec 100644 --- a/binsrc/yacutia/import_csv.vspx +++ b/binsrc/conductor/import_csv.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/conductor/inifile.vspx b/binsrc/conductor/inifile.vspx new file mode 100644 index 0000000000..0d7977c389 --- /dev/null +++ b/binsrc/conductor/inifile.vspx @@ -0,0 +1,259 @@ + + + + Virtuoso System Parameters + + + + + + + + + + + + + + + + + + + if (cmp = cmp1 or (cmp1 is null and cmp = 1)) + return 'page_tab_selected'; + + return 'page_tab'; + + + + + + + + +

Virtuoso configuration file ""

+ + + + +
+ + + + + + + +
+ + + + +   +
+ + + + + +
+ + + + + +
+ + + + + + + + + '); + if ((self.sect = 'Parameters') and (item in ('AllowOSCalls', 'SafeExecutables', 'DbaExecutables', 'DirsAllowed', 'DirsDenied'))) + { + http (sprintf ('', item)); + http (sprintf ('', item_value)); + http (''); + } + else + { + http (sprintf ('', item, item, item)); + http (sprintf ('', item, item_value)); + http (sprintf('', item, self.pos, self.sid, self.realm)); + } + http (''); + } + if ('' <> get_keyword ('add', control.vc_page.vc_event.ve_params, '')) + { + http (''); + http (''); + http (''); + } + ?> + + + +
NameValueAction
%V%V %VRemove Remove
New:
+ + + item) + cfg_write (virtuoso_ini_path(), self.sect, item, ''); + + item_value := cfg_item_value (virtuoso_ini_path(), self.sect, item); + if (new_item_value <> item_value) + cfg_write (virtuoso_ini_path(), self.sect, new_item, new_item_value); + } + } + if ('' <> get_keyword ('_new_item', params, '')) + { + item := get_keyword ('_new_item', params); + item_value := get_keyword ('_new_value', params, ''); + cfg_write (virtuoso_ini_path(), self.sect, item, item_value); + } + http_request_status ('HTTP/1.1 302 Found'); + http_header (sprintf('Location: inifile.vspx?sid=%s&realm=%s&dd_sect=%i\r\n', self.sid , self.realm, self.pos)); + ]]> + + + '); + ?> +
+
+ +
+
+ + + + + +
+ Stop +
+ You are about to remove the parameter "", are you sure? +
+ This removal cannot be undone. Do you wish to continue? +
+ + + + '') + cfg_write(virtuoso_ini_path(), self.sect, self.to_rem, ''); + + self.to_rem := ''; + self.to_del := 0; + http_request_status ('HTTP/1.1 302 Found'); + http_header (sprintf ('Location: inifile.vspx?sid=%s&realm=%s&dd_sect=%i\r\n', self.sid , self.realm, self.pos)); + ]]> + + + + + + + + + +
+ + + + + diff --git a/binsrc/yacutia/inifile.xml b/binsrc/conductor/inifile.xml similarity index 95% rename from binsrc/yacutia/inifile.xml rename to binsrc/conductor/inifile.xml index 7ef0bad354..0c9a568a14 100644 --- a/binsrc/yacutia/inifile.xml +++ b/binsrc/conductor/inifile.xml @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile.xsl b/binsrc/conductor/inifile.xsl similarity index 99% rename from binsrc/yacutia/inifile.xsl rename to binsrc/conductor/inifile.xsl index 36e898ce04..f0e5e2066a 100644 --- a/binsrc/yacutia/inifile.xsl +++ b/binsrc/conductor/inifile.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_autorepair.vspx b/binsrc/conductor/inifile_autorepair.vspx similarity index 97% rename from binsrc/yacutia/inifile_autorepair.vspx rename to binsrc/conductor/inifile_autorepair.vspx index deb7f2cdc6..936166f07e 100644 --- a/binsrc/yacutia/inifile_autorepair.vspx +++ b/binsrc/conductor/inifile_autorepair.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_autorepair_inc.vspx b/binsrc/conductor/inifile_autorepair_inc.vspx similarity index 99% rename from binsrc/yacutia/inifile_autorepair_inc.vspx rename to binsrc/conductor/inifile_autorepair_inc.vspx index 285399ed17..c7e576034b 100644 --- a/binsrc/yacutia/inifile_autorepair_inc.vspx +++ b/binsrc/conductor/inifile_autorepair_inc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_client.vspx b/binsrc/conductor/inifile_client.vspx similarity index 97% rename from binsrc/yacutia/inifile_client.vspx rename to binsrc/conductor/inifile_client.vspx index db42db440e..caca17a2ac 100644 --- a/binsrc/yacutia/inifile_client.vspx +++ b/binsrc/conductor/inifile_client.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_client_inc.vspx b/binsrc/conductor/inifile_client_inc.vspx similarity index 99% rename from binsrc/yacutia/inifile_client_inc.vspx rename to binsrc/conductor/inifile_client_inc.vspx index f35830ebbc..d523bf8d94 100644 --- a/binsrc/yacutia/inifile_client_inc.vspx +++ b/binsrc/conductor/inifile_client_inc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_database.vspx b/binsrc/conductor/inifile_database.vspx similarity index 97% rename from binsrc/yacutia/inifile_database.vspx rename to binsrc/conductor/inifile_database.vspx index 65178b8ab8..38fafdee46 100644 --- a/binsrc/yacutia/inifile_database.vspx +++ b/binsrc/conductor/inifile_database.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_database_inc.vspx b/binsrc/conductor/inifile_database_inc.vspx similarity index 99% rename from binsrc/yacutia/inifile_database_inc.vspx rename to binsrc/conductor/inifile_database_inc.vspx index 5139cc95f0..173365b92b 100644 --- a/binsrc/yacutia/inifile_database_inc.vspx +++ b/binsrc/conductor/inifile_database_inc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_engine.vspx b/binsrc/conductor/inifile_engine.vspx similarity index 97% rename from binsrc/yacutia/inifile_engine.vspx rename to binsrc/conductor/inifile_engine.vspx index 16e3868c6c..f11683db22 100644 --- a/binsrc/yacutia/inifile_engine.vspx +++ b/binsrc/conductor/inifile_engine.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_engine_inc.vspx b/binsrc/conductor/inifile_engine_inc.vspx similarity index 95% rename from binsrc/yacutia/inifile_engine_inc.vspx rename to binsrc/conductor/inifile_engine_inc.vspx index dfea3c2222..fbcb5c7943 100644 --- a/binsrc/yacutia/inifile_engine_inc.vspx +++ b/binsrc/conductor/inifile_engine_inc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_http.vspx b/binsrc/conductor/inifile_http.vspx similarity index 97% rename from binsrc/yacutia/inifile_http.vspx rename to binsrc/conductor/inifile_http.vspx index 60706b2e59..ab67325daa 100644 --- a/binsrc/yacutia/inifile_http.vspx +++ b/binsrc/conductor/inifile_http.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_http_inc.vspx b/binsrc/conductor/inifile_http_inc.vspx similarity index 95% rename from binsrc/yacutia/inifile_http_inc.vspx rename to binsrc/conductor/inifile_http_inc.vspx index 4f864157fb..9c92e08c08 100644 --- a/binsrc/yacutia/inifile_http_inc.vspx +++ b/binsrc/conductor/inifile_http_inc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_metadata.xml b/binsrc/conductor/inifile_metadata.xml similarity index 99% rename from binsrc/yacutia/inifile_metadata.xml rename to binsrc/conductor/inifile_metadata.xml index b3f3aa3ece..b9503a9115 100644 --- a/binsrc/yacutia/inifile_metadata.xml +++ b/binsrc/conductor/inifile_metadata.xml @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_repl.vspx b/binsrc/conductor/inifile_repl.vspx similarity index 97% rename from binsrc/yacutia/inifile_repl.vspx rename to binsrc/conductor/inifile_repl.vspx index 9b153e2e70..afd1580e7e 100644 --- a/binsrc/yacutia/inifile_repl.vspx +++ b/binsrc/conductor/inifile_repl.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_repl_inc.vspx b/binsrc/conductor/inifile_repl_inc.vspx similarity index 99% rename from binsrc/yacutia/inifile_repl_inc.vspx rename to binsrc/conductor/inifile_repl_inc.vspx index 62426550a1..5a94616133 100644 --- a/binsrc/yacutia/inifile_repl_inc.vspx +++ b/binsrc/conductor/inifile_repl_inc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_style.xsl b/binsrc/conductor/inifile_style.xsl similarity index 99% rename from binsrc/yacutia/inifile_style.xsl rename to binsrc/conductor/inifile_style.xsl index 34f708aeaf..206f399ede 100644 --- a/binsrc/yacutia/inifile_style.xsl +++ b/binsrc/conductor/inifile_style.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_vdb.vspx b/binsrc/conductor/inifile_vdb.vspx similarity index 97% rename from binsrc/yacutia/inifile_vdb.vspx rename to binsrc/conductor/inifile_vdb.vspx index 38d9c5860c..1b3a6d2159 100644 --- a/binsrc/yacutia/inifile_vdb.vspx +++ b/binsrc/conductor/inifile_vdb.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifile_vdb_inc.vspx b/binsrc/conductor/inifile_vdb_inc.vspx similarity index 99% rename from binsrc/yacutia/inifile_vdb_inc.vspx rename to binsrc/conductor/inifile_vdb_inc.vspx index 3bc6e4ad05..d6e4e5e7f4 100644 --- a/binsrc/yacutia/inifile_vdb_inc.vspx +++ b/binsrc/conductor/inifile_vdb_inc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/inifiles_load.sql b/binsrc/conductor/inifiles_load.sql similarity index 96% rename from binsrc/yacutia/inifiles_load.sql rename to binsrc/conductor/inifiles_load.sql index 0034ed52e1..43b8c67a08 100644 --- a/binsrc/yacutia/inifiles_load.sql +++ b/binsrc/conductor/inifiles_load.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/isql.vspx b/binsrc/conductor/isql.vspx similarity index 99% rename from binsrc/yacutia/isql.vspx rename to binsrc/conductor/isql.vspx index 87b6097e78..1e3916723f 100644 --- a/binsrc/yacutia/isql.vspx +++ b/binsrc/conductor/isql.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/isql_main.vspx b/binsrc/conductor/isql_main.vspx similarity index 96% rename from binsrc/yacutia/isql_main.vspx rename to binsrc/conductor/isql_main.vspx index 8e400b32be..bbeaefe144 100644 --- a/binsrc/yacutia/isql_main.vspx +++ b/binsrc/conductor/isql_main.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/isql_main_inc.vspx b/binsrc/conductor/isql_main_inc.vspx similarity index 99% rename from binsrc/yacutia/isql_main_inc.vspx rename to binsrc/conductor/isql_main_inc.vspx index 3f7dfcab9b..092bb6481e 100644 --- a/binsrc/yacutia/isql_main_inc.vspx +++ b/binsrc/conductor/isql_main_inc.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -162,7 +162,7 @@ 		-   + &nbsp;
diff --git a/binsrc/yacutia/ldap_import.vspx b/binsrc/conductor/ldap_import.vspx similarity index 99% rename from binsrc/yacutia/ldap_import.vspx rename to binsrc/conductor/ldap_import.vspx index 89a01482e6..54ff56782b 100644 --- a/binsrc/yacutia/ldap_import.vspx +++ b/binsrc/conductor/ldap_import.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/ldap_server.vspx b/binsrc/conductor/ldap_server.vspx similarity index 99% rename from binsrc/yacutia/ldap_server.vspx rename to binsrc/conductor/ldap_server.vspx index 46b8510583..71d67d5729 100644 --- a/binsrc/yacutia/ldap_server.vspx +++ b/binsrc/conductor/ldap_server.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/link_tables.js b/binsrc/conductor/link_tables.js similarity index 96% rename from binsrc/yacutia/link_tables.js rename to binsrc/conductor/link_tables.js index 0dd322826e..387669dad8 100644 --- a/binsrc/yacutia/link_tables.js +++ b/binsrc/conductor/link_tables.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/logging.vspx b/binsrc/conductor/logging.vspx similarity index 98% rename from binsrc/yacutia/logging.vspx rename to binsrc/conductor/logging.vspx index af7cfa8cbc..cd459188c3 100644 --- a/binsrc/yacutia/logging.vspx +++ b/binsrc/conductor/logging.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/logging_cli.vspx b/binsrc/conductor/logging_cli.vspx similarity index 99% rename from binsrc/yacutia/logging_cli.vspx rename to binsrc/conductor/logging_cli.vspx index 68772949e4..0c68238e7f 100644 --- a/binsrc/yacutia/logging_cli.vspx +++ b/binsrc/conductor/logging_cli.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/logging_db.vspx b/binsrc/conductor/logging_db.vspx similarity index 99% rename from binsrc/yacutia/logging_db.vspx rename to binsrc/conductor/logging_db.vspx index b1e75fe1a5..16f5d6046a 100644 --- a/binsrc/yacutia/logging_db.vspx +++ b/binsrc/conductor/logging_db.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/logging_disk.vspx b/binsrc/conductor/logging_disk.vspx similarity index 98% rename from binsrc/yacutia/logging_disk.vspx rename to binsrc/conductor/logging_disk.vspx index d1b241507d..44f9a9554b 100644 --- a/binsrc/yacutia/logging_disk.vspx +++ b/binsrc/conductor/logging_disk.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/logging_http.vspx b/binsrc/conductor/logging_http.vspx similarity index 98% rename from binsrc/yacutia/logging_http.vspx rename to binsrc/conductor/logging_http.vspx index 6d8e4c5a97..de6a83a09c 100644 --- a/binsrc/yacutia/logging_http.vspx +++ b/binsrc/conductor/logging_http.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/logging_index.vspx b/binsrc/conductor/logging_index.vspx similarity index 98% rename from binsrc/yacutia/logging_index.vspx rename to binsrc/conductor/logging_index.vspx index 15fa4c1a35..05fc74e455 100644 --- a/binsrc/yacutia/logging_index.vspx +++ b/binsrc/conductor/logging_index.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/logging_lock.vspx b/binsrc/conductor/logging_lock.vspx similarity index 99% rename from binsrc/yacutia/logging_lock.vspx rename to binsrc/conductor/logging_lock.vspx index 21b5a6ed95..fb95985dc7 100644 --- a/binsrc/yacutia/logging_lock.vspx +++ b/binsrc/conductor/logging_lock.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/conductor/logging_page.vspx b/binsrc/conductor/logging_page.vspx new file mode 100644 index 0000000000..88e0d9d593 --- /dev/null +++ b/binsrc/conductor/logging_page.vspx @@ -0,0 +1,209 @@ + + + + Virtuoso System Statistics + + + + + + + + + + + + + self.autorefresh := get_keyword ('autorefresh', e.ve_params, ''); + self.page := get_keyword ('page', e.ve_params, '1'); + if (self.page = '') + self.page := '1'; + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + &nbsp; +
+ + + + + + + + +
+  Data Updated: + + +
+ auto update interval: + + sec + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + diff --git a/binsrc/yacutia/logging_prof.vspx b/binsrc/conductor/logging_prof.vspx similarity index 98% rename from binsrc/yacutia/logging_prof.vspx rename to binsrc/conductor/logging_prof.vspx index 0c46d9974a..f0a686d0e4 100644 --- a/binsrc/yacutia/logging_prof.vspx +++ b/binsrc/conductor/logging_prof.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/logging_space.vspx b/binsrc/conductor/logging_space.vspx similarity index 99% rename from binsrc/yacutia/logging_space.vspx rename to binsrc/conductor/logging_space.vspx index 7a7ba40697..27208f9c22 100644 --- a/binsrc/yacutia/logging_space.vspx +++ b/binsrc/conductor/logging_space.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/logging_tab.vspx b/binsrc/conductor/logging_tab.vspx similarity index 98% rename from binsrc/yacutia/logging_tab.vspx rename to binsrc/conductor/logging_tab.vspx index b6fe9f5dd5..f5e84e1921 100644 --- a/binsrc/yacutia/logging_tab.vspx +++ b/binsrc/conductor/logging_tab.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/logging_tab.xsl b/binsrc/conductor/logging_tab.xsl similarity index 96% rename from binsrc/yacutia/logging_tab.xsl rename to binsrc/conductor/logging_tab.xsl index abe37b4c43..3e9ba52a85 100644 --- a/binsrc/yacutia/logging_tab.xsl +++ b/binsrc/conductor/logging_tab.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/logging_view.vspx b/binsrc/conductor/logging_view.vspx similarity index 99% rename from binsrc/yacutia/logging_view.vspx rename to binsrc/conductor/logging_view.vspx index 88377e4fa6..a1fbd30871 100644 --- a/binsrc/yacutia/logging_view.vspx +++ b/binsrc/conductor/logging_view.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/main_tabs.vspx b/binsrc/conductor/main_tabs.vspx similarity index 97% rename from binsrc/yacutia/main_tabs.vspx rename to binsrc/conductor/main_tabs.vspx index 04fa1f3055..a75f175c31 100644 --- a/binsrc/yacutia/main_tabs.vspx +++ b/binsrc/conductor/main_tabs.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -103,9 +103,7 @@
   &nbsp;
diff --git a/binsrc/yacutia/make.xsl b/binsrc/conductor/make.xsl similarity index 96% rename from binsrc/yacutia/make.xsl rename to binsrc/conductor/make.xsl index d61ddda5fa..165650c3b3 100644 --- a/binsrc/yacutia/make.xsl +++ b/binsrc/conductor/make.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/mapped_schema_xml.vspx b/binsrc/conductor/mapped_schema_xml.vspx similarity index 99% rename from binsrc/yacutia/mapped_schema_xml.vspx rename to binsrc/conductor/mapped_schema_xml.vspx index 0bd0862b00..c26716f847 100644 --- a/binsrc/yacutia/mapped_schema_xml.vspx +++ b/binsrc/conductor/mapped_schema_xml.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/md5.js b/binsrc/conductor/md5.js similarity index 100% rename from binsrc/yacutia/md5.js rename to binsrc/conductor/md5.js diff --git a/binsrc/yacutia/merge.xsl b/binsrc/conductor/merge.xsl similarity index 96% rename from binsrc/yacutia/merge.xsl rename to binsrc/conductor/merge.xsl index 6022404c05..67a59f6dd1 100644 --- a/binsrc/yacutia/merge.xsl +++ b/binsrc/conductor/merge.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/mkvad.ini b/binsrc/conductor/mkvad.ini similarity index 100% rename from binsrc/yacutia/mkvad.ini rename to binsrc/conductor/mkvad.ini diff --git a/binsrc/yacutia/mkvad.sh b/binsrc/conductor/mkvad.sh similarity index 99% rename from binsrc/yacutia/mkvad.sh rename to binsrc/conductor/mkvad.sh index e24c673aeb..7be2c23ace 100755 --- a/binsrc/yacutia/mkvad.sh +++ b/binsrc/conductor/mkvad.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -289,7 +289,7 @@ echo "
" >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER -echo " " >> $STICKER +echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/binsrc/yacutia/mkvad.sql b/binsrc/conductor/mkvad.sql similarity index 95% rename from binsrc/yacutia/mkvad.sql rename to binsrc/conductor/mkvad.sql index 4f669c1a7d..51677c7ad1 100644 --- a/binsrc/yacutia/mkvad.sql +++ b/binsrc/conductor/mkvad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/mm_menu.js b/binsrc/conductor/mm_menu.js similarity index 100% rename from binsrc/yacutia/mm_menu.js rename to binsrc/conductor/mm_menu.js diff --git a/binsrc/yacutia/mm_menu1.js b/binsrc/conductor/mm_menu1.js similarity index 99% rename from binsrc/yacutia/mm_menu1.js rename to binsrc/conductor/mm_menu1.js index 79c69307df..3df2ba3cb4 100644 --- a/binsrc/yacutia/mm_menu1.js +++ b/binsrc/conductor/mm_menu1.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/msg_news_conf.vspx b/binsrc/conductor/msg_news_conf.vspx similarity index 96% rename from binsrc/yacutia/msg_news_conf.vspx rename to binsrc/conductor/msg_news_conf.vspx index e2b2a08117..1dc2a784b6 100644 --- a/binsrc/yacutia/msg_news_conf.vspx +++ b/binsrc/conductor/msg_news_conf.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -67,24 +67,14 @@
- - - - - - - +
NNTP servers - - + NNTP servers + + - - - - -
-
+ &nbsp;
diff --git a/binsrc/yacutia/msg_news_conf_global.vspx b/binsrc/conductor/msg_news_conf_global.vspx similarity index 86% rename from binsrc/yacutia/msg_news_conf_global.vspx rename to binsrc/conductor/msg_news_conf_global.vspx index d062efe262..6e01fb4647 100644 --- a/binsrc/yacutia/msg_news_conf_global.vspx +++ b/binsrc/conductor/msg_news_conf_global.vspx @@ -1,12 +1,10 @@ 		- - - - - - - +
- - General Setup + + + General Setup - - - - -
-
+ &nbsp;
diff --git a/binsrc/yacutia/msg_news_group_info.vspx b/binsrc/conductor/msg_news_group_info.vspx similarity index 99% rename from binsrc/yacutia/msg_news_group_info.vspx rename to binsrc/conductor/msg_news_group_info.vspx index 5b6f7e9559..000dadff36 100644 --- a/binsrc/yacutia/msg_news_group_info.vspx +++ b/binsrc/conductor/msg_news_group_info.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/msg_news_group_message_body.vspx b/binsrc/conductor/msg_news_group_message_body.vspx similarity index 89% rename from binsrc/yacutia/msg_news_group_message_body.vspx rename to binsrc/conductor/msg_news_group_message_body.vspx index fa90e7a1f2..f3408a27d7 100644 --- a/binsrc/yacutia/msg_news_group_message_body.vspx +++ b/binsrc/conductor/msg_news_group_message_body.vspx @@ -1,12 +1,10 @@ - - - + Virtuoso NNTP Server Groups Subscriptions Management @@ -50,24 +46,14 @@ if(self.nm_body_id = '') {
- - - - - - - +
NNTP servers - - + NNTP servers + + - - - - -
-
+ &nbsp;
diff --git a/binsrc/yacutia/msg_news_group_messages.vspx b/binsrc/conductor/msg_news_group_messages.vspx similarity index 92% rename from binsrc/yacutia/msg_news_group_messages.vspx rename to binsrc/conductor/msg_news_group_messages.vspx index e2320c6d08..1d210d2734 100644 --- a/binsrc/yacutia/msg_news_group_messages.vspx +++ b/binsrc/conductor/msg_news_group_messages.vspx @@ -1,12 +1,10 @@ 		- - - - - - - +
NNTP servers - - + NNTP servers + + - - - - -
-
+ &nbsp;
diff --git a/binsrc/yacutia/msg_news_group_messages_list.vspx b/binsrc/conductor/msg_news_group_messages_list.vspx similarity index 99% rename from binsrc/yacutia/msg_news_group_messages_list.vspx rename to binsrc/conductor/msg_news_group_messages_list.vspx index 7380cbf14a..bd906b5f25 100644 --- a/binsrc/yacutia/msg_news_group_messages_list.vspx +++ b/binsrc/conductor/msg_news_group_messages_list.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/msg_news_group_subscribe.vspx b/binsrc/conductor/msg_news_group_subscribe.vspx similarity index 96% rename from binsrc/yacutia/msg_news_group_subscribe.vspx rename to binsrc/conductor/msg_news_group_subscribe.vspx index 2a6b2e4813..aed167628d 100644 --- a/binsrc/yacutia/msg_news_group_subscribe.vspx +++ b/binsrc/conductor/msg_news_group_subscribe.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -237,24 +237,14 @@ if(self.first = 0) {
- - - - - - - +
NNTP servers - - + NNTP servers + + - - - - -
-
+ &nbsp;
diff --git a/binsrc/conductor/msg_news_groups.vspx b/binsrc/conductor/msg_news_groups.vspx new file mode 100644 index 0000000000..cb4e85c05e --- /dev/null +++ b/binsrc/conductor/msg_news_groups.vspx @@ -0,0 +1,103 @@ + + + + + + + Virtuoso NNTP Server Groups Subscriptions Management + + + + + + + + + + + + + + +
+ + + + + + +
NNTP servers + + + + &nbsp; +
+ + + + +
+ + + + + + + + + + + + + + +
+ Subscribed groups for "" +
+ +
+ +
+ +
+ +
+
+ + + + diff --git a/binsrc/yacutia/msg_news_server_details.vspx b/binsrc/conductor/msg_news_server_details.vspx similarity index 99% rename from binsrc/yacutia/msg_news_server_details.vspx rename to binsrc/conductor/msg_news_server_details.vspx index a5c931dfba..0915badf41 100644 --- a/binsrc/yacutia/msg_news_server_details.vspx +++ b/binsrc/conductor/msg_news_server_details.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/msg_news_server_info.vspx b/binsrc/conductor/msg_news_server_info.vspx similarity index 98% rename from binsrc/yacutia/msg_news_server_info.vspx rename to binsrc/conductor/msg_news_server_info.vspx index 16dc03b310..3215cea653 100644 --- a/binsrc/yacutia/msg_news_server_info.vspx +++ b/binsrc/conductor/msg_news_server_info.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/page.xsl b/binsrc/conductor/page.xsl similarity index 99% rename from binsrc/yacutia/page.xsl rename to binsrc/conductor/page.xsl index c15268042a..50ee3a349c 100644 --- a/binsrc/yacutia/page.xsl +++ b/binsrc/conductor/page.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/persistent_xmlns.vspx b/binsrc/conductor/persistent_xmlns.vspx similarity index 99% rename from binsrc/yacutia/persistent_xmlns.vspx rename to binsrc/conductor/persistent_xmlns.vspx index f0af03bea6..c5042b0c8e 100644 --- a/binsrc/yacutia/persistent_xmlns.vspx +++ b/binsrc/conductor/persistent_xmlns.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/popup2_browser.vspx b/binsrc/conductor/popup2_browser.vspx similarity index 98% rename from binsrc/yacutia/popup2_browser.vspx rename to binsrc/conductor/popup2_browser.vspx index 04dcd13205..6a830504b2 100644 --- a/binsrc/yacutia/popup2_browser.vspx +++ b/binsrc/conductor/popup2_browser.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/popup_browser.vspx b/binsrc/conductor/popup_browser.vspx similarity index 98% rename from binsrc/yacutia/popup_browser.vspx rename to binsrc/conductor/popup_browser.vspx index acbe7c628e..771cd06a99 100644 --- a/binsrc/yacutia/popup_browser.vspx +++ b/binsrc/conductor/popup_browser.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/r2rml_gen.vspx b/binsrc/conductor/r2rml_gen.vspx similarity index 99% rename from binsrc/yacutia/r2rml_gen.vspx rename to binsrc/conductor/r2rml_gen.vspx index d34d39786c..43ef7b884a 100644 --- a/binsrc/yacutia/r2rml_gen.vspx +++ b/binsrc/conductor/r2rml_gen.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/r2rml_import.vspx b/binsrc/conductor/r2rml_import.vspx similarity index 99% rename from binsrc/yacutia/r2rml_import.vspx rename to binsrc/conductor/r2rml_import.vspx index 6c9652b7b7..d23a08a788 100644 --- a/binsrc/yacutia/r2rml_import.vspx +++ b/binsrc/conductor/r2rml_import.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/r2rml_validate.vspx b/binsrc/conductor/r2rml_validate.vspx similarity index 98% rename from binsrc/yacutia/r2rml_validate.vspx rename to binsrc/conductor/r2rml_validate.vspx index 9e68418b90..2d7b1519a6 100644 --- a/binsrc/yacutia/r2rml_validate.vspx +++ b/binsrc/conductor/r2rml_validate.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/rdf_conf.vspx b/binsrc/conductor/rdf_conf.vspx similarity index 95% rename from binsrc/yacutia/rdf_conf.vspx rename to binsrc/conductor/rdf_conf.vspx index 3742b2596a..9bdadd78c6 100644 --- a/binsrc/yacutia/rdf_conf.vspx +++ b/binsrc/conductor/rdf_conf.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -50,13 +50,6 @@
- - - - - - -
@@ -77,12 +70,7 @@ Configuration - - - - -
-
+ &nbsp;
@@ -130,7 +118,7 @@ registry_remove ('__ldgen_long_running_threshold'); llrt := 8192; } - self.sponger_async_threshold := sprintf('%d', llrt); + self.sponger_async_threshold := sprintf('%d', llrt); control.vc_data_bound := 1; ]]> @@ -156,10 +144,10 @@
- @@ -172,7 +160,7 @@ - @@ -184,7 +172,7 @@ - diff --git a/binsrc/yacutia/rdf_console.vspx b/binsrc/conductor/rdf_console.vspx similarity index 81% rename from binsrc/yacutia/rdf_console.vspx rename to binsrc/conductor/rdf_console.vspx index 571bc5c34a..8b285b0ba0 100644 --- a/binsrc/yacutia/rdf_console.vspx +++ b/binsrc/conductor/rdf_console.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -56,40 +56,28 @@
- - - - - - - - - + + - + + - + +
- - - - + + + + - + Console - - - - - - -
-
- 		+ &nbsp; +
@@ -99,7 +87,7 @@
- +
@@ -139,7 +127,7 @@ - @@ -175,7 +163,7 @@ ctr := ctr + 1; if (mses = self.ses) { - for select ML_ID, ML_PROC from DB.DBA.RDF_CARTRIDGES_LOG where ML_SESSION = mses do + for select ML_ID, ML_PROC from DB.DBA.RDF_CARTRIDGES_LOG where ML_SESSION = mses do { ?> @@ -204,35 +192,35 @@ ctr := ctr + 1; } } - } + } ?>
Cartridge Action

Details for session: , sequence:

Cartridge:

Request:

-
-
+
+

Response:

-
+

Transformation Result:

-
+
+ + + Sponger + + + + + + + + + + + + ]]> + + + + +
+ + + + + + + + + + + + +
+ Extractor Cartridges + + + + + + + + + + + + &nbsp; +
+ + + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Seq#DescriptionPatternAction
+ + + + + + + ' || (control.vc_parent as vspx_row_template).te_rowset[2]; + ]]> + + + + + + + + + + +   + + + Delete'; + ]]> + + + + + +   + + + + + +   + + + + + +
+ + +
+
+ + +
+ + +
+ + +
+ + + + + + +
+ + +
+ + +
+ + +
+ + + + Get Facebook session + + + Get Facebook access token + + + + + + +
+ + + + + + + + + + self.c_id) + { + update DB.DBA.SYS_RDF_MAPPERS set RM_ID = -1 where RM_ID = self.c_id; + if (_id < self.c_id) + { + for (select RM_ID _rm_id from DB.DBA.SYS_RDF_MAPPERS where RM_ID >= _id and RM_ID < self.c_id order by RM_ID desc) do + { + update DB.DBA.SYS_RDF_MAPPERS set RM_ID = RM_ID + 1 where RM_ID = _rm_id; + } + } + else + { + for (select RM_ID _rm_id from DB.DBA.SYS_RDF_MAPPERS where RM_ID > self.c_id and RM_ID <= _id order by RM_ID) do + { + update DB.DBA.SYS_RDF_MAPPERS set RM_ID = RM_ID - 1 where RM_ID = _rm_id; + } + } + update DB.DBA.SYS_RDF_MAPPERS set RM_ID = _id where RM_ID = -1; + } + self.c_mode := 'C/browse'; + self.vc_data_bind (e); + ]]> + + + +
+
+ + +
+
+ +
+ + + diff --git a/binsrc/conductor/rdf_filters_pp.vspx b/binsrc/conductor/rdf_filters_pp.vspx new file mode 100644 index 0000000000..d55b6062f8 --- /dev/null +++ b/binsrc/conductor/rdf_filters_pp.vspx @@ -0,0 +1,475 @@ + + + + Meta Cartridges + + + + + + + + + + + + + ]]> + + + + +
+ + + + + + + + + + + + +
+ + + Meta Cartridges + + + + + + + + + + &nbsp; +
+ + + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Seq#IDDescriptionPatternAPI typeAction
+ + + + + + + + + ' || (control.vc_parent as vspx_row_template).te_rowset[2]; + ]]> + + + + + + + + + + + + +   + + + Delete'; + ]]> + + + + + +   + + + + + +   + + + + + +
+ + + +
+
+ + +
+ + +
+ + +
+ + + + + + + +
+ + +
+ + +
+ + +
+ + + + Get Facebook session + + + Get Facebook access token + +
+ + + + + + + + + + self.c_seq) + { + if (_seq < self.c_seq) + { + for (select MC_ID _mc_id from DB.DBA.RDF_META_CARTRIDGES where MC_SEQ >= _seq and MC_SEQ < self.c_seq order by MC_SEQ desc) do + { + update DB.DBA.RDF_META_CARTRIDGES set MC_SEQ = MC_SEQ + 1 where MC_ID = _mc_id; + } + } + else + { + for (select MC_ID _mc_id from DB.DBA.RDF_META_CARTRIDGES where MC_SEQ > self.c_seq and MC_SEQ <= _seq order by MC_SEQ) do + { + update DB.DBA.RDF_META_CARTRIDGES set MC_SEQ = MC_SEQ - 1 where MC_ID = _mc_id; + } + } + update DB.DBA.RDF_META_CARTRIDGES set MC_SEQ = _seq where MC_ID = self.c_id; + } + + self.c_mode := 'C/browse'; + self.vc_data_bind (e); + ]]> + + + +
+
+ + +
+
+ +
+ + + diff --git a/binsrc/yacutia/rdf_import.vspx b/binsrc/conductor/rdf_import.vspx similarity index 99% rename from binsrc/yacutia/rdf_import.vspx rename to binsrc/conductor/rdf_import.vspx index 58f7884d40..2eabee5792 100644 --- a/binsrc/yacutia/rdf_import.vspx +++ b/binsrc/conductor/rdf_import.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/rdf_psh_subs.vspx b/binsrc/conductor/rdf_psh_subs.vspx similarity index 99% rename from binsrc/yacutia/rdf_psh_subs.vspx rename to binsrc/conductor/rdf_psh_subs.vspx index 3969eac067..f5bd1989f1 100644 --- a/binsrc/yacutia/rdf_psh_subs.vspx +++ b/binsrc/conductor/rdf_psh_subs.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/rdf_schemas.vspx b/binsrc/conductor/rdf_schemas.vspx similarity index 98% rename from binsrc/yacutia/rdf_schemas.vspx rename to binsrc/conductor/rdf_schemas.vspx index 23ce69e79a..18f2ca38ed 100644 --- a/binsrc/yacutia/rdf_schemas.vspx +++ b/binsrc/conductor/rdf_schemas.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/rdf_void.vspx b/binsrc/conductor/rdf_void.vspx similarity index 98% rename from binsrc/yacutia/rdf_void.vspx rename to binsrc/conductor/rdf_void.vspx index 0977892090..e59e6c0471 100644 --- a/binsrc/yacutia/rdf_void.vspx +++ b/binsrc/conductor/rdf_void.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/registries.vspx b/binsrc/conductor/registries.vspx similarity index 99% rename from binsrc/yacutia/registries.vspx rename to binsrc/conductor/registries.vspx index 3588e83942..e488cdf4f3 100644 --- a/binsrc/yacutia/registries.vspx +++ b/binsrc/conductor/registries.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/robot_control.vspx b/binsrc/conductor/robot_control.vspx similarity index 97% rename from binsrc/yacutia/robot_control.vspx rename to binsrc/conductor/robot_control.vspx index cc07f0bdea..3872a0c538 100644 --- a/binsrc/yacutia/robot_control.vspx +++ b/binsrc/conductor/robot_control.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -50,7 +50,7 @@ 		-      + &nbsp;&nbsp;&nbsp;&nbsp; @@ -148,21 +148,21 @@ value="images/icons/edit_16.png" xhtml_alt="Edit" xhtml_title="Edit" - text=" Edit" + text="&nbsp;Edit" url="--sprintf ('robot_edit.vspx?mode=edit&EDIT=%U&url=%U&root=%U', (control.vc_parent as vspx_row_template).te_rowset[1], (control.vc_parent as vspx_row_template).te_rowset[2], (control.vc_parent as vspx_row_template).te_rowset[3])" /> + + + WebDAV Content Management + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ +

+ + + + + ]]> + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + &nbsp; +
+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Target description + +
Target URL + +
Login name on target + +
Login password on target + +
Copy to local DAV collection + + 'edit') + { + ?> + + +
+ + 'edit') + { + ?> + + + + + +
Local resources owner + + + + + +
Download only newer than + +
Follow links matching
(delimited with ;)		 + +
Do not follow links matching
(delimited with ;)		 + +
+ + + +
Custom HTTP headers + +
+ +
XPath expression for links extraction + +
Crawling depth limit + +
Update Interval (minutes) + +
Number of threads + +
Crawl delay (sec) + +
Store Function + + + + +
Extract Function + + + + +
+ + + +
If Graph IRI is unassigned use this Data Source URI + +
+ + + +
+ + + +
Follow RDF properties
(one IRI per row)		 + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ +
+
    +
  • Cartridges
    • + +
  • Meta Cartridges
    • + +
+
+
+
+
+ + + + + + + + + +
+ + RDF Cartridge +
+ + + + + + +
+
+ +
+ + + + + + + + + +
+ + Meta Cartridge +
+ + + + + + +
+
+ + +
+ +
+
+ + + + + + + + + self._host) + { + self._host := sav_host; + self.vc_error_message := sprintf ('Host name can not be edited, it must be "%s".', sav_host); + self.vc_is_valid := 0; + return; + } + + if (length (self.tar_uid.ufl_value) and length (self.tar_pwd.ufl_value)) + { + self._auth := concat (self.tar_uid.ufl_value,':',self.tar_pwd.ufl_value); + } + else + { + self._auth := left (ret_arr[1], pos); + } + + if (self.mode = 'edit' and sav_host <> self._host) + { + self._host := sav_host; + self.vc_error_message := sprintf ('Host name can not be edited, it must be "%s".', sav_host); + self.vc_is_valid := 0; + return; + } + + self._descr := trim (get_keyword ('descr', params)); + self._url := ret_arr[2]; + if (ret_arr[4] is not null and length (ret_arr[4]) > 0) + { + self._url := concat (self._url, '?', ret_arr[4]); + self._url := trim (self._url); + } + self._root := trim (get_keyword ('root', params)); + if (self.mode <> 'edit' and right(self._root, 1) <> '/') + self._root := concat(self._root, '/'); + + if (left(self._root, 5) = '/DAV/') + self._root := right (self._root, length (self._root) - 5); + + self._newd := get_keyword ('newd', params); + self._flow := get_keyword ('flow', params); + self._dflow := get_keyword ('dflow', params); + self._store_fn := get_keyword ('store_fn', params); + self._ext_fn := get_keyword ('ext_fn', params); + self._intv := atoi (get_keyword ('intv', params, '0')); + self._other := atoi (get_keyword ('other', params, '0')); + + self._xp_exp := get_keyword ('xp_exp', params, ''); + self._head := get_keyword ('head', params, ''); + self._depth := get_keyword ('depth', params, ''); + + if (self._depth = '' or self._depth = 'unlimited') + self._depth := null; + + if (self._xp_exp = '') + self._xp_exp := null; + + if (self._head = '') + self._head := null; + + if (self._xp_exp is not null) + { + declare exit handler for sqlstate '*' + { + self.vc_is_valid := 0; + self.vc_error_message := 'Invalid XPath expression for URL extraction'; + return 0; + }; + xpath_eval (self._xp_exp, xtree_doc ('')); + } + + self._del := get_keyword ('del', params); + if (self.mode = 'edit') + self._opage := self._opage; + else + self._opage := get_keyword ('opage', params); + + _idx := null; + self._img := get_keyword ('img', params); + self._dav := get_keyword ('dav', params); + self._own := get_keyword ('own', params); + self._redir := get_keyword ('redir', params); + self._store := get_keyword ('store', params, '0'); + self._get_rdf := atoi (get_keyword ('get_rdf', params, '0')); + self._ask_rdf := atoi (get_keyword ('ask_rdf', params, '0')); + self._accept_rdf := atoi (get_keyword ('accept_rdf', params, '0')); + self._convhtml := atoi (get_keyword ('convhtml', params, '0')); + self._bot := atoi (get_keyword ('bot', params, '0')); + self._thr := atoi (get_keyword ('thr', params, '1')); + self._delay := atof (get_keyword ('delay', params, '0')); + + if (get_keyword ('semweb', params) = '1' and 0 = length (self._store_fn) and 0 = length (self._ext_fn)) + { + self._store_fn := 'WS.WS.SITEMAP_RDF_STORE'; + self._ext_fn := 'WS.WS.SITEMAP_XML_PARSE'; + self._ask_rdf := 1; + self._accept_rdf := 1; + } + if (get_keyword ('semweb', params) <> '1' and self._store_fn = 'WS.WS.SITEMAP_RDF_STORE' and self._ext_fn = 'WS.WS.SITEMAP_XML_PARSE') + { + self._store_fn := ''; + self._ext_fn := ''; + } + declare farr any; + self._rdf_flw := get_keyword ('rdf_flw', params, ''); + self._html_meta := atoi (get_keyword ('html_meta', params, '0')); + self._rdf_graph := get_keyword ('rdf_graph', params, ''); + tmp := split_and_decode (self._rdf_flw, 0, '\0\0\n'); + farr := vector (); + foreach (any x in tmp) do + { + x := trim (rtrim (x, '\r\n')); + if (length (x)) + farr := vector_concat (farr, vector (x)); + } + opts := vector (); + -- 'meta_foaf', atoi (get_keyword ('meta_foaf', params, '0')), + -- 'meta_rdf', atoi (get_keyword ('meta_rdf', params, '0')), + -- 'meta_rss', atoi (get_keyword ('meta_rss', params, '0')), + -- 'meta_grddl', atoi (get_keyword ('meta_grddl', params, '0')) + if (length (farr)) + opts := vector_concat (opts, vector ('follow-property', farr)); + + opts := vector_concat (opts, vector ('follow-meta', self._html_meta)); + if (length (self._rdf_graph)) + opts := vector_concat (opts, vector ('rdf-graph', self._rdf_graph)); + + if (self._ask_rdf) + opts := vector_concat (opts, vector ('meta_rdf', 1)); + + self._udata := opts; + + if (self.mode <> 'edit' and self._opage = '1') + self._opage := 'checked'; + + if (self._del = '1') + self._del := 'checked'; + + if (self._img = '1') + self._img := 'checked'; + + if (self._dav = '1') + self._dav := 'checked'; + + if (WS.WS.isempty(self._host) or WS.WS.isempty(self._root) or WS.WS.isempty(self._url)) + { + self.vc_error_message := 'Host, Target collection and Start path must be specified'; + self.vc_is_valid := 0; + return; + } + if (aref(self._url, 0) <> ascii('/')) + self._url := concat('/', self._url); + + if (aref(self._root, 0) = ascii('/') or strstr(self._root , '..') is not null and self.mode <> 'edit') + { + self.vc_error_message := 'The local collection/resource destination MUST be a relative path under WebDAV root collection/resource and cannot contain a ''..''.'; + self.vc_is_valid := 0; + return; + } + if (self._opage = 'checked') + { + declare u_arr any; + declare target_page varchar; + if (self._url not like '%/') + { + u_arr := WS.WS.HREF_TO_ARRAY(self._url, ''); + target_page := u_arr[length (u_arr) - 1]; + } + else + { + target_page := 'index.html'; + } + + -- we'll guess is the root is a collection or not + if (self._root[length(self._root) - 1] = ascii('/')) + self._root := concat(self._root, target_page); + } + if (exists(select 1 from WS.WS.VFS_SITE where VS_ROOT = self._root and VS_HOST = self._host) and self.mode <> 'edit') + { + self.vc_error_message := 'Target resource/collection already specified. Please do specify another target collection or resource'; + self.vc_is_valid := 0; + return; + } + + if (self.mode = 'edit') + { + update WS.WS.VFS_SITE + set VS_DESCR = self._descr, + VS_INX = _idx, + VS_OWN = (select U_ID from WS.WS.SYS_DAV_USER where U_NAME = self._own), + VS_NEWER = stringdate(self._newd), + VS_DEL = self._del, + VS_FOLLOW = self._flow, + VS_NFOLLOW = self._dflow, + VS_SRC = self._img, + VS_OPAGE = self._opage, + VS_METHOD = self._dav, + VS_OPTIONS = self._auth, + VS_URL = self._url, + VS_REDIRECT = self._redir, + VS_STORE = self._store, + VS_DLOAD_META = self._ask_rdf, + VS_UDATA = serialize (self._udata), + VS_STORE_FN = self._store_fn, + VS_EXTRACT_FN = self._ext_fn, + VS_OTHER = case when self._other = 1 then 'checked' else NULL end, + VS_CONVERT_HTML = self._convhtml, + VS_DEPTH = self._depth, + VS_XPATH = self._xp_exp, + VS_ACCEPT_RDF = self._accept_rdf, + VS_THREADS = self._thr, + VS_BOT = self._bot, + VS_DELAY = self._delay, + VS_HEADERS = self._head + where VS_HOST = self._host + and VS_ROOT = self._root; + + if (not exists (select 1 from WS.WS.VFS_QUEUE where VQ_HOST = self._host and VQ_ROOT = self._root and VQ_URL = self._url)) + update WS.WS.VFS_QUEUE set VQ_URL = self._url where VQ_HOST = self._host and VQ_ROOT = self._root and VQ_URL = self._old_url; + + insert soft WS.WS.VFS_QUEUE (VQ_HOST, VQ_URL, VQ_TS, VQ_STAT, VQ_ROOT) + values (self._host, self._url, now(), 'waiting', self._root); + } + else + { + insert into WS.WS.VFS_SITE ( + VS_DESCR, + VS_HOST, + VS_URL, + VS_INX, + VS_OWN, + VS_ROOT, + VS_NEWER, + VS_DEL, + VS_FOLLOW, + VS_NFOLLOW, + VS_SRC, + VS_METHOD, + VS_OTHER, + VS_OPTIONS, + VS_OPAGE, + VS_REDIRECT, + VS_STORE, + VS_DLOAD_META, + VS_UDATA, + VS_STORE_FN, + VS_EXTRACT_FN, + VS_CONVERT_HTML, + VS_XPATH, + VS_DEPTH, + VS_ACCEPT_RDF, + VS_THREADS, + VS_BOT, + VS_DELAY, + VS_HEADERS + ) + values ( + self._descr, + self._host, + self._url, + _idx, + (select U_ID from WS.WS.SYS_DAV_USER where U_NAME = self._own), + self._root, + stringdate (self._newd), + self._del, + self._flow, + self._dflow, + self._img, + self._dav, + case when self._other then 'checked' else NULL end, + self._auth, + self._opage, + self._redir, + self._store, + self._ask_rdf, + serialize (self._udata), + self._store_fn, + self._ext_fn, + self._convhtml, + self._xp_exp, + self._depth, + self._accept_rdf, + self._thr, + self._bot, + self._delay, + self._head + ); + + insert into WS.WS.VFS_QUEUE (VQ_HOST, VQ_URL, VQ_TS, VQ_STAT, VQ_ROOT) + values (self._host, self._url, now(), 'waiting', self._root); + } + + declare _mp, _idx, p_id, _seq, ename, ename_old any; + + _seq := 0; + _idx := 0; + delete from WS.WS.VFS_SITE_RDF_MAP where VM_HOST = self._host and VM_ROOT = self._root; + if (self._get_rdf) + { + while (_mp := adm_next_keyword ('mapper', params, _idx)) + { + _seq := _seq + 1; + p_id := atoi (_mp); + insert into WS.WS.VFS_SITE_RDF_MAP (VM_HOST, VM_ROOT, VM_RDF_MAP, VM_RDF_MAP_TYPE, VM_SEQ) + values (self._host, self._root, p_id, 0, _seq); + } + while (_mp := adm_next_keyword ('metaMapper', params, _idx)) + { + _seq := _seq + 1; + p_id := atoi (_mp); + insert into WS.WS.VFS_SITE_RDF_MAP (VM_HOST, VM_ROOT, VM_RDF_MAP, VM_RDF_MAP_TYPE, VM_SEQ) + values (self._host, self._root, p_id, 1, _seq); + } + } + + ename := concat(self._descr, '(', self._host, ' in /DAV/', self._root, ')'); + if (desc_save <> '') + { + ename_old := concat(desc_save, '(', self._host, ' in /DAV/', self._root, ')'); + if (ename_old <> ename) + delete from DB.DBA.SYS_SCHEDULED_EVENT where SE_NAME = ename_old; + } + if (self._intv = 0) + { + delete from DB.DBA.SYS_SCHEDULED_EVENT where SE_NAME = ename; + } + else + { + insert replacing DB.DBA.SYS_SCHEDULED_EVENT (SE_NAME, SE_START, SE_INTERVAL, SE_SQL) + values (ename, now (), self._intv, concat('WS.WS.SERV_QUEUE_TOP(\'',self._host,'\',\'',self._root,'\', 1, 0, null, null)')); + } + commit work; + + http_request_status ('HTTP/1.1 302 Found'); + http_header(sprintf('Location: cont_page.vspx?page=2&sid=%s&realm=%s\r\n', self.sid, self.realm)); + ]]> + + +
+ * The "Target URL" will be used as a destination Quad Store Graph IRI.
+ If no RDF cartridge is enabled only RDF content will be retrieved and imported i.e., no RDF transformation via Sponger. +
+ +
+
+ + + diff --git a/binsrc/conductor/robot_export.vspx b/binsrc/conductor/robot_export.vspx new file mode 100644 index 0000000000..af1e8b85dd --- /dev/null +++ b/binsrc/conductor/robot_export.vspx @@ -0,0 +1,221 @@ + + + + WebDAV Content Management + + + + + + + + + + + + + + + + select VS_DESCR into self.site_name from WS.WS.VFS_SITE where VS_HOST = self.host and VS_ROOT = self.root and VS_URL = self.url; + + + + + +
+ + + + + + + + +
+ + + + + + + + + &nbsp; +
+ + + + +
+ + + if (e.ve_button = control and e.ve_initiator = self.src_type) + { + self.is_dav_src := 0; + if (get_keyword ('src_type', e.ve_params)) + self.is_dav_src := 1; + } + + + + + + + + + + + + + + + +
Selected Site
+ + + control.ufl_selected := self.is_dav_src; + + + +
Destination path + + + + +
+ + + + + + + + 0) + { + self.vc_is_valid := 0; + + if (isstring (_rc)) + self.vc_error_message := _rc; + else if (isnumeric (_rc)) + self.vc_error_message := sprintf ('Error number: %d', _rc); + else + self.vc_error_message := 'Unspecified error'; + } + else + { + if (length (_dst) > 2) + { + if (aref (_dst, 1) = ascii (':')) + { + if (aref (_dst, 2) = ascii ('\\')) + _dst := replace (_dst, '\\', '/'); + } + } + if (aref (_dst, length (_dst) - 1) <> ascii ('/')) + _dst := concat (_dst, '/'); + + self.exp := concat ('Exported to: ', _dst, _root); + self.exps.vc_data_bind (e); + self.expf.vc_enabled := 0; + } + } + else + { + self.vc_error_message := 'Destination path/URL must be supplied.'; + self.vc_is_valid := 0; + } + ]]> + + +
+ + +
+
+ +
+ +
+
+ + + diff --git a/binsrc/yacutia/robot_process.vspx b/binsrc/conductor/robot_process.vspx similarity index 98% rename from binsrc/yacutia/robot_process.vspx rename to binsrc/conductor/robot_process.vspx index 5fbe417431..8c4334fa50 100644 --- a/binsrc/yacutia/robot_process.vspx +++ b/binsrc/conductor/robot_process.vspx @@ -1,12 +1,10 @@ WebDAV Content Management diff --git a/binsrc/conductor/robot_queues.vspx b/binsrc/conductor/robot_queues.vspx new file mode 100644 index 0000000000..c89c715beb --- /dev/null +++ b/binsrc/conductor/robot_queues.vspx @@ -0,0 +1,341 @@ + + + + WebDAV Content Management + + + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + &nbsp; +
+ + + + +
+ + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + + + + + + + + + + + + +
DescriptionURLStateAction
+ + + + + + + +
+ No rows selected +
+ + + + + + + + + +
+ + + + + + + + + + + + + + + 'waiting'; + commit work; + log_enable (old_mode, 1); + ]]> + + + + + + + +
+ + + + + + + +
+ +
+ + +
+ +
+ + + + + + + + + + + + + + + +
DescriptionStart onInterval (minutes)Last executedAction
+ + + + + + + + + +
+ No rows selected +
+ + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + + +
+ +
+ + + +
+
+
+ + + diff --git a/binsrc/conductor/robot_sched.vspx b/binsrc/conductor/robot_sched.vspx new file mode 100644 index 0000000000..e8bf313d32 --- /dev/null +++ b/binsrc/conductor/robot_sched.vspx @@ -0,0 +1,271 @@ + + + + WebDAV Content Management + + + + + + + + + + +

+ +

+ + + + + + +
+ + + + + + + + +
+ + + + + + + + + &nbsp; +
+ + + + +
+ + + + +
+ + + + + + +
+ + + + + + + + + + + +
+ +
+ + + + + + + + '' or self.vc_is_valid = 0) + { + success: + http_request_status ('HTTP/1.1 302 Found'); + http_header(sprintf('Location: robot_queues.vspx?sid=%s&realm=%s\r\n', self.sid, self.realm)); + return; + } + inter := 0; + if ((control.vc_find_control('start_time') as vspx_field).ufl_value <> '') + { + declare state, msg, m_dta, res varchar; + + state := '00000'; + exec('stringdate(?)', state, msg, vector((control.vc_find_control('start_time') as vspx_field).ufl_value), m_dta, res); + if (state <> '00000') + start_str := cast(now() as varchar); + else + start_str := stringdate((control.vc_find_control('start_time') as vspx_field).ufl_value); + } + else + { + start_str := cast(now() as varchar); + } + inter := get_keyword('interval_value', e.ve_params, '10'); + if (exists(select 1 from DB.DBA.SYS_SCHEDULED_EVENT where SE_NAME = self.ename)) + { + update DB.DBA.SYS_SCHEDULED_EVENT set SE_START = start_str, SE_INTERVAL = inter where SE_NAME = self.ename; + } + else + { + insert into SYS_SCHEDULED_EVENT (SE_NAME, SE_START, SE_INTERVAL, SE_SQL) values(self.ename, start_str, inter, concat('WS.WS.SERV_QUEUE_TOP(\'',self.host,'\',\'',self.root,'\', 1, 0, null, null)')); + } + + commit work; + goto success; + ]]> + + + + + + + + + + + + + + + + + +
Event Name + +
Start Time + + + + + +
Interval + + + + + + + +
+ + + 'edit') + { + ?> + + + +
+
+
+ + + diff --git a/binsrc/conductor/robot_sites.vspx b/binsrc/conductor/robot_sites.vspx new file mode 100644 index 0000000000..ed20963a0f --- /dev/null +++ b/binsrc/conductor/robot_sites.vspx @@ -0,0 +1,147 @@ + + + + WebDAV Content Management + + + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + &nbsp; +
+ + + + +
+ + + + +
+ + + + + + +
+ + + + + + + + + + + +
+ +
+
+ + + + + + + + + + + + + + + + + + + +
DescriptionURLPages (downloaded/total)Action
/ +  Edit'); + ?> + +
There are no retrieved sites
+
+
+
+
+ + + diff --git a/binsrc/conductor/robot_status.vspx b/binsrc/conductor/robot_status.vspx new file mode 100644 index 0000000000..c50e77229a --- /dev/null +++ b/binsrc/conductor/robot_status.vspx @@ -0,0 +1,152 @@ + + + + Virtuoso Crawler Status + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + &:nbsp; +
+ + + + +
+ + + + + + + +
+ + + + + + +   + + +
+ + Results for ', host,'')); + if (exists (select 1 from WS.WS.VFS_QUEUE where VQ_ROOT = root and VQ_HOST = host and VQ_STAT = 'pending')) + { + http (''); + for (select top 10 VQ_URL, VQ_TS, VQ_STAT + from WS.WS.VFS_QUEUE + where VQ_HOST = host and VQ_ROOT = root and VQ_STAT in ('waiting', 'pending') + order by VQ_HOST, VQ_ROOT, VQ_TS) do + { + ?> + + + + + + + '); + + http ('
Top pending URLs
URLRegistered onState
+ + + +
'); + http(''); + for (select VQ_STAT, count(*) as cnt from WS.WS.VFS_QUEUE where VQ_HOST = host and VQ_ROOT = root) do + { + ?> + + '); + } + else + { + if (exists (select 1 from WS.WS.VFS_QUEUE where VQ_HOST = host and VQ_ROOT = root and VQ_STAT = 'error')) + http (concat ('

errors while retrieving target. Select "reset" to return initial state

')); + ?> +

+ Total URLs processed : +

+

+ Download finished +

+ + + +
StatusCount
+
+ + + diff --git a/binsrc/conductor/robot_urls_list.vspx b/binsrc/conductor/robot_urls_list.vspx new file mode 100644 index 0000000000..4f0b8dae8c --- /dev/null +++ b/binsrc/conductor/robot_urls_list.vspx @@ -0,0 +1,200 @@ + + + + WebDAV Content Management + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + &nbsp; +
+ + + + +
+ + + + +
+ + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ +
+ get_keyword ('host', params)) + { + _host := get_keyword ('host', params); + _root := get_keyword ('root', params); + } + if ('yes' = get_keyword ('DELETE', params)) + { + _url := get_keyword ('url', params); + delete from WS.WS.VFS_URL where VU_HOST = _host and VU_ROOT = _root and VU_URL = _url; + } + set isolation='uncommitted'; + ?> +

Current downloads for

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
URLEtagRetrievedAction
There are no URLs
+ + + if (not self.vc_is_valid) + return; + + delete from WS.WS.VFS_URL where VU_HOST = self.host and VU_ROOT = self.root and VU_URL = (control.vc_parent as vspx_row_template).te_rowset[0]; + self.data_set1.vc_data_bind (e); + + +
+ +
+
+
+
+ + + diff --git a/binsrc/yacutia/role_remove.vspx b/binsrc/conductor/role_remove.vspx similarity index 98% rename from binsrc/yacutia/role_remove.vspx rename to binsrc/conductor/role_remove.vspx index f1a0eb482b..77b1f5952f 100644 --- a/binsrc/yacutia/role_remove.vspx +++ b/binsrc/conductor/role_remove.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/roles.vspx b/binsrc/conductor/roles.vspx similarity index 99% rename from binsrc/yacutia/roles.vspx rename to binsrc/conductor/roles.vspx index 658a6abcf8..080d82f39a 100644 --- a/binsrc/yacutia/roles.vspx +++ b/binsrc/conductor/roles.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sec_acl_edit.vspx b/binsrc/conductor/sec_acl_edit.vspx similarity index 99% rename from binsrc/yacutia/sec_acl_edit.vspx rename to binsrc/conductor/sec_acl_edit.vspx index 5edbbdcbed..bf765d3027 100644 --- a/binsrc/yacutia/sec_acl_edit.vspx +++ b/binsrc/conductor/sec_acl_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sec_acl_edit_sp.vspx b/binsrc/conductor/sec_acl_edit_sp.vspx similarity index 99% rename from binsrc/yacutia/sec_acl_edit_sp.vspx rename to binsrc/conductor/sec_acl_edit_sp.vspx index 415ad9e862..8bfff8c1ca 100644 --- a/binsrc/yacutia/sec_acl_edit_sp.vspx +++ b/binsrc/conductor/sec_acl_edit_sp.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sec_auth_serv.vspx b/binsrc/conductor/sec_auth_serv.vspx similarity index 99% rename from binsrc/yacutia/sec_auth_serv.vspx rename to binsrc/conductor/sec_auth_serv.vspx index a1d478f175..a0b618c923 100644 --- a/binsrc/yacutia/sec_auth_serv.vspx +++ b/binsrc/conductor/sec_auth_serv.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sec_auth_serv_sp.vspx b/binsrc/conductor/sec_auth_serv_sp.vspx similarity index 99% rename from binsrc/yacutia/sec_auth_serv_sp.vspx rename to binsrc/conductor/sec_auth_serv_sp.vspx index 0f20bf025f..d3256fabf9 100644 --- a/binsrc/yacutia/sec_auth_serv_sp.vspx +++ b/binsrc/conductor/sec_auth_serv_sp.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sec_auth_sponger_1.vspx b/binsrc/conductor/sec_auth_sponger_1.vspx similarity index 99% rename from binsrc/yacutia/sec_auth_sponger_1.vspx rename to binsrc/conductor/sec_auth_sponger_1.vspx index 2a3a2cac2b..6175a05d6b 100644 --- a/binsrc/yacutia/sec_auth_sponger_1.vspx +++ b/binsrc/conductor/sec_auth_sponger_1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sec_auth_sponger_2.vspx b/binsrc/conductor/sec_auth_sponger_2.vspx similarity index 99% rename from binsrc/yacutia/sec_auth_sponger_2.vspx rename to binsrc/conductor/sec_auth_sponger_2.vspx index 475684aa15..2070f1ffbd 100644 --- a/binsrc/yacutia/sec_auth_sponger_2.vspx +++ b/binsrc/conductor/sec_auth_sponger_2.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sec_ca.vspx b/binsrc/conductor/sec_ca.vspx similarity index 99% rename from binsrc/yacutia/sec_ca.vspx rename to binsrc/conductor/sec_ca.vspx index 24cd761e6b..187620d2b8 100644 --- a/binsrc/yacutia/sec_ca.vspx +++ b/binsrc/conductor/sec_ca.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sec_pki_1.vspx b/binsrc/conductor/sec_pki_1.vspx similarity index 99% rename from binsrc/yacutia/sec_pki_1.vspx rename to binsrc/conductor/sec_pki_1.vspx index b8a8f0b7be..828a5bc359 100644 --- a/binsrc/yacutia/sec_pki_1.vspx +++ b/binsrc/conductor/sec_pki_1.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sec_pki_2.vspx b/binsrc/conductor/sec_pki_2.vspx similarity index 98% rename from binsrc/yacutia/sec_pki_2.vspx rename to binsrc/conductor/sec_pki_2.vspx index 2cbb5389d0..d4543165b5 100644 --- a/binsrc/yacutia/sec_pki_2.vspx +++ b/binsrc/conductor/sec_pki_2.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -450,10 +450,7 @@ - - + diff --git a/binsrc/yacutia/sec_pki_2_conf.vspx b/binsrc/conductor/sec_pki_2_conf.vspx similarity index 99% rename from binsrc/yacutia/sec_pki_2_conf.vspx rename to binsrc/conductor/sec_pki_2_conf.vspx index 4289131938..14c3bf91ce 100644 --- a/binsrc/yacutia/sec_pki_2_conf.vspx +++ b/binsrc/conductor/sec_pki_2_conf.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sec_pki_3.vspx b/binsrc/conductor/sec_pki_3.vspx similarity index 99% rename from binsrc/yacutia/sec_pki_3.vspx rename to binsrc/conductor/sec_pki_3.vspx index e4e954d83a..8ecc60a147 100644 --- a/binsrc/yacutia/sec_pki_3.vspx +++ b/binsrc/conductor/sec_pki_3.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sec_pki_4.vspx b/binsrc/conductor/sec_pki_4.vspx similarity index 99% rename from binsrc/yacutia/sec_pki_4.vspx rename to binsrc/conductor/sec_pki_4.vspx index 5704eadd05..8fd081627c 100644 --- a/binsrc/yacutia/sec_pki_4.vspx +++ b/binsrc/conductor/sec_pki_4.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sec_pki_download.vsp b/binsrc/conductor/sec_pki_download.vsp similarity index 100% rename from binsrc/yacutia/sec_pki_download.vsp rename to binsrc/conductor/sec_pki_download.vsp diff --git a/binsrc/yacutia/sec_pki_drop.vspx b/binsrc/conductor/sec_pki_drop.vspx similarity index 98% rename from binsrc/yacutia/sec_pki_drop.vspx rename to binsrc/conductor/sec_pki_drop.vspx index 6ac3a9f19a..fe430da80d 100644 --- a/binsrc/yacutia/sec_pki_drop.vspx +++ b/binsrc/conductor/sec_pki_drop.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/site.vspx b/binsrc/conductor/site.vspx similarity index 99% rename from binsrc/yacutia/site.vspx rename to binsrc/conductor/site.vspx index 4703c0d421..6b03cc9f2a 100644 --- a/binsrc/yacutia/site.vspx +++ b/binsrc/conductor/site.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/soap_del_path.vspx b/binsrc/conductor/soap_del_path.vspx similarity index 98% rename from binsrc/yacutia/soap_del_path.vspx rename to binsrc/conductor/soap_del_path.vspx index 9d80f176a9..e85b54d176 100644 --- a/binsrc/yacutia/soap_del_path.vspx +++ b/binsrc/conductor/soap_del_path.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/soap_options_edit.vspx b/binsrc/conductor/soap_options_edit.vspx similarity index 99% rename from binsrc/yacutia/soap_options_edit.vspx rename to binsrc/conductor/soap_options_edit.vspx index a4b85f16bd..0735644ccf 100644 --- a/binsrc/yacutia/soap_options_edit.vspx +++ b/binsrc/conductor/soap_options_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/soap_services.vspx b/binsrc/conductor/soap_services.vspx similarity index 99% rename from binsrc/yacutia/soap_services.vspx rename to binsrc/conductor/soap_services.vspx index 8d5c511ef4..fea92b5ad5 100644 --- a/binsrc/yacutia/soap_services.vspx +++ b/binsrc/conductor/soap_services.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/soap_services_edit.vspx b/binsrc/conductor/soap_services_edit.vspx similarity index 98% rename from binsrc/yacutia/soap_services_edit.vspx rename to binsrc/conductor/soap_services_edit.vspx index 38c3d42bb9..f8506e9645 100644 --- a/binsrc/yacutia/soap_services_edit.vspx +++ b/binsrc/conductor/soap_services_edit.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -236,9 +236,13 @@ select U_ID into _u_id from SYS_USERS where U_NAME = self.soapuser; self.xml_grant_list := get_granted_xml_templates (_u_id, plist); - for (select P_NAME - from DB.DBA.SYS_PROCEDURES, DB.DBA.SYS_GRANTS - where G_USER = _u_id and G_OP = 32 and G_OBJECT = P_NAME and P_TYPE is null) do + for (select a.P_NAME as P_NAME + from DB.DBA.SYS_PROCEDURES a, DB.DBA.SYS_GRANTS g1 + where g1.G_USER = _u_id and g1.G_OP = 32 and g1.G_OBJECT = a.P_NAME and a.P_TYPE is null + union all + select g2.G_OBJECT as G_OBJECT from DB.DBA.SYS_GRANTS g2 where g2.G_USER = _u_id and g2.G_OP = 32 and + not exists (select 1 from DB.DBA.SYS_PROCEDURES b where g2.G_OBJECT = b.P_NAME) + ) do { if (0 = position (P_NAME, plist)) self.roles_grant_list := vector_concat(self.roles_grant_list, vector(P_NAME)); @@ -569,7 +573,7 @@ 		-   + &nbsp;
@@ -638,9 +642,13 @@ select U_ID into _u_id from SYS_USERS where U_NAME = self.soapuser; self.xml_grant_list := get_granted_xml_templates (_u_id, plist); - for (select P_NAME - from DB.DBA.SYS_PROCEDURES, DB.DBA.SYS_GRANTS - where G_USER = _u_id and G_OP = 32 and G_OBJECT = P_NAME and P_TYPE is null) do + for (select a.P_NAME as P_NAME + from DB.DBA.SYS_PROCEDURES a, DB.DBA.SYS_GRANTS g1 + where g1.G_USER = _u_id and g1.G_OP = 32 and g1.G_OBJECT = a.P_NAME and a.P_TYPE is null + union all + select g2.G_OBJECT as G_OBJECT from DB.DBA.SYS_GRANTS g2 where g2.G_USER = _u_id and g2.G_OP = 32 and + not exists (select 1 from DB.DBA.SYS_PROCEDURES b where g2.G_OBJECT = b.P_NAME) + ) do { if (0 = position (P_NAME, plist)) self.roles_grant_list := vector_concat(self.roles_grant_list, vector(P_NAME)); @@ -959,7 +967,11 @@ sql="select P_NAME from DB.DBA.SYS_PROCEDURES where self.browse_cat = name_part (P_NAME, 0) and p_name not like '%.vsp' and P_TYPE is null - order by P_NAME" + union all + select G_OBJECT from SYS_GRANTS where G_OP = 32 and self.browse_cat = name_part (G_OBJECT, 0) and + G_USER = get_user_id_by_name (self.soapuser) and + not exists (select 1 from SYS_PROCEDURES where G_OBJECT = P_NAME) + order by 1" nrows="1000" scrollable="1" edit="1"> @@ -1940,11 +1952,7 @@ } if (length (self.cors) > 0) { - self.global_opts := vector ('cors', self.cors, 'cors_restricted', self.cors_rej); - } - else - { - self.global_opts := null; + self.global_opts := vector_concat (self.global_opts, vector('cors', self.cors, 'cors_restricted', self.cors_rej)); } commit work; if (exists (select 1 from DB.DBA.HTTP_PATH where HP_HOST = self._httphost and HP_LISTEN_HOST = self._host and HP_LPATH = self.lpath) ) diff --git a/binsrc/yacutia/soap_services_list.vspx b/binsrc/conductor/soap_services_list.vspx similarity index 99% rename from binsrc/yacutia/soap_services_list.vspx rename to binsrc/conductor/soap_services_list.vspx index 80515627bb..0c0abee6b8 100644 --- a/binsrc/yacutia/soap_services_list.vspx +++ b/binsrc/conductor/soap_services_list.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sparql_acl.vspx b/binsrc/conductor/sparql_acl.vspx similarity index 99% rename from binsrc/yacutia/sparql_acl.vspx rename to binsrc/conductor/sparql_acl.vspx index 5b841b35b1..55d293af56 100644 --- a/binsrc/yacutia/sparql_acl.vspx +++ b/binsrc/conductor/sparql_acl.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/conductor/sparql_filters.vspx b/binsrc/conductor/sparql_filters.vspx new file mode 100644 index 0000000000..2b79be5eda --- /dev/null +++ b/binsrc/conductor/sparql_filters.vspx @@ -0,0 +1,248 @@ + + + + GRDDL filters for XHTML + + + + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + Stylesheets + + + + + + + + &nbsp; +
+ + + + + +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProfileProfile URIAction
+ + + ' || (control.vc_parent as vspx_row_template).te_rowset[0]; + ]]> + + + + + + + + + + +   + + + Delete'; + ]]> + + + + + +
+ + +
+
+ + + +
+ + +
+ + + +
+ + + + + + + + + + + + + +
+
+ + +
+
+
+ + + diff --git a/binsrc/yacutia/sparql_graph.vspx b/binsrc/conductor/sparql_graph.vspx similarity index 99% rename from binsrc/yacutia/sparql_graph.vspx rename to binsrc/conductor/sparql_graph.vspx index 31cdeb7c0a..fd66207360 100644 --- a/binsrc/yacutia/sparql_graph.vspx +++ b/binsrc/conductor/sparql_graph.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sparql_input.vspx b/binsrc/conductor/sparql_input.vspx similarity index 93% rename from binsrc/yacutia/sparql_input.vspx rename to binsrc/conductor/sparql_input.vspx index 19f3e0883b..1139579ccd 100644 --- a/binsrc/yacutia/sparql_input.vspx +++ b/binsrc/conductor/sparql_input.vspx @@ -1,12 +1,10 @@ 		- - - - - - - - - - - + + +
Query - - - - - - -
-
- 		Query + + + &nbsp; +
diff --git a/binsrc/yacutia/sparql_load.vspx b/binsrc/conductor/sparql_load.vspx similarity index 90% rename from binsrc/yacutia/sparql_load.vspx rename to binsrc/conductor/sparql_load.vspx index cfad0ffbfb..9d991d0da8 100644 --- a/binsrc/yacutia/sparql_load.vspx +++ b/binsrc/conductor/sparql_load.vspx @@ -1,12 +1,10 @@ SPARQL interface @@ -43,27 +40,14 @@
- - - - - - - - - - - + + +
- - Saved Queries - - - - -
-
- 		+ + Saved Queries + &nbsp; +
diff --git a/binsrc/yacutia/sqlbuilder.vsp b/binsrc/conductor/sqlbuilder.vsp similarity index 99% rename from binsrc/yacutia/sqlbuilder.vsp rename to binsrc/conductor/sqlbuilder.vsp index 8abbd71868..50f3011945 100644 --- a/binsrc/yacutia/sqlbuilder.vsp +++ b/binsrc/conductor/sqlbuilder.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/syntax/SyntaxHighlighter.css b/binsrc/conductor/syntax/SyntaxHighlighter.css similarity index 98% rename from binsrc/yacutia/syntax/SyntaxHighlighter.css rename to binsrc/conductor/syntax/SyntaxHighlighter.css index e52d5e1659..960d98901a 100644 --- a/binsrc/yacutia/syntax/SyntaxHighlighter.css +++ b/binsrc/conductor/syntax/SyntaxHighlighter.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/syntax/shBrushSql.js b/binsrc/conductor/syntax/shBrushSql.js similarity index 98% rename from binsrc/yacutia/syntax/shBrushSql.js rename to binsrc/conductor/syntax/shBrushSql.js index 592a0a79f2..e4b3ad8f68 100644 --- a/binsrc/yacutia/syntax/shBrushSql.js +++ b/binsrc/conductor/syntax/shBrushSql.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/syntax/shBrushXml.js b/binsrc/conductor/syntax/shBrushXml.js similarity index 98% rename from binsrc/yacutia/syntax/shBrushXml.js rename to binsrc/conductor/syntax/shBrushXml.js index 84a00fdd83..0ec77f3743 100644 --- a/binsrc/yacutia/syntax/shBrushXml.js +++ b/binsrc/conductor/syntax/shBrushXml.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/syntax/shCore.js b/binsrc/conductor/syntax/shCore.js similarity index 100% rename from binsrc/yacutia/syntax/shCore.js rename to binsrc/conductor/syntax/shCore.js diff --git a/binsrc/yacutia/sys_info.vspx b/binsrc/conductor/sys_info.vspx similarity index 99% rename from binsrc/yacutia/sys_info.vspx rename to binsrc/conductor/sys_info.vspx index ec6b019abf..0bb9a0b1a2 100644 --- a/binsrc/yacutia/sys_info.vspx +++ b/binsrc/conductor/sys_info.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sys_queues.vspx b/binsrc/conductor/sys_queues.vspx similarity index 99% rename from binsrc/yacutia/sys_queues.vspx rename to binsrc/conductor/sys_queues.vspx index 04f800e9a3..2dd48604fd 100644 --- a/binsrc/yacutia/sys_queues.vspx +++ b/binsrc/conductor/sys_queues.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sys_queues_edit.vspx b/binsrc/conductor/sys_queues_edit.vspx similarity index 99% rename from binsrc/yacutia/sys_queues_edit.vspx rename to binsrc/conductor/sys_queues_edit.vspx index ff243a8847..b82b55921e 100644 --- a/binsrc/yacutia/sys_queues_edit.vspx +++ b/binsrc/conductor/sys_queues_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sys_queues_edit_inc.vspx b/binsrc/conductor/sys_queues_edit_inc.vspx similarity index 99% rename from binsrc/yacutia/sys_queues_edit_inc.vspx rename to binsrc/conductor/sys_queues_edit_inc.vspx index 38d7a6ddb5..23b9fa61ca 100644 --- a/binsrc/yacutia/sys_queues_edit_inc.vspx +++ b/binsrc/conductor/sys_queues_edit_inc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sys_queues_error.vspx b/binsrc/conductor/sys_queues_error.vspx similarity index 98% rename from binsrc/yacutia/sys_queues_error.vspx rename to binsrc/conductor/sys_queues_error.vspx index db105f3668..04d680a747 100644 --- a/binsrc/yacutia/sys_queues_error.vspx +++ b/binsrc/conductor/sys_queues_error.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/sys_queues_remove.vspx b/binsrc/conductor/sys_queues_remove.vspx similarity index 98% rename from binsrc/yacutia/sys_queues_remove.vspx rename to binsrc/conductor/sys_queues_remove.vspx index 64b9fc45b3..a9c95de68b 100644 --- a/binsrc/yacutia/sys_queues_remove.vspx +++ b/binsrc/conductor/sys_queues_remove.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/tbl.js b/binsrc/conductor/tbl.js similarity index 99% rename from binsrc/yacutia/tbl.js rename to binsrc/conductor/tbl.js index 65d4afa504..9d98304a6a 100644 --- a/binsrc/yacutia/tbl.js +++ b/binsrc/conductor/tbl.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/text_queries.vspx b/binsrc/conductor/text_queries.vspx similarity index 99% rename from binsrc/yacutia/text_queries.vspx rename to binsrc/conductor/text_queries.vspx index bf971faedc..742df94a63 100644 --- a/binsrc/yacutia/text_queries.vspx +++ b/binsrc/conductor/text_queries.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/text_queries_edit.vspx b/binsrc/conductor/text_queries_edit.vspx similarity index 99% rename from binsrc/yacutia/text_queries_edit.vspx rename to binsrc/conductor/text_queries_edit.vspx index 49369fbd66..38879ccc04 100644 --- a/binsrc/yacutia/text_queries_edit.vspx +++ b/binsrc/conductor/text_queries_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/text_results.vspx b/binsrc/conductor/text_results.vspx similarity index 99% rename from binsrc/yacutia/text_results.vspx rename to binsrc/conductor/text_results.vspx index 5b886794b3..2ab15a0db7 100644 --- a/binsrc/yacutia/text_results.vspx +++ b/binsrc/conductor/text_results.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/text_search.vspx b/binsrc/conductor/text_search.vspx similarity index 99% rename from binsrc/yacutia/text_search.vspx rename to binsrc/conductor/text_search.vspx index ee4f6490ef..04067052c2 100644 --- a/binsrc/yacutia/text_search.vspx +++ b/binsrc/conductor/text_search.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/text_triggers.vspx b/binsrc/conductor/text_triggers.vspx similarity index 99% rename from binsrc/yacutia/text_triggers.vspx rename to binsrc/conductor/text_triggers.vspx index dcd2a70b16..36cea5fb54 100644 --- a/binsrc/yacutia/text_triggers.vspx +++ b/binsrc/conductor/text_triggers.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/uddi_remove.vspx b/binsrc/conductor/uddi_remove.vspx similarity index 99% rename from binsrc/yacutia/uddi_remove.vspx rename to binsrc/conductor/uddi_remove.vspx index 4363951135..c66787c3ab 100644 --- a/binsrc/yacutia/uddi_remove.vspx +++ b/binsrc/conductor/uddi_remove.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/uddi_serv.vspx b/binsrc/conductor/uddi_serv.vspx similarity index 92% rename from binsrc/yacutia/uddi_serv.vspx rename to binsrc/conductor/uddi_serv.vspx index 75de6473ec..db3017ef97 100644 --- a/binsrc/yacutia/uddi_serv.vspx +++ b/binsrc/conductor/uddi_serv.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -46,13 +46,6 @@ diff --git a/binsrc/yacutia/vdb_conf_dsn_new.vspx b/binsrc/conductor/vdb_conf_dsn_new.vspx similarity index 95% rename from binsrc/yacutia/vdb_conf_dsn_new.vspx rename to binsrc/conductor/vdb_conf_dsn_new.vspx index 41550eb433..e35f2b5afb 100644 --- a/binsrc/yacutia/vdb_conf_dsn_new.vspx +++ b/binsrc/conductor/vdb_conf_dsn_new.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -54,12 +54,7 @@
- - - - - - - @@ -82,12 +70,7 @@      @@ -99,12 +82,7 @@   tModels   diff --git a/binsrc/yacutia/uddi_serv_browse.vspx b/binsrc/conductor/uddi_serv_browse.vspx similarity index 99% rename from binsrc/yacutia/uddi_serv_browse.vspx rename to binsrc/conductor/uddi_serv_browse.vspx index a2bb1fe0a2..8300d3f6f9 100644 --- a/binsrc/yacutia/uddi_serv_browse.vspx +++ b/binsrc/conductor/uddi_serv_browse.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/uddi_serv_create.vspx b/binsrc/conductor/uddi_serv_create.vspx similarity index 99% rename from binsrc/yacutia/uddi_serv_create.vspx rename to binsrc/conductor/uddi_serv_create.vspx index 225765bb1a..5a76852a21 100644 --- a/binsrc/yacutia/uddi_serv_create.vspx +++ b/binsrc/conductor/uddi_serv_create.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vad.vspx b/binsrc/conductor/vad.vspx similarity index 99% rename from binsrc/yacutia/vad.vspx rename to binsrc/conductor/vad.vspx index 839ab64832..8e83628699 100644 --- a/binsrc/yacutia/vad.vspx +++ b/binsrc/conductor/vad.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vad_install.vspx b/binsrc/conductor/vad_install.vspx similarity index 99% rename from binsrc/yacutia/vad_install.vspx rename to binsrc/conductor/vad_install.vspx index 789e217542..7b2b13f4f9 100644 --- a/binsrc/yacutia/vad_install.vspx +++ b/binsrc/conductor/vad_install.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vad_install_batch.vspx b/binsrc/conductor/vad_install_batch.vspx similarity index 99% rename from binsrc/yacutia/vad_install_batch.vspx rename to binsrc/conductor/vad_install_batch.vspx index 25bab6f7fb..36705ac385 100644 --- a/binsrc/yacutia/vad_install_batch.vspx +++ b/binsrc/conductor/vad_install_batch.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vad_remove.vspx b/binsrc/conductor/vad_remove.vspx similarity index 98% rename from binsrc/yacutia/vad_remove.vspx rename to binsrc/conductor/vad_remove.vspx index f8588b0fb9..b5078acb12 100644 --- a/binsrc/yacutia/vad_remove.vspx +++ b/binsrc/conductor/vad_remove.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vad_remove_batch.vspx b/binsrc/conductor/vad_remove_batch.vspx similarity index 99% rename from binsrc/yacutia/vad_remove_batch.vspx rename to binsrc/conductor/vad_remove_batch.vspx index ce2416968b..e45b435f4d 100644 --- a/binsrc/yacutia/vad_remove_batch.vspx +++ b/binsrc/conductor/vad_remove_batch.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vad_src.vspx b/binsrc/conductor/vad_src.vspx similarity index 99% rename from binsrc/yacutia/vad_src.vspx rename to binsrc/conductor/vad_src.vspx index a2b3ec7bd8..7191b0312b 100644 --- a/binsrc/yacutia/vad_src.vspx +++ b/binsrc/conductor/vad_src.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vad_status.vspx b/binsrc/conductor/vad_status.vspx similarity index 98% rename from binsrc/yacutia/vad_status.vspx rename to binsrc/conductor/vad_status.vspx index e52d700f3e..b5ab5ee51a 100644 --- a/binsrc/yacutia/vad_status.vspx +++ b/binsrc/conductor/vad_status.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/conductor/vad_version b/binsrc/conductor/vad_version new file mode 100644 index 0000000000..defbcf7274 --- /dev/null +++ b/binsrc/conductor/vad_version @@ -0,0 +1 @@ +1.00.8800 diff --git a/binsrc/yacutia/vdb_conf_dsn_edit.vspx b/binsrc/conductor/vdb_conf_dsn_edit.vspx similarity index 99% rename from binsrc/yacutia/vdb_conf_dsn_edit.vspx rename to binsrc/conductor/vdb_conf_dsn_edit.vspx index 792d53c22d..c54b134d56 100644 --- a/binsrc/yacutia/vdb_conf_dsn_edit.vspx +++ b/binsrc/conductor/vdb_conf_dsn_edit.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -227,12 +227,7 @@
@@ -63,12 +56,7 @@      - - - - -
-
+ &nbsp; 		- - - - -
-
+ &nbsp; 		- - - - -
-
+ &nbsp;
Configure Data Sources - - - - -
-
+ &nbsp;
@@ -496,7 +491,7 @@


- Copyright 1998-2018 OpenLink Software
+ Copyright 1998-2019 OpenLink Software
All rights reserved

Configure Data Sources - - - - -
-
+ &nbsp;
diff --git a/binsrc/yacutia/vdb_conf_dsn_remove.vspx b/binsrc/conductor/vdb_conf_dsn_remove.vspx similarity index 73% rename from binsrc/yacutia/vdb_conf_dsn_remove.vspx rename to binsrc/conductor/vdb_conf_dsn_remove.vspx index b4d95f020f..bbebde55cb 100644 --- a/binsrc/yacutia/vdb_conf_dsn_remove.vspx +++ b/binsrc/conductor/vdb_conf_dsn_remove.vspx @@ -1,12 +1,10 @@ 		- - - - - - - - - - - - + + + +
- - - - Configure Data Sources - - - - -
-
- 		+ + + + Configure Data Sources + &nbsp; +
diff --git a/binsrc/yacutia/vdb_config_dsn.vspx b/binsrc/conductor/vdb_config_dsn.vspx similarity index 99% rename from binsrc/yacutia/vdb_config_dsn.vspx rename to binsrc/conductor/vdb_config_dsn.vspx index c433fd213c..69984a2ab1 100644 --- a/binsrc/yacutia/vdb_config_dsn.vspx +++ b/binsrc/conductor/vdb_config_dsn.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vdb_conn_dsn.vspx b/binsrc/conductor/vdb_conn_dsn.vspx similarity index 99% rename from binsrc/yacutia/vdb_conn_dsn.vspx rename to binsrc/conductor/vdb_conn_dsn.vspx index 78ceda0c2f..a33d64d8c8 100644 --- a/binsrc/yacutia/vdb_conn_dsn.vspx +++ b/binsrc/conductor/vdb_conn_dsn.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -56,7 +56,7 @@
-   + &nbsp;
diff --git a/binsrc/yacutia/vdb_conn_dsn_del.vspx b/binsrc/conductor/vdb_conn_dsn_del.vspx similarity index 99% rename from binsrc/yacutia/vdb_conn_dsn_del.vspx rename to binsrc/conductor/vdb_conn_dsn_del.vspx index 3a41a33ee4..81ebb5ccf5 100644 --- a/binsrc/yacutia/vdb_conn_dsn_del.vspx +++ b/binsrc/conductor/vdb_conn_dsn_del.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vdb_conn_dsn_edit.vspx b/binsrc/conductor/vdb_conn_dsn_edit.vspx similarity index 95% rename from binsrc/yacutia/vdb_conn_dsn_edit.vspx rename to binsrc/conductor/vdb_conn_dsn_edit.vspx index 962a6647a1..c3702a0b37 100644 --- a/binsrc/yacutia/vdb_conn_dsn_edit.vspx +++ b/binsrc/conductor/vdb_conn_dsn_edit.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -58,12 +58,7 @@ 		- - - - -
-
+ &nbsp;
diff --git a/binsrc/yacutia/vdb_dsn_edit.vspx b/binsrc/conductor/vdb_dsn_edit.vspx similarity index 99% rename from binsrc/yacutia/vdb_dsn_edit.vspx rename to binsrc/conductor/vdb_dsn_edit.vspx index 12ea3cdb2d..1671c169ac 100644 --- a/binsrc/yacutia/vdb_dsn_edit.vspx +++ b/binsrc/conductor/vdb_dsn_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vdb_dsns.vspx b/binsrc/conductor/vdb_dsns.vspx similarity index 99% rename from binsrc/yacutia/vdb_dsns.vspx rename to binsrc/conductor/vdb_dsns.vspx index 53000e4147..60bcc64720 100644 --- a/binsrc/yacutia/vdb_dsns.vspx +++ b/binsrc/conductor/vdb_dsns.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vdb_error_inc.vspx b/binsrc/conductor/vdb_error_inc.vspx similarity index 97% rename from binsrc/yacutia/vdb_error_inc.vspx rename to binsrc/conductor/vdb_error_inc.vspx index a26ef8c948..10f59588eb 100644 --- a/binsrc/yacutia/vdb_error_inc.vspx +++ b/binsrc/conductor/vdb_error_inc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vdb_errs.vspx b/binsrc/conductor/vdb_errs.vspx similarity index 73% rename from binsrc/yacutia/vdb_errs.vspx rename to binsrc/conductor/vdb_errs.vspx index 60320971c3..4111fde9c1 100644 --- a/binsrc/yacutia/vdb_errs.vspx +++ b/binsrc/conductor/vdb_errs.vspx @@ -1,12 +1,10 @@ 		- - - - - - - - - - - - + + + +
- - Data Sources - - - - - - -
-
- 		+ + Data Sources + + + &nbsp; +
diff --git a/binsrc/yacutia/vdb_export.vspx b/binsrc/conductor/vdb_export.vspx similarity index 96% rename from binsrc/yacutia/vdb_export.vspx rename to binsrc/conductor/vdb_export.vspx index 38e9912637..72a4ae17e9 100644 --- a/binsrc/yacutia/vdb_export.vspx +++ b/binsrc/conductor/vdb_export.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vdb_link.vspx b/binsrc/conductor/vdb_link.vspx similarity index 99% rename from binsrc/yacutia/vdb_link.vspx rename to binsrc/conductor/vdb_link.vspx index ef8138bae2..70e8555230 100644 --- a/binsrc/yacutia/vdb_link.vspx +++ b/binsrc/conductor/vdb_link.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vdb_linked_obj.vspx b/binsrc/conductor/vdb_linked_obj.vspx similarity index 99% rename from binsrc/yacutia/vdb_linked_obj.vspx rename to binsrc/conductor/vdb_linked_obj.vspx index cc5d080025..04ec0e1448 100644 --- a/binsrc/yacutia/vdb_linked_obj.vspx +++ b/binsrc/conductor/vdb_linked_obj.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -71,7 +71,7 @@
-   + &nbsp;
diff --git a/binsrc/yacutia/vdb_main.vspx b/binsrc/conductor/vdb_main.vspx similarity index 99% rename from binsrc/yacutia/vdb_main.vspx rename to binsrc/conductor/vdb_main.vspx index f8a07baafc..0a17871a1a 100644 --- a/binsrc/yacutia/vdb_main.vspx +++ b/binsrc/conductor/vdb_main.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vdb_obj_link.vspx b/binsrc/conductor/vdb_obj_link.vspx similarity index 99% rename from binsrc/yacutia/vdb_obj_link.vspx rename to binsrc/conductor/vdb_obj_link.vspx index 6e35dd3227..4f1ce40c72 100644 --- a/binsrc/yacutia/vdb_obj_link.vspx +++ b/binsrc/conductor/vdb_obj_link.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -88,12 +88,7 @@ 		- - - - -
-
+ &nbsp;
diff --git a/binsrc/yacutia/vdb_obj_link_opts.vspx b/binsrc/conductor/vdb_obj_link_opts.vspx similarity index 99% rename from binsrc/yacutia/vdb_obj_link_opts.vspx rename to binsrc/conductor/vdb_obj_link_opts.vspx index bfcf7ca28e..69554f375c 100644 --- a/binsrc/yacutia/vdb_obj_link_opts.vspx +++ b/binsrc/conductor/vdb_obj_link_opts.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -76,12 +76,7 @@ 		- - - - -
-
+ &nbsp;
diff --git a/binsrc/yacutia/vdb_obj_link_pk.vspx b/binsrc/conductor/vdb_obj_link_pk.vspx similarity index 97% rename from binsrc/yacutia/vdb_obj_link_pk.vspx rename to binsrc/conductor/vdb_obj_link_pk.vspx index 792867ccbb..e3ced626eb 100644 --- a/binsrc/yacutia/vdb_obj_link_pk.vspx +++ b/binsrc/conductor/vdb_obj_link_pk.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -77,15 +77,10 @@ - - - - -
-
- - - + &nbsp; + + + diff --git a/binsrc/yacutia/vdb_resources.vspx b/binsrc/conductor/vdb_resources.vspx similarity index 99% rename from binsrc/yacutia/vdb_resources.vspx rename to binsrc/conductor/vdb_resources.vspx index dbc9b943c5..0c300db78f 100644 --- a/binsrc/yacutia/vdb_resources.vspx +++ b/binsrc/conductor/vdb_resources.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vdb_unlink_obj.vspx b/binsrc/conductor/vdb_unlink_obj.vspx similarity index 97% rename from binsrc/yacutia/vdb_unlink_obj.vspx rename to binsrc/conductor/vdb_unlink_obj.vspx index 481b397792..e6e8a8c6bc 100644 --- a/binsrc/yacutia/vdb_unlink_obj.vspx +++ b/binsrc/conductor/vdb_unlink_obj.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -59,12 +59,7 @@
- - - - -
-
+ &nbsp;
diff --git a/binsrc/yacutia/vdir_browser.vspx b/binsrc/conductor/vdir_browser.vspx similarity index 99% rename from binsrc/yacutia/vdir_browser.vspx rename to binsrc/conductor/vdir_browser.vspx index 4efc249ced..30acd03507 100644 --- a/binsrc/yacutia/vdir_browser.vspx +++ b/binsrc/conductor/vdir_browser.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vfs_export.vspx b/binsrc/conductor/vfs_export.vspx similarity index 96% rename from binsrc/yacutia/vfs_export.vspx rename to binsrc/conductor/vfs_export.vspx index c3fce162ea..17d03d52a4 100644 --- a/binsrc/yacutia/vfs_export.vspx +++ b/binsrc/conductor/vfs_export.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/vhost_export.vspx b/binsrc/conductor/vhost_export.vspx similarity index 97% rename from binsrc/yacutia/vhost_export.vspx rename to binsrc/conductor/vhost_export.vspx index f4149759b8..8740c4fd79 100644 --- a/binsrc/yacutia/vhost_export.vspx +++ b/binsrc/conductor/vhost_export.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/view.vsp b/binsrc/conductor/view.vsp similarity index 97% rename from binsrc/yacutia/view.vsp rename to binsrc/conductor/view.vsp index 77325cc628..89a608014b 100644 --- a/binsrc/yacutia/view.vsp +++ b/binsrc/conductor/view.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/view.vspx b/binsrc/conductor/view.vspx similarity index 97% rename from binsrc/yacutia/view.vspx rename to binsrc/conductor/view.vspx index 431d00a8d1..d944b0a049 100644 --- a/binsrc/yacutia/view.vspx +++ b/binsrc/conductor/view.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/view_dav_res.vsp b/binsrc/conductor/view_dav_res.vsp similarity index 97% rename from binsrc/yacutia/view_dav_res.vsp rename to binsrc/conductor/view_dav_res.vsp index 8eb4151baa..87d009bbc2 100644 --- a/binsrc/yacutia/view_dav_res.vsp +++ b/binsrc/conductor/view_dav_res.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/view_file.vsp b/binsrc/conductor/view_file.vsp similarity index 98% rename from binsrc/yacutia/view_file.vsp rename to binsrc/conductor/view_file.vsp index 11cfab02f2..eb53368b7b 100644 --- a/binsrc/yacutia/view_file.vsp +++ b/binsrc/conductor/view_file.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/virtuoso_splash.vspx b/binsrc/conductor/virtuoso_splash.vspx similarity index 94% rename from binsrc/yacutia/virtuoso_splash.vspx rename to binsrc/conductor/virtuoso_splash.vspx index 99601bb5d0..1de36f574b 100644 --- a/binsrc/yacutia/virtuoso_splash.vspx +++ b/binsrc/conductor/virtuoso_splash.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/wsdl_service_create.vspx b/binsrc/conductor/wsdl_service_create.vspx similarity index 99% rename from binsrc/yacutia/wsdl_service_create.vspx rename to binsrc/conductor/wsdl_service_create.vspx index a982759512..43438a2d7e 100644 --- a/binsrc/yacutia/wsdl_service_create.vspx +++ b/binsrc/conductor/wsdl_service_create.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/conductor/wsdl_services.vspx b/binsrc/conductor/wsdl_services.vspx new file mode 100644 index 0000000000..88f7a7811d --- /dev/null +++ b/binsrc/conductor/wsdl_services.vspx @@ -0,0 +1,85 @@ + + + + Virtuoso WSDL Services + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ Import + + + + &nbsp; + + + + Export + + &nbsp; +
+ + + + + +
+ + + + + + +
+
+ + + diff --git a/binsrc/yacutia/wsdltree.vspx b/binsrc/conductor/wsdltree.vspx similarity index 99% rename from binsrc/yacutia/wsdltree.vspx rename to binsrc/conductor/wsdltree.vspx index c9db98dd49..706dd703fa 100644 --- a/binsrc/yacutia/wsdltree.vspx +++ b/binsrc/conductor/wsdltree.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xddl-tables.vspx b/binsrc/conductor/xddl-tables.vspx similarity index 99% rename from binsrc/yacutia/xddl-tables.vspx rename to binsrc/conductor/xddl-tables.vspx index 663398d577..7f1a894b39 100644 --- a/binsrc/yacutia/xddl-tables.vspx +++ b/binsrc/conductor/xddl-tables.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xddl.vspx b/binsrc/conductor/xddl.vspx similarity index 99% rename from binsrc/yacutia/xddl.vspx rename to binsrc/conductor/xddl.vspx index f07cdbc9a4..ebda261e8c 100644 --- a/binsrc/yacutia/xddl.vspx +++ b/binsrc/conductor/xddl.vspx @@ -1,12 +1,10 @@ - - - - -
-
+ &nbsp; @@ -458,12 +450,7 @@    - - - - -
-
+ &nbsp; @@ -484,12 +471,7 @@   Stored Procedures   - - - - -
-
+ &nbsp; --> diff --git a/binsrc/yacutia/xml_check.vspx b/binsrc/conductor/xml_check.vspx similarity index 98% rename from binsrc/yacutia/xml_check.vspx rename to binsrc/conductor/xml_check.vspx index 9cf1711b5d..c568ca873b 100644 --- a/binsrc/yacutia/xml_check.vspx +++ b/binsrc/conductor/xml_check.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xml_sql.vspx b/binsrc/conductor/xml_sql.vspx similarity index 99% rename from binsrc/yacutia/xml_sql.vspx rename to binsrc/conductor/xml_sql.vspx index 0b5590dd45..8b0e086faf 100644 --- a/binsrc/yacutia/xml_sql.vspx +++ b/binsrc/conductor/xml_sql.vspx @@ -1,12 +1,10 @@ - - - - -
-
+ &nbsp; diff --git a/binsrc/yacutia/xml_sql2.vspx b/binsrc/conductor/xml_sql2.vspx similarity index 99% rename from binsrc/yacutia/xml_sql2.vspx rename to binsrc/conductor/xml_sql2.vspx index e7601b54b9..1c1a097fb7 100644 --- a/binsrc/yacutia/xml_sql2.vspx +++ b/binsrc/conductor/xml_sql2.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xml_sql_check.vspx b/binsrc/conductor/xml_sql_check.vspx similarity index 99% rename from binsrc/yacutia/xml_sql_check.vspx rename to binsrc/conductor/xml_sql_check.vspx index 9bdbf8952f..026e341693 100644 --- a/binsrc/yacutia/xml_sql_check.vspx +++ b/binsrc/conductor/xml_sql_check.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xml_sql_view_show.vspx b/binsrc/conductor/xml_sql_view_show.vspx similarity index 98% rename from binsrc/yacutia/xml_sql_view_show.vspx rename to binsrc/conductor/xml_sql_view_show.vspx index 954fdb2c29..61b290cf40 100644 --- a/binsrc/yacutia/xml_sql_view_show.vspx +++ b/binsrc/conductor/xml_sql_view_show.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xml_xsd.vspx b/binsrc/conductor/xml_xsd.vspx similarity index 99% rename from binsrc/yacutia/xml_xsd.vspx rename to binsrc/conductor/xml_xsd.vspx index 6e477ba4c5..905f37cfb8 100644 --- a/binsrc/yacutia/xml_xsd.vspx +++ b/binsrc/conductor/xml_xsd.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xquery.vspx b/binsrc/conductor/xquery.vspx similarity index 91% rename from binsrc/yacutia/xquery.vspx rename to binsrc/conductor/xquery.vspx index 4ab5d5465f..3019fb56a5 100644 --- a/binsrc/yacutia/xquery.vspx +++ b/binsrc/conductor/xquery.vspx @@ -1,12 +1,10 @@ - - - - - - - - - - - - + + + +
XQuery Basic - - - - - - - - -
-
- 		XQuery Basic + + + + + &nbsp; +
diff --git a/binsrc/yacutia/xquery2.vspx b/binsrc/conductor/xquery2.vspx similarity index 95% rename from binsrc/yacutia/xquery2.vspx rename to binsrc/conductor/xquery2.vspx index 3d2f808869..3aa73ae9e6 100644 --- a/binsrc/yacutia/xquery2.vspx +++ b/binsrc/conductor/xquery2.vspx @@ -1,12 +1,10 @@ XQuery Creation @@ -48,30 +45,17 @@ + +
- - - - - - - - - - - - + + + +
XQuery Basic - - - - - - - - -
-
- 		XQuery Basic + + + + + &nbsp; +
diff --git a/binsrc/yacutia/xquery3.vspx b/binsrc/conductor/xquery3.vspx similarity index 96% rename from binsrc/yacutia/xquery3.vspx rename to binsrc/conductor/xquery3.vspx index 7c4f50fda6..2d1322b851 100644 --- a/binsrc/yacutia/xquery3.vspx +++ b/binsrc/conductor/xquery3.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -79,30 +79,17 @@ + + + +
- - - - - - - - - - - - + + + +
XQuery Basic - - - - - - - - -
-
- 		XQuery Basic + + + + + &nbsp; +
diff --git a/binsrc/yacutia/xquery4.vspx b/binsrc/conductor/xquery4.vspx similarity index 70% rename from binsrc/yacutia/xquery4.vspx rename to binsrc/conductor/xquery4.vspx index 25996181bd..4e1d3e2037 100644 --- a/binsrc/yacutia/xquery4.vspx +++ b/binsrc/conductor/xquery4.vspx @@ -1,12 +1,10 @@ Virtuoso Xquery service @@ -41,30 +38,17 @@ - -
- - - - - - - - - - - - + + + +
XQuery Basic - - - - - - - - -
-
- 		XQuery Basic + + + + + &nbsp; +
@@ -98,17 +82,17 @@ http_request_status ('HTTP/1.1 302 Found'); http_header (sprintf('Location: xquery.vspx?sid=%s&realm=%s\r\n',self.sid ,self.realm)); ]]> - - - - - -
- -
-
+ +
+ +
+
diff --git a/binsrc/yacutia/xquery_adv.vspx b/binsrc/conductor/xquery_adv.vspx similarity index 93% rename from binsrc/yacutia/xquery_adv.vspx rename to binsrc/conductor/xquery_adv.vspx index db26719e30..3c975913c8 100644 --- a/binsrc/yacutia/xquery_adv.vspx +++ b/binsrc/conductor/xquery_adv.vspx @@ -1,12 +1,10 @@ - - - - - - - - - - - - + + + +
- - XQuery Advanced - - - - - - -
-
- 		+ + XQuery Advanced + + + &nbsp; +
diff --git a/binsrc/yacutia/xquery_check.vspx b/binsrc/conductor/xquery_check.vspx similarity index 99% rename from binsrc/yacutia/xquery_check.vspx rename to binsrc/conductor/xquery_check.vspx index ee0d6fd71a..e0d43d458d 100644 --- a/binsrc/yacutia/xquery_check.vspx +++ b/binsrc/conductor/xquery_check.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xquery_src_show.vspx b/binsrc/conductor/xquery_src_show.vspx similarity index 98% rename from binsrc/yacutia/xquery_src_show.vspx rename to binsrc/conductor/xquery_src_show.vspx index 8e74701618..7f95d43d99 100644 --- a/binsrc/yacutia/xquery_src_show.vspx +++ b/binsrc/conductor/xquery_src_show.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xquery_templates.vspx b/binsrc/conductor/xquery_templates.vspx similarity index 86% rename from binsrc/yacutia/xquery_templates.vspx rename to binsrc/conductor/xquery_templates.vspx index 59a9022ddc..a59d281348 100644 --- a/binsrc/yacutia/xquery_templates.vspx +++ b/binsrc/conductor/xquery_templates.vspx @@ -1,12 +1,10 @@ Virtuoso XQuery interface @@ -43,30 +40,17 @@ \n'); - } - if (tp = 2) -- defd in data sets + row_count := length (graph_usages); + for (row_ctr := 0; row_ctr < row_count; row_ctr := row_ctr + 1) { - qr := 'sparql define input:storage "" select ?g count (*) where { graph ?g { ?s ?p `iri(??)` }} group by ?g order by desc 2 limit 20'; - http ('\n'); + declare grvar any; + declare tot, phy integer; + grvar := graph_usages[row_ctr][0]; + tot := graph_usages[row_ctr][1]; + phy := graph_usages[row_ctr][2]; + http (''); + if (position (grvar, grs)) + tgr := vector_concat (tgr, vector (grvar)); + http (sprintf ('', + grvar, + case when position (grvar, grs) then 'checked' else '' end, + b3s_u2w (page_resource_uri), + grvar, + ses_params, + grvar)); + http ('\n'); + } } if (tp = 3) -- Expanded sas { - qr := 'sparql define input:storage "" select ?syn (sql:rnk_scale ( (?syn))) where {{ select ?s ?syn where {{?syn owl:sameAs ?s } union {?s owl:sameAs ?syn}}} option (transitive, t_distinct, t_min (0), T_in (?s), t_out (?syn)) . filter (!isliteral (?syn) && ?s = iri(??) ) } order by desc 2 limit 20'; http (sprintf ('\n', 'Identifier (URI)')); + for (sparql define input:storage "" + select ?syn (sql:rnk_scale ( (?syn))) as ?rnk + where + { + { select ?s ?syn where {{?syn owl:sameAs ?s } union {?s owl:sameAs ?syn}}} option (transitive, t_distinct, t_min (0), T_in (?s), t_out (?syn)) . + filter (!isliteral (?syn) && ?s = iri(?:_S)) + } + order by desc 2 limit 20) do + { + http (''); + http (sprintf ('', "syn", ses_params, b3s_uri_curie ("syn"))); + http (sprintf ('', "rnk")); + http ('\n'); + } } if (tp = 4) -- Expanded ifp { - qr := sprintf ('sparql define input:storage "" select distinct ?syn ?p ?o (sql:rnk_scale ( (?syn))) where { `iri(??)` ?p ?o . filter (0 != ( ("%s", ?p, lod:ifp_like, 3))) . ?syn ?p ?o . } order by desc 4 limit 20', coalesce (inf_rule, 'b3sifp')); + qr := 'sparql define input:storage "" select distinct ?syn ?p ?o (sql:rnk_scale ( (?syn))) where { `iri(??)` ?p ?o . filter (0 != ( ("' || coalesce (inf_rule, 'b3sifp') || '", ?p, lod:ifp_like, 3))) . ?syn ?p ?o . } order by desc 4 limit 20'; http (sprintf ('\n', fct_s_term (), fct_p_term (), fct_o_term ())); - } - b3s_dbg_out(dbg_out, qr); - exec (qr, null, null, vector (_S), 0, null, null, h1); while (0 = exec_next (h1, null, null, data)) { http (''); - if (tp = 1 or tp = 2) - { - declare grvar any; - grvar := data[0]; - if (position (grvar, grs)) - tgr := vector_concat (tgr, vector (grvar)); - http (sprintf ('', - grvar, - case when position (grvar, grs) then 'checked' else '' end, - b3s_u2w (page_resource_uri), - grvar, - b3s_render_ses_params(), - data[0])); - http (sprintf ('', data[1])); - } - else if (tp = 3) - { - http (sprintf ('', data[0], b3s_render_ses_params(), b3s_uri_curie (data[0]))); - http (sprintf ('', data[1])); - } - else if (tp = 4) - { - http (sprintf ('', data[0], b3s_render_ses_params(), b3s_uri_curie (data[0]))); - http (sprintf ('', data[1], b3s_render_ses_params(), b3s_uri_curie (data[1]))); + http (sprintf ('', data[0], ses_params, b3s_uri_curie (data[0]))); + http (sprintf ('', data[1], ses_params, b3s_uri_curie (data[1]))); if (__box_flags (data[2]) = 1) - http (sprintf ('', data[2], b3s_render_ses_params(), b3s_uri_curie (data[2]))); + http (sprintf ('', data[2], ses_params, b3s_uri_curie (data[2]))); else { declare tmp any; @@ -284,12 +296,10 @@ } http (sprintf ('', cast (data[3] as decimal))); --http (sprintf ('', data[3])); - } http ('\n'); } exec_close (h1); - ?> - ODE -     Raw Data in: CXML | CSV | RDF ( @@ -380,8 +389,8 @@ - Valid XHTML + RDFa
diff --git a/binsrc/b3s/s/description.js b/binsrc/fct/s/description.js similarity index 98% rename from binsrc/b3s/s/description.js rename to binsrc/fct/s/description.js index 67e1a1462b..9cbbe7add3 100644 --- a/binsrc/b3s/s/description.js +++ b/binsrc/fct/s/description.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/sparql.vsp b/binsrc/fct/sparql.vsp similarity index 99% rename from binsrc/b3s/sparql.vsp rename to binsrc/fct/sparql.vsp index bb18f94472..9549d12733 100644 --- a/binsrc/b3s/sparql.vsp +++ b/binsrc/fct/sparql.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/srank.sql b/binsrc/fct/srank.sql similarity index 99% rename from binsrc/b3s/srank.sql rename to binsrc/fct/srank.sql index 49f13d1d29..928e7e0afc 100644 --- a/binsrc/b3s/srank.sql +++ b/binsrc/fct/srank.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/srank23.sql b/binsrc/fct/srank23.sql similarity index 99% rename from binsrc/b3s/srank23.sql rename to binsrc/fct/srank23.sql index 0cf4711e14..d2dfd2ec3b 100644 --- a/binsrc/b3s/srank23.sql +++ b/binsrc/fct/srank23.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/styles/default.css b/binsrc/fct/styles/default.css similarity index 99% rename from binsrc/b3s/styles/default.css rename to binsrc/fct/styles/default.css index a958b59fbb..dd60e005c7 100644 --- a/binsrc/b3s/styles/default.css +++ b/binsrc/fct/styles/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/styles/highlighter.css b/binsrc/fct/styles/highlighter.css similarity index 100% rename from binsrc/b3s/styles/highlighter.css rename to binsrc/fct/styles/highlighter.css diff --git a/binsrc/b3s/sum.sql b/binsrc/fct/sum.sql similarity index 83% rename from binsrc/b3s/sum.sql rename to binsrc/fct/sum.sql index 60044e87d9..4361ba97e6 100644 --- a/binsrc/b3s/sum.sql +++ b/binsrc/fct/sum.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -246,56 +246,56 @@ create procedure s_sum_page (in rows any, in text_exp varchar) grant execute on s_sum_page to "SPARQL" ; -create procedure sum_tst (in text_exp varchar, in text_words varchar := null) -{ - declare res any; - if (text_words is null) - text_words := vector (text_exp); - res := (sparql select ( ( (?c1, ?sm))) as ?res - where { - { select ((?s1)) as ?c1, - ( ( - (?s1), - (?s1textp), - (?o1), - ?sc ) ) as ?sm - where { ?s1 ?s1textp ?o1 . ?o1 bif:contains "NEW AND YORK" option (score ?sc) . } - order by desc ( (( ( - (?s1), - (?s1textp), - (?o1), - ?sc ) ) ) ) limit 20 } } ); - --dbg_obj_print (res); - res := s_sum_page (res, text_words); - return res; -} -; +--create procedure sum_tst (in text_exp varchar, in text_words varchar := null) +--{ + --declare res any; + --if (text_words is null) + --text_words := vector (text_exp); + --res := (sparql select ( ( (?c1, ?sm))) as ?res + --where { + --{ select ((?s1)) as ?c1, + --( ( + -- (?s1), + --(?s1textp), + --(?o1), + --?sc ) ) as ?sm + --where { ?s1 ?s1textp ?o1 . ?o1 bif:contains "NEW AND YORK" option (score ?sc) . } + --order by desc ( (( ( + -- (?s1), + --(?s1textp), + --(?o1), + --?sc ) ) ) ) limit 20 } } ); + ----dbg_obj_print (res); + --res := s_sum_page (res, text_words); + --return res; +--} +--; -create procedure sum_tst_1 (in text_exp varchar, in text_words varchar := null) -{ - declare res any; - if (text_words is null) - text_words := vector (text_exp); - res := (select vector_agg (vector ("c1", "sm")) from ( - sparql - select ((?s1)) as ?c1, ( ( - (?s1), - (?s1textp), - (?o1), - ?sc ) ) as ?sm - where { ?s1 ?s1textp ?o1 . ?o1 bif:contains "NEW AND YORK" option (score ?sc) } - order by desc ( (( ( - (?s1), - (?s1textp), - (?o1), - ?sc ) ) ) ) - limit 20 ) s option (quietcast) - ); - --dbg_obj_print (res); - res := s_sum_page (res, text_words); - return res; -} -; +--create procedure sum_tst_1 (in text_exp varchar, in text_words varchar := null) +--{ + --declare res any; + --if (text_words is null) + --text_words := vector (text_exp); + --res := (select vector_agg (vector ("c1", "sm")) from ( + --sparql + --select ((?s1)) as ?c1, ( ( + -- (?s1), + --(?s1textp), + --(?o1), + --?sc ) ) as ?sm + --where { ?s1 ?s1textp ?o1 . ?o1 bif:contains "NEW AND YORK" option (score ?sc) } + --order by desc ( (( ( + -- (?s1), + --(?s1textp), + --(?o1), + --?sc ) ) ) ) + --limit 20 ) s option (quietcast) + --); + ----dbg_obj_print (res); + --res := s_sum_page (res, text_words); + --return res; +--} +--; --create procedure sum_tst_2 (in text_exp varchar, in text_words varchar := null) --{ diff --git a/binsrc/fct/urilbl_status.vsp b/binsrc/fct/urilbl_status.vsp new file mode 100644 index 0000000000..26c370dc7a --- /dev/null +++ b/binsrc/fct/urilbl_status.vsp @@ -0,0 +1,71 @@ + + + + + Entity Lookup Table Status + + +

Entity Lookup Table Status

+ +

Status

+

+ +

+ +

Log

+ There are no entries in the log

\n'); + } else { + http('

Most recent entries in log (in descending order):

\n'); + http('
- - - - - - - - - - - - + + + +
- - - - Stored XQuery Templates - - - - -
-
- 		+ + + + Stored XQuery Templates + &nbsp; +
diff --git a/binsrc/yacutia/xslt.vspx b/binsrc/conductor/xslt.vspx similarity index 99% rename from binsrc/yacutia/xslt.vspx rename to binsrc/conductor/xslt.vspx index aa08262f4a..27b40ee14d 100644 --- a/binsrc/yacutia/xslt.vspx +++ b/binsrc/conductor/xslt.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xslt_inc.vspx b/binsrc/conductor/xslt_inc.vspx similarity index 99% rename from binsrc/yacutia/xslt_inc.vspx rename to binsrc/conductor/xslt_inc.vspx index d232505ec1..78ff1f2a91 100644 --- a/binsrc/yacutia/xslt_inc.vspx +++ b/binsrc/conductor/xslt_inc.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xslt_res.vsp b/binsrc/conductor/xslt_res.vsp similarity index 97% rename from binsrc/yacutia/xslt_res.vsp rename to binsrc/conductor/xslt_res.vsp index 8f4e4e90ab..006f719d9f 100644 --- a/binsrc/yacutia/xslt_res.vsp +++ b/binsrc/conductor/xslt_res.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xslt_res.vspx b/binsrc/conductor/xslt_res.vspx similarity index 98% rename from binsrc/yacutia/xslt_res.vspx rename to binsrc/conductor/xslt_res.vspx index 6fa47f7483..a30f7a1c15 100644 --- a/binsrc/yacutia/xslt_res.vspx +++ b/binsrc/conductor/xslt_res.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/xslt_result.vspx b/binsrc/conductor/xslt_result.vspx similarity index 98% rename from binsrc/yacutia/xslt_result.vspx rename to binsrc/conductor/xslt_result.vspx index ec7fb9a6d1..c7d0366e87 100644 --- a/binsrc/yacutia/xslt_result.vspx +++ b/binsrc/conductor/xslt_result.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/yac.sql b/binsrc/conductor/yac.sql similarity index 96% rename from binsrc/yacutia/yac.sql rename to binsrc/conductor/yac.sql index 43925e7d44..79a48fd17a 100644 --- a/binsrc/yacutia/yac.sql +++ b/binsrc/conductor/yac.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/yacutia.sql b/binsrc/conductor/yacutia.sql similarity index 98% rename from binsrc/yacutia/yacutia.sql rename to binsrc/conductor/yacutia.sql index b883a01b93..ea4c218f21 100644 --- a/binsrc/yacutia/yacutia.sql +++ b/binsrc/conductor/yacutia.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -211,11 +211,8 @@ create procedure adm_menu_tree () - ', - case when __proc_exists ('VAL.DBA.setup_val_host') is not null then - '' - end, - ' + + @@ -430,25 +427,8 @@ create procedure adm_menu_tree () - ', - case when check_package('VAL') then - ' - - ' - end, --- --- --- --- --- --- --- ', ---case wa_available ---when 1 then ' --- --- ' ---when 0 then '' end, -' + + ', ' @@ -2021,63 +2001,53 @@ db.dba.dav_br_map_icon (in type varchar) -- XXX add weeks, months, years. -- -create procedure -db.dba.yac_hum_min_to_dur (in mins integer) +create procedure db.dba.yac_hum_min_to_dur ( + in mins integer) { - if (mins < 60) return sprintf ('%d minutes', mins); + if (mins < 60) + return sprintf ('%d minutes', mins); if (mins < 1440) return sprintf ('%dhrs,%dmin', mins/60, mod (mins, 60)); - return (sprintf ('%dd,%dhrs,%dmin', - mins/1440, - mod (mins, 1440)/60, - mod (mod (mins, 1440), 60))); + return (sprintf ('%dd,%dhrs,%dmin', mins/1440, mod (mins, 1440)/60, mod (mod (mins, 1440), 60))); } ; -create procedure -db.dba.yac_hum_datefmt (in d datetime) +create procedure db.dba.yac_hum_datefmt ( + in d datetime) { - - declare date_part varchar; - declare time_part varchar; - declare min_diff integer; - declare day_diff integer; + declare min_diff, day_diff integer; + declare dn datetime; if (isnull (d)) - { - return ('Never'); - } + return ('Never'); - day_diff := datediff ('day', d, now ()); + dn := curdatetime (); + if (is_timezoneless (d) <> is_timezoneless (dn)) + { + d := forget_timezone (d, 0); + dn := forget_timezone (dn, 0); + } + day_diff := datediff ('day', d, dn); if (day_diff < 1) - { - min_diff := datediff ('minute', d, now ()); - if (min_diff = 1) - { - return ('A minute ago'); - } - else if (min_diff < 1) - { - return ('Less than a minute ago'); - } - else if (min_diff < 60) - { - return (sprintf ('%d minutes ago', min_diff)); - } - else return (sprintf ('Today at %02d:%02d', hour (d), minute (d))); - } + { + min_diff := datediff ('minute', d, dn); + if (min_diff = 1) + return ('A minute ago'); + + if (min_diff < 1) + return ('Less than a minute ago'); + + if (min_diff < 60) + return (sprintf ('%d minutes ago', min_diff)); + + return (sprintf ('Today at %02d:%02d', hour (d), minute (d))); + } if (day_diff < 2) - { - return (sprintf ('Yesterday at %02d:%02d', hour (d), minute (d))); - } - return (sprintf ('%02d/%02d/%02d %02d:%02d', - year (d), - month (d), - dayofmonth (d), - hour (d), - minute (d))); + return (sprintf ('Yesterday at %02d:%02d', hour (d), minute (d))); + + return (sprintf ('%02d/%02d/%02d %02d:%02d', year (d), month (d), dayofmonth (d), hour (d), minute (d))); } ; @@ -5700,7 +5670,7 @@ create procedure WS.WS.VFS_EXPORT_DEFS (in ids any := null) http ('insert soft WS.WS.VFS_SITE_RDF_MAP (VM_HOST, VM_ROOT, VM_RDF_MAP, VM_RDF_MAP_TYPE) values (', ses); http (DB.DBA.SYS_SQL_VAL_PRINT (VM_HOST),ses); http (',', ses); http (DB.DBA.SYS_SQL_VAL_PRINT (VM_ROOT),ses); http (',', ses); - if (coalesce (VM_RDF_MAP_TYPE, 0) = 0) + if ((coalesce (VM_RDF_MAP_TYPE, 0) = 0) and not isnull (VAD_CHECK_VERSION ('cartridges'))) { http ('(select RM_PID from DB.DBA.SYS_RDF_MAPPERS where RM_PID = ', ses); http (DB.DBA.SYS_SQL_VAL_PRINT (VM_RDF_MAP), ses); @@ -5712,8 +5682,8 @@ create procedure WS.WS.VFS_EXPORT_DEFS (in ids any := null) http (DB.DBA.SYS_SQL_VAL_PRINT (VM_RDF_MAP), ses); http (')', ses); } - http (');\n', ses); - http (DB.DBA.SYS_SQL_VAL_PRINT (coalesce (VM_RDF_MAP_TYPE, 0)),ses); http ('\n', ses); + http (',', ses); + http (DB.DBA.SYS_SQL_VAL_PRINT (coalesce (VM_RDF_MAP_TYPE, 0)),ses); http (');\n', ses); } http ('\n', ses); @@ -5982,7 +5952,7 @@ INTO GRAPH key_iri, cert_modulus, cert_exponent, webid, cer_iri, cer_iri, cert_fingerprint, digest_type, cert_subject, cert_issuer, - DB..date_iso8601 (DB..X509_STRING_DATE (cert_val_not_before)), DB..date_iso8601 (DB..X509_STRING_DATE (cert_val_not_after)), + DB..date_iso8601 (DB.DBA.X509_STRING_DATE (cert_val_not_before)), DB..date_iso8601 (DB.DBA.X509_STRING_DATE (cert_val_not_after)), cert_serial, tag, case when san is not null then sprintf ('oplcert:subjectAltName <%s> ; ', san) else '' end, case when ian is not null then sprintf ('oplcert:issuerAltName <%s> ;', ian) else '' end, @@ -6095,7 +6065,7 @@ create procedure y_registries ( { declare N integer; declare V, v0, v1 any; - declare c0, c1 varchar; + declare c0, c1 long varchar; result_names (c0, c1); @@ -6103,7 +6073,7 @@ create procedure y_registries ( for (N := 0; N < length (V); N := N + 2) { v0 := cast (V[N] as varchar); - v1 := V[N+1]; + v1 := subseq (V[N+1], 0, 1024); if ((_filter <> '') and (v0 not like _filter)) goto _skip; diff --git a/binsrc/yacutia/yacutia_decor.vspx b/binsrc/conductor/yacutia_decor.vspx similarity index 98% rename from binsrc/yacutia/yacutia_decor.vspx rename to binsrc/conductor/yacutia_decor.vspx index d8da54b850..09b498d6a4 100644 --- a/binsrc/yacutia/yacutia_decor.vspx +++ b/binsrc/conductor/yacutia_decor.vspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/yacutia_style.css b/binsrc/conductor/yacutia_style.css similarity index 99% rename from binsrc/yacutia/yacutia_style.css rename to binsrc/conductor/yacutia_style.css index 888e17fb91..7eaf54a10c 100644 --- a/binsrc/yacutia/yacutia_style.css +++ b/binsrc/conductor/yacutia_style.css @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -385,12 +385,10 @@ th clear: both; } -#copyright_ctr -{ - /*clear: both;*/ +#copyright_ctr { font-size: x-small; text-align: right; - margin-right: 5px; + padding-right: 5px; border-top: 1px solid silver; } diff --git a/binsrc/yacutia/yacutia_style.xsl b/binsrc/conductor/yacutia_style.xsl similarity index 99% rename from binsrc/yacutia/yacutia_style.xsl rename to binsrc/conductor/yacutia_style.xsl index 7b09f5d898..bd21ca4960 100644 --- a/binsrc/yacutia/yacutia_style.xsl +++ b/binsrc/conductor/yacutia_style.xsl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -22,7 +22,7 @@ --> pv[0]) + if (__tag of vector <> pv[0]) return; doc := null; diff --git a/binsrc/dav/DET_DynaRes.sql b/binsrc/dav/DET_DynaRes.sql index 7c72eceb2f..02d0baf5d1 100644 --- a/binsrc/dav/DET_DynaRes.sql +++ b/binsrc/dav/DET_DynaRes.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -130,6 +130,7 @@ create procedure "DynaRes_DAV_AUTHENTICATE" ( declare pacl any; declare _perms, a_gid any; declare webid, serviceId varchar; + declare a_cert any; whenever not found goto _exit; select DR_PERMS, DR_OWNER_UID, DR_OWNER_GID, DR_ACL into pperms, puid, pgid, pacl from WS.WS.DYNA_RES where DR_DETCOL_ID = id[1] and DR_RES_ID = id[3]; @@ -150,9 +151,10 @@ create procedure "DynaRes_DAV_AUTHENTICATE" ( return a_uid; } - if (DAV_AUTHENTICATE_SSL (id, what, null, req, a_uid, a_gid, _perms, webid)) + if (DAV_AUTHENTICATE_SSL (id, what, null, req, a_uid, a_gid, _perms, webid, a_cert)) return a_uid; + -- Both DAV_AUTHENTICATE_SSL and DAV_AUTHENTICATE_WITH_VAL only check IRI ACLs -- However, service ids may map to ODS user accounts. This is what we check here a_uid := -1; @@ -204,6 +206,7 @@ create procedure "DynaRes_DAV_AUTHENTICATE_HTTP" ( declare pacl any; declare u_password, pperms varchar; declare allow_anon integer; + declare a_cert any; -- used for error reporting in case of NetID or OAuth login declare webid, serviceId varchar; @@ -229,9 +232,10 @@ create procedure "DynaRes_DAV_AUTHENTICATE_HTTP" ( if (rc < 0) { - if (DAV_AUTHENTICATE_SSL (id, what, null, req, a_uid, a_gid, _perms, webid)) + if (DAV_AUTHENTICATE_SSL (id, what, null, req, a_uid, a_gid, _perms, webid, a_cert)) return a_uid; + -- Normalize the service variables for error handling in VAL if (not webid is null and serviceId is null) { @@ -727,15 +731,22 @@ create procedure "DynaRes_DAV_DIR_FILTER" ( in auth_uid integer) returns any { -- dbg_obj_princ ('DynaRes_DAV_DIR_FILTER (', detcol_id, path_parts, detcol_path, compilation, recursive, auth_uid, ')'); - declare st, qry_text, execstate, execmessage varchar; + declare N integer; + declare qry_text, execstate, execmessage varchar; declare res any; declare cond_list, execmeta, execrows any; declare condtext, cond_key varchar; - vectorbld_init (res); cond_list := get_keyword ('', compilation); + for (N := 0; N < length (cond_list); N := N + 1) + { + if (cond_list[N][0] in ('RES_TAGS', 'RES_PUBLIC_TAGS', 'RES_PRIVATE_TAGS')) + return vector (); + } condtext := "DynaRes_DAV_FC_PRINT_WHERE" (cond_list, auth_uid); compilation := vector_concat (compilation, vector (cond_key, condtext)); + + vectorbld_init (res); execstate := '00000'; qry_text := ' select DAV_CONCAT_PATH (?, _top.DR_NAME), ''R'', _top.DR_LAST_LENGTH, coalesce (_top.DR_MODIFIED_DT, now ()), vector (UNAME''DynaRes'', _top.DR_DETCOL_ID, null, _top.DR_RES_ID), _top.DR_PERMS, _top.DR_OWNER_GID, _top.DR_OWNER_UID, _top.DR_CREATED_DT, _top.DR_MIME, _top.DR_NAME' || @@ -759,7 +770,6 @@ create procedure "DynaRes_DAV_DIR_FILTER" ( vectorbld_concat_acc (res, execrows); -finalize: vectorbld_final (res); return res; } diff --git a/binsrc/dav/DET_Gallery.sql b/binsrc/dav/DET_Gallery.sql index e2ca27a3f9..61712c9c21 100644 --- a/binsrc/dav/DET_Gallery.sql +++ b/binsrc/dav/DET_Gallery.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -306,15 +306,9 @@ done: } ; ---#IF VER=5 ---!AFTER __PROCEDURE__ DB.DBA.VT_CREATE_TEXT_INDEX ! ---#ENDIF DB.DBA.vt_create_text_index (fix_identifier_case ('WS.WS.HOSTFS_RES_CACHE'), fix_identifier_case ('RESC_DATA'), fix_identifier_case ('RESC_ID'), 2, 0, NULL, 1, '*ini*', '*ini*') ; ---#IF VER=5 ---!AFTER __PROCEDURE__ DB.DBA.VT_CREATE_TEXT_INDEX ! ---#ENDIF DB.DBA.vt_batch_update (fix_identifier_case ('WS.WS.HOSTFS_RES_CACHE'), 'ON', 5) ; @@ -631,7 +625,7 @@ create function "Gallery_DAV_RES_UPLOAD" (in detcol_id any, in path_parts any, i declare rc integer; -- dbg_obj_princ ('Gallery_DAV_RES_UPLOAD (', detcol_id, path_parts, ', [content], ', type, permissions, uid, gid, auth_uid, ')'); ospath := DAV_CONCAT_PATH ("Gallery_ID_TO_OSPATH" (detcol_id), path_parts); - if (__tag (content) = 126) + if (__tag (content) = __tag of long varchar handle) { declare p varchar; p := '[' || serialize (now()) || '][' || serialize (detcol_id) || '][' || serialize (path_parts) || ']'; diff --git a/binsrc/dav/DET_HostFs.sql b/binsrc/dav/DET_HostFs.sql index ef6649bd12..319518814c 100644 --- a/binsrc/dav/DET_HostFs.sql +++ b/binsrc/dav/DET_HostFs.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -156,15 +156,9 @@ create trigger HOSTFS_RES_META_U after update on WS.WS.HOSTFS_RES_META referenci ; ---#IF VER=5 ---!AFTER __PROCEDURE__ DB.DBA.VT_CREATE_TEXT_INDEX ! ---#ENDIF DB.DBA.vt_create_text_index (fix_identifier_case ('WS.WS.HOSTFS_RES_META'), fix_identifier_case ('RESM_DATA'), fix_identifier_case ('RESM_ID'), 2, 0, NULL, 0, '*ini*', '*ini*') ; ---#IF VER=5 ---!AFTER __PROCEDURE__ DB.DBA.VT_CREATE_TEXT_INDEX ! ---#ENDIF DB.DBA.vt_batch_update (fix_identifier_case ('WS.WS.HOSTFS_RES_META'), 'ON', 1) ; @@ -310,15 +304,9 @@ done: } ; ---#IF VER=5 ---!AFTER __PROCEDURE__ DB.DBA.VT_CREATE_TEXT_INDEX ! ---#ENDIF DB.DBA.vt_create_text_index (fix_identifier_case ('WS.WS.HOSTFS_RES_CACHE'), fix_identifier_case ('RESC_DATA'), fix_identifier_case ('RESC_ID'), 2, 0, NULL, 1, '*ini*', '*ini*') ; ---#IF VER=5 ---!AFTER __PROCEDURE__ DB.DBA.VT_CREATE_TEXT_INDEX ! ---#ENDIF DB.DBA.vt_batch_update (fix_identifier_case ('WS.WS.HOSTFS_RES_CACHE'), 'ON', 5) ; @@ -635,7 +623,7 @@ create function "HostFs_DAV_RES_UPLOAD" (in detcol_id any, in path_parts any, in declare rc integer; -- dbg_obj_princ ('HostFs_DAV_RES_UPLOAD (', detcol_id, path_parts, ', [content], ', type, permissions, uid, gid, auth_uid, ')'); ospath := DAV_CONCAT_PATH ("HostFs_ID_TO_OSPATH" (detcol_id), path_parts); - if (__tag (content) = 126) + if (__tag (content) = __tag of long varchar handle) { declare p varchar; p := '[' || serialize (now()) || '][' || serialize (detcol_id) || '][' || serialize (path_parts) || ']'; diff --git a/binsrc/dav/DET_PropFilter.sql b/binsrc/dav/DET_PropFilter.sql index 08154111a8..36ad7f044e 100644 --- a/binsrc/dav/DET_PropFilter.sql +++ b/binsrc/dav/DET_PropFilter.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -33,7 +33,7 @@ create function "PropFilter_DAV_AUTHENTICATE" (in id any, in what char(1), in re create function "PropFilter_NORM" (in value any) returns varchar { value := blob_to_string (value); - if (('' = value) or (193 <> value[0])) + if (('' = value) or (__tag of vector <> value[0])) return value; value := deserialize (value)[1]; if (isstring (value)) @@ -62,7 +62,7 @@ create function "PropFilter_FIT_INTO_CONDITION" (in id integer, in what char (1) { declare old_value varchar; declare propid integer; - if (__tag (pfc_value) = 193) + if (__tag (pfc_value) = __tag of vector) pfc_value := serialize (pfc_value); else if (not isstring (pfc_value)) return -17; diff --git a/binsrc/dav/DET_RDFData.sql b/binsrc/dav/DET_RDFData.sql index 7ec2783fa0..458a9ace6e 100644 --- a/binsrc/dav/DET_RDFData.sql +++ b/binsrc/dav/DET_RDFData.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/DET_ResFilter.sql b/binsrc/dav/DET_ResFilter.sql index 2d6f746845..25073f9b94 100644 --- a/binsrc/dav/DET_ResFilter.sql +++ b/binsrc/dav/DET_ResFilter.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -49,7 +49,7 @@ create function "ResFilter_DAV_AUTHENTICATE" (in id any, in what char(1), in req create function "ResFilter_NORM" (in value any) returns varchar { value := blob_to_string (value); - if (('' = value) or (193 <> value[0])) + if (('' = value) or (__tag of vector <> value[0])) return value; value := deserialize (value)[1]; if (isstring (value)) @@ -61,7 +61,7 @@ create function "ResFilter_NORM" (in value any) returns varchar create function "ResFilter_ENCODE_FILTER" (in filt any) returns varchar { - if (193 <> __tag (filt)) + if (__tag of vector <> __tag (filt)) signal ('.....', 'Invalid filter passed to ResFilter_ENCODE_FILTER'); filt := serialize (filt); filt[0] := 2; @@ -75,7 +75,7 @@ create function "ResFilter_DECODE_FILTER" (in value any) returns any value := blob_to_string (value); if (('' = value) or (value[0] <> 2)) signal ('.....', 'Invalid filter serialization passed to ResFilter_DECODE_FILTER'); - value [0] := 193; + value [0] := __tag of vector; return deserialize (value); } ; diff --git a/binsrc/dav/DET_Stub.sql b/binsrc/dav/DET_Stub.sql index 5dfc834f56..a0d98ab214 100644 --- a/binsrc/dav/DET_Stub.sql +++ b/binsrc/dav/DET_Stub.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/DET_nntp.sql b/binsrc/dav/DET_nntp.sql index 71fa855544..298493706f 100644 --- a/binsrc/dav/DET_nntp.sql +++ b/binsrc/dav/DET_nntp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -691,7 +691,7 @@ create function "nntp_DAV_RES_CONTENT" (in id any, inout content any, out type v } } - if (__tag (parsed_message) <> 193) + if (__tag (parsed_message) <> __tag of vector) parsed_message := mime_tree (_body); _head := parsed_message[0]; diff --git a/binsrc/dav/DETtest.sql b/binsrc/dav/DETtest.sql index fdb6013647..72b61bc1c3 100644 --- a/binsrc/dav/DETtest.sql +++ b/binsrc/dav/DETtest.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/DETtest_CatFilter.sql b/binsrc/dav/DETtest_CatFilter.sql index 979165d478..bbea189376 100644 --- a/binsrc/dav/DETtest_CatFilter.sql +++ b/binsrc/dav/DETtest_CatFilter.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/DETtest_sec.sql b/binsrc/dav/DETtest_sec.sql index bc903e657e..8b64643c1e 100644 --- a/binsrc/dav/DETtest_sec.sql +++ b/binsrc/dav/DETtest_sec.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/Makefile.am b/binsrc/dav/Makefile.am index 75f7d8a008..cf3128bfad 100644 --- a/binsrc/dav/Makefile.am +++ b/binsrc/dav/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/Versioning/DETVerTest.m4 b/binsrc/dav/Versioning/DETVerTest.m4 index 7258e163ed..b4cd1d9854 100644 --- a/binsrc/dav/Versioning/DETVerTest.m4 +++ b/binsrc/dav/Versioning/DETVerTest.m4 @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/Versioning/DETVerTest.sql b/binsrc/dav/Versioning/DETVerTest.sql index 52bdd44c39..b79ea15240 100644 --- a/binsrc/dav/Versioning/DETVerTest.sql +++ b/binsrc/dav/Versioning/DETVerTest.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -24,7 +24,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/Versioning/DETVerTest2.sql b/binsrc/dav/Versioning/DETVerTest2.sql index 5832b84ee8..cb83f058ee 100644 --- a/binsrc/dav/Versioning/DETVerTest2.sql +++ b/binsrc/dav/Versioning/DETVerTest2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/Versioning/DET_Versioning.sql b/binsrc/dav/Versioning/DET_Versioning.sql index 4e513ef360..b2dddee749 100644 --- a/binsrc/dav/Versioning/DET_Versioning.sql +++ b/binsrc/dav/Versioning/DET_Versioning.sql @@ -1,10 +1,8 @@ -- --- $Id$ --- -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -19,26 +17,6 @@ -- with this program; if not, write to the Free Software Foundation, Inc., -- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -- --- ---#IF VER=5 -ALTER TABLE WS.WS.SYS_DAV_COL ADD COL_AUTO_VERSIONING char(1) -; - -ALTER TABLE WS.WS.SYS_DAV_COL ADD COL_FORK INTEGER DEFAULT 0 -; - -ALTER TABLE WS.WS.SYS_DAV_RES ADD RES_STATUS VARCHAR -; - -ALTER TABLE WS.WS.SYS_DAV_RES ADD RES_VCR_ID INTEGER -; - -ALTER TABLE WS.WS.SYS_DAV_RES ADD RES_VCR_CO_VERSION INTEGER -; - -ALTER TABLE WS.WS.SYS_DAV_RES ADD RES_VCR_STATE INTEGER -- 0 CIN, -- 1 COUT -; ---#ENDIF CREATE TABLE WS.WS.SYS_DAV_RES_VERSION ( RV_RES_ID INTEGER NOT NULL, -- This is equal to either existing resource ID or to an attic ID @@ -57,10 +35,6 @@ alter index SYS_DAV_RES_VERSION on WS.WS.SYS_DAV_RES_VERSION partition (RV_RES_I ; ---#IF VER=5 -ALTER TABLE WS.WS.SYS_DAV_RES_VERSION ADD RV_WHO VARCHAR -; ---#ENDIF CREATE TABLE WS.WS.SYS_DAV_RES_DIFF ( RD_RES_ID INTEGER NOT NULL, -- referenced by WS.WS.SYS_DAV_RES_VERSION (RV_RES_ID), @@ -136,13 +110,6 @@ CREATE TABLE WS.WS.SYS_DAV_BASELINE_RES ( alter index SYS_DAV_BASELINE_RES on WS.WS.SYS_DAV_BASELINE_RES partition (BR_RES_ID int) ; ---#IF VER=5 -ALTER TABLE WS.WS.SYS_DAV_RES_VERSION ADD RV_SIZE INTEGER NOT NULL -; - -UPDATE WS.WS.SYS_DAV_RES_VERSION SET RV_SIZE = 0 WHERE RV_SIZE IS NULL -; ---#ENDIF --| When DAV_DELETE_INT calls DET function, authentication and check for lock are passed. CREATE TRIGGER "Versioning_DAV_DELETE" BEFORE DELETE ON WS.WS.SYS_DAV_RES REFERENCING OLD AS O @@ -312,7 +279,7 @@ CREATE TRIGGER "Versioning_DAV_RES_UPDATE" BEFORE UPDATE ON WS.WS.SYS_DAV_RES OR "Versioning_AUTO_VERSION_PROP" ((select COL_AUTO_VERSIONING from WS.WS.SYS_DAV_COL where COL_ID = N.RES_COL and COL_AUTO_VERSIONING is not null)), DAV_HIDE_ERROR(DAV_PROP_GET_INT (N.RES_ID, 'R', 'DAV:auto-version', 0))); - if (DAV_HIDE_ERROR (DAV_PROP_GET_INT (N.RES_ID,'R','DAV:checked-out')) is null and _auto_version_type is not null) { + if (DAV_HIDE_ERROR (DAV_PROP_GET_INT (N.RES_ID,'R','DAV:checked-out', 0)) is null and _auto_version_type is not null) { if ((length (N.RES_CONTENT) < 10000000) and (length (O.RES_CONTENT) < 10000000)) { if (cast (N.RES_CONTENT as varchar) = cast (O.RES_CONTENT as varchar)) { if (N.RES_NAME <> O.RES_NAME) { -- move @@ -1032,74 +999,83 @@ create function "Versioning_DAV_DIR_FILTER" (in detcol_id any, in path_parts any ; --| When DAV_PROP_GET_INT or DAV_DIR_LIST_INT calls DET function, authentication is performed before the call. -create function "Versioning_DAV_SEARCH_ID" (in detcol_id any, in path_parts any, in what char(1)) returns any +create function "Versioning_DAV_SEARCH_ID" ( + in detcol_id any, + in path_parts any, + in what char(1)) returns any { + -- dbg_obj_princ ('Versioning_DAV_SEARCH_ID (', detcol_id, path_parts, what, ')'); declare base_path varchar; + base_path := "Versioning_GET_BASE_PATH" (detcol_id); if (base_path is null) return -20; - -- dbg_obj_princ ('Versioning_DAV_SEARCH_ID (', detcol_id, path_parts, what, ')'); - if ('C' = what) { - if ( (length (path_parts) = 3) ) - return -1; - declare base_id int; - base_id := DAV_SEARCH_ID (base_path, 'C'); - if (base_id > 0) { - declare _res_id int; - _res_id := (select RES_ID from WS.WS.SYS_DAV_RES where RES_COL = base_id - and RES_NAME = aref (path_parts, 0) ); - -- dbg_obj_princ ('Versioning_DAV_SEARCH_ID = ', _res_id); - if (_res_id is not null) { - if (DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, 'R', 'DAV:checked-in', 0)) is null - and DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, 'R', 'DAV:checked-out', 0)) is null) + + if (('C' = what) and (length (path_parts) <> 3)) + { + declare base_id integer; + + base_id := DB.DBA.DAV_SEARCH_ID (base_path, 'C'); + if (base_id > 0) + { + declare _res_id integer; + + _res_id := (select RES_ID from WS.WS.SYS_DAV_RES where RES_COL = base_id and RES_NAME = aref (path_parts, 0)); + if (_res_id is not null) + { + if (DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_PROP_GET_INT (_res_id, 'R', 'DAV:checked-in', 0)) is null and + DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_PROP_GET_INT (_res_id, 'R', 'DAV:checked-out', 0)) is null) return -1; + return vector (UNAME'Versioning', cast (detcol_id as integer), _res_id); } } - return -1; } - else if ('R' = what) { - if (length (path_parts) = 2) { - declare _res_id, _ver_id, _id int; - _res_id := DAV_SEARCH_ID (base_path || path_parts[0], 'R'); - -- dbg_obj_princ ('res id == ', _res_id); - if (_res_id < 0) - return -1; - if (DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, 'R', 'DAV:checked-in', 0)) is null - and DAV_HIDE_ERROR (DAV_PROP_GET_INT (_res_id, 'R', 'DAV:checked-out', 0)) is null) + else if (('R' = what) and (length (path_parts) = 2)) + { + declare _res_id, _ver_id, _id integer; + + _res_id := DB.DBA.DAV_SEARCH_ID (base_path || path_parts[0], 'R'); + if (_res_id < 0) + return -1; + + if (DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_PROP_GET_INT (_res_id, 'R', 'DAV:checked-in', 0)) is null and DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_PROP_GET_INT (_res_id, 'R', 'DAV:checked-out', 0)) is null) + return -1; + + if (path_parts[1] = 'history.xml') + _ver_id := -1; + else if (path_parts[1] = 'last') + _ver_id := -2; + else if (path_parts[1] like '%.diff') + { + _ver_id := atoi (path_parts[1]); + return vector (UNAME'Versioning', detcol_id, _res_id, _ver_id, 'diff'); + } + else + { + _ver_id := atoi (path_parts[1]); + if (not exists (select 1 from WS.WS.SYS_DAV_RES_VERSION where RV_RES_ID = _res_id and RV_ID = _ver_id)) return -1; - if (path_parts[1] = 'history.xml') - _ver_id := -1; - else if (path_parts[1] = 'last') - _ver_id := -2; - else if (path_parts[1] like '%.diff') { - _ver_id := atoi (path_parts[1]); - return vector (UNAME'Versioning', detcol_id, _res_id, _ver_id, 'diff'); - } - else { - _ver_id := cast (path_parts[1] as integer); - if (not exists (select 1 from WS.WS.SYS_DAV_RES_VERSION where RV_RES_ID = _res_id and RV_ID = _ver_id)) - return -1; - } - return vector (UNAME'Versioning', detcol_id, _res_id, _ver_id); } - return -1; + return vector (UNAME'Versioning', detcol_id, _res_id, _ver_id); } - else - return -1; + return -1; } ; --| When DAV_SEARCH_PATH_INT calls DET function, authentication is performed before the call. -create function "Versioning_DAV_SEARCH_PATH" (in id any, in what char(1)) returns any +create function "Versioning_DAV_SEARCH_PATH" ( + in id any, + in what char(1)) returns any { -- dbg_obj_princ ('Versioning_DAV_SEARCH_PATH (', id, what, ')'); - if (what = 'C' and isarray (id) and length (id) = 3) { + if (what = 'C' and isarray (id) and length (id) = 3) + { declare base_coll varchar; + base_coll := DAV_PROP_GET_INT (id[1], 'C','virt:Versioning-Collection', 0); - if (isinteger (base_coll)) - return -1; - return base_coll || (select RES_NAME from WS.WS.SYS_DAV_RES where RES_ID = id[2]) || '/'; + if (not isinteger (base_coll)) + return base_coll || (select RES_NAME from WS.WS.SYS_DAV_RES where RES_ID = id[2]) || '/'; } return -1; } diff --git a/binsrc/dav/Versioning/dav_ver_new.sql b/binsrc/dav/Versioning/dav_ver_new.sql index 82fe06943d..24d18685d8 100644 --- a/binsrc/dav/Versioning/dav_ver_new.sql +++ b/binsrc/dav/Versioning/dav_ver_new.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -29,19 +29,6 @@ DROP TABLE WS.WS.SYS_DAV_RES_MERGE; DROP TABLE WS.WS.SYS_DAV_RES_DIFF; DROP TABLE WS.WS.SYS_DAV_RES_VERSION; -ALTER TABLE WS.WS.SYS_DAV_COL ADD COL_AUTO_VERSIONING char(1); - -ALTER TABLE WS.WS.SYS_DAV_COL ADD COL_FORK INTEGER NOT NULL DEFAULT 0; - --- ALTER TABLE WS.WS.SYS_DAV_COL ADD COL_VERSION_NAME_TEMPLATE NOT NULL DEFAULT 'WS.WS.VERSION_NAME_TEMPLATE_PLAIN'; - -ALTER TABLE WS.WS.SYS_DAV_RES ADD RES_STATUS VARCHAR; - -ALTER TABLE WS.WS.SYS_DAV_RES ADD RES_VCR_ID INTEGER; - -ALTER TABLE WS.WS.SYS_DAV_RES ADD RES_VCR_CO_VERSION INTEGER; - -ALTER TABLE WS.WS.SYS_DAV_RES ADD RES_VCR_STATE INTEGER; -- 0 CIN, -- 1 COUT CREATE TABLE WS.WS.SYS_DAV_RES_VERSION ( RV_RES_ID INTEGER NOT NULL, -- This is equal to either existing resource ID or to an attic ID diff --git a/binsrc/dav/Versioning/test.m4 b/binsrc/dav/Versioning/test.m4 index 4d22e952ba..0db3d6da23 100644 --- a/binsrc/dav/Versioning/test.m4 +++ b/binsrc/dav/Versioning/test.m4 @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/dav-rdf-schema-example.rdf b/binsrc/dav/dav-rdf-schema-example.rdf index 07f57ebd9d..31cb2d4acf 100644 --- a/binsrc/dav/dav-rdf-schema-example.rdf +++ b/binsrc/dav/dav-rdf-schema-example.rdf @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/dav.sql b/binsrc/dav/dav.sql index c3509ac8f1..497d2b59d6 100644 --- a/binsrc/dav/dav.sql +++ b/binsrc/dav/dav.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -23,91 +23,85 @@ create procedure WS.WS."OPTIONS" (in path varchar, inout params varchar, in lines varchar) { - declare full_path varchar; + -- dbg_obj_princ ('WS.WS.OPTIONS (', path, params, lines, ')'); + declare _det varchar; declare _path_id, _res_id any; + declare _etag, _ldp_head varchar; + declare _name, _type, _path varchar; + declare _id integer; + declare _mod_time datetime; + whenever not found goto not_found; - full_path := DAV_CONCAT_PATH ('/', DAV_CONCAT_PATH (path, '/')); - _path_id := DAV_SEARCH_ID (full_path, 'C'); - _res_id := DAV_SEARCH_ID (DAV_CONCAT_PATH ('/', path), 'R'); - if (isarray (_path_id)) + _path := DB.DBA.DAV_CONCAT_PATH ('/', DB.DBA.DAV_CONCAT_PATH (path, '/')); + _path_id := DB.DBA.DAV_SEARCH_ID (_path, 'C'); + if (DB.DBA.DAV_HIDE_ERROR (_path_id) is not null) { - if (_path_id[0] = UNAME'CalDAV') + _det := DB.DBA.DAV_DET_NAME (_path_id); + if (_det = 'CalDAV') { - http_header (concat ( - 'Content-Type: text/xml\r\n', - 'Allow: OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, COPY, MOVE\r\n', - 'Allow: PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT, ACL\r\n', - 'DAV: 1, 2, access-control, calendar-access\r\n', - 'MS-Author-Via: DAV\r\n')); + WS.WS.OPTIONS_DET (allow=>'OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, COPY, MOVE, PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT', dav=>'1, 2, access-control, calendar-access'); return; } - if (_path_id[0] = UNAME'CardDAV') + if (_det = UNAME'CardDAV') { - http_header (concat ( - 'Content-Type: text/xml\r\n', - 'Allow: OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, COPY, MOVE\r\n', - 'Allow: PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT, ACL\r\n', - 'DAV: 1, 2, 3, access-control, addressbook\r\n', - 'MS-Author-Via: DAV\r\n')); + WS.WS.OPTIONS_DET (allow=>'OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, COPY, MOVE, PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT', dav=>'1, 2, access-control, addressbook'); return; } - } - else - { - if (exists (select 1 from WS.WS.SYS_DAV_COL where COL_ID = _path_id and COL_DET = 'CalDAV')) + else if (not isvector (_path_id)) { - http_header (concat ( - 'Content-Type: text/xml\r\n', - 'Allow: OPTIONS, GET, HEAD, POST, TRACE\r\n', - 'Allow: PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT\r\n', - 'DAV: 1, 2, access-control, calendar-access\r\n', - 'MS-Author-Via: DAV\r\n') - ); - return; - } - if (exists (select 1 from WS.WS.SYS_DAV_COL where COL_ID = _path_id and COL_DET = 'CardDAV')) - { - http_header (concat ( - 'Content-Type: text/xml\r\n', - 'Allow: OPTIONS, GET, HEAD, POST, TRACE\r\n', - 'Allow: PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT\r\n', - 'DAV: 1, 2, access-control, addressbook\r\n', - 'MS-Author-Via: DAV\r\n') - ); - return; + if (exists (select 1 from WS.WS.SYS_DAV_COL where COL_ID = _path_id and COL_DET = 'CalDAV')) + { + WS.WS.OPTIONS_DET (allow=>'OPTIONS, GET, HEAD, POST, TRACE, PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT', dav=>'1, 2, access-control, calendar-access'); + return; + } + if (exists (select 1 from WS.WS.SYS_DAV_COL where COL_ID = _path_id and COL_DET = 'CardDAV')) + { + WS.WS.OPTIONS_DET (allow=>'OPTIONS, GET, HEAD, POST, TRACE, PROPFIND, PROPPATCH, LOCK, UNLOCK, REPORT', dav=>'1, 2, access-control, addressbook'); + return; + } } } - declare _etag, _ldp_head varchar; - + _etag := ''; _ldp_head := ''; - if (not isvector (_path_id) and not isvector (_res_id)) - { - declare _name varchar; - declare _id integer; - declare _mod_time datetime; - whenever not found goto not_found; - if (_path_id <> -1) + if (DB.DBA.DAV_HIDE_ERROR (_path_id) is not null) + { + -- Collection + if (DB.DBA.DAV_DET_IS_WEBDAV_BASED (DB.DBA.DAV_DET_NAME (_path_id))) { - select COL_NAME, COL_MOD_TIME into _name, _mod_time from WS.WS.SYS_DAV_COL where COL_ID = _path_id; + -- DAV based collection + -- + select COL_NAME, COL_MOD_TIME into _name, _mod_time from WS.WS.SYS_DAV_COL where COL_ID = DB.DBA.DAV_DET_DAV_ID (_path_id); _id := _path_id; - if (LDP_ENABLED (_path_id)) - _ldp_head := 'Link: ; rel="type"\r\nLink: ; rel="type"\r\n'; + + _etag := sprintf ('ETag: "%s"\r\n', WS.WS.ETAG (_name, _id, _mod_time)); + _ldp_head := WS.WS.LDP_HDRS (1, DB.DBA.LDP_ENABLED (_id), 0, 0, _path); } - else + } + else + { + _path := DB.DBA.DAV_CONCAT_PATH ('/', path); + _res_id := DB.DBA.DAV_SEARCH_ID (DB.DBA.DAV_CONCAT_PATH ('/', path), 'R'); + if (DB.DBA.DAV_HIDE_ERROR (_res_id) is not null) { - select RES_COL, RES_NAME, RES_MOD_TIME into _id, _name, _mod_time from WS.WS.SYS_DAV_RES where RES_ID = _res_id; - if (LDP_ENABLED (_id)) - _ldp_head := 'Link: ; rel="type"\r\n'; + -- Resource + if (DB.DBA.DAV_DET_IS_WEBDAV_BASED (DB.DBA.DAV_DET_NAME (_res_id))) + { + -- DAV based resource + -- + select RES_COL, RES_NAME, RES_TYPE, RES_MOD_TIME into _id, _name, _type, _mod_time from WS.WS.SYS_DAV_RES where RES_ID = DB.DBA.DAV_DET_DAV_ID (_res_id); + + _etag := sprintf ('ETag: "%s"\r\n', WS.WS.ETAG (_name, _id, _mod_time)); + _ldp_head := WS.WS.LDP_HDRS (0, DB.DBA.LDP_ENABLED (_id), 0, 0, _path, _type); + } } - _etag := sprintf ('ETag: "%s"\r\n', WS.WS.ETAG (_name, _id, _mod_time)); } not_found: ; declare headers, acceptPatch, acceptPost, msAuthor any; - http_methods_set ('GET','HEAD','POST','PUT','DELETE','OPTIONS','PROPFIND','PROPPATCH','COPY','MOVE','LOCK','UNLOCK','TRACE','PATCH'); + http_methods_set ('COPY', 'DELETE', 'GET', 'HEAD', 'LOCK', 'MKCOL', 'MOVE', 'OPTIONS', 'PATCH', 'POST', 'PROPFIND', 'PROPPATCH', 'PUT', 'TRACE', 'UNLOCK'); WS.WS.GET (path, params, lines); http_rewrite (); @@ -116,22 +110,18 @@ not_found: ; if (acceptPatch <> '') acceptPatch := sprintf ('Accept-Patch: %s\r\n', acceptPatch); - acceptPost := http_request_header (headers, 'Accept-Post', null, '*/*'); - if (acceptPost <> '') - acceptPost := sprintf ('Accept-Post: %s\r\n', acceptPost); - + acceptPost := sprintf ('Accept-Post: %s\r\n', http_request_header (headers, 'Accept-Post', null, 'text/turtle, text/html, application/xhtml+xml, application/ld+json')); msAuthor := sprintf ('MS-Author-Via: %s\r\n', http_request_header (headers, 'MS-Author-Via', null, 'DAV')); DB.DBA.DAV_SET_HTTP_STATUS (204); http_header ( 'X-Powered-By: Virtuoso Universal Server ' || sys_stat ('st_dbms_ver') || '\r\n' || - 'Vary: Origin, Access-Control-Request-Headers\r\n' || _etag || 'DAV: 1,2,\r\n' || _ldp_head || - 'Access-Control-Allow-Methods: GET,HEAD,POST,PUT,DELETE,OPTIONS,PROPFIND,PROPPATCH,COPY,MOVE,LOCK,UNLOCK,TRACE,PATCH\r\n' || - 'Access-Control-Allow-Headers: Authorization, Accept, Slug, Link, Origin, Content-Type\r\n' || - 'Access-Control-Expose-Headers: Authorization, User, Location, Link, Vary, Last-Modified, ETag, Accept-Patch, Accept-Post, Updates-Via, Allow, WAC-Allow, Content-Length, WWW-Authenticate\r\n' || + 'Access-Control-Allow-Methods: COPY, DELETE, GET, HEAD, LOCK, MOVE, MKCOL, OPTIONS, PATCH, POST, PROPFIND, PROPPATCH, PUT, TRACE, UNLOCK\r\n' || + 'Access-Control-Allow-Headers: Accept, Authorization, Content-Length, Content-Type, Depth, If-None-Match, Link, Location, On-Behalf-Of, Origin, WebID-TLS, Slug, X-Requested-With\r\n' || + 'Access-Control-Expose-Headers: Accept-Patch, Accept-Post, Access-Control-Allow-Headers, Access-Control-Allow-Methods, Access-Control-Allow-Origin, Allow, Authorization, Content-Length, Content-Type, ETag, Last-Modified, Link, Location, Updates-Via, User, Vary, WAC-Allow, WWW-Authenticate\r\n' || 'Access-Control-Allow-Credentials: true\r\n' || 'Access-Control-Max-Age: 1728000\r\n' || acceptPatch || @@ -141,6 +131,17 @@ not_found: ; } ; +create procedure WS.WS.OPTIONS_DET ( + in contentType varchar := 'text/xml', + in allow varchar, + in dav varchar, + in msAuthor varchar := 'DAV') +{ + DB.DBA.DAV_SET_HTTP_STATUS (204); + http_header (sprintf ('Content-Type: %s\r\nAllow: OPTIONS, %s\r\nDAV: %s\r\nMS-Author-Via: %s\r\n', contentType, allow, dav, msAuthor)); +} +; + create procedure WS.WS.PROPFIND ( in path varchar, inout params varchar, @@ -191,6 +192,12 @@ create procedure WS.WS.PROPFIND ( return; } + if (0 = http_map_get ('browseable')) + { + DB.DBA.DAV_SET_HTTP_STATUS (403, null, null, 'You are not permitted to view the directory index in this location: ' || sprintf ('%V', http_path ()), 1); + return; + } + if (strstr (WS.WS.FINDPARAM (lines, 'User-Agent'), 'Microsoft') is not null) _ms_date := 1; else @@ -251,13 +258,14 @@ create procedure WS.WS.PROPFIND ( full_path := '/' || DAV_CONCAT_PATH (path, '/'); path_id := DAV_SEARCH_ID (full_path, 'C'); + + http_header ('Content-type: text/xml; charset="utf-8"\r\n'); if (DB.DBA.DAV_DET_NAME (path_id) = 'CalDAV') - http_header ('DAV: 1, calendar-access, calendar-schedule, calendar-proxy\r\nContent-type: application/xml; charset="utf-8"\r\n'); + http_header (http_header_get () || 'DAV: 1, 2, access-control, calendar-access\r\n'); else if (DB.DBA.DAV_DET_NAME (path_id) = 'CardDAV') - http_header ('DAV: 1, addressbook\r\nContent-type: application/xml; charset="utf-8"\r\n'); + http_header (http_header_get () || 'DAV: 1, 2, access-control, addressbook\r\n'); - http_header ('Content-type: text/xml; charset="utf-8"\r\n'); http ('\n'); http ('\n'); if (-13 = WS.WS.PROPFIND_RESPONSE (_lpath, _ppath, _depth, st, _ms_date, _props, _uid)) @@ -273,9 +281,6 @@ create procedure WS.WS.PROPFIND ( } ; ---#IF VER=5 ---!AFTER ---#ENDIF create function WS.WS.PROPFIND_RESPONSE ( in lpath varchar, in ppath varchar, @@ -386,11 +391,11 @@ create procedure WS.WS.PROPFIND_RESPONSE_FORMAT ( in _u_id integer) { -- dbg_obj_princ ('WS.WS.PROPFIND_RESPONSE_FORMAT (', lpath, dirlist, append_name_to_href, ms_date, propnames, all_prop, add_not_found, _u_id, ')'); - declare dir_len, dir_ctr, dt_flag, iso_dt_flag, res_len, parent_col, id, found_cprop, found_sprop, mix integer; + declare dir_ctr, dt_flag, iso_dt_flag, res_len, parent_col, id, found_cprop, found_sprop, mix integer; declare crt, modt datetime; - declare name, mime_type, prop, prop1, dt_ms, mis_prop varchar; + declare name, mime_type, prop1, dt_ms, mis_prop varchar; declare st char(1); - declare diritm, prop_val, href any; + declare prop_val, href any; declare perms, uid, gid any; if (ms_date) @@ -405,368 +410,360 @@ create procedure WS.WS.PROPFIND_RESPONSE_FORMAT ( iso_dt_flag := 0; dt_ms := ''; } - dir_ctr := 0; - dir_len := length (dirlist); - -next_response: - if (dir_ctr >= dir_len) - return; - diritm := dirlist[dir_ctr]; - st := diritm[1]; - if (('R' <> st) and resources_only) + foreach (any diritm in dirlist) do { - dir_ctr := dir_ctr + 1; - goto next_response; - } + st := diritm[1]; + if (('R' <> st) and resources_only) + goto _continue; - res_len := diritm[2]; - modt := diritm[3]; - id := diritm[4]; - crt := diritm[8]; - mime_type := diritm[9]; - name := diritm[10]; - perms := diritm[5]; - uid := diritm[7]; - gid := diritm[6]; + res_len := diritm[2]; + modt := diritm[3]; + id := diritm[4]; + crt := diritm[8]; + mime_type := diritm[9]; + name := diritm[10]; + perms := diritm[5]; + uid := diritm[7]; + gid := diritm[6]; - found_sprop := 0; - mis_prop := ''; - mix := 0; + found_sprop := 0; + mis_prop := ''; + mix := 0; - if (__tag (crt) <> 211) - crt := now (); + if (__tag (crt) <> 211) + crt := now (); - if (__tag (modt) <> 211) - modt := now (); + if (__tag (modt) <> 211) + modt := now (); - href := case append_name_to_href when 0 then lpath else DAV_CONCAT_PATH (lpath, name) end; - if (st = 'C' and href not like '%/' and href not like '%.ics' and href not like '%.vcf') - href := href || '/'; + href := case append_name_to_href when 0 then lpath else DB.DBA.DAV_CONCAT_PATH (lpath, name) end; + if (st = 'C' and href not like '%/' and href not like '%.ics' and href not like '%.vcf') + href := href || '/'; - parent_col := DAV_SEARCH_ID (href, 'P'); - http ('\n'); - http (sprintf ('%V\n', DB.DBA.DAV_HREF_URL (href))); - http ('\n'); - http ('\n'); + parent_col := DAV_SEARCH_ID (href, 'P'); + http ('\n'); + http (sprintf ('%V\n', DB.DBA.DAV_HREF_URL (href))); + http ('\n'); + http ('\n'); - foreach (any prop in propnames) do - { - if (prop = ':acl') - { - http (''); - found_sprop := 1; - } - else if (prop = ':displayname') - { - http (sprintf ('%V\n', name)); - found_sprop := 1; - } - else if (prop = ':getlastmodified') + foreach (any prop in propnames) do { - http (sprintf ('%V\n', dt_ms, soap_print_box (modt, '', dt_flag))); - found_sprop := 1; - } - else if (prop = ':creationdate') - { - http (sprintf ('%V\n', dt_ms, soap_print_box (crt, '', iso_dt_flag))); - found_sprop := 1; - } - else if (prop = ':lastaccessed') - { - http (sprintf ('%V\n', dt_ms, soap_print_box (modt, '', dt_flag))); - found_sprop := 1; - } - else if (prop = ':getetag' and st = 'R') - { - http (sprintf ('"%V"\n', WS.WS.ETAG (name, parent_col, modt))); - found_sprop := 1; - } - else if (prop = ':getcontenttype') - { - http (sprintf ('%V\n', mime_type)); - found_sprop := 1; - } - else if (prop = ':getcontentlength') - { - http (sprintf ('%d\n', case when (st = 'R') then res_len else 0 end)); - found_sprop := 1; - } - else if (prop = 'urn:ietf:params:xml:ns:caldav:supported-calendar-component-set') - { - http ('\r\n'); - found_sprop := 1; - } - else if (prop = 'urn:ietf:params:xml:ns:carddav:supported-address-data') - { - http ('\r\n'); - found_sprop := 1; - } - else if (prop = ':getetag' and st = 'C') - { - http (sprintf ('"%V"\n', WS.WS.ETAG (name, parent_col, modt))); - found_sprop := 1; - } - else if (prop = 'http://calendarserver.org/ns/:getctag') - { - http (concat('', WS.WS.ETAG (name, parent_col, modt), '\n')); - found_sprop := 1; - } - else if (prop = 'urn:ietf:params:xml:ns:caldav:calendar-data') - { - declare content, type_ any; - - DB.DBA.DAV_RES_CONTENT_INT (DAV_SEARCH_ID (lpath, 'R'), content, type_, 0, 0); - http (concat('', content, '\n')); - found_sprop := 1; - } - else if (prop = 'urn:ietf:params:xml:ns:carddav:address-data') - { - declare content, type_ any; - DB.DBA.DAV_RES_CONTENT_INT (DAV_SEARCH_ID (lpath, 'R'), content, type_, 0, 0); - http (concat('', content, '\n')); - found_sprop := 1; - } - else if (prop = 'urn:ietf:params:xml:ns:caldav:calendar-home-set') - { - http (sprintf ('%V\n', DB.DBA.DAV_HREF_URL (lpath))); - found_sprop := 1; - } - else if (prop = 'urn:ietf:params:xml:ns:carddav:addressbook-home-set') - { - http (sprintf ('%V\n', DB.DBA.DAV_HREF_URL (lpath))); - found_sprop := 1; - } - else if (prop = ':principal-URL') - { - http (sprintf ('%V\n', DB.DBA.DAV_HREF_URL (lpath))); - found_sprop := 1; - } - else if (prop = ':current-user-privilege-set') - { - if (mime_type = 'text/vcard' or mime_type = 'text/calendar') + if (prop = ':acl') { - http (''); + http (''); found_sprop := 1; } - } - else if (prop = ':supported-report-set') - { - if (mime_type = 'text/vcard') + else if (prop = ':displayname') { - http ( - ''|| - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - '\n' - ); + http (sprintf ('%V\n', name)); found_sprop := 1; } - else if (mime_type = 'text/calendar') + else if (prop = ':getlastmodified') { - http ( - ''|| - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - ' ' || - '\n' - ); + http (sprintf ('%V\n', dt_ms, DB.DBA.DAV_RESPONSE_FORMAT_DATE (modt, '', dt_flag))); found_sprop := 1; } - } - else if (prop = ':resource-id') - { - http (sprintf ('%V\n', WS.WS.DAV_LINK (lpath))); - } - else if (prop = ':resourcetype') - { - if (st = 'C') + else if (prop = ':creationdate') { - if (mime_type = 'text/vcard') - http ('\n'); - else if (mime_type = 'text/calendar') - http ('\n'); - else - http ('\n'); + http (sprintf ('%V\n', dt_ms, DB.DBA.DAV_RESPONSE_FORMAT_DATE (crt, '', iso_dt_flag))); + found_sprop := 1; } - else + else if (prop = ':lastaccessed') { - http ('\n'); + http (sprintf ('%V\n', dt_ms, DB.DBA.DAV_RESPONSE_FORMAT_DATE (modt, '', dt_flag))); + found_sprop := 1; } - found_sprop := 1; - } - else if (prop = ':lockdiscovery') - { - declare locks any; - - locks := DAV_LIST_LOCKS (id, st); - http (''); - foreach (any lock in locks) do + else if (prop = ':getetag') { - http ('\n'); - http ('\n'); - if (lock[1] = 'X') - http ('\n'); - else - http ('\n'); - http ('infinity\n'); - http (sprintf ('%sSecond-%d\n', coalesce (lock[5], ''), lock[3])); - http (sprintf ('opaquelocktoken:%s\n', lock[2])); - http ('\n'); + http (sprintf ('"%V"\n', WS.WS.ETAG (name, parent_col, modt))); + found_sprop := 1; } - http (''); - found_sprop := 1; - } - else if (prop = ':supportedlock') - { - http ('\n\n\n\n\n\n\n\n\n\n'); - found_sprop := 1; - } - else if (prop = ':virtpermissions') - { - perms := trim (perms, '\r\n '); - http (concat('', perms, '\n')); - found_sprop := 1; - } - else if (prop = ':virtowneruid') - { - declare tmp varchar; - - tmp := (select U_NAME from DB.DBA.SYS_USERS where U_ID = uid); - if (tmp is not null) + else if (prop = ':getcontenttype') { - http (sprintf ('%U\n', tmp)); + http (sprintf ('%V\n', mime_type)); found_sprop := 1; } - else + else if (prop = ':getcontentlength') { - mis_prop := concat (mis_prop, '\n'); + http (sprintf ('%d\n', case when (st = 'R') then res_len else 0 end)); + found_sprop := 1; } - } - else if (prop = ':virtownergid') - { - declare tmp varchar; - tmp := (select U_NAME from DB.DBA.SYS_USERS where U_ID = gid); - if (tmp is not null) + else if (prop = 'urn:ietf:params:xml:ns:caldav:supported-calendar-component-set') { - http (sprintf ('%U\n', tmp)); + http ('\r\n'); found_sprop := 1; } - else + else if (prop = 'urn:ietf:params:xml:ns:carddav:supported-address-data') { - mis_prop := concat (mis_prop, '\n'); + http ('\r\n'); + found_sprop := 1; } - } - else if (all_prop = 0) - { - if (prop[0] = ascii (':')) - prop1 := subseq (prop, 1); - else - prop1 := prop; + else if (prop = ':getetag' and st = 'C') + { + http (sprintf ('"%V"\n', WS.WS.ETAG (name, parent_col, modt))); + found_sprop := 1; + } + else if (prop = 'http://calendarserver.org/ns/:getctag') + { + http (sprintf ('%V\n', WS.WS.ETAG (name, parent_col, modt))); + found_sprop := 1; + } + else if (prop = 'urn:ietf:params:xml:ns:caldav:calendar-data') + { + declare x_content, x_type any; - found_cprop := 0; - prop_val := DAV_HIDE_ERROR (DAV_PROP_GET_INT (id, st, prop1, 0), null); - if (prop_val is not null) + DB.DBA.DAV_RES_CONTENT_INT (DB.DBA.DAV_SEARCH_ID (lpath, 'R'), x_content, x_type, 0, 0); + http ('' || x_content || '\n'); + found_sprop := 1; + } + else if (prop = 'urn:ietf:params:xml:ns:carddav:address-data') { - WS.WS.PROPFIND_RESPONSE_FORMAT_CUSTOM (prop, prop1, prop_val); + declare x_content, x_type any; - found_cprop := 1; + DB.DBA.DAV_RES_CONTENT_INT (DB.DBA.DAV_SEARCH_ID (lpath, 'R'), x_content, x_type, 0, 0); + http ('' || x_content || '\n'); found_sprop := 1; } - if (add_not_found and not found_cprop) + else if (prop = 'urn:ietf:params:xml:ns:caldav:calendar-home-set') { - declare names, namep varchar; - declare colon any; + http (sprintf ('%V\n', DB.DBA.DAV_HREF_URL (lpath))); + found_sprop := 1; + } + else if (prop = 'urn:ietf:params:xml:ns:carddav:addressbook-home-set') + { + http (sprintf ('%V\n', DB.DBA.DAV_HREF_URL (lpath))); + found_sprop := 1; + } + else if (prop = ':principal-URL') + { + http (sprintf ('%V\n', DB.DBA.DAV_HREF_URL (lpath))); + found_sprop := 1; + } + else if (prop = ':current-user-privilege-set') + { + if (mime_type = 'text/vcard' or mime_type = 'text/calendar') + { + http (''); + found_sprop := 1; + } + } + else if (prop = ':supported-report-set') + { + if (mime_type = 'text/vcard') + { + http ( + ''|| + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + '\n' + ); + found_sprop := 1; + } + else if (mime_type = 'text/calendar') + { + http ( + ''|| + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + ' ' || + '\n' + ); + found_sprop := 1; + } + } + else if (prop = ':resource-id') + { + http (sprintf ('%V\n', WS.WS.DAV_LINK (lpath))); + } + else if (prop = ':resourcetype') + { + if (st = 'C') + { + if (mime_type = 'text/vcard') + http ('\n'); + else if (mime_type = 'text/calendar') + http ('\n'); + else + http ('\n'); + } + else + { + http ('\n'); + } + found_sprop := 1; + } + else if (prop = ':lockdiscovery') + { + declare locks any; - colon := strrchr (prop, ':'); - if (colon > 0) + locks := DB.DBA.DAV_LIST_LOCKS (id, st); + http (''); + foreach (any lock in locks) do { - namep := substring (prop, colon + 1, length (prop)); - names := substring (prop, 1, colon); - mix := mix + 1; - mis_prop := concat (mis_prop, sprintf ('\n', mix, namep, mix, names)); + http ('\n'); + http ('\n'); + if (lock[1] = 'X') + http ('\n'); + else + http ('\n'); + http ('infinity\n'); + http (sprintf ('%sSecond-%d\n', coalesce (lock[5], ''), lock[3])); + http (sprintf ('opaquelocktoken:%s\n', lock[2])); + http ('\n'); + } + http (''); + found_sprop := 1; + } + else if (prop = ':supportedlock') + { + http ('\n\n\n\n\n\n\n\n\n\n'); + found_sprop := 1; + } + else if (prop = ':virtpermissions') + { + perms := trim (perms, '\r\n '); + http (concat('', perms, '\n')); + found_sprop := 1; + } + else if (prop = ':virtowneruid') + { + declare tmp varchar; + + tmp := (select U_NAME from DB.DBA.SYS_USERS where U_ID = uid); + if (tmp is not null) + { + http (sprintf ('%U\n', tmp)); + found_sprop := 1; } else { - mis_prop := concat (mis_prop, sprintf ('\n', prop)); + mis_prop := concat (mis_prop, '\n'); } } - } - } - if (all_prop = 1) - { - declare props any; + else if (prop = ':virtownergid') + { + declare tmp varchar; + tmp := (select U_NAME from DB.DBA.SYS_USERS where U_ID = gid); + if (tmp is not null) + { + http (sprintf ('%U\n', tmp)); + found_sprop := 1; + } + else + { + mis_prop := concat (mis_prop, '\n'); + } + } + else if ((all_prop = 0) and (prop not in (':href'))) + { + if (prop[0] = ascii (':')) + prop1 := subseq (prop, 1); + else + prop1 := prop; + + found_cprop := 0; + prop_val := DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_PROP_GET_INT (id, st, prop1, 0), null); + if (prop_val is not null) + { + WS.WS.PROPFIND_RESPONSE_FORMAT_CUSTOM (prop, prop1, prop_val); - props := DAV_PROP_LIST_INT (id, st, '%', 0); - foreach (any prop in props) do + found_cprop := 1; + found_sprop := 1; + } + if (add_not_found and not found_cprop) + { + declare names, namep varchar; + declare colon any; + + colon := strrchr (prop, ':'); + if (colon > 0) + { + namep := substring (prop, colon + 1, length (prop)); + names := substring (prop, 1, colon); + mix := mix + 1; + mis_prop := concat (mis_prop, sprintf ('\n', mix, namep, mix, names)); + } + else + { + mis_prop := concat (mis_prop, sprintf ('\n', prop)); + } + } + } + } + if (all_prop = 1) { - prop1 := prop[0]; - if ((prop1 = 'LDP') or (prop1 like 'virt:%') or (prop1 like 'http://www.openlinksw.com/schemas/%') or (prop1 like 'http://local.virt/DAV-RDF%')) - goto _skip2; + declare props any; - WS.WS.PROPFIND_RESPONSE_FORMAT_CUSTOM (prop1, prop1, prop[1]); - _skip2:; + props := DB.DBA.DAV_PROP_LIST_INT (id, st, '%', 0); + foreach (any prop in props) do + { + prop1 := prop[0]; + if ((prop1 = 'LDP') or (prop1 like 'virt:%') or (prop1 like 'http://www.openlinksw.com/schemas/%') or (prop1 like 'http://local.virt/DAV-RDF%')) + goto _skip2; + + WS.WS.PROPFIND_RESPONSE_FORMAT_CUSTOM (prop1, prop1, prop[1]); + _skip2:; + } } - } - if (found_sprop) - { - http ('\n'); - http ('HTTP/1.1 200 OK\n'); - http ('\n'); - } - if (mis_prop <> '') - { if (found_sprop) - http ('\n\n'); + { + http ('\n'); + http ('HTTP/1.1 200 OK\n'); + http ('\n'); + } + if (mis_prop <> '') + { + if (found_sprop) + http ('\n\n'); - http (mis_prop); - http ('\nHTTP/1.1 404 Not Found\n\n'); + http (mis_prop); + http ('\nHTTP/1.1 404 Not Found\n\n'); + } + http ('\n'); + _continue:; } - http ('\n'); - - dir_ctr := dir_ctr + 1; - goto next_response; } ; @@ -775,6 +772,7 @@ create procedure WS.WS.PROPFIND_RESPONSE_FORMAT_CUSTOM ( in prop1 varchar, in prop_value any) { + -- dbg_obj_princ ('WS.WS.PROPFIND_RESPONSE_FORMAT_CUSTOM (', prop, prop1, prop_value, ')'); declare tree, tree_error, item, pname, pns any; tree_error := 1; @@ -790,8 +788,13 @@ _skip:; item := xpath_eval ('/*', tree, 1); pname := cast (xpath_eval ('local-name(.)', item) as varchar); pns := cast (xpath_eval ('namespace-uri(.)', item) as varchar); - if ((length (pns) <> 0) and (pns <> 'DAV') and (pns <> 'http://www.openlinksw.com/virtuoso/webdav/1.0/')) + if ((length (pns) <> 0) and (pns <> 'http://www.openlinksw.com/virtuoso/webdav/1.0/')) + { + if ((prop like 'DAV:%') and (pns = 'D')) + pns := 'DAV'; + pname := concat (pns, ':', pname); + } if (pname = prop) { @@ -804,7 +807,18 @@ _skip:; } else { - http (concat ('\n')); + if (prop1 like 'DAV:%') + { + http (sprintf ('<%s>\n', prop1, prop_value, prop1)); + } + else if (prop1 like 'oWiki:%') + { + http (sprintf ('<%s>\n', prop1, deserialize (prop_value), prop1)); + } + else + { + http (concat ('\n')); + } } } ; @@ -849,9 +863,9 @@ create procedure WS.WS.PROPNAMES ( { pns := cast (xpath_eval ('namespace-uri(.)', item) as varchar); pname := cast (xpath_eval ('local-name(.)', item) as varchar); - if (pns = 'DAV:') + if ((pns = 'DAV:') or (pns = 'http://www.openlinksw.com/virtuoso/webdav/1.0/')) pname := concat (':', pname); - else if ((pns <> '') and (pns <> 'http://www.openlinksw.com/virtuoso/webdav/1.0/')) + else if (pns <> '') pname := concat (pns, ':', pname); rc := vector_concat (rc, vector (pname)); @@ -878,6 +892,7 @@ create procedure WS.WS.REPORT ( inout params varchar, in lines varchar) { + -- dbg_obj_princ ('WS.WS.REPORT (', path, params, lines, ')'); declare _depth integer; declare st, _temp varchar; declare _ms_date integer; @@ -951,6 +966,7 @@ create procedure WS.WS.REPORT ( DB.DBA.DAV_SET_HTTP_STATUS (400); return; }; + if (length (_body) > 0) test_tree := xml_tree (_body); } @@ -976,12 +992,12 @@ create procedure WS.WS.REPORT ( { declare urls any; urls := xpath_eval ('[xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav:"] //calendar-multiget/D:href/text()', xml_tree_doc (xml_expand_refs (xml_tree (_body))), 0); - http_header ('DAV: 1, calendar-access, calendar-schedule, calendar-proxy\r\nContent-type: application/xml; charset="utf-8"\r\n'); + http_header ('DAV: 1, 2, access-control, calendar-access \r\nContent-type: text/xml; charset="utf-8"\r\n'); http ('\n'); http ('\n'); foreach (any prop in urls) do { - if (-13 = WS.WS.REPORT_RESPONSE (cast(prop as varchar), _ppath, _depth, st, _ms_date, _props, _u_id)) + if (-13 = WS.WS.REPORT_RESPONSE (cast (prop as varchar), _ppath, _depth, st, _ms_date, _props, _u_id)) { _u_id := null; _g_id := null; @@ -997,12 +1013,12 @@ create procedure WS.WS.REPORT ( { declare urls any; urls := xpath_eval ('[xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:carddav:"] //addressbook-multiget/D:href/text()', xml_tree_doc (xml_expand_refs (xml_tree (_body))), 0); - http_header ('DAV: 1, addressbook\r\nContent-type: application/xml; charset="utf-8"\r\n'); + http_header ('DAV: 1, 2, access-control, addressbook\r\nContent-type: text/xml; charset="utf-8"\r\n'); http ('\n'); http ('\n'); foreach (any prop in urls) do { - if (-13 = WS.WS.REPORT_RESPONSE (cast(prop as varchar), _ppath, _depth, st, _ms_date, _props, _u_id)) + if (-13 = WS.WS.REPORT_RESPONSE (cast (prop as varchar), _ppath, _depth, st, _ms_date, _props, _u_id)) { _u_id := null; _g_id := null; @@ -1033,10 +1049,7 @@ create procedure WS.WS.REPORT ( } ; ---#IF VER=5 ---!AFTER ---#ENDIF -create function WS.WS.REPORT_RESPONSE ( +create procedure WS.WS.REPORT_RESPONSE ( in lpath varchar, in ppath varchar, in depth integer, @@ -1045,12 +1058,14 @@ create function WS.WS.REPORT_RESPONSE ( in propnames any, in u_id integer) returns integer { + -- dbg_obj_princ ('WS.WS.REPORT_RESPONSE (', lpath, ppath, depth, st, ms_date, propnames, ')'); declare N, all_prop, add_not_found integer; declare items any; if (not isstring (lpath) or not isstring (ppath)) return -28; + lpath := split_and_decode(lpath)[0]; if (st = 'C' and aref (ppath, length (ppath) - 1) <> ascii ('/')) ppath := concat (ppath, '/'); @@ -1062,7 +1077,7 @@ create function WS.WS.REPORT_RESPONSE ( { add_not_found := 0; propnames := vector (':getlastmodified', ':creationdate', ':lastaccessed', ':getcontentlength', ':resourcetype', ':supportedlock'); - } + } else { propnames := vector (':getlastmodified', ':getcontentlength', ':resourcetype'); @@ -1103,7 +1118,6 @@ create procedure WS.WS.CUSTOM_PROP ( declare N integer; declare props, prop_name, prop_value, prop_tree any; declare proot, pname, pns any; - declare p cursor for select PROP_NAME, PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_TYPE = st and PROP_PARENT_ID = id; -- there should be cycle http_request_status ('HTTP/1.1 207 Multi-Status'); @@ -1140,6 +1154,9 @@ create procedure WS.WS.CUSTOM_PROP ( if (pns = 'DAV') http (sprintf ('\n', pname)); + else if (pns = 'http://www.openlinksw.com/virtuoso/webdav/1.0/') + http (sprintf ('\n', pname)); + else if (length (pns) <> 0) http (sprintf ('\n', N, pname, N, pns)); @@ -1205,7 +1222,7 @@ create procedure WS.WS.PROPPATCH_INT ( in lines varchar, in id any, in st varchar, - in auth_uid varchar, + in auth_uid any, in auth_pwd varchar, in uid integer, in gid integer, @@ -1249,6 +1266,9 @@ create procedure WS.WS.PROPPATCH_INT ( if (mode = 'proppatch') http_request_status ('HTTP/1.1 207 Multi-Status'); + if (isstring (auth_uid)) + auth_uid := (select U_ID from DB.DBA.SYS_USERS where U_NAME = auth_uid); + rc := string_output (); http ('\n', rc); http ('\n', rc); @@ -1281,7 +1301,7 @@ create procedure WS.WS.PROPPATCH_INT ( { tmp := (select U_ID from DB.DBA.SYS_USERS where U_NAME = tmp); } - rc_prop := DAV_PROP_SET_INT (path, ':' || prop_name, tmp, null, null, 0, 0, 1, case when isstring (auth_uid) then (select U_ID from DB.DBA.SYS_USERS where U_NAME = auth_uid) else auth_uid end); + rc_prop := DAV_PROP_SET_INT (path, ':' || prop_name, tmp, null, null, 0, 0, 1, auth_uid); } else if ((pns = 'http://www.openlinksw.com/virtuoso/webdav/1.0/') and (prop_name = 'virtdet')) { @@ -1530,14 +1550,14 @@ create procedure WS.WS.DELCHILDREN (in id integer, in lines varchar) http_header ('Content-type: text/xml; charset="utf-8"\r\n'); http (concat ( '', - '', - '', - '', + '', + '', + '', DB.DBA.DAV_HREF_URL (name), - '', - 'HTTP/1.1 423 Locked', - '', - '' + '', + 'HTTP/1.1 423 Locked', + '', + '' )); return 1; } @@ -1562,14 +1582,14 @@ del_res_end: http_header ('Content-type: text/xml; charset="utf-8"\r\n'); http (concat ( '', - '', - '', - '', + '', + '', + '', DB.DBA.DAV_HREF_URL (cname), - '', - 'HTTP/1.1 423 Locked', - '', - '' + '', + 'HTTP/1.1 423 Locked', + '', + '' )); return 1; } @@ -1594,13 +1614,11 @@ create procedure WS.WS."DELETE" ( in lines varchar) { -- dbg_obj_princ ('WS.WS.DELETE (', path, params, lines, ')'); - declare depth, len integer; declare src_id any; declare uname, upwd, _perms varchar; declare rc integer; - declare res integer; declare u_id, g_id integer; - declare what, full_path varchar; + declare what, if_token, full_path varchar; uname := null; upwd := null; @@ -1641,11 +1659,20 @@ create procedure WS.WS."DELETE" ( return; } + if_token := WS.WS.FINDPARAM (lines, 'If'); + if (if_token <> '') + { + declare tmp any; + + tmp := WS.WS.IF_HEADER_PARSE (path, if_token); + if (not isnull (tmp) and length (tmp)) + if_token := tmp[0][1][0][1]; + } full_path := DAV_CONCAT_PATH ('/', path); - rc := DAV_DELETE_INT (full_path, 1, null, null, 0); + rc := DAV_DELETE_INT (full_path, 1, null, null, 0, 1, if_token); if (rc >= 0) { - http_header (WS.WS.LDP_HDRS (0, 0, 0, 0, full_path)); + http_header (WS.WS.LDP_HDRS (equ (what, 'C'), 0, 0, 0, full_path)); DB.DBA.DAV_SET_HTTP_STATUS (204); } else if (rc = -8) @@ -1729,18 +1756,39 @@ create procedure WS.WS.HEAD (in path varchar, inout params varchar, in lines var create procedure WS.WS.DAV_LINK (in p varchar) { declare def, h, s any; + def := registry_get ('URIQADefaultHost'); h := sprintf ('%s://%s', case when is_https_ctx () then 'https' else 'http' end, http_host (def)); s := string_output (); http_dav_url (p, null, s); s := string_output_string (s); - return h || p; + return h || s; +} +; + +create procedure WS.WS.DAV_ACL ( + in path varchar, + in deep integer := 1) +{ + -- dbg_obj_princ ('WS.WS.DAV_ACL (', path, ')'); + declare rc varchar; + + while (length (path) > 4) + { + rc := rtrim (path, '/') || ',acl'; + if (not isnull (DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_SEARCH_ID (rc, 'R')))) + return rc; + + if (deep = 0) + return null; + + path := DB.DBA.DAV_DET_PATH_PARENT (path, 1); + } + + return null; } ; ---#IF VER=5 ---!AFTER ---#ENDIF create procedure WS.WS.PUT ( in path varchar, inout params varchar, @@ -1759,7 +1807,7 @@ create procedure WS.WS.PUT ( declare _atomPub integer; declare _path, _destination, _oldName, _name, _what, _method, _category varchar; declare _xtree, _content, _parts any; - declare client_etag, server_etag, slug, res_name_, rc_type varchar; + declare client_etag, server_etag, res_name_, rc_type varchar; declare res_id_, id_ integer; declare mod_time datetime; declare o_perms, o_uid, o_gid any; @@ -1883,14 +1931,7 @@ create procedure WS.WS.PUT ( WS.WS.IS_REDIRECT_REF (path, lines, location); path := WS.WS.FIXPATH (path); - full_path := DAV_CONCAT_PATH ('/', path); - slug := WS.WS.FINDPARAM (lines, 'Slug'); - if (slug <> '') - { - full_path := rtrim (full_path, '/') || '/' || slug; - path := vector_concat (path, vector (slug)); - } uid := null; gid := null; @@ -1952,36 +1993,39 @@ create procedure WS.WS.PUT ( if ((res_id_ is not null or _col is not null) and length (client_etag)) { server_etag := client_etag; - if (res_id_ is not null) + if (isinteger (res_id_)) { - if (isinteger(res_id_)) - { - select RES_COL, RES_NAME, RES_MOD_TIME, RES_OWNER, RES_GROUP, RES_PERMS into id_, res_name_, mod_time, o_uid, o_gid, o_perms from WS.WS.SYS_DAV_RES where RES_ID = res_id_; - server_etag := WS.WS.ETAG (res_name_, id_, mod_time); - } + select RES_COL, RES_NAME, RES_MOD_TIME, RES_OWNER, RES_GROUP, RES_PERMS into id_, res_name_, mod_time, o_uid, o_gid, o_perms from WS.WS.SYS_DAV_RES where RES_ID = res_id_; + server_etag := WS.WS.ETAG (res_name_, id_, mod_time); } - else + else if (isinteger (_col)) { - if (isinteger(_col)) - { - select COL_ID, COL_NAME, COL_MOD_TIME into id_, res_name_, mod_time from WS.WS.SYS_DAV_COL where COL_ID = _col; - server_etag := WS.WS.ETAG (res_name_, id_, mod_time); - } + select COL_ID, COL_NAME, COL_MOD_TIME into id_, res_name_, mod_time from WS.WS.SYS_DAV_COL where COL_ID = _col; + server_etag := WS.WS.ETAG (res_name_, id_, mod_time); } + if (client_etag <> server_etag) { - http_status_set (412); + DB.DBA.DAV_SET_HTTP_STATUS (412); + DB.DBA.DAV_SET_HTTP_LDP_STATUS (_col_parent_id, 412); return; } } if ((res_id_ is not null) and isinteger (res_id_) and (length (client_etag) = 0)) { + if ((_method = 'PUT') and (registry_get ('LDP_strict_put') = '1') and DB.DBA.LDP_ENABLED (_col_parent_id)) + { + DB.DBA.DAV_SET_HTTP_STATUS (428); + DB.DBA.DAV_SET_HTTP_LDP_STATUS (_col_parent_id, 428); + return; + } select RES_OWNER, RES_GROUP, RES_PERMS into o_uid, o_gid, o_perms from WS.WS.SYS_DAV_RES where RES_ID = res_id_; } - if (registry_get ('LDP_strict_put') = '1' and _method = 'PUT' - and (res_id_ is not null or _col is not null) and content_type = 'text/turtle' and length (client_etag) = 0) + if ((_method = 'PUT') and (registry_get ('LDP_strict_put') = '1') and + (res_id_ is not null or _col is not null) and (content_type = 'text/turtle') and (length (client_etag) = 0)) { - http_status_set (428); + DB.DBA.DAV_SET_HTTP_STATUS (428); + DB.DBA.DAV_SET_HTTP_LDP_STATUS (_col_parent_id, 428); return; } @@ -2007,9 +2051,9 @@ create procedure WS.WS.PUT ( } else if ((content_type = 'text/turtle') and not DB.DBA.DAV_MAC_METAFILE (full_path)) { - declare gr, newg, newpath, link, arr, is_container any; + declare gr, newGr, newPath, link, arr, is_container any; - newpath := DAV_CONCAT_PATH (full_path, '/'); + newPath := DAV_CONCAT_PATH (full_path, '/'); is_container := 0; link := http_request_header (lines, 'Link', null, null); arr := split_and_decode (link, 0, '\0\0;='); @@ -2019,7 +2063,7 @@ create procedure WS.WS.PUT ( if (length (ses) = 0) http ('<> a . ', ses); - full_path := newpath; + full_path := newPath; } rc := WS.WS.TTL_QUERY_POST (full_path, ses, case when _col is not null or is_container then 0 else 1 end); if (DAV_HIDE_ERROR (rc) is null) @@ -2028,10 +2072,10 @@ create procedure WS.WS.PUT ( gr := iri_to_id (WS.WS.DAV_IRI (full_path)); if (is_container or (sparql define input:inference "ldp" ask where { graph ?:gr { ?:gr a }})) { - newg := iri_to_id (WS.WS.DAV_IRI (newpath)); - if (gr <> newg) + newGr := iri_to_id (WS.WS.DAV_IRI (newPath)); + if (gr <> newGr) { - sparql move graph ?:gr to ?:newg; + sparql move graph ?:gr to ?:newGr; } rc_type := 'C'; if (_col is null) @@ -2040,6 +2084,12 @@ create procedure WS.WS.PUT ( } else { + if (DB.DBA.LDP_ENABLED (_col)) + { + DB.DBA.DAV_SET_HTTP_STATUS (409); + DB.DBA.DAV_SET_HTTP_LDP_STATUS (_col, 409); + return; + } rc := _col; } @@ -2053,16 +2103,18 @@ create procedure WS.WS.PUT ( } http_header (sprintf ('Location: %s\r\n', WS.WS.DAV_LINK (newpath))); - http_header (http_header_get () || WS.WS.LDP_HDRS (1, 1, 0, 0, newpath)); + http_header (http_header_get () || WS.WS.LDP_HDRS (1, 1, 0, 0, newpath, content_type)); goto rcck; } http_header (sprintf ('Location: %s\r\n', WS.WS.DAV_LINK (full_path))); - http_header (http_header_get () || WS.WS.LDP_HDRS (0, 1, 0, 0, full_path)); + http_header (http_header_get () || WS.WS.LDP_HDRS (0, 1, 0, 0, full_path, content_type)); } else { - http_header (sprintf ('Location: %s\r\nLink: ; rel="type"\r\n', WS.WS.DAV_LINK (full_path))); + http_header (sprintf ('Location: %s\r\n', WS.WS.DAV_LINK (full_path))); + if (DB.DBA.LDP_ENABLED (_col_parent_id)) + http_header (http_header_get () || WS.WS.LDP_HDRS (0, 1, 0, 0, full_path, content_type)); } rc := DAV_RES_UPLOAD_STRSES_INT (full_path, ses, content_type, o_perms, auth_name, null, auth_name, auth_pwd, 0, now(), now(), null, o_uid, o_gid, 0, 1); @@ -2077,11 +2129,9 @@ create procedure WS.WS.PUT ( rcck: if (DAV_HIDE_ERROR (rc) is not null) { - commit work; - http_request_status ('HTTP/1.1 201 Created'); - declare _etag varchar; + commit work; _etag := WS.WS.ETAG_BY_ID (rc, rc_type); if (_etag is not null) http_header (http_header_get () || sprintf ('ETag: "%s"\r\n', _etag)); @@ -2092,7 +2142,7 @@ rcck: } else { - http_header (http_header_get () || sprintf('Content-Type: %s\r\n', content_type)); + http_header (http_header_get () || sprintf ('Content-Type: %s\r\n', content_type)); if (content_type = 'application/sparql-query') { http_header (http_header_get () || http_header ('MS-Author-Via: SPARQL\r\n')); @@ -2107,6 +2157,7 @@ rcck: ); } } + DB.DBA.DAV_SET_HTTP_STATUS (201); return; } @@ -2124,6 +2175,7 @@ error_ret: DAV_SET_HTTP_REQUEST_STATUS (rc); if (rc = -44) http_value (connection_get ('__sql_message'), 'p'); + if ((rc < 0) and bit_and (sys_stat ('public_debug'), 2)) http_value (callstack_dump (), 'pre'); } @@ -2204,13 +2256,19 @@ create procedure WS.WS.PATCH ( { declare giid, meta, data any; + if (_col is not null and _res_id is null) + { + DB.DBA.DAV_SET_HTTP_STATUS (412, '412 Precondition Failed', '412 Precondition Failed', 'The command is not applied to collections.'); + return; + } + if (not WS.WS.SPARQL_QUERY_UPDATE (ses, full_path, path, lines)) return; giid := iri_to_id (WS.WS.DAV_IRI (full_path)); set_user_id ('dba'); exec ('sparql define output:format "NICE_TTL" construct { ?s ?p ?o } where { graph ?? { ?s ?p ?o }}', null, null, vector (giid), 0, meta, data); - if (not (isvector (data) and length (data) = 1 and isvector (data[0]) and length (data[0]) = 1 and __tag (data[0][0]) = 185)) + if (not (isvector (data) and length (data) = 1 and isvector (data[0]) and length (data[0]) = 1 and __tag (data[0][0]) = __tag of stream)) goto _skip; ses := data[0][0]; @@ -2449,7 +2507,7 @@ create procedure WS.WS.GET ( inout params any, in lines any) { - --dbg_obj_princ ('WS.WS.GET (', path, params, lines, ')'); + -- dbg_obj_princ ('WS.WS.GET (', path, params, lines, ')'); declare path_len integer; declare content long varchar; declare content_type varchar; @@ -2492,19 +2550,32 @@ again: if (_res_id is null and _col_id is null) { - declare meta_path varchar; + declare acl_path, meta_path, meta_what, meta_accept varchar; declare meta_id any; declare content_, type any; meta_path := DAV_CONCAT_PATH ('/', full_path); if (meta_path like '%,meta') { + meta_accept := HTTP_RDF_GET_ACCEPT_BY_Q (http_request_header_full (lines, 'Accept', '*/*'), 'text/turtle'); + if (meta_accept not in ('*/*', 'text/turtle')) + { + DB.DBA.DAV_SET_HTTP_STATUS (406, '406 Not Acceptable', '406 Not Acceptable', sprintf ('

An appropriate representation of the requested resource %s could not be found on this server.

', meta_path)); + return; + } + + meta_what := 'R'; meta_path := subseq (meta_path, 0, length (meta_path) - length (',meta')); - meta_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (meta_path, 'R')); + meta_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (meta_path, meta_what)); + if (meta_id is null) + { + meta_what := 'C'; + meta_id := DAV_HIDE_ERROR (DAV_SEARCH_ID (DAV_CONCAT_PATH (meta_path, '/'), meta_what)); + } if (meta_id is null) goto _404; - rc := DAV_AUTHENTICATE_HTTP (meta_id, 'R', '1__', 1, lines, uname, upwd, uid, gid, perms); + rc := DAV_AUTHENTICATE_HTTP (meta_id, meta_what, '1__', 1, lines, uname, upwd, uid, gid, perms); if ((rc < 0) and (rc <> -1)) goto _403; @@ -2513,6 +2584,44 @@ again: goto _500; DB.DBA.DAV_SET_HTTP_STATUS (200); + http_header ('Content-Type: text/turtle\r\n'); + server_etag := WS.WS.ETAG_BY_ID (meta_id, meta_what); + if (server_etag is not null) + http_header (http_header_get () || sprintf ('ETag: "%s"\r\n', server_etag)); + + http (content_); + } + else if (meta_path like '%,acl') + { + meta_what := 'R'; + meta_path := subseq (meta_path, 0, length (meta_path) - length (',acl')); + acl_path := WS.WS.DAV_ACL (meta_path); + if (acl_path is null) + goto _404; + + meta_id := DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_SEARCH_ID (meta_path, meta_what)); + if (meta_id is null) + { + meta_what := 'C'; + meta_id := DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_SEARCH_ID (DB.DBA.DAV_CONCAT_PATH (meta_path, '/'), meta_what)); + } + if (meta_id is null) + goto _404; + + rc := DB.DBA.DAV_AUTHENTICATE_HTTP (meta_id, meta_what, '1__', 1, lines, uname, upwd, uid, gid, perms); + if ((rc < 0) and (rc <> -1)) + goto _403; + + rc := DB.DBA.DAV_RES_CONTENT_INT (DB.DBA.DAV_SEARCH_ID (acl_path, 'R'), content_, type, 0, 0); + if (DB.DBA.DAV_HIDE_ERROR (rc) is null) + goto _500; + + DB.DBA.DAV_SET_HTTP_STATUS (200); + http_header ('Content-Type: text/turtle\r\n'); + server_etag := WS.WS.ETAG_BY_ID (meta_id, meta_what); + if (server_etag is not null) + http_header (http_header_get () || sprintf ('ETag: "%s"\r\n', server_etag)); + http (content_); } else @@ -2988,14 +3097,14 @@ again: hdr_str := hdr_str || 'Content-Type: ' || cont_type || '\r\n'; if (modt is not null and strcasestr (hdr_str, 'Last-Modified:') is null) - hdr_str := hdr_str || sprintf ('Last-Modified: %s\r\n', soap_print_box (modt, '', 1)); + hdr_str := hdr_str || sprintf ('Last-Modified: %s\r\n', DB.DBA.DAV_RESPONSE_FORMAT_DATE (modt, '', 1)); hdr_path := DAV_CONCAT_PATH ('/', full_path); hdr_uri := sprintf ('%s://%s%s', case when is_https_ctx () then 'https' else 'http' end, http_request_header (lines, 'Host', NULL, NULL), hdr_path); if (hdr_path not like '%,meta') hdr_str := hdr_str || sprintf ('Link: <%s,meta>; rel="meta"; title="Metadata File"\r\n', hdr_uri); - if (hdr_path not like '%,acl') + if ((hdr_path not like '%,acl') and not isnull (WS.WS.DAV_ACL (hdr_path))) hdr_str := hdr_str || sprintf ('Link: <%s,acl>; rel="acl"; title="Access Control File"\r\n', hdr_uri); rdf_graph := (select PROP_VALUE from WS.WS.SYS_DAV_PROP where PROP_PARENT_ID = _col and PROP_TYPE = 'C' and PROP_NAME = 'virt:rdfSink-graph'); @@ -3167,7 +3276,7 @@ again: _to_get := 65536; _chunk := subseq (content, _start, _start + _to_get); - if (__tag (_chunk) = 185) + if (__tag (_chunk) = __tag of stream) _chunk := string_output_string (_chunk); ses_write (_chunk, _ses); @@ -3183,7 +3292,7 @@ again: return; } - http_header (http_header_get () || WS.WS.LDP_HDRS (0, LDP_ENABLED (_col), 0, 0, full_path)); + http_header (http_header_get () || WS.WS.LDP_HDRS (0, LDP_ENABLED (_col), 0, 0, full_path, cont_type)); if (length (content) > WS.WS.GET_DAV_CHUNKED_QUOTA ()) { commit work; @@ -3260,15 +3369,16 @@ create procedure WS.WS.LDP_HDRS ( in add_rel integer := 0, in page integer := 0, in last integer := 0, - in path any := null) + in path varchar := null, + in contentType varchar := null) { declare link, header, msAuthor, acceptPatch, acceptPost, netID any; msAuthor := sprintf ('MS-Author-Via: %s\r\n', case when add_rel then 'DAV, SPARQL' else 'DAV' end); acceptPatch := case when add_rel then 'Accept-Patch: application/sparql-update\r\n' else '' end; - acceptPost := sprintf ('Accept-Post: %s\r\n', case when add_rel then 'text/turtle,text/n3,text/nt,text/html,application/ld+json' else '*/*' end); - header := 'Allow: GET,HEAD,POST,PUT,DELETE,OPTIONS,PROPFIND,PROPPATCH,COPY,MOVE,MKCOL,LOCK,UNLOCK,TRACE,PATCH\r\n' || - 'Vary: Accept,Origin,If-Modified-Since,If-None-Match\r\n' || + acceptPost := sprintf ('Accept-Post: %s\r\n', case when add_rel then 'text/turtle, text/n3, text/nt, text/html, application/ld+json' else '*/*' end); + header := 'Allow: COPY, DELETE, GET, HEAD, LOCK, MKCOL, MOVE, OPTIONS, PATCH, POST, PROPFIND, PROPPATCH, PUT, TRACE, UNLOCK\r\n' || + 'Vary: Accept-Encoding, Access-Control-Request-Headers, Origin\r\n' || msAuthor || acceptPatch || acceptPost; @@ -3280,7 +3390,25 @@ create procedure WS.WS.LDP_HDRS ( { header := header || 'Link: ; rel="type"\r\n'; if (is_col) - header := header || 'Link: ; rel="type"\r\n'; + { + header := header || + 'Link: ; rel="type"\r\n' || + 'Link: ; rel="type"\r\n'; + } + else + { + if (contentType = 'text/turtle') + { + header := header || 'Link: ; rel="type"\r\n'; + } + else + { + link := WS.WS.DAV_LINK (rtrim (path, '/')); + header := header || + 'Link: ; rel="type"\r\n' || + sprintf ('Link: <%s,meta>; rel="describedby"\r\n', link); + } + } } if (page > 0) @@ -3298,7 +3426,7 @@ create procedure WS.WS.LDP_HDRS ( if ((strcasestr (hdr_str, 'rel="meta"') is null) and (link not like '%,meta')) header := header || sprintf ('Link: <%s,meta>; rel="meta"; title="Metadata File"\r\n', link); - if ((strcasestr (hdr_str, 'rel="acl"') is null) and (link not like '%,acl')) + if ((strcasestr (hdr_str, 'rel="acl"') is null) and (link not like '%,acl') and not isnull (WS.WS.DAV_ACL (path))) header := header || sprintf ('Link: <%s,acl>; rel="acl"; title="Access Control File"\r\n', link); } @@ -3341,9 +3469,11 @@ create procedure WS.WS.GET_EXT_DAV_LDP ( -- dbg_obj_princ ('WS.WS.GET_EXT_DAV_LDP (', _res_id, _col_id, ')'); declare accept, accept_mime, accept_full, accept_profile, name_ varchar; declare mod_time datetime; - declare gr, as_part varchar; + declare gr, as_define, as_part, as_part2, as_limit, as_offset varchar; declare id_ integer; declare pref_mime varchar; + declare fmt, etag, qr varchar; + declare n_page, n_count, n_last, n_per_page, is_col integer; -- macOS WebDAV request if (strstr (WS.WS.FINDPARAM (lines, 'User-Agent'), 'WebDAVFS') is not null) @@ -3377,14 +3507,9 @@ create procedure WS.WS.GET_EXT_DAV_LDP ( } } - if (accept not in ('text/turtle', 'application/ld+json')) + if (not position (accept, DB.DBA.LDP_RDF_TYPES ())) return 0; - declare fmt, etag, qr any; - declare page, cnt, last, n_per_page, is_col int; - - n_per_page := 10000; - page := atoi (get_keyword ('p', params, '1')); fmt := accept; is_col := 0; if (fmt = 'text/turtle') @@ -3399,12 +3524,12 @@ create procedure WS.WS.GET_EXT_DAV_LDP ( grs := string_output (); pwd := null; auid := http_dav_uid (); - cid := DAV_SEARCH_ID (full_path, 'P'); - ppath := DAV_SEARCH_PATH (cid, 'C'); + cid := DB.DBA.DAV_SEARCH_ID (full_path, 'P'); + ppath := DB.DBA.DAV_SEARCH_PATH (cid, 'C'); if (length (full_path) > length (ppath)) mask := subseq (full_path, length (ppath)); - dir := DAV_DIR_LIST_INT (DAV_SEARCH_PATH (cid, 'C'), 0, mask, 'dba', pwd, auid); + dir := DB.DBA.DAV_DIR_LIST_INT (DAV_SEARCH_PATH (cid, 'C'), 0, mask, 'dba', pwd, auid); foreach (any x in dir) do { http (sprintf ('<%s>,', WS.WS.DAV_IRI (x[0])), grs); @@ -3420,7 +3545,7 @@ create procedure WS.WS.GET_EXT_DAV_LDP ( { id_ := coalesce (_res_id, _col_id); if (_col_id is null) - _col_id := DAV_SEARCH_ID (DAV_SEARCH_PATH (_res_id, 'R'), 'P'); + _col_id := DB.DBA.DAV_SEARCH_ID (DAV_SEARCH_PATH (_res_id, 'R'), 'P'); name_ := ''; mod_time := now (); @@ -3461,20 +3586,56 @@ create procedure WS.WS.GET_EXT_DAV_LDP ( DB.DBA.DAV_SET_HTTP_STATUS (406, '406 Not Acceptable', '406 Not Acceptable', sprintf ('

An appropriate representation of the requested resource %s could not be found on this server.

', full_path)); return 1; } + + n_per_page := 10000; + n_page := atoi (get_keyword ('p', params, '1')); + n_count := (sparql define input:storage "" select count(1) where { graph `iri(?:gr)` { ?s ?p ?o }}); + n_last := (n_count / n_per_page) + 1; + http_header (sprintf('Content-Type: %s\r\n%s', accept, WS.WS.LDP_HDRS (is_col, 1, n_page, n_last, full_path))); + etag := WS.WS.ETAG (name_, id_, mod_time); - cnt := (sparql define input:storage "" select count(1) where { graph `iri(?:gr)` { ?s ?p ?o }}); - last := (cnt / n_per_page) + 1; - http_header (sprintf('Content-Type: %s\r\n%s', accept, WS.WS.LDP_HDRS (is_col, 1, page, last, full_path))); if (isstring (etag)) http_header (http_header_get () || sprintf('ETag: "%s"\r\n', etag)); accept_profile := case when (accept = 'application/ld+json') then DB.DBA.LDP_ACCEPT_PARAM (accept_full, accept_mime, 'profile') else null end; - as_part := ''; + as_define := ''; + as_part := ' ?dyn_s ?p ?dyn_o . '; + as_part2 := ' ?dyn_o a ?t . '; if (accept_profile = '"https://www.w3.org/ns/activitystreams"') - as_part := ' owl:equivalentProperty . owl:equivalentClass .'; - - qr := sprintf ('define sql:select-option "order" define input:storage "" construct { %s `sql:dynamic_host_name(?s)` ?p `sql:dynamic_host_name(?o)` . `sql:dynamic_host_name(?o)` a ?t } where { ?s ?p ?o option (table_option "index G") . optional { graph ?g { ?o a ?t option (table_option "index primary key") } } } order by ?s ?p ?o limit %d offset %d', as_part, n_per_page, n_per_page * (page - 1)); - + { + as_define := 'define input:inference "asEquivalent" '; + as_part := ' ?dyn_s `if (regex (str (?p), \'http://www.w3.org/ns/activitystreams#\') || regex (str (?p), \'http://www.w3.org/1999/02/22-rdf-syntax-ns#\'), ?p, ?x)` `if (regex (str (?dyn_o), \'http://www.w3.org/ns/activitystreams#\') || regex (str (?p), \'http://www.w3.org/ns/activitystreams\'), ?dyn_o, ?y)` .' ; + as_part2 := ''; + } + as_limit := ''; + if (n_count > n_per_page) + as_limit := sprintf ('limit %d', n_per_page); + + as_offset := ''; + if ((n_per_page * (n_page - 1)) > 0) + as_offset := sprintf ('offset %d', n_per_page * (n_page - 1)); + + qr := sprintf ('define sql:select-option "order" ' || + 'define input:storage "" %s ' || + 'construct ' || + ' { ' || + ' %s %s' || + ' } ' || + 'where ' || + ' { ' || + ' ?s ?p ?o option (table_option "index G") . ' || + ' optional { graph ?g { ?o a ?t option (table_option "index primary key") } } . ' || + ' BIND (sql:dynamic_host_name(?s) as ?dyn_s) .' || + ' BIND (sql:dynamic_host_name(?o) as ?dyn_o) .' || + ' } ' || + 'order by ?s ?p ?o ' || + '%s %s', + as_define, + as_part, + as_part2, + as_limit, + as_offset + ); execqr: DB.DBA.DAV_SET_HTTP_STATUS (200); connection_set ('SPARQLUserId', 'SPARQL_ADMIN'); @@ -3515,9 +3676,25 @@ create procedure WS.WS.POST ( } else if (_content_type = 'application/sparql-query') { + declare full_path, procname varchar; + declare pars, ses any; + full_path := http_physical_path (); + procname := sprintf ('%s.%s.%s', http_map_get ('vsp_qual'), http_map_get ('vsp_proc_owner'), full_path); + if ( __proc_exists (procname) and + (cast (registry_get (full_path) as varchar) = 'no_vsp_recompile') and + (http_map_get ('noinherit') = 1)) + { + ses := WS.WS.GET_BODY (params); + pars := vector_concat(params, vector ('query', string_output_string (ses))); + commit work; + __set_user_id (http_map_get ('vsp_uid')); + call (procname)(path, pars, lines); + __pop_user_id (); + return; + } WS.WS.PUT (path, params, lines); } - else if ((_content_type in ('text/turtle', 'application/ld+json')) or (length (slug) > 0)) + else if (position (_content_type, DB.DBA.LDP_RDF_TYPES ()) or (length (slug) > 0)) { declare cid integer; @@ -3528,6 +3705,8 @@ create procedure WS.WS.POST ( if (length (slug)) { p := slug; + if (DB.DBA.LDP_ENABLED (cid)) + p := slug || '-' || xenc_rand_bytes (2, 1); } else { @@ -3553,16 +3732,16 @@ create procedure WS.WS.POST ( { if (r[10] not like '%,meta' and r[10] not like '%,acl') { - sinv := sprintf_inverse (r[10], p||'%d', 0); + sinv := sprintf_inverse (r[10], p||'-'||'%d', 0); if (length (sinv) > 0 and sinv[0] > nth) nth := sinv[0]; } } - p := sprintf ('%s%d', p, nth + 1); + p := sprintf ('%s-%d', p, nth + 1); } else { - p := xenc_rand_bytes (8,1); + p := xenc_rand_bytes (8, 1); } } path := vector_concat (path, vector (p)); @@ -3578,7 +3757,7 @@ create procedure WS.WS.POST ( create procedure WS.WS.SPARQL_QUERY_POST ( in path varchar, - inout ses varchar, + inout ses any, in uname varchar, in dav_call integer := 0) { @@ -3611,7 +3790,7 @@ create procedure WS.WS.SPARQL_QUERY_POST ( if (stat <> '00000') signal (stat, msg); - if (length (data) > 0 and length (data[0]) and __tag (data[0][0]) = 214) + if (length (data) > 0 and length (data[0]) and __tag (data[0][0]) = __tag of dictionary reference) { declare dict, triples any; @@ -3971,7 +4150,7 @@ create procedure WS.WS.SPARQL_QUERY_UPDATE (in content any, in full_path varchar params := vector ('query', string_output_string (content), 'default-graph-uri', WS.WS.DAV_IRI (full_path)); WS.WS."/!sparql/" (path, params, lines); data := http_get_string_output (); - if (data not like '', '', '', - '')); if (scope = 'X') http (''); else http (''); + '')); + if (scope = 'X') http (''); else http (''); http (sprintf ('%s', depth)); http (owner_name); http (concat ( @@ -4189,7 +4369,7 @@ create procedure WS.WS.PARENT_PATH ( { declare len integer; - if (__tag (path) <> 193) + if (__tag (path) <> __tag of vector) return null; len := length (path) - 1; @@ -4277,6 +4457,7 @@ create procedure WS.WS.COPY_OR_MOVE ( in lines varchar, in is_copy integer) { + declare tmp any; declare st, _dst_url, if_header varchar; declare _host varchar; declare _overwrite char; @@ -4295,10 +4476,14 @@ create procedure WS.WS.COPY_OR_MOVE ( DB.DBA.DAV_SET_HTTP_STATUS (403); return; } - src_id := DB.DBA.DAV_HIDE_ERROR (DAV_SEARCH_SOME_ID (vector_concat (vector(''), path), st)); - if (src_id is null) + tmp := vector_concat (vector(''), path); + st := DB.DBA.DAV_WHAT (tmp); + src_id := DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_SEARCH_ID (tmp, st)); + if (src_id is null and (st <> 'C')) { - src_id := DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_SEARCH_SOME_ID (vector_concat (vector(''), path, vector('')), st)); + tmp := vector_concat (tmp, vector('')); + st := DB.DBA.DAV_WHAT (tmp); + src_id := DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_SEARCH_ID (tmp, st)); if (src_id is not null) { path := vector_concat (path, vector('')); @@ -4967,52 +5152,79 @@ create procedure WS.WS.DAV_VSP_DEF_REMOVE ( } ; -create function DAV_PERMS_SET_CHAR (in perms varchar, in ch any, in pos integer) returns varchar +create function DAV_PERMS_SET_CHAR ( + in perms varchar, + in ch any, + in pos integer) returns varchar { declare l integer; + l := length (perms); if (l < 11) perms := perms || subseq ('000000000--', l); + if (isinteger (ch)) - perms [pos] := ch; + perms[pos] := ch; else perms[pos] := ch[0]; + return perms; } ; -create procedure DAV_PERMS_FIX (inout perms varchar, in full_perms varchar) +create procedure DAV_PERMS_FIX ( + inout perms varchar, + in full_perms varchar) { declare l integer; + l := length (perms); if (l < 11) perms := perms || subseq (full_perms, l); + if (ascii('-') = perms [9]) perms[9] := full_perms[9]; + if (ascii('-') = perms [10]) perms[10] := full_perms[10]; } ; -create procedure DAV_PERMS_INHERIT (inout perms varchar, in parent_perms varchar, in force_parent integer := 0) +create procedure DAV_PERMS_INHERIT ( + inout perms varchar, + in parent_perms varchar, + in force_parent integer := 0) { declare l integer; + l := length (perms); if (l < 11) perms := perms || subseq (parent_perms, l); + if ((ascii('-') = perms [9]) or (force_parent and (ascii('T') <> parent_perms [9]))) perms[9] := parent_perms[9]; + if ((ascii('-') = perms [10]) or (force_parent and (ascii('M') <> parent_perms [10]))) perms[10] := parent_perms[10]; } ; --- Triggers for full_path column +-- Triggers for full_path column +create trigger SYS_DAV_RES_FULL_PATH_BI before insert on WS.WS.SYS_DAV_RES order 0 referencing new as N +{ + -- dbg_obj_princ ('trigger SYS_DAV_RES_FULL_PATH_BI (', N.RES_ID, ')'); + + if (not exists (select 1 from WS.WS.SYS_DAV_COL where COL_ID = N.RES_COL)) + signal ('37000', 'The parent collection doesn''t exist!'); + +} +; + create trigger SYS_DAV_RES_FULL_PATH_I after insert on WS.WS.SYS_DAV_RES order 0 referencing new as N { -- dbg_obj_princ ('trigger SYS_DAV_RES_FULL_PATH_I (', N.RES_ID, ')'); - declare full_path, name, _pflags, _rflags, _inh varchar; - declare parent_col, col, res integer; + declare _res_full_path, _col_full_path, _parent_perms, _res_perms, _parent_inherit, _new_replicate varchar; + declare _parent_id, _res_id integer; -- if (not WS.WS.DAV_CHECK_QUOTA ()) -- { @@ -5021,101 +5233,81 @@ create trigger SYS_DAV_RES_FULL_PATH_I after insert on WS.WS.SYS_DAV_RES order 0 -- -- signal ('VSPRT', 'Storage Limit exceeded'); -- } - col := N.RES_COL; - res := N.RES_ID; - _rflags := N.RES_PERMS; - full_path := concat ('/', N.RES_NAME); - select COL_PERMS, COL_INHERIT into _pflags, _inh from WS.WS.SYS_DAV_COL where COL_ID = col; - if (_inh = 'R' or _inh = 'M') - _rflags := _pflags; - - DAV_PERMS_FIX (_pflags, '000000000TM'); - DAV_PERMS_INHERIT (_rflags, _pflags); - whenever not found goto not_found; - while (1) - { - select COL_NAME, COL_PARENT into name, parent_col from WS.WS.SYS_DAV_COL where COL_ID = col; - col := parent_col; - full_path := concat ('/', name, full_path); - } -not_found: - DAV_SPACE_QUOTA_RES_INSERT (full_path, DAV_RES_LENGTH (N.RES_CONTENT, N.RES_SIZE)); + _parent_id := N.RES_COL; + _res_id := N.RES_ID; + select COL_PERMS, COL_INHERIT, COL_FULL_PATH into _parent_perms, _parent_inherit, _col_full_path from WS.WS.SYS_DAV_COL where COL_ID = _parent_id; + _res_full_path := _col_full_path || N.RES_NAME; + _res_perms := case when (_parent_inherit = 'R' or _parent_inherit = 'M') then _parent_perms else N.RES_PERMS end; + + DB.DBA.DAV_PERMS_FIX (_parent_perms, '000000000TM'); + DB.DBA.DAV_PERMS_INHERIT (_res_perms, _parent_perms); + + DB.DBA.DAV_SPACE_QUOTA_RES_INSERT (_res_full_path, DB.DBA.DAV_RES_LENGTH (N.RES_CONTENT, N.RES_SIZE)); set triggers off; - if (_rflags <> N.RES_PERMS) + if (_res_perms <> N.RES_PERMS) { - update WS.WS.SYS_DAV_RES set RES_FULL_PATH = full_path, RES_PERMS = _rflags where RES_ID = res; - N.RES_PERMS := _rflags; + update WS.WS.SYS_DAV_RES set RES_FULL_PATH = _res_full_path, RES_PERMS = _res_perms where RES_ID = _res_id; + N.RES_PERMS := _res_perms; } else { - update WS.WS.SYS_DAV_RES set RES_FULL_PATH = full_path where RES_ID = res; + update WS.WS.SYS_DAV_RES set RES_FULL_PATH = _res_full_path where RES_ID = _res_id; } - N.RES_FULL_PATH := full_path; + N.RES_FULL_PATH := _res_full_path; -- DAV_DEBUG_CHECK_SPACE_QUOTAS (); -- REPLICATION - declare pub varchar; - declare uname, gname varchar; - - uname := ''; gname := ''; - pub := WS.WS.ISPUBL (full_path); - if (isstring (pub)) - { - -- dbg_obj_princ ('RES INS: ', pub, ' -> ' , full_path); - whenever not found goto nfu; - select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = N.RES_OWNER; -nfu:; - whenever not found goto nfg; - select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = N.RES_GROUP; -nfg:; - repl_text (pub, '"DB.DBA.DAV_RES_I" (?, ?, ?, ?, ?, ?, ?)', full_path, N.RES_CR_TIME, - uname, gname, N.RES_PERMS, N.RES_TYPE, WS.WS.BODY_ARR (N.RES_CONTENT, null)); + _new_replicate := WS.WS.ISPUBL (_res_full_path); + if (isstring (_new_replicate)) + { + -- dbg_obj_princ ('RES INS: ', pub, ' -> ' , _res_full_path); + declare _res_uname, _res_gname varchar; + + _res_uname := coalesce ((select U_NAME from WS.WS.SYS_DAV_USER where U_ID = N.RES_OWNER), ''); + _res_gname := coalesce ((select G_NAME from WS.WS.SYS_DAV_GROUP where G_ID = N.RES_GROUP), ''); + repl_text (_new_replicate, '"DB.DBA.DAV_RES_I" (?, ?, ?, ?, ?, ?, ?)', _res_full_path, N.RES_CR_TIME, _res_uname, _res_gname, N.RES_PERMS, N.RES_TYPE, WS.WS.BODY_ARR (N.RES_CONTENT, null)); } -- END REPLICATION if (N.RES_TYPE = 'text/xsl') - xslt_stale (concat ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:', N.RES_FULL_PATH)); + xslt_stale (concat ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:', _res_full_path)); -- Update parent collection modification date - update WS.WS.SYS_DAV_COL set COL_MOD_TIME = now () where COL_ID = N.RES_COL; + update WS.WS.SYS_DAV_COL set COL_MOD_TIME = now () where COL_ID = _parent_id; } ; -create trigger SYS_DAV_RES_FULL_PATH_BU before update on WS.WS.SYS_DAV_RES referencing old as O, new as N +create trigger SYS_DAV_RES_FULL_PATH_BU before update (RES_COL, RES_PERMS) on WS.WS.SYS_DAV_RES order 0 referencing old as O, new as N { -- dbg_obj_princ ('trigger SYS_DAV_RES_FULL_PATH_BU (', N.RES_ID, ')'); - declare _pflags, _rflags, _inh varchar; - declare col integer; + declare _parent_perms, _res_perms, _parent_inherit varchar; + declare _parent_id integer; - _rflags := N.RES_PERMS; - if ((O.RES_COL <> N.RES_COL) or (O.RES_PERMS <> N.RES_PERMS)) - { - col := N.RES_COL; - select COL_PERMS, COL_INHERIT into _pflags, _inh from WS.WS.SYS_DAV_COL where COL_ID = col; - if (_inh = 'M' or _inh = 'R') - _rflags := _pflags; + if (not exists (select 1 from WS.WS.SYS_DAV_COL where COL_ID = N.RES_COL)) + signal ('37000', 'The parent collection doesn''t exist!'); - DAV_PERMS_FIX (_pflags, '000000000TM'); - DAV_PERMS_INHERIT (_rflags, _pflags, neq (O.RES_COL, N.RES_COL)); - } - if (_rflags <> N.RES_PERMS) + _parent_id := N.RES_COL; + select COL_PERMS, COL_INHERIT into _parent_perms, _parent_inherit from WS.WS.SYS_DAV_COL where COL_ID = _parent_id; + _res_perms := case when (_parent_inherit = 'R' or _parent_inherit = 'M') then _parent_perms else N.RES_PERMS end; + + DB.DBA.DAV_PERMS_FIX (_parent_perms, '000000000TM'); + DB.DBA.DAV_PERMS_INHERIT (_res_perms, _parent_perms, neq (O.RES_COL, N.RES_COL)); + + if (_res_perms <> N.RES_PERMS) { set triggers off; - -- dbg_obj_princ ('old perms = ', O.RES_PERMS, ', new perms = ', N.RES_PERMS, ', patched perms = ', _rflags); - update WS.WS.SYS_DAV_RES set RES_PERMS = _rflags where RES_ID = N.RES_ID; - N.RES_PERMS := _rflags; + update WS.WS.SYS_DAV_RES set RES_PERMS = _res_perms where RES_ID = N.RES_ID; + N.RES_PERMS := _res_perms; } - -- dbg_obj_princ ('trigger SYS_DAV_RES_FULL_PATH_BU (', N.RES_ID, ') done'); } ; create trigger SYS_DAV_RES_FULL_PATH_U after update on WS.WS.SYS_DAV_RES referencing old as O, new as N { -- dbg_obj_princ ('trigger SYS_DAV_RES_FULL_PATH_U (', N.RES_ID, ')'); - declare full_path, name varchar; - declare parent_col, col, res integer; - declare str, cont varchar; + declare _res_full_path, _old_replicate, _new_replicate varchar; + declare _parent_id, _res_id integer; -- if (not WS.WS.DAV_CHECK_QUOTA ()) -- { @@ -5125,385 +5317,467 @@ create trigger SYS_DAV_RES_FULL_PATH_U after update on WS.WS.SYS_DAV_RES referen -- signal ('VSPRT', 'Storage Limit exceeded'); -- } - col := N.RES_COL; - res := N.RES_ID; - full_path := concat ('/', N.RES_NAME); - whenever not found goto not_found; - while (1) - { - select COL_NAME, COL_PARENT into name, parent_col from WS.WS.SYS_DAV_COL where COL_ID = col; - col := parent_col; - full_path := concat ('/', name, full_path); - } + _parent_id := N.RES_COL; + _res_id := N.RES_ID; + _res_full_path := (select COL_FULL_PATH from WS.WS.SYS_DAV_COL where COL_ID = _parent_id) || N.RES_NAME; -not_found: set triggers off; - DAV_SPACE_QUOTA_RES_UPDATE (O.RES_FULL_PATH, DAV_RES_LENGTH (O.RES_CONTENT, O.RES_SIZE), full_path, length (N.RES_CONTENT)); + DAV_SPACE_QUOTA_RES_UPDATE (O.RES_FULL_PATH, DAV_RES_LENGTH (O.RES_CONTENT, O.RES_SIZE), _res_full_path, length (N.RES_CONTENT)); -- delete all associated url entries - if (O.RES_FULL_PATH <> full_path) + if (O.RES_FULL_PATH <> _res_full_path) { update WS.WS.VFS_URL set VU_ETAG = '' where VU_RES_ID = O.RES_ID; } -- end of urls removal WS.WS.DAV_VSP_DEF_REMOVE (O.RES_FULL_PATH); - -- dbg_obj_princ ('trigger SYS_DAV_RES_FULL_PATH_U: set RES_FULL_PATH = ', full_path, ', triggers off'); - update WS.WS.SYS_DAV_RES set RES_FULL_PATH = full_path where RES_ID = res; - N.RES_FULL_PATH := full_path; + if (O.RES_FULL_PATH <> _res_full_path) + { + update WS.WS.SYS_DAV_RES set RES_FULL_PATH = _res_full_path where RES_ID = _res_id; + N.RES_FULL_PATH := _res_full_path; + } -- DAV_DEBUG_CHECK_SPACE_QUOTAS (); -- REPLICATION - declare pub, pub1 varchar; - declare uname, gname varchar; - uname := ''; - gname := ''; - pub := WS.WS.ISPUBL (O.RES_FULL_PATH); - pub1 := WS.WS.ISPUBL (full_path); - if (isstring (pub)) + _old_replicate := WS.WS.ISPUBL (O.RES_FULL_PATH); + if (isstring (_old_replicate)) { - repl_text (pub, '"DB.DBA.DAV_RES_D" (?)', O.RES_FULL_PATH); + repl_text (_old_replicate, '"DB.DBA.DAV_RES_D" (?)', O.RES_FULL_PATH); } - if (isstring (pub1)) + _new_replicate := WS.WS.ISPUBL (_res_full_path); + if (isstring (_new_replicate)) { - whenever not found goto nfu; - select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = N.RES_OWNER; -nfu:; - whenever not found goto nfg; - select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = N.RES_GROUP; -nfg:; - repl_text (pub1, '"DB.DBA.DAV_RES_I" (?, ?, ?, ?, ?, ?, ?)', full_path, N.RES_MOD_TIME, - uname, gname, N.RES_PERMS, N.RES_TYPE, WS.WS.BODY_ARR (N.RES_CONTENT, null)); + declare _res_uname, _res_gname varchar; + + _res_uname := coalesce ((select U_NAME from WS.WS.SYS_DAV_USER where U_ID = N.RES_OWNER), ''); + _res_gname := coalesce ((select G_NAME from WS.WS.SYS_DAV_GROUP where G_ID = N.RES_GROUP), ''); + repl_text (_new_replicate, '"DB.DBA.DAV_RES_I" (?, ?, ?, ?, ?, ?, ?)', _res_full_path, N.RES_MOD_TIME, _res_uname, _res_gname, N.RES_PERMS, N.RES_TYPE, WS.WS.BODY_ARR (N.RES_CONTENT, null)); } -- END REPLICATION if (N.RES_TYPE = 'text/xsl') - xslt_stale (concat ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:', N.RES_FULL_PATH)); + xslt_stale (concat ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:', _res_full_path)); -- Update parent collection modification date if ( (O.RES_COL <> N.RES_COL) or (O.RES_NAME <> N.RES_NAME) or - (DAV_RES_LENGTH (O.RES_CONTENT, O.RES_SIZE) <> DAV_RES_LENGTH (N.RES_CONTENT, N.RES_SIZE)) or + (DB.DBA.DAV_RES_LENGTH (O.RES_CONTENT, O.RES_SIZE) <> DB.DBA.DAV_RES_LENGTH (N.RES_CONTENT, N.RES_SIZE)) or (O.RES_CONTENT <> N.RES_CONTENT) ) { set triggers off; if (O.RES_COL <> N.RES_COL) - update WS.WS.SYS_DAV_COL set COL_MOD_TIME = now () where COL_ID = O.RES_COL; - - update WS.WS.SYS_DAV_COL set COL_MOD_TIME = now () where COL_ID = N.RES_COL; + { + update WS.WS.SYS_DAV_COL set COL_MOD_TIME = now () where COL_ID = O.RES_COL; + } + update WS.WS.SYS_DAV_COL set COL_MOD_TIME = now () where COL_ID = N.RES_COL; } } ; -create trigger SYS_DAV_RES_FULL_PATH_D after delete on WS.WS.SYS_DAV_RES +create trigger SYS_DAV_RES_FULL_PATH_D after delete on WS.WS.SYS_DAV_RES referencing old as O { - -- dbg_obj_princ ('trigger SYS_DAV_RES_FULL_PATH_D (', RES_ID, ')'); + -- dbg_obj_princ ('trigger SYS_DAV_RES_FULL_PATH_D (', O.RES_ID, ')'); + declare _old_replicate varchar; set triggers off; - DAV_SPACE_QUOTA_RES_DELETE (RES_FULL_PATH, DAV_RES_LENGTH (RES_CONTENT, RES_SIZE)); + DAV_SPACE_QUOTA_RES_DELETE (O.RES_FULL_PATH, DB.DBA.DAV_RES_LENGTH (O.RES_CONTENT, O.RES_SIZE)); -- DAV_DEBUG_CHECK_SPACE_QUOTAS (); - WS.WS.DAV_VSP_DEF_REMOVE (RES_FULL_PATH); - if (RES_TYPE = 'xml/persistent-view') - delete from DB.DBA.SYS_SCHEDULED_EVENT where SE_NAME = RES_FULL_PATH; + + WS.WS.DAV_VSP_DEF_REMOVE (O.RES_FULL_PATH); + if (O.RES_TYPE = 'xml/persistent-view') + delete from DB.DBA.SYS_SCHEDULED_EVENT where SE_NAME = O.RES_FULL_PATH; -- REPLICATION - declare pub varchar; - pub := WS.WS.ISPUBL (RES_FULL_PATH); - if (isstring (pub)) + _old_replicate := WS.WS.ISPUBL (O.RES_FULL_PATH); + if (isstring (_old_replicate)) { - repl_text (pub, '"DB.DBA.DAV_RES_D" (?)', RES_FULL_PATH); + repl_text (_old_replicate, '"DB.DBA.DAV_RES_D" (?)', O.RES_FULL_PATH); } -- END REPLICATION -- delete all associated url entries - update WS.WS.VFS_URL set VU_ETAG = '' where VU_RES_ID = RES_ID; - if (RES_TYPE = 'text/xsl') - xslt_stale (concat ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:', RES_FULL_PATH)); + update WS.WS.VFS_URL set VU_ETAG = '' where VU_RES_ID = O.RES_ID; + if (O.RES_TYPE = 'text/xsl') + xslt_stale (concat ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:', O.RES_FULL_PATH)); -- Properties of resource lives as it - delete from WS.WS.SYS_DAV_PROP where PROP_TYPE = 'R' and PROP_PARENT_ID = RES_ID; - delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = 'R' and LOCK_PARENT_ID = RES_ID; - delete from WS.WS.SYS_DAV_TAG where DT_RES_ID = RES_ID; + delete from WS.WS.SYS_DAV_PROP where PROP_TYPE = 'R' and PROP_PARENT_ID = O.RES_ID; + delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = 'R' and LOCK_PARENT_ID = O.RES_ID; + delete from WS.WS.SYS_DAV_TAG where DT_RES_ID = O.RES_ID; -- Update parent collection modification date set triggers off; - update WS.WS.SYS_DAV_COL set COL_MOD_TIME = now () where COL_ID = RES_COL; + update WS.WS.SYS_DAV_COL set COL_MOD_TIME = now () where COL_ID = O.RES_COL; } ; -create trigger SYS_DAV_COL_U after update on WS.WS.SYS_DAV_COL referencing old as O, new as N +create trigger SYS_DAV_COL_BI before insert on WS.WS.SYS_DAV_COL order 0 referencing new as N { - declare full_path, name, _pflags, _cflags varchar; - declare old_col_path, new_col_path varchar; - declare res, col integer; - -- dbg_obj_princ ('trigger SYS_DAV_COL_U (', N.COL_ID, ')'); - col := N.COL_PARENT; - res := N.COL_ID; - full_path := concat ('/', N.COL_NAME,'/'); - _cflags := N.COL_PERMS; - _pflags := coalesce ((select COL_PERMS from WS.WS.SYS_DAV_COL where COL_ID = col), '000000000TM'); - if ((O.COL_PARENT <> N.COL_PARENT) or (O.COL_PERMS <> N.COL_PERMS)) - { - DAV_PERMS_FIX (_pflags, '000000000TM'); - DAV_PERMS_INHERIT (_cflags, _pflags); - } - whenever not found goto not_found; - while (1) - { - select COL_NAME, COL_PARENT into name, col from WS.WS.SYS_DAV_COL where COL_ID = col; - full_path := concat ('/', name, full_path); - } -not_found: + -- dbg_obj_princ ('trigger SYS_DAV_COL_BI (', N.COL_ID, ')'); + + if (N.COL_ID = N.COL_PARENT) + signal ('37000', 'The new collection''s tree will have a loop!'); + + if (isnull (DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_SEARCH_PATH (N.COL_PARENT, 'C')))) + signal ('37000', 'The parent collection doesn''t exist!'); +} +; + +create trigger SYS_DAV_COL_I after insert on WS.WS.SYS_DAV_COL referencing new as N +{ + -- dbg_obj_princ ('trigger SYS_DAV_COL_I (', N.COL_ID, ')'); + declare _parent_perms, _col_perms, _parent_path, _col_path, _parent_inherit varchar; + declare _col_id, _parent_id integer; + declare _new_replicate varchar; + set triggers off; - if (_cflags <> N.COL_PERMS) - { - -- dbg_obj_princ ('old perms = ', O.COL_PERMS, ', new perms = ', N.COL_PERMS, ', patched perms = ', _cflags); - update WS.WS.SYS_DAV_COL set COL_PERMS = _cflags where COL_ID = res; - N.COL_PERMS := _cflags; - } - old_col_path := concat (WS.WS.COL_PATH (O.COL_PARENT), O.COL_NAME, '/'); - new_col_path := WS.WS.COL_PATH (N.COL_ID); - if (old_col_path <> new_col_path) - { - -- dbg_obj_princ ('trigger SYS_DAV_COL_U: CatFilter-related operations for move from ', old_col_path, ' to ', new_col_path); - for - select SUBCOL_ID, SUBCOL_FULL_PATH as old_subcol_path, SUBCOL_DET - from DAV_PLAIN_SUBMOUNTS - where root_id = O.COL_ID and root_path = old_col_path and recursive=1 and subcol_auth_uid = http_dav_uid() - and not (SUBCOL_DET like '%Filter') - do - { - declare new_subcol_path varchar; - new_subcol_path := new_col_path || subseq (old_subcol_path, length (old_col_path)); - for - select CF_ID from WS.WS.SYS_DAV_CATFILTER - where ( - ("LEFT" (old_subcol_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH) and - ("LEFT" (new_subcol_path, length (CF_SEARCH_PATH)) <> CF_SEARCH_PATH) ) - do - { - delete from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_CF_ID = CF_ID and CFD_DET_SUBCOL_ID = SUBCOL_ID; - } - for - select CF_ID from WS.WS.SYS_DAV_CATFILTER - where ( - ("LEFT" (old_subcol_path, length (CF_SEARCH_PATH)) <> CF_SEARCH_PATH) and - ("LEFT" (new_subcol_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH) ) - do - { - insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET) values (CF_ID, SUBCOL_ID, SUBCOL_DET); - } - } - } - if ( - (N.COL_DET is not null or O.COL_DET is not null) and - not (N.COL_DET is not null and O.COL_DET is not null and (N.COL_DET = O.COL_DET) and (N.COL_ID = O.COL_ID) and (N.COL_PARENT = O.COL_PARENT))) + + _col_id := N.COL_ID; + _parent_id := N.COL_PARENT; + if (_parent_id <> 0) + { + select COL_PERMS, COL_INHERIT, COL_FULL_PATH into _parent_perms, _parent_inherit, _parent_path from WS.WS.SYS_DAV_COL where COL_ID = _parent_id; + } + else + { + _parent_perms := '000000000TM'; + _parent_inherit := 'N'; + _parent_path := '/'; + } + _col_path := _parent_path || N.COL_NAME || '/'; + _col_perms := case when (_parent_inherit = 'R') then _parent_perms else N.COL_PERMS end; + + DB.DBA.DAV_PERMS_FIX (_col_perms, _parent_perms); + if (_col_perms <> N.COL_PERMS) + { + update WS.WS.SYS_DAV_COL set COL_PERMS = _col_perms, COL_FULL_PATH = _col_path where COL_ID = _col_id; + N.COL_PERMS := _col_perms; + N.COL_FULL_PATH := _col_path; + } + else + { + update WS.WS.SYS_DAV_COL set COL_FULL_PATH = _col_path where COL_ID = _col_id; + N.COL_FULL_PATH := _col_path; + } + + if (N.COL_DET is not null and not (N.COL_DET like '%Filter')) + { + for (select CF_ID from WS.WS.SYS_DAV_CATFILTER where "LEFT" (_col_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH) do { - -- dbg_obj_princ ('trigger SYS_DAV_COL_U: CatFilter-related operations for own record in WS.WS.SYS_DAV_CATFILTER_DETS'); - delete from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_DET_SUBCOL_ID = O.COL_ID; - if (N.COL_DET is not null and not (N.COL_DET like '%Filter')) - { - for select CF_ID from WS.WS.SYS_DAV_CATFILTER where "LEFT" (new_col_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH do - { - insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET) - values (CF_ID, N.COL_ID, N.COL_DET); - } - } + insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET) + values (CF_ID, _col_id, N.COL_DET); } + } + -- REPLICATION - declare repl varchar; - repl := null; - declare pub, pub1 varchar; - declare uname, gname varchar; + _new_replicate := WS.WS.ISPUBL (_col_path); + if (isstring (_new_replicate)) + { + -- dbg_obj_princ ('COLL INS: ', pub, ' -> ' ,col_path); + declare _col_uname, _col_gname varchar; + + _col_uname := coalesce ((select U_NAME from WS.WS.SYS_DAV_USER where U_ID = N.COL_OWNER), ''); + _col_gname := coalesce ((select G_NAME from WS.WS.SYS_DAV_GROUP where G_ID = N.COL_GROUP), ''); + repl_text (_new_replicate, '"DB.DBA.DAV_COL_I" (?, ?, ?, ?, ?, ?)', N.COL_NAME, _col_path, N.COL_CR_TIME, _col_uname, _col_gname, N.COL_PERMS); + } +-- END REPLICATION +} +; + +create trigger SYS_DAV_COL_BU before update (COL_PARENT) on WS.WS.SYS_DAV_COL order 0 referencing old as O, new as N +{ + -- dbg_obj_princ ('trigger SYS_DAV_COL_BU (', N.COL_ID, ')'); + declare _id, _col_id, _parent_id integer; + + if (isnull (DB.DBA.DAV_HIDE_ERROR (DB.DBA.DAV_SEARCH_PATH (N.COL_PARENT, 'C')))) + signal ('37000', 'The parent collection doesn''t exist!'); + + _id := N.COL_ID; + _col_id := N.COL_PARENT; + if (_id = _col_id) + goto _error; + + while (_col_id > 0) + { + _parent_id := (select COL_PARENT from WS.WS.SYS_DAV_COL where COL_ID = _col_id); + if (isnull (_parent_id)) + return; + + if (_id = _parent_id) + goto _error; + + _col_id := _parent_id; + } + return; + +_error:; + signal ('37000', 'The new collection''s tree will have a loop!'); +} +; + +create trigger SYS_DAV_COL_U after update on WS.WS.SYS_DAV_COL referencing old as O, new as N +{ + -- dbg_obj_princ ('trigger SYS_DAV_COL_U (', N.COL_ID, ')'); + declare _parent_perms, _col_perms varchar; + declare _parent_path, _old_col_path, _new_col_path varchar; + declare _col_id integer; + declare _replicate, _old_replicate, _new_replicate varchar; + declare _col_uname, _col_gname varchar; + + _col_id := N.COL_ID; + _col_perms := N.COL_PERMS; + _parent_perms := coalesce ((select COL_PERMS from WS.WS.SYS_DAV_COL where COL_ID = N.COL_PARENT), '000000000TM'); + if ((O.COL_PARENT <> N.COL_PARENT) or (O.COL_PERMS <> N.COL_PERMS)) + { + DB.DBA.DAV_PERMS_FIX (_parent_perms, '000000000TM'); + DB.DBA.DAV_PERMS_INHERIT (_col_perms, _parent_perms); + } - uname := ''; gname := ''; - pub := WS.WS.ISPUBL (old_col_path); - pub1 := WS.WS.ISPUBL (new_col_path); - if (isstring (pub1)) + set triggers off; + if (_col_perms <> N.COL_PERMS) + { + update WS.WS.SYS_DAV_COL set COL_PERMS = _col_perms where COL_ID = _col_id; + N.COL_PERMS := _col_perms; + } + + if ((O.COL_PARENT = N.COL_PARENT) and (O.COL_NAME = N.COL_NAME)) + { + _old_col_path := O.COL_FULL_PATH; + _new_col_path := N.COL_FULL_PATH; + } + else + { + -- update full path + _parent_path := coalesce ((select COL_FULL_PATH from WS.WS.SYS_DAV_COL where COL_ID = O.COL_PARENT), '/'); + _old_col_path := _parent_path || O.COL_NAME || '/'; + if (O.COL_PARENT = N.COL_PARENT) { - whenever not found goto nfu; - select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = N.COL_OWNER; -nfu:; - whenever not found goto nfg; - select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = N.COL_GROUP; -nfg:; + _new_col_path := _parent_path || N.COL_NAME || '/'; } - if ((not isstring (pub) and isstring (pub1)) or (isstring (pub) and isstring (pub1) and pub <> pub1)) + else { - -- dbg_obj_princ ('COL INS: ', pub1, ' -> ' , new_col_path); - repl_text (pub1, '"DB.DBA.DAV_COL_I" (?, ?, ?, ?, ?, ?)', - N.COL_NAME, new_col_path, N.COL_CR_TIME, uname, gname, - N.COL_PERMS ); - repl := pub1; + _new_col_path := coalesce ((select COL_FULL_PATH from WS.WS.SYS_DAV_COL where COL_ID = N.COL_PARENT), '/') || N.COL_NAME || '/'; } - if (isstring (pub) and isstring (pub1) and pub = pub1) + update WS.WS.SYS_DAV_COL set COL_FULL_PATH = _new_col_path where COL_ID = _col_id; + N.COL_FULL_PATH := _new_col_path; + + for (select SUBCOL_ID, SUBCOL_FULL_PATH as old_subcol_path, SUBCOL_DET + from DB.DBA.DAV_PLAIN_SUBMOUNTS + where root_id = O.COL_ID + and root_path = _old_col_path + and recursive = 1 + and subcol_auth_uid = http_dav_uid () + and not (SUBCOL_DET like '%Filter')) do { - -- dbg_obj_princ ('COL UPD: ', old_col_path, ' -> ' , new_col_path); - repl_text (pub1, '"DB.DBA.DAV_COL_U" (?, ?, ?, ?, ?, ?)', - old_col_path, new_col_path, N.COL_CR_TIME, uname, gname, - N.COL_PERMS ); + declare new_subcol_path varchar; + + new_subcol_path := _new_col_path || subseq (old_subcol_path, length (_old_col_path)); + for (select CF_ID + from WS.WS.SYS_DAV_CATFILTER + where ("LEFT" (old_subcol_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH) + and ("LEFT" (new_subcol_path, length (CF_SEARCH_PATH)) <> CF_SEARCH_PATH)) do + { + delete + from WS.WS.SYS_DAV_CATFILTER_DETS + where CFD_CF_ID = CF_ID + and CFD_DET_SUBCOL_ID = SUBCOL_ID; + } + for (select CF_ID + from WS.WS.SYS_DAV_CATFILTER + where ("LEFT" (old_subcol_path, length (CF_SEARCH_PATH)) <> CF_SEARCH_PATH) + and ("LEFT" (new_subcol_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH)) do + { + insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET) + values (CF_ID, SUBCOL_ID, SUBCOL_DET); + } } - if ((not isstring (pub1) and isstring (pub)) or (isstring (pub) and isstring (pub1) and pub <> pub1)) + } + + if ( + (N.COL_DET is not null or O.COL_DET is not null) and + not (N.COL_DET is not null and O.COL_DET is not null and (N.COL_DET = O.COL_DET) and (N.COL_ID = O.COL_ID) and (N.COL_PARENT = O.COL_PARENT)) + ) + { + -- dbg_obj_princ ('trigger SYS_DAV_COL_U: CatFilter-related operations for own record in WS.WS.SYS_DAV_CATFILTER_DETS'); + delete from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_DET_SUBCOL_ID = O.COL_ID; + if (N.COL_DET is not null and not (N.COL_DET like '%Filter')) { - -- dbg_obj_princ ('COL DEL: ', pub, ' -> ' , old_col_path); - repl_text (pub, '"DB.DBA.DAV_COL_D" (?, 1)', old_col_path); + for (select CF_ID from WS.WS.SYS_DAV_CATFILTER where "LEFT" (_new_col_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH) do + { + insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET) + values (CF_ID, N.COL_ID, N.COL_DET); + } } + } + + _replicate := null; + +-- REPLICATION + _old_replicate := WS.WS.ISPUBL (_old_col_path); + _new_replicate := WS.WS.ISPUBL (_new_col_path); + if (isstring (_new_replicate)) + { + _col_uname := coalesce ((select U_NAME from WS.WS.SYS_DAV_USER where U_ID = N.COL_OWNER), ''); + _col_gname := coalesce ((select G_NAME from WS.WS.SYS_DAV_GROUP where G_ID = N.COL_GROUP), ''); + } + else + { + _col_uname := ''; + _col_gname := ''; + } + if ((not isstring (_old_replicate) and isstring (_new_replicate)) or (isstring (_old_replicate) and isstring (_new_replicate) and _old_replicate <> _new_replicate)) + { + -- dbg_obj_princ ('COL INS: ', _new_replicate, ' -> ' , new_col_path); + repl_text (_new_replicate, '"DB.DBA.DAV_COL_I" (?, ?, ?, ?, ?, ?)', N.COL_NAME, _new_col_path, N.COL_CR_TIME, _col_uname, _col_gname, N.COL_PERMS); + _replicate := _new_replicate; + } + if (isstring (_old_replicate) and isstring (_new_replicate) and _old_replicate = _new_replicate) + { + -- dbg_obj_princ ('COL UPD: ', _old_col_path, ' -> ' , new_col_path); + repl_text (_new_replicate, '"DB.DBA.DAV_COL_U" (?, ?, ?, ?, ?, ?)', _old_col_path, _new_col_path, N.COL_CR_TIME, _col_uname, _col_gname, N.COL_PERMS); + } + if ((isstring (_old_replicate) and not isstring (_new_replicate)) or (isstring (_old_replicate) and isstring (_new_replicate) and _old_replicate <> _new_replicate)) + { + -- dbg_obj_princ ('COL DEL: ', _old_replicate, ' -> ' , _old_col_path); + repl_text (_old_replicate, '"DB.DBA.DAV_COL_D" (?, 1)', _old_col_path); + } -- END REPLICATION - WS.WS.UPDCHILD (res, full_path, _pflags, repl); + + WS.WS.UPDCHILD (_col_id, _new_col_path, _parent_perms, _replicate); set triggers on; - if (ascii('R') = _pflags[9]) - update WS.WS.SYS_DAV_RES set RES_PERMS = DAV_PERMS_SET_CHAR (RES_PERMS, 'T', 9) - where (RES_FULL_PATH between full_path and DAV_COL_PATH_BOUNDARY (full_path)) - and RES_PERMS[9] = ascii ('N'); + if (ascii('R') = _parent_perms[9]) + update WS.WS.SYS_DAV_RES + set RES_PERMS = DB.DBA.DAV_PERMS_SET_CHAR (RES_PERMS, 'T', 9) + where (RES_FULL_PATH between _new_col_path and DAV_COL_PATH_BOUNDARY (_new_col_path)) + and RES_PERMS[9] = ascii ('N'); else - update WS.WS.SYS_DAV_RES set RES_PERMS = DAV_PERMS_SET_CHAR (RES_PERMS, _pflags[9], 9) - where RES_COL = res and (case (lt (length (RES_PERMS), 10)) when 1 then 0 else RES_PERMS[9] end) <> _pflags[9]; - if (ascii('R') = _pflags[10]) - update WS.WS.SYS_DAV_RES set RES_PERMS = DAV_PERMS_SET_CHAR (RES_PERMS, 'M', 10) - where (RES_FULL_PATH between full_path and DAV_COL_PATH_BOUNDARY (full_path)) - and RES_PERMS[10] = ascii ('N'); + update WS.WS.SYS_DAV_RES + set RES_PERMS = DB.DBA.DAV_PERMS_SET_CHAR (RES_PERMS, _parent_perms[9], 9) + where RES_COL = _col_id + and (case (lt (length (RES_PERMS), 10)) when 1 then 0 else RES_PERMS[9] end) <> _parent_perms[9]; + + if (ascii('R') = _parent_perms[10]) + update WS.WS.SYS_DAV_RES + set RES_PERMS = DB.DBA.DAV_PERMS_SET_CHAR (RES_PERMS, 'M', 10) + where (RES_FULL_PATH between _new_col_path and DAV_COL_PATH_BOUNDARY (_new_col_path)) + and RES_PERMS[10] = ascii ('N'); else - update WS.WS.SYS_DAV_RES set RES_PERMS = DAV_PERMS_SET_CHAR (RES_PERMS, _pflags[10], 10) - where RES_COL = res and (case (lt (length (RES_PERMS), 11)) when 1 then 0 else RES_PERMS[10] end) <> _pflags[10]; - -- dbg_obj_princ ('trigger SYS_DAV_COL_U (', N.COL_ID, ') done'); + update WS.WS.SYS_DAV_RES + set RES_PERMS = DB.DBA.DAV_PERMS_SET_CHAR (RES_PERMS, _parent_perms[10], 10) + where RES_COL = _col_id + and (case (lt (length (RES_PERMS), 11)) when 1 then 0 else RES_PERMS[10] end) <> _parent_perms[10]; } ; -create procedure WS.WS.UPDCHILD (in col integer, in root_path varchar, in _pflags varchar, in repl varchar) +create trigger SYS_DAV_COL_D before delete on WS.WS.SYS_DAV_COL order 100 referencing old as O { - declare name, new_path, str varchar; - declare id integer; - declare c_cur cursor for select COL_ID, COL_NAME, COL_MOD_TIME, COL_PERMS, COL_OWNER, COL_GROUP - from WS.WS.SYS_DAV_COL where COL_PARENT = col; - - for select RES_ID, RES_NAME, RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_COL = col do - { - -- WebRobot URLs update - update WS.WS.VFS_URL set VU_ETAG = '' where VU_RES_ID = RES_ID; - -- drop VSPs - if (RES_NAME like '%.vsp') - WS.WS.DAV_VSP_DEF_REMOVE (RES_FULL_PATH); - } - -- dbg_obj_princ ('WS.WS.UPDCHILD (', col, root_path, _pflags, repl, ') updates RES_FULL_PATH'); - update WS.WS.SYS_DAV_RES set RES_FULL_PATH = concat (root_path, RES_NAME) where RES_COL = col and ((RES_FULL_PATH <> concat (root_path, RES_NAME)) or RES_FULL_PATH is null); - if (ascii ('R') = _pflags[9]) - update WS.WS.SYS_DAV_COL set COL_PERMS = DAV_PERMS_SET_CHAR (COL_PERMS, 'R', 9) - where COL_PARENT = col and ascii ('R') <> COL_PERMS[9]; - if (ascii ('R') = _pflags[10]) - update WS.WS.SYS_DAV_COL set COL_PERMS = DAV_PERMS_SET_CHAR (COL_PERMS, 'R', 10) - where COL_PARENT = col and ascii ('R') <> COL_PERMS[10]; + -- dbg_obj_princ ('trigger SYS_DAV_COL_D (', O.COL_ID, ')'); + declare _old_replicate, _col_path varchar; + + if (exists (select top 1 COL_ID from WS.WS.SYS_DAV_COL where COL_PARENT = O.COL_ID) or exists (select top 1 RES_ID from WS.WS.SYS_DAV_RES where RES_COL = O.COL_ID)) + signal ('37000', 'The collection has subcollections and/or resources!'); + + _col_path := O.COL_FULL_PATH; + delete from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_DET_SUBCOL_ID = O.COL_ID; + +-- REPLICATION + _old_replicate := WS.WS.ISPUBL (_col_path); + if (isstring (_old_replicate)) + { + -- dbg_obj_princ ('COLL DEL: ', pub, ' -> ' , _col_path); + repl_text (_old_replicate, '"DB.DBA.DAV_COL_D" (?, 0)', _col_path); + } +-- END REPLICATION + + -- Properties of collection lives as it + delete from WS.WS.SYS_DAV_PROP where PROP_TYPE = 'C' and PROP_PARENT_ID = O.COL_ID; + delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = 'C' and LOCK_PARENT_ID = O.COL_ID; +} +; + +create procedure WS.WS.UPDCHILD ( + in _col_id integer, + in _col_path varchar, + in _col_perms varchar, + in _replicate varchar) +{ + -- dbg_obj_princ ('WS.WS.UPDCHILD (', _col_id, _col_path, _col_perms, _replicate, '); + declare _id, _owner, _group integer; + declare _mod_time datetime; + declare _perms, _uname, _gname, _content, _type, _name, _new_path varchar; + declare c_cur cursor for select COL_ID, COL_NAME, COL_PERMS, COL_OWNER, COL_GROUP, COL_MOD_TIME + from WS.WS.SYS_DAV_COL + where COL_PARENT = _col_id; + + for (select RES_ID, RES_NAME, RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_COL = _col_id) do + { + -- WebRobot URLs update + update WS.WS.VFS_URL set VU_ETAG = '' where VU_RES_ID = RES_ID; + -- drop VSPs + if (RES_NAME like '%.vsp') + WS.WS.DAV_VSP_DEF_REMOVE (RES_FULL_PATH); + } + + -- Resources + update WS.WS.SYS_DAV_RES set RES_FULL_PATH = _col_path || RES_NAME where RES_COL = _col_id and ((RES_FULL_PATH <> _col_path || RES_NAME) or RES_FULL_PATH is null); + -- Collections + update WS.WS.SYS_DAV_COL set COL_FULL_PATH = _col_path || COL_NAME || '/' where COL_PARENT = _col_id and ((COL_FULL_PATH <> _col_path || COL_NAME || '/') or COL_FULL_PATH is null); + + if (ascii ('R') = _col_perms[9]) + update WS.WS.SYS_DAV_COL set COL_PERMS = DAV_PERMS_SET_CHAR (COL_PERMS, 'R', 9) where COL_PARENT = _col_id and ascii ('R') <> COL_PERMS[9]; + + if (ascii ('R') = _col_perms[10]) + update WS.WS.SYS_DAV_COL set COL_PERMS = DAV_PERMS_SET_CHAR (COL_PERMS, 'R', 10) where COL_PARENT = _col_id and ascii ('R') <> COL_PERMS[10]; -- REPLICATION - declare _grp, _uid integer; - declare cperms varchar; - declare ctime datetime; - declare uname, gname varchar; - declare rn, rt, rc, rp varchar; - declare ro, rg integer; - declare rmt datetime; - declare chr cursor for select RES_NAME, RES_TYPE, RES_CONTENT, RES_PERMS, - RES_OWNER, RES_GROUP, RES_MOD_TIME from WS.WS.SYS_DAV_RES - where RES_COL = col; - if (repl is not null) + if (_replicate is not null) + { + declare r_cur cursor for select RES_TYPE, RES_CONTENT, RES_NAME, RES_PERMS, RES_OWNER, RES_GROUP, RES_MOD_TIME + from WS.WS.SYS_DAV_RES + where RES_COL = _col_id; + whenever not found goto r_error; + + open r_cur; + while (1) { - whenever not found goto er; - open chr; - while (1) - { - fetch chr into rn, rt, rc, rp, ro, rg, rmt; - whenever not found goto nfu; - select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = ro; -nfu:; - whenever not found goto nfg; - select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = rg; -nfg:; - repl_text (repl, '"DB.DBA.DAV_RES_I" (?, ?, ?, ?, ?, ?, ?)', concat (root_path, rn), - rmt, uname, gname, rp, rt, WS.WS.BODY_ARR (rc, null)); - } -er: - close chr; + fetch r_cur into _type, _content, _name, _perms, _owner, _group, _mod_time; + + _uname := coalesce ((select U_NAME from WS.WS.SYS_DAV_USER where U_ID = _owner), ''); + _gname := coalesce ((select G_NAME from WS.WS.SYS_DAV_GROUP where G_ID = _group), ''); + repl_text (_replicate, '"DB.DBA.DAV_RES_I" (?, ?, ?, ?, ?, ?, ?)', _col_path || _name, _mod_time, _uname, _gname, _perms, _type, WS.WS.BODY_ARR (_content, null)); } + r_error:; + close r_cur; + } -- END REPLICATION - whenever not found goto not_col; + + whenever not found goto c_error; + open c_cur; while (1) - { - fetch c_cur into id, name, ctime, cperms, _uid, _grp; - new_path := concat (root_path, name, '/'); --- REPLICATION - if (repl is not null) - { - whenever not found goto nfu1; - select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = _uid; -nfu1:; - whenever not found goto nfg1; - select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = _grp; -nfg1:; - repl_text (repl, '"DB.DBA.DAV_COL_I" (?, ?, ?, ?, ?, ?)', - name, new_path, ctime, uname, gname, - cperms ); - } --- END REPLICATION - WS.WS.UPDCHILD (id, new_path, _pflags, repl); - } -not_col: - close c_cur; -} -; + { + fetch c_cur into _id, _name, _perms, _owner, _group, _mod_time; -create trigger SYS_DAV_COL_I after insert on WS.WS.SYS_DAV_COL referencing new as N -{ - declare _pflags, _cflags, col_path, _inh varchar; - declare _col, _p_col integer; - -- dbg_obj_princ ('trigger SYS_DAV_COL_I (', N.COL_ID, ')'); - _col := N.COL_ID; - _p_col := N.COL_PARENT; - col_path := WS.WS.COL_PATH (_p_col) || N.COL_NAME || '/'; - set triggers off; - _cflags := N.COL_PERMS; - _pflags := '000000000NN'; - _inh := 'N'; - for select COL_PERMS, COL_INHERIT from WS.WS.SYS_DAV_COL where COL_ID = _p_col do - { - _pflags := COL_PERMS; - _inh := COL_INHERIT; - } - if (_inh = 'R') - _cflags := _pflags; - DAV_PERMS_FIX (_cflags, _pflags); - if (_cflags <> N.COL_PERMS) - update WS.WS.SYS_DAV_COL set COL_PERMS = _cflags where COL_ID = _col; - if (N.COL_DET is not null and not (N.COL_DET like '%Filter')) - { - for select CF_ID from WS.WS.SYS_DAV_CATFILTER where "LEFT" (col_path, length (CF_SEARCH_PATH)) = CF_SEARCH_PATH do - { - insert replacing WS.WS.SYS_DAV_CATFILTER_DETS (CFD_CF_ID, CFD_DET_SUBCOL_ID, CFD_DET) - values (CF_ID, _col, N.COL_DET); - } - } + _new_path := _col_path || _name || '/'; -- REPLICATION - declare pub varchar; - declare uname, gname varchar; - uname := ''; gname := ''; - pub := WS.WS.ISPUBL (col_path); - if (isstring (pub)) - { - -- dbg_obj_princ ('COLL INS: ', pub, ' -> ' ,col_path); - whenever not found goto nfu; - select U_NAME into uname from WS.WS.SYS_DAV_USER where U_ID = N.COL_OWNER; -nfu:; - whenever not found goto nfg; - select G_NAME into gname from WS.WS.SYS_DAV_GROUP where G_ID = N.COL_GROUP; -nfg:; - repl_text (pub, '"DB.DBA.DAV_COL_I" (?, ?, ?, ?, ?, ?)', - N.COL_NAME, col_path, N.COL_CR_TIME, uname, gname, N.COL_PERMS ); + if (_replicate is not null) + { + _uname := coalesce ((select U_NAME from WS.WS.SYS_DAV_USER where U_ID = _owner), ''); + _gname := coalesce ((select G_NAME from WS.WS.SYS_DAV_GROUP where G_ID = _group), ''); + + repl_text (_replicate, '"DB.DBA.DAV_COL_I" (?, ?, ?, ?, ?, ?)', _name, _new_path, _mod_time, _uname, _gname, _perms); } -- END REPLICATION - -- dbg_obj_princ ('trigger SYS_DAV_COL_I (', N.COL_ID, ') done'); + WS.WS.UPDCHILD (_id, _new_path, _perms, _replicate); + } + +c_error:; + close c_cur; } ; @@ -5627,27 +5901,6 @@ create procedure WS.WS.EXPAND_INCLUDES ( } ; -create trigger SYS_DAV_COL_D before delete on WS.WS.SYS_DAV_COL order 100 -{ - declare pub, col_path varchar; - col_path := WS.WS.COL_PATH (COL_ID); - -- dbg_obj_princ ('trigger SYS_DAV_COL_D (', COL_ID, ')'); - delete from WS.WS.SYS_DAV_CATFILTER_DETS where CFD_DET_SUBCOL_ID = COL_ID; --- REPLICATION - pub := WS.WS.ISPUBL (col_path); - if (isstring (pub)) - { - -- dbg_obj_princ ('COLL DEL: ', pub, ' -> ' ,col_path); - repl_text (pub, '"DB.DBA.DAV_COL_D" (?, 0)', col_path); - } - -- Properties of collection lives as it - delete from WS.WS.SYS_DAV_PROP where PROP_TYPE = 'C' and PROP_PARENT_ID = COL_ID; - delete from WS.WS.SYS_DAV_LOCK where LOCK_PARENT_TYPE = 'C' and LOCK_PARENT_ID = COL_ID; - -- dbg_obj_princ ('trigger SYS_DAV_COL_D (', COL_ID, ') done'); -} -; --- END REPLICATION - -- IvAn/XmlView/000810 procedure WS.WS.XML_VIEW_HEADER added create procedure WS.WS.XML_VIEW_HEADER ( @@ -5827,7 +6080,7 @@ create procedure WS.WS.BODY_ARR (inout __ses any, in __pcs integer) _res := null; _from := 1; - if (__tag (__ses) = 126 or __tag (__ses) = 133) + if (__tag (__ses) in (__tag of long varchar handle, __tag of long nvarchar handle)) { _ses := string_output (); http (__ses, _ses); @@ -5842,7 +6095,7 @@ create procedure WS.WS.BODY_ARR (inout __ses any, in __pcs integer) _from := _from + _pcs; } } - else if (isstring (__ses) or __tag (__ses) = 185) + else if (isstring (__ses) or __tag (__ses) = __tag of stream) { _len := length (__ses); while (_from < _len) @@ -5957,7 +6210,7 @@ create procedure WS.WS.HTTP_RESP ( declare line, code varchar; descr := 'Bad Gateway'; - if (hdr is null or __tag (hdr) <> 193) + if (hdr is null or __tag (hdr) <> __tag of vector) return (502); if (length (hdr) < 1) @@ -6191,7 +6444,10 @@ create function WS.WS.DAV_DIR_LIST ( declare _user_id, _group_id integer; declare action, feedAction any; - if ((length (params) = 4) and (__tag (params[1]) = 185) and (params[2] = 'attr-Content')) + if (http_request_get ('REQUEST_METHOD') = 'OPTIONS') + return 0; + + if ((length (params) = 4) and (__tag (params[1]) = __tag of stream) and (params[2] = 'attr-Content')) params := __http_stream_params (); action := get_keyword ('a', params, ''); @@ -6224,8 +6480,8 @@ create function WS.WS.DAV_DIR_LIST ( http (''); http (''); http (sprintf ('WebDAV Directory %s"', cast (full_path as varchar))); - http (sprintf ('%s', soap_print_box (_dir_entry[8], '', 1))); - http (sprintf ('%s', soap_print_box (_dir_entry[3], '', 1))); + http (sprintf ('%s', DB.DBA.DAV_RESPONSE_FORMAT_DATE (_dir_entry[8], '', 1))); + http (sprintf ('%s', DB.DBA.DAV_RESPONSE_FORMAT_DATE (_dir_entry[3], '', 1))); http (sprintf ('%s', coalesce ((select U_NAME from DB.DBA.SYS_USERS where U_ID = _dir_entry[7]), 'nobody'))); http (''); http (''); @@ -6287,11 +6543,11 @@ create function WS.WS.DAV_DIR_LIST ( _group_id := coalesce (_dir_item[6], -1); _group_name := coalesce ((select U_NAME from DB.DBA.SYS_USERS where U_ID = _group_id), ''); } - http (sprintf ('\n', _xml ); } @@ -6332,11 +6588,11 @@ create function WS.WS.DAV_DIR_LIST ( _group_id := coalesce (_dir_item[6], -1); _group_name := coalesce ((select U_NAME from DB.DBA.SYS_USERS where U_ID = _group_id), ''); } - http (sprintf ('\n', _xml ); } @@ -6455,8 +6711,8 @@ create procedure WS.WS.DAV_ATOM_ENTRY ( http (sprintf (' %V', entry[0])); http (sprintf (' ', case when what = 'R' then 'resource' else 'collection' end)); http (sprintf (' %V', (select U_NAME from DB.DBA.SYS_USERS where U_ID = entry[7]))); - http (sprintf (' %V', soap_print_box (entry[3], '', 0))); - http (sprintf (' %V', soap_print_box (entry[8], '', 0))); + http (sprintf (' %V', DB.DBA.DAV_RESPONSE_FORMAT_DATE (entry[3], '', 0))); + http (sprintf (' %V', DB.DBA.DAV_RESPONSE_FORMAT_DATE (entry[8], '', 0))); http ( ''); } ; @@ -6479,8 +6735,8 @@ create procedure WS.WS.DAV_ATOM_ENTRY_LIST ( http (sprintf (' %V', entry[0])); http (sprintf (' ', case when what = 'R' then 'resource' else 'collection' end)); http (sprintf (' %V', (select U_NAME from DB.DBA.SYS_USERS where U_ID = entry[7]))); - http (sprintf (' %V', soap_print_box (entry[3], '', 0))); - http (sprintf (' %V', soap_print_box (entry[8], '', 0))); + http (sprintf (' %V', DB.DBA.DAV_RESPONSE_FORMAT_DATE (entry[3], '', 0))); + http (sprintf (' %V', DB.DBA.DAV_RESPONSE_FORMAT_DATE (entry[8], '', 0))); dir := DB.DBA.DAV_DIR_LIST_INT (DB.DBA.DAV_SEARCH_PATH (id, what), 0, '%', null, null, http_dav_uid ()); for (N := 0; N < length (dir); N := N + 1) @@ -6618,6 +6874,7 @@ create procedure DAV_SET_HTTP_REQUEST_STATUS ( in rc integer) { declare st any; + st := DAV_SET_HTTP_REQUEST_STATUS_DESCRIPTION (rc); if (length (st)) http_request_status (st); @@ -6718,11 +6975,13 @@ create procedure DB.DBA.DAV_SET_HTTP_STATUS ( in message varchar := null, in rewrite integer := 0) { + -- dbg_obj_print ('DB.DBA.DAV_SET_HTTP_STATUS (', status, ')'); if (rewrite) http_rewrite (); if (isinteger (status)) { + http_status_set (status); if (status = 200) { http_request_status ('HTTP/1.1 200 OK'); @@ -6799,6 +7058,10 @@ create procedure DB.DBA.DAV_SET_HTTP_STATUS ( { http_request_status ('HTTP/1.1 423 Locked'); } + else if (status = 428) + { + http_request_status ('HTTP/1.1 428 Precondition Required'); + } else if (status = 500) { http_request_status ('HTTP/1.1 500 Internal Server Error'); @@ -6813,7 +7076,37 @@ create procedure DB.DBA.DAV_SET_HTTP_STATUS ( http_request_status (status); } - if (not isnull (title) and not isnull (message_head) and not isnull (message)) + DB.DBA.DAV_SET_HTTP_BODY (title, message_head, message); +} +; + +create procedure DB.DBA.DAV_SET_HTTP_LDP_STATUS ( + in col_id any, + in rc integer) +{ + declare message varchar; + + if (DB.DBA.LDP_ENABLED (col_id)) + { + http_header (http_header_get () || 'Link: ; rel="http://www.w3.org/ns/ldp#constrainedBy"\r\n'); + message := ''; + if (rc = 409) + message := 'LDP servers SHOULD NOT allow HTTP PUT to update an LDPC''s containment triples; if the server receives such a request, it SHOULD respond with a 409 (Conflict) status code.'; + + else if ((rc = 412) or (rc = 428)) + message := '4.2.4.5 LDP clients should use the HTTP If-Match header and HTTP ETags to ensure it is not modifying a resource that has changed since the client last retrieved its representation. LDP servers should require the HTTP If-Match header and HTTP ETags to detect collisions. LDP servers must respond with status code 412 (Condition Failed) if ETags fail to match when there are no other errors with the request [RFC7232]. LDP servers that require conditional requests must respond with status code 428 (Precondition Required) when the absence of a precondition is the only reason for rejecting the request [RFC6585].'; + + DB.DBA.DAV_SET_HTTP_BODY ('', '', message); + } +} +; + +create procedure DB.DBA.DAV_SET_HTTP_BODY ( + in title any := null, + in message_head varchar := null, + in message varchar := null) +{ + if ((not isnull (title) or not isnull (message_head)) and not isnull (message)) { http (sprintf ( '\n' || @@ -6826,14 +7119,20 @@ create procedure DB.DBA.DAV_SET_HTTP_STATUS ( ' %s\n' || ' \n' || '', - coalesce (title, ''), - coalesce (message_head, ''), + coalesce (title, coalesce (message_head, '')), + coalesce (message_head, coalesce (title, '')), coalesce (message, '') )); } } ; +create procedure DB.DBA.LDP_RDF_TYPES () +{ + return vector ('text/turtle', 'application/ld+json'); +} +; + create procedure DB.DBA.LDP_ENABLED ( in _col_id any) { @@ -6874,17 +7173,18 @@ create procedure DB.DBA.LDP_CREATE_COL ( graph := WS.WS.DAV_IRI (path); set_user_id ('dba'); - TTLP (sprintf ('<%s> , .', graph), graph, graph); + TTLP (sprintf ('<%s> , , , .', graph), graph, graph); DB.DBA.LDP_CREATE (path, id_parent); } ; create procedure DB.DBA.LDP_CREATE_RES ( in path any, + in mimeType varchar := null, in id_parent any := null) { -- dbg_obj_princ ('LDP_CREATE_RES (', path, ')'); - declare graph any; + declare graph, rdfSource varchar; -- macOS metadata files if (DB.DBA.DAV_MAC_METAFILE (path)) @@ -6898,17 +7198,20 @@ create procedure DB.DBA.LDP_CREATE_RES ( graph := WS.WS.DAV_IRI (path); set_user_id ('dba'); - TTLP (sprintf ('<%s> , .', graph), graph, graph); - DB.DBA.LDP_CREATE (path, id_parent); + rdfSource := case when position (mimeType, DB.DBA.LDP_RDF_TYPES ()) then ', ' else '' end; + TTLP (sprintf ('<%s> , %s.', graph, rdfSource), graph, graph); + DB.DBA.LDP_CREATE (path, id_parent, mimeType); } ; create procedure DB.DBA.LDP_CREATE ( in path any, - in id_parent any := null) + in id_parent any := null, + in mimeType varchar := null) { -- dbg_obj_princ ('LDP_CREATE (', path, ')'); - declare path_parent, graph, graph_parent varchar; + declare tmp, path_parent, graph, graph_parent varchar; + declare graphIdn, graphParentIdn any; -- macOS metadata files if (DB.DBA.DAV_MAC_METAFILE (path)) @@ -6923,7 +7226,23 @@ create procedure DB.DBA.LDP_CREATE ( graph_parent := WS.WS.DAV_IRI (path_parent); graph := WS.WS.DAV_IRI (path); set_user_id ('dba'); - TTLP (sprintf ('<%s> <%s> .', graph_parent, graph), graph_parent, graph_parent); + + tmp := sprintf (' <%s> <%s> .', graph_parent, graph); + if ((path <> '') and (path[length(path)-1] <> 47)) + { + -- delete old data + graphIdn := __i2idn (graph); + graphParentIdn := __i2idn (graph_parent); + delete from DB.DBA.RDF_QUAD where G = graphParentIdn and P = __i2idn ('http://www.w3.org/ns/posix/stat#mtime') and S = graphIdn; + delete from DB.DBA.RDF_QUAD where G = graphParentIdn and P = __i2idn ('http://www.w3.org/ns/posix/stat#size') and S = graphIdn; + for (select DB.DBA.DAV_RES_LENGTH (RES_CONTENT, RES_SIZE) as _size, RES_MOD_TIME as _mod_time from WS.WS.SYS_DAV_RES where RES_FULL_PATH = path) do + { + tmp := tmp || + sprintf (' <%s> %d .', graph, datediff ('second', stringdate ('1970-1-1Z'), adjust_timezone (_mod_time, 0, 1))) || + sprintf (' <%s> %d .', graph, _size); + } + } + DB.DBA.TTLP (tmp, '', graph_parent); } } ; @@ -6933,8 +7252,8 @@ create procedure DB.DBA.LDP_DELETE ( in allData integer := 0) { -- dbg_obj_princ ('LDP_DELETE (', path, ')'); - declare graph varchar; - declare graphIdn any; + declare graph, graph_parent varchar; + declare graphIdn, graphParentIdn, tmpIdn any; -- macOS metadata files if (DB.DBA.DAV_MAC_METAFILE (path)) @@ -6942,16 +7261,23 @@ create procedure DB.DBA.LDP_DELETE ( graph := WS.WS.DAV_IRI (path); graphIdn := __i2idn (graph); + graph_parent := WS.WS.DAV_IRI (DB.DBA.DAV_DET_PATH_PARENT (path, 1)); + graphParentIdn := __i2idn (graph_parent); if (allData) { SPARQL clear graph ?:graph; } else { - delete from DB.DBA.RDF_QUAD where G = graphIdn and S = graphIdn and P = __i2idn ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type') and O = __i2idn ('http://www.w3.org/ns/ldp#Resource'); - delete from DB.DBA.RDF_QUAD where G = graphIdn and S = graphIdn and P = __i2idn ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type') and O = __i2idn ('http://www.w3.org/2000/01/rdf-schema#Resource'); + tmpIdn := __i2idn ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'); + delete from DB.DBA.RDF_QUAD where G = graphIdn and S = graphIdn and P = tmpIdn and O = __i2idn ('http://www.w3.org/ns/ldp#Resource'); + delete from DB.DBA.RDF_QUAD where G = graphIdn and S = graphIdn and P = tmpIdn and O = __i2idn ('http://www.w3.org/2000/01/rdf-schema#Resource'); + delete from DB.DBA.RDF_QUAD where G = graphIdn and S = graphIdn and P = tmpIdn and O = __i2idn ('http://www.w3.org/ns/ldp#RDFSource'); + delete from DB.DBA.RDF_QUAD where G = graphIdn and S = graphIdn and P = tmpIdn and O = __i2idn ('http://www.w3.org/ns/ldp#NonRDFSource'); } - delete from DB.DBA.RDF_QUAD where P = __i2idn ('http://www.w3.org/ns/ldp#contains') and O = graphIdn; + delete from DB.DBA.RDF_QUAD where G = graphParentIdn and P = __i2idn ('http://www.w3.org/ns/ldp#contains') and O = graphIdn; + delete from DB.DBA.RDF_QUAD where G = graphParentIdn and P = __i2idn ('http://www.w3.org/ns/posix/stat#mtime') and S = graphIdn; + delete from DB.DBA.RDF_QUAD where G = graphParentIdn and P = __i2idn ('http://www.w3.org/ns/posix/stat#size') and S = graphIdn; } ; @@ -6986,8 +7312,7 @@ create procedure DB.DBA.LDP_RENAME ( else if (what = 'R') { DB.DBA.LDP_RENAME_GRAPH (oldGraph, newGraph); - if (mimeType in ('text/turtle', 'application/ld+json')) - DB.DBA.LDP_CREATE_RES (newPath); + DB.DBA.LDP_CREATE_RES (newPath, mimeType); } } else if ((oldLDP = 1) and (newLDP = 0)) @@ -7016,8 +7341,7 @@ create procedure DB.DBA.LDP_RENAME ( { DB.DBA.LDP_DELETE (oldPath); DB.DBA.LDP_RENAME_GRAPH (oldGraph, newGraph); - if (mimeType in ('text/turtle', 'application/ld+json')) - DB.DBA.LDP_CREATE_RES (newPath); + DB.DBA.LDP_CREATE_RES (newPath, mimeType); } } } @@ -7084,7 +7408,7 @@ create procedure DB.DBA.LDP_REFRESH ( uri := WS.WS.DAV_IRI (path); if (enabled) { - TTLP ('@prefix ldp: . <> a ldp:BasicContainer, ldp:Container .', uri, uri); + TTLP ('@prefix ldp: . <> a ldp:BasicContainer, ldp:Container, ldp:RDFSource .', uri, uri); } else { @@ -7092,14 +7416,16 @@ create procedure DB.DBA.LDP_REFRESH ( } for (select RES_CONTENT, RES_TYPE, RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_COL = id) do { - ruri := WS.WS.DAV_IRI (RES_FULL_PATH); - if (enabled and (RES_TYPE in ('text/turtle', 'application/ld+json'))) + if (enabled) { - TTLP (sprintf ('<%s> <%s> .', uri, ruri), uri, uri); - TTLP (sprintf ('<%s> , .', ruri), ruri, ruri); + DB.DBA.LDP_CREATE_RES (RES_FULL_PATH, RES_TYPE); + if (position (RES_TYPE, DB.DBA.LDP_RDF_TYPES ())) { - declare continue handler for sqlstate '*'; - TTLP (cast (RES_CONTENT as varchar), ruri, ruri, 255); + ruri := WS.WS.DAV_IRI (RES_FULL_PATH); + { + declare continue handler for sqlstate '*'; + TTLP (cast (RES_CONTENT as varchar), ruri, ruri, 255); + } } } else @@ -7116,6 +7442,7 @@ create procedure DB.DBA.LDP_REFRESH ( for (select COL_NAME from WS.WS.SYS_DAV_COL where COL_PARENT = id and COL_DET is null) do { + commit work; DB.DBA.LDP_REFRESH (path || COL_NAME || '/', enabled); } } @@ -7159,10 +7486,36 @@ _break:; create procedure DB.DBA.DAV_HREF_URL ( in href varchar) { - href := replace (href, ' ', '%20'); + --href := replace (href, ' ', '%20'); + + -- return charset_recode (href, 'UTF-8', '_WIDE_'); - return charset_recode (href, 'UTF-8', '_WIDE_'); + -- declare ss any; + -- + -- ss := string_output (); + -- http_dav_url (charset_recode (href, 'UTF-8', '_WIDE_'), null, ss); + -- + -- return string_output_string (ss); + declare delimiter char; + declare ss, parts any; + ss := string_output (); + parts := split_and_decode (href, 0, '\0\0/'); + delimiter := ''; + foreach (any part in parts) do + { + if (part = '') + { + http ('/', ss); + } + else + { + http (delimiter, ss); + http_url (charset_recode (part, 'UTF-8', '_WIDE_'), null, ss); + delimiter := '/'; + } + } + return string_output_string (ss); } ; @@ -7173,3 +7526,19 @@ create procedure DB.DBA.DAV_MAC_METAFILE ( return case when (DB.DBA.DAV_DET_PATH_NAME (path) like '._%') then 1 else 0 end; } ; + +create procedure DB.DBA.DAV_RESPONSE_FORMAT_DATE ( + in dt datetime, + in enclosing_tag varchar, + in date_encoding_type integer) -- 0 - ISO 8601, 1 - RFC 1123 +{ + declare tz integer; + + if (is_timezoneless (dt)) + { + tz := timezone (curdatetime_tz (), 1); + dt := dt_set_tz (dateadd ('minute', -tz, dt), tz); + } + return soap_print_box (dt, enclosing_tag, date_encoding_type); +} +; diff --git a/binsrc/dav/dav_acct.sql b/binsrc/dav/dav_acct.sql index fdaf556f72..15335e659a 100644 --- a/binsrc/dav/dav_acct.sql +++ b/binsrc/dav/dav_acct.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/dav_api.sql b/binsrc/dav/dav_api.sql index 6e372d15dc..503e99f9b5 100644 --- a/binsrc/dav/dav_api.sql +++ b/binsrc/dav/dav_api.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -29,6 +29,8 @@ -- DAV_DIR_LIST - simplest analog of dir command -- DAV_SEARCH_PATH - return full path string from id -- DAV_SEARCH_ID - return id from full path string +-- DAV_LOCK - lock item +-- DAV_UNLOCK - unlock item -- DAV_IS_LOCKED - checks item for locks -- DAV_LIST_LOCKS - list all locks of an item -- DAV_AUTHENTICATE - checks authentication @@ -48,7 +50,7 @@ create procedure DAV_VERSION () { - return '1.0'; + return '1.1'; } ; @@ -429,7 +431,8 @@ create procedure DAV_DIR_LIST ( in path varchar := '/DAV/', in recursive integer, in auth_uname varchar, - in auth_pwd varchar) returns any + in auth_pwd varchar, + in options any := null) returns any { -- dbg_obj_princ ('DAV_DIR_LIST (', path, recursive, auth_uname, auth_pwd, auth_uid, ')'); declare auth_uid integer; @@ -438,7 +441,7 @@ create procedure DAV_DIR_LIST ( if (auth_uid < 0) return -12; - return DB.DBA.DAV_DIR_LIST_INT (path, recursive, '%', auth_uname, auth_pwd, auth_uid); + return DB.DBA.DAV_DIR_LIST_INT (path, recursive, '%', auth_uname, auth_pwd, auth_uid, options); } ; @@ -526,8 +529,8 @@ create function DAV_DIR_SINGLE_INT ( from WS.WS.SYS_DAV_RES where RES_ID = did ); - -- 0 1 2 3 4 5 6 7 8 9 10 11 12 - return (select vector (WS.WS.COL_PATH (COL_ID), 'C', 0, COL_MOD_TIME, COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, 'dav/unix-directory', COL_NAME, coalesce (COL_ADD_TIME, COL_CR_TIME), COL_CREATOR) + -- 0 1 2 3 4 5 6 7 8 9 10 11 12 + return (select vector (COL_FULL_PATH, 'C', 0, COL_MOD_TIME, COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, 'dav/unix-directory', COL_NAME, coalesce (COL_ADD_TIME, COL_CR_TIME), COL_CREATOR) from WS.WS.SYS_DAV_COL where COL_ID = did ); } @@ -536,10 +539,12 @@ create function DAV_DIR_SINGLE_INT ( create function DAV_DIR_LIST_INT ( in path varchar := '/DAV/', - in rec_depth integer := 0, in name_mask varchar, + in rec_depth integer := 0, + in name_mask varchar, in auth_uname varchar := null, in auth_pwd varchar := null, - inout auth_uid integer := null) returns any + inout auth_uid integer := null, + in options any := null) returns any { -- dbg_obj_princ ('DAV_DIR_LIST_INT (', path, rec_depth, name_mask, auth_uname, auth_pwd, auth_uid, ')'); declare rc, t, id, l integer; @@ -589,8 +594,8 @@ create function DAV_DIR_LIST_INT ( } else if (rec_depth = -1) { - -- 0 1 2 3 4 5 6 7 8 9 10 11 12 - for (select vector (WS.WS.COL_PATH (COL_ID), 'C', 0, COL_MOD_TIME, COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, 'dav/unix-directory', COL_NAME, coalesce (COL_ADD_TIME, COL_CR_TIME), COL_CREATOR) as i + -- 0 1 2 3 4 5 6 7 8 9 10 11 12 + for (select vector (COL_FULL_PATH, 'C', 0, COL_MOD_TIME, COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, 'dav/unix-directory', COL_NAME, coalesce (COL_ADD_TIME, COL_CR_TIME), COL_CREATOR) as i from WS.WS.SYS_DAV_COL where COL_ID = did) do { @@ -623,19 +628,69 @@ create function DAV_DIR_LIST_INT ( } else if (det is null) { - -- 0 1 2 3 4 5 6 7 8 9 10 11 12 - for (select vector (RES_FULL_PATH, 'R', DAV_RES_LENGTH (RES_CONTENT, RES_SIZE), RES_MOD_TIME, RES_ID, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME, coalesce (RES_ADD_TIME, RES_CR_TIME), RES_CREATOR) as i - from WS.WS.SYS_DAV_RES - where RES_NAME like name_mask and RES_COL = did) do + declare _st, _msg, _meta, _rows any; + declare _sql, _order, _direction, _limit, _order_sql, _limit_sql any; + + _order := get_keyword ('order', options, ''); + _direction := get_keyword ('direction', options, ''); + _limit := get_keyword ('limit', options, ''); + if ((_order = '') and (_limit = '')) { - vectorbld_acc (res, i); + -- 0 1 2 3 4 5 6 7 8 9 10 11 12 + for (select vector (RES_FULL_PATH, 'R', DAV_RES_LENGTH (RES_CONTENT, RES_SIZE), RES_MOD_TIME, RES_ID, RES_PERMS, RES_GROUP, RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME, coalesce (RES_ADD_TIME, RES_CR_TIME), RES_CREATOR) as i + from WS.WS.SYS_DAV_RES + where RES_NAME like name_mask and RES_COL = did) do + { + vectorbld_acc (res, i); + } + -- 0 1 2 3 4 5 6 7 8 9 10 11 12 + for (select vector (COL_FULL_PATH, 'C', 0, COL_MOD_TIME, COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, 'dav/unix-directory', COL_NAME, coalesce (COL_ADD_TIME, COL_CR_TIME), COL_CREATOR) as i + from WS.WS.SYS_DAV_COL + where COL_PARENT = did) do + { + vectorbld_acc (res, i); + } } - -- 0 1 2 3 4 5 6 7 8 9 10 11 12 - for (select vector (WS.WS.COL_PATH (COL_ID), 'C', 0, COL_MOD_TIME, COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, 'dav/unix-directory', COL_NAME, coalesce (COL_ADD_TIME, COL_CR_TIME), COL_CREATOR) as i - from WS.WS.SYS_DAV_COL - where COL_PARENT = did) do + else { - vectorbld_acc (res, i); + _limit_sql := ''; + if (_limit <> '') + _limit_sql := 'top ' || _limit; + + -- Resources + _order_sql := ''; + if (_order <> '') + { + _order_sql := 'order by RES_' || _order; + if (_direction <> '') + _order_sql := _order_sql || ' ' || _direction; + } + + _sql := 'select RES_FULL_PATH, \'R\' as RES_KIND, DAV_RES_LENGTH (RES_CONTENT, RES_SIZE) as RES_LENGTH, RES_MOD_TIME, RES_ID, RES_PERMS, coalesce (b.U_NAME, \'\') as RES_GROUP, coalesce (a.U_NAME, \'\') as RES_OWNER, RES_CR_TIME, RES_TYPE, RES_NAME, coalesce (RES_ADD_TIME, RES_CR_TIME) as RES_ADD_TIME, RES_CREATOR from WS.WS.SYS_DAV_RES left join DB.DBA.SYS_USERS a on RES_OWNER = a.U_ID left join DB.DBA.SYS_USERS b on RES_GROUP = b.U_ID where RES_NAME like ? and RES_COL = ? '; + _sql := replace (_sql, '', _limit_sql); + _sql := replace (_sql, '', _order_sql); + + _st := '00000'; + exec (_sql, _st, _msg, vector (name_mask, did), 0, _meta, _rows); + if (_st = '00000') + vectorbld_concat_acc (res, _rows); + + -- Collections + _order_sql := ''; + if (_order <> '') + { + _order_sql := 'order by COL_' || _order; + if (_direction <> '') + _order_sql := _order_sql || ' ' || _direction; + } + + _sql := 'select COL_FULL_PATH, \'C\' as COL_KIND, 0 as COL_LENGTH, COL_MOD_TIME, COL_ID, COL_PERMS, coalesce (b.U_NAME, \'\') as COL_GROUP, coalesce (a.U_NAME, \'\') as COL_OWNER, COL_CR_TIME, \'dav/unix-directory\' as COL_TYPE, COL_NAME, coalesce (COL_ADD_TIME, COL_CR_TIME) as COL_ADD_TIME, COL_CREATOR from WS.WS.SYS_DAV_COL left join DB.DBA.SYS_USERS a on COL_OWNER = a.U_ID left join DB.DBA.SYS_USERS b on COL_GROUP = b.U_ID where COL_NAME like ? and COL_PARENT = ? '; + _sql := replace (_sql, '', _limit_sql); + _sql := replace (_sql, '', _order_sql); + _st := '00000'; + exec (_sql, _st, _msg, vector (name_mask, did), 0, _meta, _rows); + if (_st = '00000') + vectorbld_concat_acc (res, _rows); } } else @@ -725,10 +780,9 @@ else 1 end'; } else if (rec_depth = -1) { - for select vector (WS.WS.COL_PATH (COL_ID), 'C', 0, COL_MOD_TIME, - COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, 'dav/unix-directory', COL_NAME) as i - from WS.WS.SYS_DAV_COL - where + for select vector (COL_FULL_PATH, 'C', 0, COL_MOD_TIME, COL_ID, COL_PERMS, COL_GROUP, COL_OWNER, COL_CR_TIME, 'dav/unix-directory', COL_NAME) as i + from WS.WS.SYS_DAV_COL + where -- (COL_OWNER = uid or uid = http_dav_uid() or DAV_CHECK_PERM (COL_PERMS, '1__', uid, gid, COL_GROUP, COL_OWNER)) and COL_ID = did do { @@ -805,8 +859,6 @@ create procedure DAV_SEARCH_PATH ( in id any, in what char (1)) returns any { - declare res varchar; - what := upper (what); if (isvector (id)) return call (cast (id[0] as varchar) || '_DAV_SEARCH_PATH') (id, what); @@ -821,11 +873,7 @@ create procedure DAV_SEARCH_PATH ( if (what = 'C') { - res := WS.WS.COL_PATH (id); - if (res = '/') - return -23; - - return res; + return coalesce ((select COL_FULL_PATH from WS.WS.SYS_DAV_COL where COL_ID = id), -23); } if (what = 'R') { @@ -836,72 +884,46 @@ create procedure DAV_SEARCH_PATH ( } ; - --! -- \brief Search the internal ID for a given path. -- -- \b Warning: In the case of DET folders the ID is not an integer but a vector! FIXME: containing what exactly? --/ --!AWK PUBLIC -create function -DAV_SEARCH_ID (in path any, in what char (1)) returns any +create function DAV_SEARCH_ID ( + in path any, + in what char (1)) returns any { - declare id integer; + --dbg_obj_princ ('DAV_SEARCH_ID (', path, what, ')'); + declare id, len integer; declare par any; - id := -1; - what := upper (what); - -- dbg_obj_princ ('DAV_SEARCH_ID (', path, what, ')'); + if (isstring (path)) { - -- dbg_obj_princ ('path is string, tag (', __tag(path), ')'); par := split_and_decode (path, 0, '\0\0/'); - -- dbg_obj_princ ('split_and_decode complete'); } else { - -- dbg_obj_princ ('path is not string, tag (', __tag(path), ')'); par := path; } - if (length (par) = 0) - { - -- dbg_obj_princ ('empty par'); - return -1; - } - if (aref (par, 0) <> '') + + len := length (par); + if ((len = 0) or (par[0] <> '')) { - -- dbg_obj_princ ('bad par[0]'); return -1; } - if (what = 'P') - { - if (par [length (par) - 1] = '') - { - if (2 = length (par)) - return -1; - if (3 = length (par)) - return 0; - par := vector_concat (subseq (par, 0, length (par) - 2), vector ('')); - } - else - { - if (2 = length (par)) - return 0; - par := vector_concat (subseq (par, 0, length (par) - 1), vector ('')); - } - path := null; - what := 'C'; - } - + id := -1; + what := upper (what); if (what = 'R') + -- Resources { - if (aref (par, length (par) - 1) = '') - { - -- dbg_obj_princ ('bad par[last()] for R'); - return -1; - } + if (par [len-1] = '') + return -1; + if (not isstring (path)) path := DAV_CONCAT_PATH (par, null); + id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = path), -1); if ((id <> -1) and (connection_get ('dav_store') is null)) { @@ -921,63 +943,40 @@ DAV_SEARCH_ID (in path any, in what char (1)) returns any } } else if (what = 'C') + -- Collections { - if (aref (par, length (par) - 1) <> '') - { - -- dbg_obj_princ ('bad par[last()] for C'); - return -1; - } + if (par [len-1] <> '') + return -1; + if (not isstring (path)) path := DAV_CONCAT_PATH (par, null); - --id := coalesce ((select COL_ID from WS.WS.SYS_DAV_COL where WS.WS.COL_PATH (COL_ID) = path), -1); - id := -1; - } - else - { - -- dbg_obj_princ ('-14 ???'); - return -14; } - if (id = -1) + else if (what = 'P') + -- Parent { - declare det_ret, detcol_id, detcol_path_parts, unreached_path_parts any; - return DAV_SEARCH_ID_OR_DET (par, what, det_ret, detcol_id, detcol_path_parts, unreached_path_parts); - } - return id; -} -; + if (par [len-1] = '') + { + if (2 = len) + return -1; ---!AWK PUBLIC -create function -DAV_SEARCH_SOME_ID (in path any, out what char (1)) returns any -{ - declare id integer; - declare par any; - id := -1; - -- dbg_obj_princ ('DAV_SEARCH_SOME_ID (', path, '... )\n'); - if (isstring (path)) - par := split_and_decode (path, 0, '\0\0/'); - else - par := path; - if (aref (par, 0) <> '') - { - -- dbg_obj_princ ('bad par[0]'); - return -1; - } - if (aref (par, length (par) - 1) <> '') - { - what := 'R'; - if (not isstring (path)) - path := DAV_CONCAT_PATH (par, null); - id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = path), -1); + if (3 = len) + return 0; + + par := subseq (par, 0, len-1); + len := len - 1; + } + else if (2 = len) + { + return 0; + } + par[len-1] := ''; + path := DAV_CONCAT_PATH (par, null); + what := 'C'; } else { - what := 'C'; - if (not isstring (path)) - path := DAV_CONCAT_PATH (par, null); - id := DAV_SEARCH_ID (path, 'C'); + return -14; } - -- dbg_obj_princ ('Found ', id, ' of type ', what); if (id = -1) { declare det_ret, detcol_id, detcol_path_parts, unreached_path_parts any; @@ -1109,37 +1108,47 @@ create function DAV_CONCAT_PATH ( } if (strg1 = '') return strg2; + if (strg2 = '') return strg1; + if (strg1 [length(strg1) - 1] = 47) + { if (strg2 [0] = 47) return strg1 || subseq (strg2, 1); - else - return strg1 || strg2; - else - if (strg2 [0] = 47) - return strg1 || strg2; - else - return strg1 || '/' || strg2; + + return strg1 || strg2; + } + + if (strg2 [0] = 47) + return strg1 || strg2; + + return strg1 || '/' || strg2; } ; -create function -DAV_SEARCH_SOME_ID_OR_DET (inout path any, out what char (1), out det_ret varchar, out detcol_id integer, out detcol_path_parts any, out unreached_path_parts any) returns integer +create function DAV_SEARCH_SOME_ID_OR_DET ( + inout path any, + out what char (1), + out det_ret varchar, + out detcol_id integer, + out detcol_path_parts any, + out unreached_path_parts any) returns integer { + declare len integer; + if (isstring (path)) path := split_and_decode (path, 0, '\0\0/'); - else - path := path; - if (length (path) < 2) + + len := length (path); + if (len < 2) goto bad_path_arg; + if (aref (path, 0) <> '') goto bad_path_arg; - if (path [length (path) - 1] = '') - what := 'C'; - else - what := 'R'; + + what := case when (path [len-1] = '') then 'C' else 'R' end; return DAV_SEARCH_ID_OR_DET (path, what, det_ret, detcol_id, detcol_path_parts, unreached_path_parts); bad_path_arg: @@ -1150,59 +1159,74 @@ bad_path_arg: } ; -create function -DAV_SEARCH_ID_OR_DET (in path any, in what char (1), out det_ret varchar, out detcol_id integer, out detcol_path_parts any, out unreached_path_parts any) returns integer +create function DAV_SEARCH_ID_OR_DET ( + in path any, + in what char (1), + out det_ret varchar, + out detcol_id integer, + out detcol_path_parts any, + out unreached_path_parts any) returns integer { - declare id integer; - declare par, left_par, right_par any; + -- dbg_obj_princ ('DAV_SEARCH_ID_OR_DET (', path, what,')'); + declare id, len integer; + declare par any; declare cname, det varchar; declare inx, depth, cur_id, parent_id integer; + id := -1; what := upper (what); - -- dbg_obj_princ ('DAV_SEARCH_ID_OR_DET (', path, what,')'); if (isstring (path)) par := split_and_decode (path, 0, '\0\0/'); else par := path; - if (length (par) < 2) + + + len := length (par); + if (len < 2) goto bad_path_arg; - if (aref (par, 0) <> '') + + if (par[0] <> '') goto bad_path_arg; + if (what = 'P') { - if (par [length (par) - 1] = '') + if (par [len-1] = '') { - if (2 = length (par)) + if (2 = len) goto bad_path_arg; - if (3 = length (par)) + + if (3 = len) { detcol_id := null; detcol_path_parts := null; unreached_path_parts := null; return 0; } - par := vector_concat (subseq (par, 0, length (par) - 2), vector ('')); + par := subseq (par, 0, len-1); + len := len -1; } else { - if (2 = length (par)) + if (2 = len) { detcol_id := null; detcol_path_parts := null; unreached_path_parts := null; return 0; } - par := vector_concat (subseq (par, 0, length (par) - 1), vector ('')); } + par[len-1] := ''; path := null; what := 'C'; } if (what = 'R') { - if (aref (par, length (par) - 1) = '') + if (par[len-1] = '') goto bad_path_arg; + if (not isstring (path)) path := DAV_CONCAT_PATH (par, null); + id := coalesce ((select RES_ID from WS.WS.SYS_DAV_RES where RES_FULL_PATH = path), -1); if ((id <> -1) and (connection_get ('dav_store') is null)) { @@ -1219,18 +1243,19 @@ DAV_SEARCH_ID_OR_DET (in path any, in what char (1), out det_ret varchar, out de detcol_path_parts := subseq (par, 0, inx + 1); par := subseq (par, inx + 1); unreached_path_parts := par; + return call (cast (det_ret as varchar) || '_DAV_MAKE_ID') (detcol_id, id, 'R'); } } } - if (id > 0) - goto found_plain_id; - + if (id > 0) + goto found_plain_id; } else if (what = 'C') { - if (aref (par, length (par) - 1) <> '') + if (par[len-1] <> '') goto bad_path_arg; + goto descending_col_search; } else @@ -1241,7 +1266,7 @@ descending_col_search: inx := 1; cur_id := 0; parent_id := 0; - depth := length (par) - 1; + depth := len - 1; -- dbg_obj_princ ('554: path=', path, ' par=', par); whenever not found goto not_found; while (inx < depth) @@ -1272,22 +1297,21 @@ descending_col_search: goto found_plain_id; found_plain_id: - det_ret := NULL; - detcol_id := NULL; + det_ret := null; + detcol_id := null; detcol_path_parts := null; unreached_path_parts := null; return id; not_found: - det_ret := NULL; + det_ret := null; detcol_id := null; detcol_path_parts := null; unreached_path_parts := null; return -1; bad_path_arg: - -- dbg_obj_princ ('bad_path_arg'); - det_ret := NULL; + det_ret := null; detcol_id := null; detcol_path_parts := null; unreached_path_parts := null; @@ -1296,8 +1320,11 @@ bad_path_arg: ; -create procedure -DAV_OWNER_ID (in uid any, in gid any, out _uid integer, out _gid integer) +create procedure DAV_OWNER_ID ( + in uid any, + in gid any, + out _uid integer, + out _gid integer) { -- dbg_obj_princ ('DAV_OWNER_ID (', uid, gid, _uid, _gid, ')'); if (uid is null) @@ -1305,22 +1332,22 @@ DAV_OWNER_ID (in uid any, in gid any, out _uid integer, out _gid integer) else if (isinteger (uid)) _uid := uid; else - _uid := coalesce ( - (select U_ID from WS.WS.SYS_DAV_USER where U_NAME = uid), - case (uid) when 'anonymous' then http_nobody_uid () else -12 end); + { + _uid := (select U_ID from WS.WS.SYS_DAV_USER where U_NAME = uid); + if (isnull (_uid)) + _uid := case (uid) when 'anonymous' then http_nobody_uid () else -12 end; + } if (gid is null) _gid := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_ID = _uid), http_nogroup_gid ()); else if (isinteger (gid)) _gid := gid; else - _gid := coalesce ( - (select G_ID from WS.WS.SYS_DAV_GROUP where G_NAME = gid), - (select U_GROUP from WS.WS.SYS_DAV_USER where U_NAME = gid), - -12 ); --- This must be --- _gid := coalesce ((select G_ID from WS.WS.SYS_DAV_GROUP where G_NAME = gid), -12); - -- dbg_obj_princ ('DAV_OWNER_ID translated ', uid, ' -> ', _uid, ', and ', gid, ' -> ', _gid); + { + _gid := (select G_ID from WS.WS.SYS_DAV_GROUP where G_NAME = gid); + if (isnull (_gid)) + _gid := coalesce ((select U_GROUP from WS.WS.SYS_DAV_USER where U_NAME = gid), -12); + } } ; @@ -1340,6 +1367,7 @@ create function DAV_IS_LOCKED_INT ( in check_token varchar := '', in strict_mode integer := 0) { + -- -- dbg_obj_princ ('DAV_IS_LOCKED_INT (', id, st, check_token, strict_mode, ')'); declare first integer; declare rc varchar; @@ -1491,7 +1519,10 @@ create function DAV_LOCK_INT ( p_st := 'C'; if (id is null) - id := DB.DBA.DAV_SEARCH_SOME_ID (path, st); + { + st := DB.DBA.DAV_WHAT (path); + id := DB.DBA.DAV_SEARCH_ID (path, st); + } if (DB.DBA.DAV_HIDE_ERROR (id) is null) { @@ -1664,7 +1695,8 @@ create function DAV_UNLOCK ( declare id any; declare st char (1); - id := DB.DBA.DAV_SEARCH_SOME_ID (path, st); + st := DB.DBA.DAV_WHAT (path); + id := DB.DBA.DAV_SEARCH_ID (path, st); if (DB.DBA.DAV_HIDE_ERROR (id) is null) return -1; @@ -2115,7 +2147,7 @@ create function DAV_GET_UID_BY_SERVICE_ID ( out a_uid int, out a_gid int, out a_uname varchar, - out a_perms int) + out a_perms varchar) { declare rows any; @@ -2231,24 +2263,13 @@ create function DAV_AUTHENTICATE_SSL_WEBID ( inout webidGraph varchar, inout cert any := null) { + -- dbg_obj_princ ('DAV_AUTHENTICATE_SSL_WEBID (', webid, ')'); webid := connection_get ('__webid'); webidGraph := connection_get ('__webidGraph'); if (isnull (webid)) { declare fing, vtype any; - if (cert is null or cert = 0) - cert := client_attr ('client_certificate'); - - if (cert is null or cert = 0) - { - https_renegotiate (3); - cert := client_attr ('client_certificate'); - } - - if (cert is null or cert = 0) - return null; - fing := get_certificate_info (6, cert); webidGraph := 'http:' || replace (fing, ':', ''); if (not DB.DBA.WEBID_AUTH_GEN_2 (cert, 0, null, 1, 1, webid, webidGraph, 0, vtype)) @@ -2455,6 +2476,18 @@ create function DAV_AUTHENTICATE_SSL ( DB.DBA.DAV_AUTHENTICATE_SSL_ITEM (id, what, path); + if (a_cert is null or a_cert = 0) + a_cert := client_attr ('client_certificate'); + + if (a_cert is null or a_cert = 0) + { + https_renegotiate (3); + a_cert := client_attr ('client_certificate'); + } + + if (a_cert is null or a_cert = 0) + return rc; + webidGraph := null; DB.DBA.DAV_AUTHENTICATE_SSL_WEBID (a_webid, webidGraph, a_cert); @@ -2691,23 +2724,26 @@ create procedure DAV_RES_UPLOAD_STRSES_INT ( { declare id, rc, old_log_mode, new_log_mode any; - -- clear previous uploaded data - id := DB.DBA.DAV_SEARCH_ID (path, 'R'); - if (not isnull (DB.DBA.DAV_HIDE_ERROR (id)) and ('text/turtle' = (select RES_TYPE from WS.WS.SYS_DAV_RES where RES_ID = DB.DBA.DAV_DET_DAV_ID (id)))) - WS.WS.TTL_QUERY_POST_CLEAR (path); - if (0 = dav_call) { - if (type = 'application/sparql-query') - { - WS.WS.SPARQL_QUERY_POST (path, content, uid, dav_call); - } - else if ((type = 'text/turtle') and not DB.DBA.DAV_MAC_METAFILE (path)) + if ((type = 'text/turtle') and not DB.DBA.DAV_MAC_METAFILE (path)) { rc := WS.WS.TTL_QUERY_POST (path, content, DB.DBA.LDP_ENABLED (DB.DBA.DAV_SEARCH_ID (DB.DBA.DAV_DET_PATH_PARENT (path, 1), 'C'))); if (isnull (DAV_HIDE_ERROR (rc))) return rc; } + else + { + -- clear previous uploaded data + id := DB.DBA.DAV_SEARCH_ID (path, 'R'); + if (not isnull (DB.DBA.DAV_HIDE_ERROR (id)) and ('text/turtle' = (select RES_TYPE from WS.WS.SYS_DAV_RES where RES_ID = DB.DBA.DAV_DET_DAV_ID (id)))) + WS.WS.TTL_QUERY_POST_CLEAR (path); + + if (type = 'application/sparql-query') + { + WS.WS.SPARQL_QUERY_POST (path, content, uid, dav_call); + } + } } old_log_mode := log_enable (null); @@ -2810,7 +2846,7 @@ create procedure DAV_RES_UPLOAD_STRSES_INT_INNER ( } else if (pid > 0) { - det := (select COL_DET from WS.WS.SYS_DAV_COL where COL_ID=pid and connection_get ('dav_store') is null); + det := (select COL_DET from WS.WS.SYS_DAV_COL where COL_ID = pid and connection_get ('dav_store') is null); } else { @@ -3006,6 +3042,8 @@ create procedure DAV_RES_UPLOAD_STRSES_INT_INNER ( if (_is_xper_res) update WS.WS.SYS_DAV_RES set RES_CONTENT = xml_persistent (RES_CONTENT) where current of res_cr; } + DB.DBA.LDP_CREATE_RES (path, type); + return rc; unhappy_upload: @@ -3266,7 +3304,7 @@ create procedure RDF_SINK_UPLOAD_CARTRIDGES ( xrc := call (pname) (rdf_graph, rdf_iri, null, content, aq, ps, row[4], opts); -- dbg_obj_print (pname, xrc, (select count(*) from rdf_quad where g = iri_to_id (rdf_graph))); -- when no selection we stop processing when a given cartridge indicate to stop - if (not hasSelection and (__tag (xrc) = 193 or xrc < 0 or xrc > 0)) + if (not hasSelection and (__tag (xrc) = __tag of vector or xrc < 0 or xrc > 0)) return 1; } _try_next:; @@ -3466,8 +3504,7 @@ create procedure DAV_DELETE ( in path varchar, in silent integer := 0, in auth_uname varchar, - in auth_pwd varchar -) + in auth_pwd varchar) { return DAV_DELETE_INT (path, silent, auth_uname, auth_pwd); } @@ -3479,10 +3516,11 @@ create procedure DAV_DELETE_INT ( in auth_uname varchar, in auth_pwd varchar, in extern integer := 1, - in check_locks any := 1 + in check_locks integer := 1, + in check_token varchar := '' ) { - declare id, id_meta, rc integer; + declare id, id_meta, rc, rrc integer; declare what char; declare auth_uid integer; declare par, path_meta any; @@ -3490,11 +3528,11 @@ create procedure DAV_DELETE_INT ( whenever sqlstate 'HT509' goto disabled_home; par := split_and_decode (path, 0, '\0\0/'); - if (aref (par, 0) <> '') + if (par[0] <> '') return -1; - what := case when (aref (par, length (par) - 1) = '') then 'C' else 'R' end; - id := DAV_SEARCH_ID (par, what); + what := DB.DBA.DAV_WHAT (par); + id := DB.DBA.DAV_SEARCH_ID (par, what); if (isinteger (id) and (0 > id)) return (case when silent then 1 else id end); @@ -3505,16 +3543,18 @@ create procedure DAV_DELETE_INT ( return (case when silent then 1 else auth_uid end); } else + { auth_uid := http_nobody_uid (); + } - - if (check_locks and (0 <> (rc := DAV_IS_LOCKED (id, what, check_locks)))) + if (check_locks and (0 <> (rc := DAV_IS_LOCKED (id, what, check_token)))) return rc; if (isarray (id)) { declare det varchar; declare detcol_id, detcol_path, unreached_path any; + DAV_SEARCH_ID_OR_DET (par, what, det, detcol_id, detcol_path, unreached_path); return call (cast (det as varchar) || '_DAV_DELETE') (detcol_id, unreached_path, what, silent, auth_uid); } @@ -3535,7 +3575,6 @@ create procedure DAV_DELETE_INT ( } else if (what = 'C') { - declare rrc integer; declare items any; declare det, proc, graph varchar; @@ -3550,11 +3589,7 @@ create procedure DAV_DELETE_INT ( { rrc := call (det || '_DAV_DELETE') (id, split_and_decode (item[10] || case when (item[1] = 'C') then '/' else '' end, 0, '\0\0/'), item[1], silent, auth_uid); if (rrc <> 1) - { - connection_set ('dav_store', null); - rollback work; - return rrc; - } + goto delete_error; } if (__proc_exists ('DB.DBA.IMAP__ownerErase') is not null) { @@ -3567,25 +3602,18 @@ create procedure DAV_DELETE_INT ( if (det <> '') connection_set ('dav_store', 1); - for select RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_COL = id do + for (select RES_FULL_PATH from WS.WS.SYS_DAV_RES where RES_COL = id) do { rrc := DAV_DELETE_INT (RES_FULL_PATH, silent, auth_uname, auth_pwd, extern, check_locks); if ((rrc <> 1) and (RES_FULL_PATH not like '%,acl')) - { - connection_set ('dav_store', null); - rollback work; - return rrc; - } + goto delete_error; } - for select COL_ID, COL_NAME from WS.WS.SYS_DAV_COL where COL_PARENT = id do + + for (select COL_NAME, COL_FULL_PATH from WS.WS.SYS_DAV_COL where COL_PARENT = id) do { - rrc := DAV_DELETE_INT (WS.WS.COL_PATH(COL_ID), silent, auth_uname, auth_pwd, extern, check_locks); - if ((rrc <> 1) and (COL_NAME not like '%,acl')) - { - connection_set ('dav_store', null); - rollback work; - return rrc; - } + rrc := DAV_DELETE_INT (COL_FULL_PATH, silent, auth_uname, auth_pwd, extern, check_locks); + if ((rrc <> 1) and not ((rrc = -1) and (COL_NAME = 'Attic'))) + goto delete_error; } if (det <> '') connection_set ('dav_store', null); @@ -3615,6 +3643,11 @@ create procedure DAV_DELETE_INT ( return 1; +delete_error: + connection_set ('dav_store', null); + rollback work; + return rrc; + disabled_owner: return -42; @@ -3623,7 +3656,6 @@ disabled_home: } ; - create procedure DAV_TAG_LIST ( in id any, in st char (1), @@ -3726,15 +3758,12 @@ create procedure DAV_COPY_INT ( if (aref (sar, 0) <> '') return -1; - if (aref (sar, length (sar) - 1) = '') - st := 'C'; - else - st := 'R'; + st := DB.DBA.DAV_WHAT (sar); if (aref (dar, 0) <> '') return -2; - if (aref (dar, length (dar) - 1) = '') + if (DB.DBA.DAV_WHAT (dar) = 'C') { if (st = 'R') { @@ -3832,7 +3861,7 @@ create procedure DAV_COPY_INT ( } } - if (isarray (dp_id)) + if (isvector (dp_id)) { dp_det := dp_id[0]; } @@ -3855,7 +3884,7 @@ create procedure DAV_COPY_INT ( if (d_id is not null) -- do update { - if (isarray (id)) + if (isvector (id)) { declare rt varchar; declare rcnt any; @@ -3959,8 +3988,10 @@ create procedure DAV_COPY_INT ( insufficient_storage: return -41; + disabled_owner: return -42; + disabled_home: return -43; } @@ -4080,15 +4111,11 @@ create procedure DAV_MOVE_INT ( if (aref (sar, 0) <> '') return -1; - if (aref (sar, length (sar) - 1) = '') - st := 'C'; - else - st := 'R'; - + st := DB.DBA.DAV_WHAT (sar); if (aref (dar, 0) <> '') return -2; - if (aref (dar, length (dar) - 1) = '') + if (DB.DBA.DAV_WHAT (dar) = 'C') { if (st = 'R') { @@ -4168,7 +4195,7 @@ create procedure DAV_MOVE_INT ( return (case when rc = -8 then -9 else rc end); } - if (isarray (dp_id)) + if (isvector (dp_id)) { dp_det := dp_id[0]; } @@ -4191,7 +4218,7 @@ create procedure DAV_MOVE_INT ( if (d_id is not null) -- do update of destination and delete of source { -- dbg_obj_princ ('DAV_MOVE_INT has a resource'); - if (isarray (id)) + if (isvector (id)) { declare rt varchar; declare rcnt any; @@ -4224,7 +4251,7 @@ create procedure DAV_MOVE_INT ( else { declare pid, rldp, nldp integer; - declare rname, rpath, rldp, npath varchar; + declare rname, rpath, npath varchar; select RES_NAME into rname @@ -4259,7 +4286,7 @@ create procedure DAV_MOVE_INT ( if (rname = '') return -3; - if (isarray (id)) + if (isvector (id)) { declare rt varchar; declare rcnt any; @@ -4335,7 +4362,7 @@ create procedure DAV_MOVE_INT ( } } - if (isarray (id)) + if (isvector (id)) { declare dirsingle any; @@ -4829,7 +4856,7 @@ DAV_PROP_SET_RAW_INNER ( if (not isstring (propname) or (propname in ('creationdate', 'getcontentlength', 'getcontenttype', 'getetag', 'getlastmodified', 'lockdiscovery', 'resourcetype', 'activelock', 'supportedlock'))) return -10; - if (__tag (propvalue) = 193) + if (__tag (propvalue) = __tag of vector) propvalue := serialize (propvalue); else if (not isstring (propvalue)) return -17; @@ -5009,10 +5036,8 @@ DAV_PROP_GET ( in auth_pwd varchar := null) returns any { declare st varchar; - if ((path <> '') and (path[length(path)-1] = 47)) - st := 'C'; - else - st := 'R'; + + st := DB.DBA.DAV_WHAT (path); return DAV_PROP_GET_INT (DAV_SEARCH_ID (path, st), st, propname, 1, auth_uname, auth_pwd); } ; @@ -5261,10 +5286,8 @@ DAV_PROP_LIST ( in auth_pwd varchar := null) { declare st varchar; - if ((path <> '') and (path[length(path)-1] = 47)) - st := 'C'; - else - st := 'R'; + + st := DB.DBA.DAV_WHAT (path); return DAV_PROP_LIST_INT (DAV_SEARCH_ID (path, st), st, propmask, 1, auth_uname, auth_pwd); } ; @@ -5501,18 +5524,26 @@ create procedure DAV_RES_CONTENT_META ( { -- dbg_obj_princ ('DAV_RES_CONTENT_META (', path, ', [content], [type], ', content_mode, extern, auth_uname, auth_pwd, ')'); declare rc, auth_uid integer; + declare what varchar; declare id, cont any; if (path like '%,meta') path := subseq (path, 0, length (path) - length (',meta')); - id := DAV_SEARCH_ID (path, 'R'); + what := 'R'; + id := DAV_SEARCH_ID (path, what); if (DAV_HIDE_ERROR (id) is null) - return id; + { + what := 'C'; + path := DAV_CONCAT_PATH (path, '/'); + id := DAV_SEARCH_ID (path, what); + if (DAV_HIDE_ERROR (id) is null) + return id; + } if (extern) { - auth_uid := DAV_AUTHENTICATE (id, 'R', '1__', auth_uname, auth_pwd); + auth_uid := DAV_AUTHENTICATE (id, what, '1__', auth_uname, auth_pwd); if (auth_uid < 0) return auth_uid; } @@ -5625,6 +5656,19 @@ create function DAV_RES_LENGTH ( } ; +create function DAV_WHAT ( + in path any) +{ + if (isvector (path) and length (path)) + return case when (path[length (path)-1] = '') then 'C' else 'R' end; + + if (isstring (path) and length (path)) + return case when (path[length (path)-1] = 47) then 'C' else 'R' end; + + return null; +} +; + create function DAV_COL_IS_ANCESTOR_OF (in a_id integer, in d_id integer) returns integer { declare p_id integer; @@ -5645,10 +5689,7 @@ again: create function DAV_COL_PATH_BOUNDARY ( in path varchar) returns varchar { - declare len integer; - - len := length (path); - if ((len = 0) or (path[len-1] <> 47)) + if (DB.DBA.DAV_WHAT (path) <> 'C') signal ('.....', sprintf ('Bad path in DAV_COL_PATH_BOUNDARY: %s', path)); return path || '\377\377\377\377'; @@ -5795,8 +5836,8 @@ create trigger SYS_DAV_COL_WAC_U after update (COL_NAME, COL_PARENT) on WS.WS.SY if (aciContent is null) return; - oldPath := WS.WS.COL_PATH (O.COL_PARENT) || O.COL_NAME || '/'; - newPath := WS.WS.COL_PATH (N.COL_PARENT) || N.COL_NAME || '/'; + oldPath := O.COL_FULL_PATH; + newPath := N.COL_FULL_PATH; update_acl := 1; WS.WS.WAC_DELETE (oldPath, update_acl); @@ -5812,7 +5853,7 @@ create trigger SYS_DAV_COL_WAC_D after delete on WS.WS.SYS_DAV_COL order 100 ref if (connection_get ('dav_acl_sync') = 1) return; - path := WS.WS.COL_PATH (O.COL_ID); + path := O.COL_FULL_PATH; update_acl := 1; WS.WS.WAC_DELETE (path, update_acl); @@ -6005,7 +6046,7 @@ create procedure WS.WS.WAC_INSERT_PROP ( } else { - select DAV_SEARCH_PATH (COL_ID, what), COL_OWNER, COL_GROUP + select COL_FULL_PATH, COL_OWNER, COL_GROUP into _path, _owner, _group from WS.WS.SYS_DAV_COL where COL_ID = id; @@ -6122,13 +6163,20 @@ create procedure WS.WS.DAV_HOST () create procedure WS.WS.DAV_IRI ( in path varchar) { - declare S any; - - S := string_output (); - http_dav_url (path, null, S); - S := string_output_string (S); + declare parts any; + declare retValue varchar; - return WS.WS.DAV_HOST () || S; + retValue := ''; + if (not DB.DBA.is_empty_or_null (path)) + { + parts := split_and_decode (path, 0, '\0\0/'); + foreach (varchar part in parts) do + { + retValue := retValue || case when (part = '') then '/' else sprintf ('%U/', part) end; + } + retValue := subseq (retValue, 0, length(retValue)-1); + } + return WS.WS.DAV_HOST () || retValue; } ; @@ -6369,7 +6417,7 @@ create procedure WS.WS.ACL_SERIALIZE_INT ( create procedure WS.WS.ACL_DESERIALIZE_INT ( in _value any) returns integer { - if (__tag (_value) <> 189) + if (__tag (_value) <> __tag of integer) _value := cast (_value as varchar); _value := right (repeat ('\0', 4) || _value, 4); @@ -6536,15 +6584,15 @@ create procedure WS.WS.ACL_IS_GRANTED ( ids := (select vector_concat (vector (uid), VECTOR_AGG (GI_SUB)) from DB.DBA.SYS_ROLE_GRANTS where GI_SUPER = uid); or_acc := 0; - foreach (any acl in aAcl) do + foreach (any a in aAcl) do { - if (position (acl[0], ids)) + if (position (a[0], ids)) { - anded := bit_and (acl[3], bitmask); + anded := bit_and (a[3], bitmask); if (anded) { -- revoke of any single bit invalidates the permission. - if (not acl[1]) + if (not a[1]) return 0; or_acc := bit_or (or_acc, anded); @@ -6700,7 +6748,7 @@ ret_null: create function DAV_FC_CONST_AS_SQL (inout val any) { - if (193 = __tag (val)) + if (__tag of vector = __tag (val)) { declare res varchar; res := ''; @@ -6708,9 +6756,9 @@ create function DAV_FC_CONST_AS_SQL (inout val any) res := concat (res, ', ', DAV_FC_CONST_AS_SQL(item)); return subseq (res, 2); } - if (182 = __tag (val)) + if (__tag of varchar = __tag (val)) return replace (WS.WS.STR_SQL_APOS (val), '^{', '\\136{'); - if (189 = __tag (val)) + if (__tag of integer = __tag (val)) return sprintf ('%d', val); if (211 = __tag (val)) return sprintf ('cast (''%s'' as datetime)', cast (val as varchar)); @@ -6843,17 +6891,17 @@ create function DAV_FC_PRINT_COMPARISON (inout pred any, inout pred_metas any, i pattern_sample := pred[2]; if ('scalar' = cmp_meta[0]) { - if (not (__tag (pattern_sample) in (182, 189, 211))) + if (not (__tag (pattern_sample) in (__tag of varchar, __tag of integer, 211))) goto bad_pattern_datatype; } else if ('vector' = cmp_meta[0]) { - if (193 <> __tag (pattern_sample)) + if (__tag of vector <> __tag (pattern_sample)) goto bad_pattern_datatype; if (0 = length (pattern_sample)) goto empty_array_pattern; pattern_sample := pattern_sample[0]; - if (not (__tag (pattern_sample) in (182, 189, 211))) + if (not (__tag (pattern_sample) in (__tag of varchar, __tag of integer, 211))) goto bad_pattern_datatype; foreach (any itm in pred[2]) do { @@ -7426,14 +7474,14 @@ again: create procedure DAV_GET_RDF_SCHEMA_N3 ( in schema_uri varchar) { - for (select RS_LOCATION, RS_LOCAL_ADDONS, RS_PRECOMPILED from WS.WS.SYS_RDF_SCHEMAS where RS_URI = schema_uri) do + for (select RS_LOCATION, RS_LOCAL_ADDONS, RS_PRECOMPILED as _RS_PRECOMPILED from WS.WS.SYS_RDF_SCHEMAS where RS_URI = schema_uri) do { declare std_schema, local_addon, mix any; declare schema_catname varchar; declare prop_list, prop_catnames, prop_catnames_hash any; - if (RS_PRECOMPILED is not null) - return RS_PRECOMPILED; + if (_RS_PRECOMPILED is not null) + return _RS_PRECOMPILED; if (RS_LOCATION is null) { @@ -7617,10 +7665,8 @@ create procedure DAV_RDF_PROP_GET ( in auth_pwd varchar := null) returns any { declare st varchar; - if ((path <> '') and (path[length(path)-1] = 47)) - st := 'C'; - else - st := 'R'; + + st := DB.DBA.DAV_WHAT (path); return DAV_RDF_PROP_GET_INT (DAV_SEARCH_ID (path, st), st, single_schema, 1, auth_uname, auth_pwd); } ; @@ -8256,7 +8302,7 @@ create function DAV_NOBODY_DIR_UPDATE () if (isstring (registry_get ('DAV_NOBODY_DIR_UPDATE'))) return; - for (select COL_ID as cid, COL_OWNER as uid, COL_GROUP as gid from WS.WS.SYS_DAV_COL where WS.WS.COL_PATH (COL_ID) like '/DAV/home/nobody/%') do + for (select COL_ID as cid, COL_OWNER as uid, COL_GROUP as gid from WS.WS.SYS_DAV_COL where COL_FULL_PATH like '/DAV/home/nobody/%') do { changed := 0; if (uid = http_nobody_uid()) diff --git a/binsrc/dav/dav_debug.sql b/binsrc/dav/dav_debug.sql index e1a8788c94..5d9b028e02 100644 --- a/binsrc/dav/dav_debug.sql +++ b/binsrc/dav/dav_debug.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/dav_det.sql b/binsrc/dav/dav_det.sql index 2bbe835cd1..27edb51fae 100644 --- a/binsrc/dav/dav_det.sql +++ b/binsrc/dav/dav_det.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -432,7 +432,7 @@ create function DB.DBA.DAV_DET_DAV_LIST ( vectorbld_acc (retValue, i); } - for (select vector (WS.WS.COL_PATH (COL_ID), + for (select vector (COL_FULL_PATH, 'C', 0, COL_MOD_TIME, @@ -574,6 +574,9 @@ create function DB.DBA.DAV_DET_HTTP_ERROR ( in _header any, in _silent integer := 0) { + if (not isvector (_header)) + return 0; + if ((_header[0] like 'HTTP/1._ 4__ %') or (_header[0] like 'HTTP/1._ 5__ %')) { if (not _silent) @@ -588,6 +591,9 @@ create function DB.DBA.DAV_DET_HTTP_ERROR ( create function DB.DBA.DAV_DET_HTTP_CODE ( in _header any) { + if (not isvector (_header)) + return 500; + return subseq (_header[0], 9, 12); } ; @@ -595,6 +601,9 @@ create function DB.DBA.DAV_DET_HTTP_CODE ( create function DB.DBA.DAV_DET_HTTP_MESSAGE ( in _header any) { + if (not isvector (_header)) + return 'Server Error'; + return subseq (_header[0], 13); } ; @@ -1559,11 +1568,12 @@ create function DB.DBA.DAV_DET_LDP_GRAPH_UPDATE ( { -- dbg_obj_princ ('DB.DBA.DAV_DET_LDP_GRAPH_UPDATE (', id, ')'); - for (select COL_ACL as _acl, - COL_OWNER as _owner, - COL_GROUP as _group, - COL_PERMS as _perms, - COL_PARENT as _parent_id + for (select COL_ACL as _acl, + COL_OWNER as _owner, + COL_GROUP as _group, + COL_PERMS as _perms, + COL_FULL_PATH as _path, + COL_PARENT as _parent_id from WS.WS.SYS_DAV_COL where COL_ID = id) do { @@ -1574,7 +1584,7 @@ create function DB.DBA.DAV_DET_LDP_GRAPH_UPDATE ( _newAcls := vector (_acl); DB.DBA.DAV_DET_PRIVATE_ACL_CHAIN (_parent_id, 'C', _oldAcls, _newAcls); - _rdfParams := vector ('graph', WS.WS.DAV_IRI (DB.DBA.DAV_SEARCH_PATH (id, 'C'))); + _rdfParams := vector ('graph', WS.WS.DAV_IRI (_path)); -- check for graph DB.DBA.DAV_DET_GRAPH_UPDATE ( @@ -1778,19 +1788,16 @@ create function DB.DBA.DAV_DET_GRAPH_UPDATE_CURRENT ( if (what = 'C') { - for (select COL_ID as _id, - COL_ACL as _acl, - COL_OWNER as _owner, - COL_GROUP as _group, - COL_PERMS as _perms, - COL_PARENT as _parent_id + for (select COL_ID as _id, + COL_ACL as _acl, + COL_OWNER as _owner, + COL_GROUP as _group, + COL_PERMS as _perms, + COL_FULL_PATH as _path, + COL_PARENT as _parent_id from WS.WS.SYS_DAV_COL where COL_ID = id) do { - declare _path varchar; - - _path := DB.DBA.DAV_SEARCH_PATH (_id, 'C'); - -- ACLs _oldAcls := vector (_acl); _newAcls := vector (_acl); @@ -1878,14 +1885,11 @@ create function DB.DBA.DAV_DET_GRAPH_UPDATE_CHILD ( COL_ACL as _acl, COL_OWNER as _owner, COL_GROUP as _group, - COL_PERMS as _perms + COL_PERMS as _perms, + COL_FULL_PATH as _path from WS.WS.SYS_DAV_COL where COL_PARENT = id) do { - declare _path varchar; - - _path := DB.DBA.DAV_SEARCH_PATH (_id, 'C'); - -- ACLs if (length (_acl) > 8) { @@ -1983,7 +1987,7 @@ create trigger SYS_DAV_COL_PRIVATE_GRAPH_I after insert on WS.WS.SYS_DAV_COL ord declare _acis, _rdfParams any; -- Paths - _newPath := DB.DBA.DAV_SEARCH_PATH (N.COL_ID, 'C'); + _newPath := N.COL_FULL_PATH; -- ACLs _oldAcls := vector (); @@ -2005,7 +2009,7 @@ create trigger SYS_DAV_COL_PRIVATE_GRAPH_I after insert on WS.WS.SYS_DAV_COL ord } ; -create trigger SYS_DAV_COL_PRIVATE_GRAPH_U after update (COL_NAME, COL_OWNER, COL_GROUP, COL_PERMS, COL_ACL) on WS.WS.SYS_DAV_COL order 111 referencing old as O, new as N +create trigger SYS_DAV_COL_PRIVATE_GRAPH_U after update (COL_NAME, COL_FULL_PATH, COL_OWNER, COL_GROUP, COL_PERMS, COL_ACL) on WS.WS.SYS_DAV_COL order 111 referencing old as O, new as N { -- dbg_obj_print ('SYS_DAV_COL_PRIVATE_GRAPH_U ---------------'); declare _oldPath, _newPath varchar; @@ -2013,8 +2017,8 @@ create trigger SYS_DAV_COL_PRIVATE_GRAPH_U after update (COL_NAME, COL_OWNER, CO declare _acis, _oldRDFParams, _newRDFParams any; -- Pahs - _oldPath := DB.DBA.DAV_SEARCH_PATH (N.COL_PARENT, 'C') || O.COL_NAME || '/'; - _newPath := DB.DBA.DAV_SEARCH_PATH (N.COL_ID, 'C'); + _oldPath := O.COL_FULL_PATH; + _newPath := N.COL_FULL_PATH; -- ACLs _oldAcls := vector (O.COL_ACL); @@ -2055,7 +2059,7 @@ create trigger SYS_DAV_COL_PRIVATE_GRAPH_D after delete on WS.WS.SYS_DAV_COL ord DB.DBA.DAV_DET_GRAPH_PERMISSIONS_REMOVE ( O.COL_ID, 'C', - WS.WS.DAV_IRI (DB.DBA.DAV_SEARCH_PATH (O.COL_ID, 'C')), + WS.WS.DAV_IRI (O.COL_FULL_PATH), O.COL_OWNER, O.COL_GROUP, _oldAcls diff --git a/binsrc/dav/dav_meta.sql b/binsrc/dav/dav_meta.sql index 0a532fca51..e9137807e9 100644 --- a/binsrc/dav/dav_meta.sql +++ b/binsrc/dav/dav_meta.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -116,7 +116,7 @@ create function DAV_GUESS_MIME_TYPE (in orig_res_name varchar, inout content any -- dbg_obj_princ ('DAV_GUESS_MIME_TYPE (', orig_res_name, '..., ...)'); whenever sqlstate '*' goto no_op; content_len := length (content); - if (__tag (content) in (125, 126, 132, 133)) + if (__tag (content) in (125, __tag of long varchar handle, 132, __tag of long nvarchar handle)) { declare beginning varchar; if (content_len < 10000000) @@ -139,7 +139,7 @@ create function DAV_GUESS_MIME_TYPE (in orig_res_name varchar, inout content any html_start := null; if (html_start is null) { - if (230 = __tag (content)) + if (__tag of XML = __tag (content)) html_start := content; else { @@ -1459,7 +1459,7 @@ create function "DAV_EXTRACT_RDF_application/x-openlinksw-vad" (in orig_res_name declare s1, s2, s3, s4, len1 integer; -- dbg_obj_princ ('DAV_EXTRACT_RDF_application/x-openlinksw-vad (', orig_res_name, content, html_start, ')'); whenever sqlstate '*' goto errexit; - if (aref(subseq(content, 0, 1), 0) <> 182) + if (aref(subseq(content, 0, 1), 0) <> __tag of varchar) goto errexit; if (subseq(content, 5, 8) <> 'VAD') goto errexit; @@ -2223,7 +2223,7 @@ create function DAV_CONVERT_SPOTLIGHT_TO_VIRTUOSO (in sp_data any) returns any 'kMDItemDisplayName', 'kMDItemContentModificationDate', 'kMDItemFSName', 'kMDItemContentTypeTree')) goto end_loop; - if (__tag (vals) = 193) + if (__tag (vals) = __tag of vector) foreach (any val in line [1]) do DAV_SPOTLIGHT_ADD (res, name, val); else diff --git a/binsrc/dav/dav_metr.sh b/binsrc/dav/dav_metr.sh index 02f354462c..6680092d82 100755 --- a/binsrc/dav/dav_metr.sh +++ b/binsrc/dav/dav_metr.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/dav_rdf_quad.sql b/binsrc/dav/dav_rdf_quad.sql index b66f4676f9..2ecd041693 100644 --- a/binsrc/dav/dav_rdf_quad.sql +++ b/binsrc/dav/dav_rdf_quad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -31,7 +31,7 @@ create function DB.DBA.DAV_FULL_PATH_TO_IRI (in dav_iri varchar, in _str varchar declare _ses any; _ses := string_output(); http (dav_iri, _ses); - http_escape (subseq (_str, 4), 7, _ses, 0, 1); + http_escape (subseq (_str, 5), 7, _ses, 0, 1); return string_output_string(_ses); } ; diff --git a/binsrc/dav/davddk.sql b/binsrc/dav/davddk.sql index 931171337b..8ef675f52e 100644 --- a/binsrc/dav/davddk.sql +++ b/binsrc/dav/davddk.sql @@ -1,10 +1,8 @@ -- --- $Id$ --- -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -20,7 +18,6 @@ -- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -- --- Cleanup WebDAV DB use WS ; @@ -37,22 +34,22 @@ create table WS.WS.SYS_DAV_COL COL_MOD_TIME datetime, COL_ADD_TIME datetime, COL_PERMS char (11), + COL_FULL_PATH varchar, COL_DET varchar (64), COL_ACL long varbinary, COL_IID IRI_ID_8, COL_AUTO_VERSIONING char(1), - COL_FORK integer not null default 0, COL_INHERIT char(1) default 'N', -- NMR flag denotes, none, members, recursive - primary key (COL_NAME, COL_PARENT) + + primary key (COL_ID) ) -alter index SYS_DAV_COL on WS.WS.SYS_DAV_COL partition (COL_PARENT int) -create index SYS_DAV_COL_PARENT_ID on WS.WS.SYS_DAV_COL (COL_PARENT) partition (COL_PARENT int) -create unique index SYS_DAV_COL_ID on WS.WS.SYS_DAV_COL (COL_ID) partition (COL_ID int) +alter index SYS_DAV_COL on WS.WS.SYS_DAV_COL partition (COL_ID integer) +create unique index SYS_DAV_COL_PARENT on WS.WS.SYS_DAV_COL (COL_PARENT, COL_NAME) partition (COL_PARENT integer) +create index SYS_DAV_COL_FULL_PATH on WS.WS.SYS_DAV_COL (COL_FULL_PATH) partition (COL_FULL_PATH varchar (-10, 0hexffff)) create not null index SYS_DAV_COL_IID on WS.WS.SYS_DAV_COL (COL_IID) partition (COL_IID int (0hexffff00)) ; ---#IF VER=5 -alter table WS.WS.SYS_DAV_COL add COL_DET varchar +alter table WS.WS.SYS_DAV_COL add COL_DET varchar (64) ; alter table WS.WS.SYS_DAV_COL add COL_ACL long varbinary @@ -70,11 +67,11 @@ alter table WS.WS.SYS_DAV_COL add COL_INHERIT char(1) default 'N' alter table WS.WS.SYS_DAV_COL add COL_ADD_TIME datetime ; ---#ENDIF - alter table WS.WS.SYS_DAV_COL add COL_CREATOR IRI_ID_8 ; +alter table WS.WS.SYS_DAV_COL add COL_FULL_PATH varchar +; -- WebDAV Resource create table WS.WS.SYS_DAV_RES @@ -97,9 +94,7 @@ create table WS.WS.SYS_DAV_RES RES_ACL long varbinary, RES_IID IRI_ID_8, RES_STATUS varchar, - RES_VCR_ID integer, - RES_VCR_CO_VERSION integer, - RES_VCR_STATE integer, + primary key (RES_ID) ) create unique index SYS_DAV_RES_COL on WS.WS.SYS_DAV_RES (RES_COL, RES_NAME) partition (RES_COL int) @@ -108,7 +103,6 @@ alter index SYS_DAV_RES on WS.WS.SYS_DAV_RES partition (RES_ID int) create index SYS_DAV_RES_IID on WS.WS.SYS_DAV_RES (RES_IID) partition (RES_IID int (0hexffff00)) ; ---#IF VER=5 alter table WS.WS.SYS_DAV_RES add ROWGUID varchar ; @@ -127,14 +121,9 @@ alter table WS.WS.SYS_DAV_RES add RES_SIZE integer alter table WS.WS.SYS_DAV_RES add RES_ADD_TIME datetime ; ---#ENDIF - alter table WS.WS.SYS_DAV_RES add RES_CREATOR IRI_ID_8 ; ---__ddl_changed ('WS.WS.SYS_DAV_RES') ---; - create procedure WS.WS.SYS_DAV_RES_RES_CONTENT_HOOK ( inout vtb any, in d_id integer, @@ -160,15 +149,9 @@ create procedure WS.WS.SYS_DAV_RES_RES_CONTENT_UNINDEX_HOOK ( } ; ---#IF VER=5 ---!AFTER __PROCEDURE__ DB.DBA.VT_CREATE_TEXT_INDEX ! ---#ENDIF DB.DBA.vt_create_text_index ('WS.WS.SYS_DAV_RES', 'RES_CONTENT', 'RES_ID', 2, 0, vector ('RES_FULL_PATH', 'RES_OWNER', 'RES_MOD_TIME', 'RES_TYPE'), 1, '*ini*', '*ini*') ; ---#IF VER=5 ---!AFTER ---#ENDIF DB.DBA.vt_create_ftt ('WS.WS.SYS_DAV_RES', 'RES_ID', 'RES_CONTENT', 2) ; @@ -181,6 +164,7 @@ create table WS.WS.SYS_DAV_PROP PROP_TYPE char (1), PROP_PARENT_ID integer, PROP_VALUE long varchar, + primary key (PROP_PARENT_ID, PROP_TYPE, PROP_NAME) ) alter index SYS_DAV_PROP on WS.WS.SYS_DAV_PROP partition (PROP_PARENT_ID int) @@ -188,12 +172,6 @@ alter index SYS_DAV_PROP on WS.WS.SYS_DAV_PROP partition (PROP_PARENT_ID int) create unique index SYS_DAV_PROP_ID on WS.WS.SYS_DAV_PROP (PROP_ID) partition (PROP_ID int) ; ---#IF VER=5 -update DB.DBA.SYS_COLS set COL_DTP = 125 where "TABLE" = 'WS.WS.SYS_DAV_PROP' and "COLUMN" = 'PROP_VALUE' -; -__ddl_changed ('WS.WS.SYS_DAV_PROP') -; ---#ENDIF -- WebDAV Locks @@ -208,6 +186,7 @@ create table WS.WS.SYS_DAV_LOCK LOCK_TIMEOUT integer not null, LOCK_OWNER integer, LOCK_OWNER_INFO varchar, + primary key (LOCK_PARENT_ID, LOCK_PARENT_TYPE, LOCK_TOKEN) ) alter index SYS_DAV_LOCK on WS.WS.SYS_DAV_LOCK partition (LOCK_PARENT_ID int) @@ -243,6 +222,7 @@ create table WS.WS.SYS_DAV_RES_TYPES T_EXT varchar not null, -- File extension T_TYPE varchar not null, -- MIME type 'x/y' identifier, may be listed in WS.WS.SYS_MIME_TYPES maybe not T_DESCRIPTION varchar, -- NULL or a single-line text description of an extension if differs from generic MT_DESCRIPTION. + primary key (T_EXT) ) alter index SYS_DAV_RES_TYPES on WS.WS.SYS_DAV_RES_TYPES partition cluster replicated @@ -254,6 +234,7 @@ create table WS.WS.SYS_MIME_TYPES ( MT_DESCRIPTION varchar not null, -- Single-line text description of an extension, if differs from generic MT_DESCRIPTION. MT_DEFAULT_EXT varchar not null, -- Default file extension for resources. MT_BADMAGIC_IDENT varchar, -- MIME type that should be used if the content does not match magic data of the proclaimed MIME or NULL to use magic as best guess. + primary key (MT_IDENT) ) alter index SYS_MIME_TYPES on WS.WS.SYS_MIME_TYPES partition cluster replicated @@ -271,31 +252,20 @@ create table WS.WS.SYS_RDF_SCHEMAS ( RS_CATNAME varchar, -- A readable and unique label of an RDF schema that can act as collection name in category filter. RS_PROP_CATNAMES long varchar, -- The serialized vector of names and labels of all declared properties of top-level elements for category filter. RS_DEPRECATED integer, -- Flag if schema is deprecated. + primary key (RS_URI) ) alter index SYS_RDF_SCHEMAS on WS.WS.SYS_RDF_SCHEMAS partition cluster replicated create unique index SYS_RDF_SCHEMAS_CATNAME on WS.WS.SYS_RDF_SCHEMAS (RS_CATNAME) partition cluster replicated ; ---#IF VER=5 -alter table WS.WS.SYS_RDF_SCHEMAS add RS_COMPILATION_DATE datetime -; - -alter table WS.WS.SYS_RDF_SCHEMAS add RS_CATNAME varchar -; - -alter table WS.WS.SYS_RDF_SCHEMAS add RS_PROP_CATNAMES long varchar -; - -alter table WS.WS.SYS_RDF_SCHEMAS add RS_DEPRECATED integer -; ---#ENDIF -- Known uses of RDF schemas for particular MIME types create table WS.WS.SYS_MIME_RDFS ( MR_MIME_IDENT varchar not null, -- MIME type 'x/y' identifier, may be listed in WS.WS.SYS_MIME_TYPES maybe not MR_RDF_URI varchar not null, -- A URI of an RDF schema that can be used for this MIME, The URI may be listed in WS.WS.SYS_MIME_RDFS may be not. MR_DEPRECATED integer, -- Flags if UIs should display the RDF in the list of RDF schemas available for the type. + primary key (MR_MIME_IDENT, MR_RDF_URI) ) alter index SYS_MIME_RDFS on WS.WS.SYS_MIME_RDFS partition cluster replicated @@ -328,6 +298,7 @@ create table WS.WS.SYS_DAV_CATFILTER_DETS CFD_CF_ID integer not null, CFD_DET_SUBCOL_ID integer not null, CFD_DET varchar not null, + primary key (CFD_CF_ID, CFD_DET_SUBCOL_ID) ) alter index SYS_DAV_CATFILTER_DETS on WS.WS.SYS_DAV_CATFILTER_DETS partition (CFD_CF_ID int) @@ -341,6 +312,7 @@ create table WS.WS.SYS_DAV_RDF_INVERSE DRI_PROP_CATID integer not null, DRI_CATVALUE varchar not null, DRI_RES_ID integer not null, + primary key (DRI_CATF_ID, DRI_PROP_CATID, DRI_CATVALUE, DRI_RES_ID) ) alter index SYS_DAV_RDF_INVERSE on WS.WS.SYS_DAV_RDF_INVERSE partition (DRI_CATF_ID int) @@ -464,9 +436,6 @@ create procedure WS.WS.SYS_DAV_TAG_DT_TAGS_UNINDEX_HOOK ( } ; ---#IF VER=5 ---!AFTER __PROCEDURE__ DB.DBA.VT_CREATE_TEXT_INDEX ! ---#ENDIF DB.DBA.vt_create_text_index ('WS.WS.SYS_DAV_TAG', 'DT_TAGS', 'DT_FT_ID', 2, 0, vector ('DT_U_ID', 'DT_RES_ID'), 1, 'x-ViDoc', '*ini*') ; @@ -562,33 +531,16 @@ not_found: ; -create procedure WS.WS.COL_PATH (in _id any) +create procedure WS.WS.COL_PATH ( + in id any) { - declare _path, _name varchar; - declare _p_id integer; - _path := '/'; - if (isarray (_id)) - return call (cast (_id[0] as varchar) || '_DAV_SEARCH_PATH')(_id, 'C'); - whenever not found goto nf; - while (_id > 0) - { - select COL_NAME, COL_PARENT into _name, _p_id from WS.WS.SYS_DAV_COL where COL_ID = _id; - if (_id = _p_id) - { - log_message (sprintf ('DAV collection %d is its own parent', _id)); - _path := '**circular**/' || _path; - return _path; - } - _id := _p_id; - _path := concat ('/', _name, _path); - } - return _path; -nf: - return NULL; + if (isarray (id)) + return call (cast (id[0] as varchar) || '_DAV_SEARCH_PATH')(id, 'C'); + + return (select COL_FULL_PATH from WS.WS.SYS_DAV_COL where COL_ID = id); } ; - create function DB.DBA.DAV_CHANGED_FUNCTIONS () returns any { return vector ( @@ -1052,7 +1004,8 @@ create procedure WS.WS.SYS_DAV_INIT () return; }; set triggers off; - insert soft WS.WS.SYS_DAV_COL (COL_ID, COL_NAME, COL_PARENT, COL_CR_TIME, COL_MOD_TIME, COL_OWNER, COL_GROUP, COL_PERMS) values (1, 'DAV', 0, now (), now (), http_dav_uid (), http_admin_gid (), '110100000R'); + insert soft WS.WS.SYS_DAV_COL (COL_ID, COL_NAME, COL_FULL_PATH, COL_PARENT, COL_CR_TIME, COL_MOD_TIME, COL_OWNER, COL_GROUP, COL_PERMS) + values (1, 'DAV', '/DAV/', 0, now (), now (), http_dav_uid (), http_admin_gid (), '110100000R'); sequence_set ('__DAV_ID_SEQ_C', 1, 1); sequence_set ('__DAV_ID_SEQ_R', 1, 1); sequence_set ('__DAV_ID_SEQ_P', 1, 1); @@ -1205,13 +1158,39 @@ WS.WS.SYS_DAV_INIT_1 () create procedure WS.WS.SYS_DAV_INIT_RDF () { - DB.DBA.TTLP ('@prefix ldp: . - @prefix rdfs: . - ldp:BasicContainer rdfs:subClassOf ldp:Container . - ldp:DirectContainer rdfs:subClassOf ldp:Container . - ldp:IndirectContainer rdfs:subClassOf ldp:Container .', 'http://www.w3.org/ns/ldp#', 'http://www.w3.org/ns/ldp#'); - DB.DBA.rdfs_rule_set ('ldp','http://www.w3.org/ns/ldp#'); - DB.DBA.XML_SET_NS_DECL ('ldp','http://www.w3.org/ns/ldp#',2); + -- Remove bad triples with bad prefix from previous update + -- + sparql + prefix ldp: + prefix rdfs: + delete from { ?s rdfs:subClassOf ldp:Container } where { ?s rdfs:subClassOf ldp:Container }; + + DB.DBA.TTLP ( + '@prefix ldp: . + @prefix rdfs: . + + ldp:BasicContainer rdfs:subClassOf ldp:Container . + ldp:DirectContainer rdfs:subClassOf ldp:Container . + ldp:IndirectContainer rdfs:subClassOf ldp:Container .', + 'http://www.w3.org/ns/ldp#', + 'http://www.w3.org/ns/ldp#' + ); + DB.DBA.rdfs_rule_set ('ldp', 'http://www.w3.org/ns/ldp#'); + DB.DBA.XML_SET_NS_DECL ('ldp', 'http://www.w3.org/ns/ldp#', 2); + + DB.DBA.TTLP ( + '@prefix as: . + @prefix ldp: . + @prefix owl: . + @prefix rdfs: . + + as:items owl:equivalentProperty ldp:contains . + as:Collection owl:equivalentClass ldp:Container .', + 'xx', + 'asEquivalent' + ); + DB.DBA.rdfs_rule_set ('asEquivalent', 'asEquivalent'); + DB.DBA.XML_SET_NS_DECL ('as', 'http://www.w3.org/ns/activitystreams#', 2); } ; @@ -1219,22 +1198,114 @@ create procedure WS.WS.SYS_DAV_INIT_RDF () WS.WS.SYS_DAV_INIT_RDF () ; -create procedure -WS.WS.SYS_DAV_PROP_PROP_VALUE_HOOK_INTERNAL (inout vtb any, inout d_id integer, in mode integer) +create procedure WS.WS.SYS_DAV_COL_LOST () +{ + -- dbg_obj_print ('WS.WS.SYS_DAV_COL_LOST ()'); + declare N, _lost_id integer; + declare _name varchar; + + _lost_id := 0; + _name := ''; + for (select COL_ID as _col_id, COL_NAME as _col_name, COL_PARENT as _col_parent from WS.WS.SYS_DAV_COL where COL_FULL_PATH is null order by COL_NAME) do + { + if (not exists (select 1 from WS.WS.SYS_DAV_COL where COL_ID = _col_parent)) + { + if (_lost_id = 0) + { + _lost_id := DB.DBA.DAV_SEARCH_ID ('/DAV/.lost+found/', 'C'); + if (isnull (DB.DBA.DAV_HIDE_ERROR (_lost_id))) + _lost_id := DB.DBA.DAV_COL_CREATE_INT ('/DAV/.lost+found/', '110100000R', http_dav_uid (), http_admin_gid (), null, null, 0, 0, 0); + + if (isnull (DB.DBA.DAV_HIDE_ERROR (_lost_id))) + signal ('BADLOST', 'Error /DAV/.lost+found/ folder creation'); + } + + if (_name <> _col_name) + { + N := 0; + _name := _col_name; + } + update WS.WS.SYS_DAV_COL + set COL_NAME = case when (N) then sprintf ('%s - %d', _name, N) else _name end, + COL_PARENT = _lost_id + where COL_ID = _col_id; + N := N + 1; + } + } +} +; + +create procedure WS.WS.SYS_DAV_COL_FULL_PATH_INTERNAL ( + in id integer, + in path varchar, + in parents any := null) +{ + -- dbg_obj_print ('WS.WS.SYS_DAV_COL_FULL_PATH_INTERNAL (', id, path, ')'); + + if (position (id, parents)) + { + log_message (sprintf ('Folder path loop: parent path - %s, id - %d', path, id)); + return; + } + + parents := vector_concat (parents, vector (id)); + set triggers off; + update WS.WS.SYS_DAV_COL + set COL_FULL_PATH = path || COL_NAME || '/' + where COL_PARENT = id; + commit work; + + for (select COL_ID as _col_id, COL_FULL_PATH as _col_full_path from WS.WS.SYS_DAV_COL where COL_PARENT = id) do + { + WS.WS.SYS_DAV_COL_FULL_PATH_INTERNAL (_col_id, _col_full_path, parents); + } + + return; +} +; + +create procedure WS.WS.SYS_DAV_COL_FULL_PATH ( + in force integer := 0) +{ + if ((force = 0) and exists (select 1 from DB.DBA.SYS_K_STAT where INDEX_NAME = 'SYS_DAV_COL_FULL_PATH')) + return; + + if (not exists (select 1 from DB.DBA.SYS_K_STAT where INDEX_NAME = 'SYS_DAV_COL_FULL_PATH')) + exec ('create index SYS_DAV_COL_FULL_PATH on WS.WS.SYS_DAV_COL (COL_FULL_PATH) partition (COL_FULL_PATH varchar (-10, 0hexffff))'); + + WS.WS.SYS_DAV_COL_FULL_PATH_INTERNAL (0, '/', vector ()); + WS.WS.SYS_DAV_COL_LOST (); + if (exists (select 1 from WS.WS.SYS_DAV_COL where COL_FULL_PATH is null)) + { + log_message ('An error was found during the upgrade of the COL_FULL_PATH column.'); + log_message ('For additional information please contact OpenLink Support '); + + return; + } + log_message ('Successfully upgraded COL_FULL_PATH column.'); +} +; + +--!AFTER +WS.WS.SYS_DAV_COL_FULL_PATH () +; + +create procedure WS.WS.SYS_DAV_PROP_PROP_VALUE_HOOK_INTERNAL ( + inout vtb any, + inout d_id integer, + in mode integer) { for select PROP_NAME as pn, PROP_VALUE as pv from WS.WS.SYS_DAV_PROP where PROP_ID = d_id do { declare doc any; - if (126 = __tag (pv)) - { + if (__tag of long varchar handle = __tag (pv)) pv := blob_to_string (pv); - } if ((not isstring (pv)) or (pv = '')) { return 1; } - if (193 <> pv[0]) + if (__tag of vector <> pv[0]) { vt_batch_feed (vtb, pv, mode, 0); return 1; @@ -1252,23 +1323,22 @@ WS.WS.SYS_DAV_PROP_PROP_VALUE_HOOK_INTERNAL (inout vtb any, inout d_id integer, } ; -create procedure -WS.WS.SYS_DAV_PROP_PROP_VALUE_INDEX_HOOK (inout vtb any, inout d_id integer) +create procedure WS.WS.SYS_DAV_PROP_PROP_VALUE_INDEX_HOOK ( + inout vtb any, + inout d_id integer) { return WS.WS.SYS_DAV_PROP_PROP_VALUE_HOOK_INTERNAL (vtb, d_id, 0); } ; -create procedure -WS.WS.SYS_DAV_PROP_PROP_VALUE_UNINDEX_HOOK (inout vtb any, inout d_id integer) +create procedure WS.WS.SYS_DAV_PROP_PROP_VALUE_UNINDEX_HOOK ( + inout vtb any, + inout d_id integer) { return WS.WS.SYS_DAV_PROP_PROP_VALUE_HOOK_INTERNAL (vtb, d_id, 1); } ; ---#IF VER=5 ---!AFTER __PROCEDURE__ DB.DBA.VT_CREATE_TEXT_INDEX ! ---#ENDIF DB.DBA.vt_create_text_index ('WS.WS.SYS_DAV_PROP', 'PROP_VALUE', 'PROP_ID', 2, 0, vector (), 1, '*ini*', '*ini*') ; @@ -2988,43 +3058,55 @@ create trigger SYS_DAV_RES_TYPES_D after delete on WS.WS.SYS_DAV_RES_TYPES refer } ; -create procedure -DB.DBA.DAV_PLAIN_SUBCOLS_P (in root_id integer, in root_path varchar := null, in recursive integer := 1, in subcol_auth_uid varchar, in subcol_auth_pwd varchar) +create procedure DB.DBA.DAV_PLAIN_SUBCOLS_P ( + in root_id integer, + in root_path varchar := null, + in recursive integer := 1, + in subcol_auth_uid varchar, + in subcol_auth_pwd varchar) { + -- dbg_obj_princ ('DB.DBA.DAV_PLAIN_SUBCOLS_P(',root_id,root_path,recursive,subcol_auth_uid,subcol_auth_pwd,')'); declare SUBCOL_FULL_PATH, SUBCOL_NAME, SUBCOL_DET varchar; declare SUBCOL_PARENT, SUBCOL_ID, SUBCOL_DEPTH integer; - -- dbg_obj_princ ('DB.DBA.DAV_PLAIN_SUBCOLS_P(',root_id,root_path,recursive,subcol_auth_uid,subcol_auth_pwd,')'); + result_names (SUBCOL_FULL_PATH, SUBCOL_NAME, SUBCOL_PARENT, SUBCOL_ID, SUBCOL_DEPTH, SUBCOL_DET); if (root_id is null) root_id := DB.DBA.DAV_SEARCH_ID (root_path, 'C'); + if (not isinteger (root_id)) return; + if (root_id <= 0) return; + if (root_path is null) root_path := DB.DBA.DAV_SEARCH_PATH (root_id, 'C'); + if (isinteger (root_path)) return; + for (select COL_NAME, COL_PARENT, COL_ID, COL_DET from WS.WS.SYS_DAV_COL where COL_ID = root_id) do - { - result (root_path, COL_NAME, COL_PARENT, COL_ID, 0, COL_DET); - if (recursive and COL_DET is null) - { - DB.DBA.DAV_PLAIN_SUBCOLS_P_INT (root_id, root_path, 1, subcol_auth_uid, subcol_auth_pwd); - } - } + { + result (root_path, COL_NAME, COL_PARENT, COL_ID, 0, COL_DET); + if (recursive and COL_DET is null) + DB.DBA.DAV_PLAIN_SUBCOLS_P_INT (root_id, root_path, 1, subcol_auth_uid, subcol_auth_pwd); + } } ; -create procedure -DB.DBA.DAV_PLAIN_SUBCOLS_P_INT (in root_id integer, in root_path varchar, in depth integer, in subcol_auth_uid varchar, in subcol_auth_pwd varchar) +create procedure DB.DBA.DAV_PLAIN_SUBCOLS_P_INT ( + in root_id integer, + in root_path varchar, + in depth integer, + in subcol_auth_uid varchar, + in subcol_auth_pwd varchar) { for (select COL_NAME, COL_ID, root_path || COL_NAME || '/' as full_path, COL_DET from WS.WS.SYS_DAV_COL where COL_PARENT = root_id) do - { - result (full_path, COL_NAME, root_id, COL_ID, depth, COL_DET); - if (COL_DET is null) - DB.DBA.DAV_PLAIN_SUBCOLS_P_INT (COL_ID, full_path, depth + 1, subcol_auth_uid, subcol_auth_pwd); - } + { + result (full_path, COL_NAME, root_id, COL_ID, depth, COL_DET); + if (COL_DET is null) + DB.DBA.DAV_PLAIN_SUBCOLS_P_INT (COL_ID, full_path, depth + 1, subcol_auth_uid, subcol_auth_pwd); + } } ; @@ -3033,44 +3115,57 @@ create procedure view DB.DBA.DAV_PLAIN_SUBCOLS as DB.DBA.DAV_PLAIN_SUBCOLS_P (ro ; -create procedure -DB.DBA.DAV_PLAIN_SUBMOUNTS_P (in root_id integer, in root_path varchar := null, in recursive integer := 1, in subcol_auth_uid varchar, in subcol_auth_pwd varchar) +create procedure DB.DBA.DAV_PLAIN_SUBMOUNTS_P ( + in root_id integer, + in root_path varchar := null, + in recursive integer := 1, + in subcol_auth_uid varchar, + in subcol_auth_pwd varchar) { declare SUBCOL_FULL_PATH, SUBCOL_NAME, SUBCOL_DET varchar; declare SUBCOL_PARENT, SUBCOL_ID, SUBCOL_DEPTH integer; + result_names (SUBCOL_FULL_PATH, SUBCOL_NAME, SUBCOL_PARENT, SUBCOL_ID, SUBCOL_DEPTH, SUBCOL_DET); if (root_id is null) root_id := DB.DBA.DAV_SEARCH_ID (root_path, 'C'); + if (not isinteger (root_id)) return; + if (root_id <= 0) return; + if (root_path is null) root_path := DB.DBA.DAV_SEARCH_PATH (root_id, 'C'); + if (not isstring (root_path)) return; + for (select COL_NAME, COL_PARENT, COL_ID, COL_DET from WS.WS.SYS_DAV_COL where COL_ID = root_id) do - { - if (COL_DET is not null) - result (root_path, COL_NAME, COL_PARENT, COL_ID, 0, COL_DET); - if (recursive and COL_DET is null) - { - DB.DBA.DAV_PLAIN_SUBMOUNTS_P_INT (root_id, root_path, 1, subcol_auth_uid, subcol_auth_pwd); - } - } + { + if (COL_DET is not null) + result (root_path, COL_NAME, COL_PARENT, COL_ID, 0, COL_DET); + + else if (recursive) + DB.DBA.DAV_PLAIN_SUBMOUNTS_P_INT (root_id, root_path, 1, subcol_auth_uid, subcol_auth_pwd); + } } ; -create procedure -DB.DBA.DAV_PLAIN_SUBMOUNTS_P_INT (in root_id integer, in root_path varchar, in depth integer, in subcol_auth_uid varchar, in subcol_auth_pwd varchar) +create procedure DB.DBA.DAV_PLAIN_SUBMOUNTS_P_INT ( + in root_id integer, + in root_path varchar, + in depth integer, + in subcol_auth_uid varchar, + in subcol_auth_pwd varchar) { - for (select COL_NAME, COL_ID, root_path || COL_NAME || '/' as full_path, COL_DET from WS.WS.SYS_DAV_COL where COL_PARENT = root_id) do - { - if (COL_DET is not null) - result (full_path, COL_NAME, root_id, COL_ID, depth, COL_DET); - if (COL_DET is null) - DB.DBA.DAV_PLAIN_SUBMOUNTS_P_INT (COL_ID, full_path, depth + 1, subcol_auth_uid, subcol_auth_pwd); - } + for (select COL_NAME, COL_ID, COL_FULL_PATH, COL_DET from WS.WS.SYS_DAV_COL where COL_PARENT = root_id) do + { + if (COL_DET is not null) + result (COL_FULL_PATH, COL_NAME, root_id, COL_ID, depth, COL_DET); + else + DB.DBA.DAV_PLAIN_SUBMOUNTS_P_INT (COL_ID, COL_FULL_PATH, depth + 1, subcol_auth_uid, subcol_auth_pwd); + } } ; @@ -3080,37 +3175,41 @@ create procedure view DB.DBA.DAV_PLAIN_SUBMOUNTS as DB.DBA.DAV_PLAIN_SUBMOUNTS_P --!AWK PUBLIC -create procedure -DB.DBA.DAV_DIR_P (in path varchar := '/DAV/', in recursive integer := 0, in auth_uid varchar, in auth_pwd varchar) +create procedure DB.DBA.DAV_DIR_P ( + in path varchar := '/DAV/', + in recursive integer := 0, + in auth_uid varchar, + in auth_pwd varchar) { - declare arr any; - declare i, l integer; + declare items any; declare FULL_PATH, PERMS, MIME_TYPE, NAME varchar; declare TYPE char(1); declare RLENGTH, ID, GRP, OWNER integer; - declare MOD_TIME, CR_TIME datetime; - result_names (FULL_PATH, TYPE, RLENGTH, MOD_TIME, ID, PERMS, GRP, OWNER, CR_TIME, MIME_TYPE, NAME); - arr := DB.DBA.DAV_DIR_LIST (path, recursive, auth_uid, auth_pwd); - i := 0; l := length (arr); - while (i < l) + declare MOD_TIME, CR_TIME, ADD_TIME datetime; + declare CREATOR IRI_ID_8; + + result_names (FULL_PATH, TYPE, RLENGTH, MOD_TIME, ID, PERMS, GRP, OWNER, CR_TIME, MIME_TYPE, NAME, ADD_TIME, CREATOR); + items := DB.DBA.DAV_DIR_LIST (path, recursive, auth_uid, auth_pwd); + foreach (any item in items) do { - result (arr[i][0], - arr[i][1], - arr[i][2], - arr[i][3], - arr[i][4], - arr[i][5], - arr[i][6], - arr[i][7], - arr[i][8], - arr[i][9], - arr[i][10]); - i := i + 1; - } + result (item[0], + item[1], + item[2], + item[3], + item[4], + item[5], + item[6], + item[7], + item[8], + item[9], + item[10], + case when length (item) < 11 then item[8] else item[10] end, + case when length (item) < 12 then null else item[11] end); + } } ; -create procedure view DB.DBA.DAV_DIR as DB.DBA.DAV_DIR_P (path,recursive,auth_uid,auth_pwd) (FULL_PATH varchar, TYPE varchar, RLENGTH integer, MOD_TIME datetime, ID integer, PERMS varchar, GRP integer, OWNER integer, CR_TIME datetime, MIME_TYPE varchar, NAME varchar) +create procedure view DB.DBA.DAV_DIR as DB.DBA.DAV_DIR_P (path, recursive, auth_uid, auth_pwd) (FULL_PATH varchar, TYPE varchar, RLENGTH integer, MOD_TIME datetime, ID integer, PERMS varchar, GRP integer, OWNER integer, CR_TIME datetime, MIME_TYPE varchar, NAME varchar, ADD_IME datetime, CREATOR IRI_ID_8) ; exec ('grant select on DB.DBA.DAV_DIR to PUBLIC') diff --git a/binsrc/dav/davxml2n3xml.xsl b/binsrc/dav/davxml2n3xml.xsl index 0b0858e8cd..b2c74385f8 100644 --- a/binsrc/dav/davxml2n3xml.xsl +++ b/binsrc/dav/davxml2n3xml.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/davxml2rdfxml.xsl b/binsrc/dav/davxml2rdfxml.xsl index d40ea854d3..a0633a352a 100644 --- a/binsrc/dav/davxml2rdfxml.xsl +++ b/binsrc/dav/davxml2rdfxml.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/init_dav_metr.sql b/binsrc/dav/init_dav_metr.sql index d03555c409..dcbb65412e 100644 --- a/binsrc/dav/init_dav_metr.sql +++ b/binsrc/dav/init_dav_metr.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/n3xml2uriqahtml.xsl b/binsrc/dav/n3xml2uriqahtml.xsl index 8c0b8cfab5..0ad1729225 100644 --- a/binsrc/dav/n3xml2uriqahtml.xsl +++ b/binsrc/dav/n3xml2uriqahtml.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/rdav.sh b/binsrc/dav/rdav.sh index 79a44ad6fc..a2fcd123fd 100755 --- a/binsrc/dav/rdav.sh +++ b/binsrc/dav/rdav.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/rdfxml2n3xml.xsl b/binsrc/dav/rdfxml2n3xml.xsl index 2c746c2a34..f55e024470 100644 --- a/binsrc/dav/rdfxml2n3xml.xsl +++ b/binsrc/dav/rdfxml2n3xml.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/dav/snapshot_repl.sql b/binsrc/dav/snapshot_repl.sql index 631079e4a2..7ce44adaba 100644 --- a/binsrc/dav/snapshot_repl.sql +++ b/binsrc/dav/snapshot_repl.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -2093,8 +2093,8 @@ create procedure REPL_COLTYPE_PS ( in _col_dtp integer, in _col_prec integer, in _col_scale integer) returns varchar { - if ((_col_dtp = 181 or _col_dtp = 182 or _col_dtp = 192 or - _col_dtp = 222 or _col_dtp = 225) + if ((_col_dtp = 181 or _col_dtp = __tag of varchar or _col_dtp = 192 or + _col_dtp = 222 or _col_dtp = __tag of nvarchar) and _col_prec is not null and _col_prec <> 0) { -- (length) for char or varchar @@ -2112,7 +2112,7 @@ create procedure REPL_COLTYPE_PS ( _coltype := concat (_prefix, _len_spec, _suffix); } } - else if (_col_dtp = 219) + else if (_col_dtp = __tag of decimal) { -- (prec, scale) for numeric if (_col_prec < _col_scale) @@ -2130,7 +2130,7 @@ create procedure REPL_COLTYPE (in _col any) returns varchar _col_scale := aref (_col, 2); _col_prec := aref (_col, 3); - if (_col_dtp = 219) + if (_col_dtp = __tag of decimal) { if (_col_scale > 15) _col_scale := 15; @@ -2285,9 +2285,9 @@ create procedure REPL_REMOTE_COLTYPE (in _dbms_name varchar, in _col any, in _re _col_prec := aref (_col, 3); -- Oracle number(38, 0) becomes integer - --if (_col_dtp = 219 and + --if (_col_dtp = __tag of decimal and -- _col_prec = 38 and (_col_scale is null or _col_scale = 0)) - -- _col_dtp := 189; + -- _col_dtp := __tag of integer; -- timestamp becomes datetime if (_col_dtp = 128) _col_dtp := 211; @@ -2301,7 +2301,7 @@ create procedure REPL_REMOTE_COLTYPE (in _dbms_name varchar, in _col any, in _re _col_type := 'char'; _col_prec := 255; } - if (_col_sql_type = 12 and _col_dtp not in (181, 182)) -- SQL_VARCHAR / DV_LONG_STRING / DV_SHORT_STRING_SERIAL + if (_col_sql_type = 12 and _col_dtp not in (181, __tag of varchar)) -- SQL_VARCHAR / DV_LONG_STRING / DV_SHORT_STRING_SERIAL { -- this is a catch-all type, so will map it to VARCHAR log_message (concat ('Changing column type ', dv_type_title (_col_dtp), ' to ', _col_type, ' when creating the destination snapshot replication table on ', _dbms_name)); @@ -2309,8 +2309,8 @@ create procedure REPL_REMOTE_COLTYPE (in _dbms_name varchar, in _col any, in _re _col_prec := 0; } -- specify length for char, varchar, nvarchar or varbinary without limit - if ((_col_dtp = 181 or _col_dtp = 182 or _col_dtp = 192 or - _col_dtp = 222 or _col_dtp = 225) and + if ((_col_dtp = 181 or _col_dtp = __tag of varchar or _col_dtp = 192 or + _col_dtp = 222 or _col_dtp = __tag of nvarchar) and (_col_prec is null or _col_prec = 0)) { if (strstr (_dbms_name, 'Virtuoso') is not null) @@ -2326,7 +2326,7 @@ create procedure REPL_REMOTE_COLTYPE (in _dbms_name varchar, in _col any, in _re -- varbinary _col_prec := 8000; } - else if (_col_dtp = 225) + else if (_col_dtp = __tag of nvarchar) { -- nvarchar _col_prec := 4000; @@ -2344,7 +2344,7 @@ create procedure REPL_REMOTE_COLTYPE (in _dbms_name varchar, in _col any, in _re -- raw _col_prec := 2000; } - else if (_col_dtp = 225) + else if (_col_dtp = __tag of nvarchar) { -- nvarchar2 _col_prec := 4000; @@ -2384,7 +2384,7 @@ create procedure REPL_REMOTE_COLTYPE (in _dbms_name varchar, in _col any, in _re if (_col_dtp = 222 and strstr (_dbms_name, 'Informix') is not null) _col_prec := null; -- decimal - if (_col_dtp = 219) + if (_col_dtp = __tag of decimal) { if (strstr (_dbms_name, 'Virtuoso') is not null) { @@ -2528,7 +2528,7 @@ create procedure REPL_ENSURE_ROWGUID ( from DB.DBA.SYS_KEY_COLUMNS where upper("KEY_TABLE") = upper(_tbl) and upper("COLUMN") = upper(_col_name); - if (_col_dtp <> 182) + if (_col_dtp <> __tag of varchar) { signal ('37000', sprintf ('Table already has %s column of incompatible data type', diff --git a/binsrc/dav/uriqa.sql b/binsrc/dav/uriqa.sql index cdedf53492..d7dd33a73d 100644 --- a/binsrc/dav/uriqa.sql +++ b/binsrc/dav/uriqa.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -33,13 +33,6 @@ create table WS.WS.URIQA_HANDLER create index URIQA_HANDLER_ORDER_NAME on WS.WS.URIQA_HANDLER (UH_ORDER, UH_NAME) ; ---#IF VER=5 -alter table WS.WS.URIQA_HANDLER add UH_MATCH_ENV any -; - -alter table WS.WS.URIQA_HANDLER add UH_HANDLER_ENV any -; ---#ENDIF create function WS.WS.URIQA_CFG_ITEM_VALUE (in param_name varchar, in is_list integer, in dflt_value varchar) { diff --git a/binsrc/dbpedia/Makefile.am b/binsrc/dbpedia/Makefile.am index 661f739fda..021857e97b 100644 --- a/binsrc/dbpedia/Makefile.am +++ b/binsrc/dbpedia/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/dbpedia/dbpedia_init.sql b/binsrc/dbpedia/dbpedia_init.sql index 385ffe4330..13c5767e92 100644 --- a/binsrc/dbpedia/dbpedia_init.sql +++ b/binsrc/dbpedia/dbpedia_init.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -303,7 +303,7 @@ create procedure DB.DBA.DBP_LINK_HDR (in in_path varchar) exp := sprintf ('Expires: %s\r\n', date_rfc1123 (dateadd ('day', 7, now ()))); } lic := ';rel="license",'; - return sprintf ('%s%sLink: %s%s; rel="timegate"', exp, loc, lic, alt, host, in_path); + return sprintf ('%s%sLink: %s%s; rel="timegate"', exp, loc, lic, alt, host, in_path); } ; diff --git a/binsrc/dbpedia/dbpedia_local.sql b/binsrc/dbpedia/dbpedia_local.sql index 00577a1532..715e138ef8 100644 --- a/binsrc/dbpedia/dbpedia_local.sql +++ b/binsrc/dbpedia/dbpedia_local.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dbpedia/make_vad.sh b/binsrc/dbpedia/make_vad.sh index 654cacd091..a44571029a 100755 --- a/binsrc/dbpedia/make_vad.sh +++ b/binsrc/dbpedia/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -251,7 +251,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/binsrc/dbpedia/vsp/description.sql b/binsrc/dbpedia/vsp/description.sql index c8a24b483c..645b465db7 100644 --- a/binsrc/dbpedia/vsp/description.sql +++ b/binsrc/dbpedia/vsp/description.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/dbpedia/vsp/description.vsp b/binsrc/dbpedia/vsp/description.vsp index 61ea76fdc2..a13e439a5c 100644 --- a/binsrc/dbpedia/vsp/description.vsp +++ b/binsrc/dbpedia/vsp/description.vsp @@ -13,7 +13,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -32,7 +32,7 @@ declare _G, _S, _P, _O, odd_position any; declare _resource_, project_name, project_home_page any; - declare page_resource_uri, rdf_link, rdf_link2, rdf_link3, rdf_link4, atom_link, jsod, ntriples, label, true_label, _subject, csv_link, cxml_link, gen_rdf_link, text_link, md_json_link, json_ld_link, embed_json, embed_turtle any; + declare page_resource_uri, rdf_link, rdf_link2, rdf_link3, rdf_link4, rdf_link5, atom_link, jsod, ntriples, label, true_label, _subject, csv_link, cxml_link, gen_rdf_link, text_link, md_json_link, json_ld_link, embed_json, embed_turtle any; declare iri_type, iri_uri, white_page, pkgs, txt, host, links, langs, dset, tmp_lines any; -- INIT VALLUES @@ -150,16 +150,18 @@ rdf_link2 := rdf_link || '&format=rdf'; rdf_link3 := rdf_link || '&format=application%2Frdf%2Bjson'; rdf_link4 := rdf_link || '&format=application%2Frdf%2Bjson'; - rdf_link := rdf_link || '&format=n3'; + rdf_link5 := rdf_link || '&format=text%2Fturtle'; atom_link := rdf_link || '&format=application%2Fatom%2Bxml'; jsod := rdf_link || '&format=application%2Fodata%2Bjson'; ntriples := rdf_link || '&format=text%2Fplain'; + rdf_link := rdf_link || '&format=text%2Fn3'; } else { rdf_link := rdf_link2 || '.n3'; rdf_link3 := rdf_link2 || '.json'; rdf_link4 := rdf_link2 || '.jrdf'; + rdf_link5 := rdf_link2 || '.ttl'; atom_link := rdf_link2 || '.atom'; jsod := rdf_link2 || '.jsod'; ntriples := rdf_link2 || '.ntriples'; @@ -168,7 +170,8 @@ links := 'Link: ;rel="license", '; links := links || sprintf ('<%s>; rel="alternate"; type="application/rdf+xml"; title="Structured Descriptor Document (RDF/XML format)", ', rdf_link2); - links := links || sprintf ('<%s>; rel="alternate"; type="text/n3"; title="Structured Descriptor Document (N3/Turtle format)", ',rdf_link); + links := links || sprintf ('<%s>; rel="alternate"; type="text/n3"; title="Structured Descriptor Document (N3 format)", ',rdf_link); + links := links || sprintf ('<%s>; rel="alternate"; type="text/turtle"; title="Structured Descriptor Document (Turtle format)", ',rdf_link5); links := links || sprintf ('<%s>; rel="alternate"; type="application/json"; title="Structured Descriptor Document (RDF/JSON format)", ', rdf_link3); links := links || sprintf ('<%s>; rel="alternate"; type="application/atom+xml"; title="OData (Atom+Feed format)", ', atom_link); links := links || sprintf ('<%s>; rel="alternate"; type="text/csv"; title="Structured Descriptor Document (CSV format)", ', csv_link); @@ -184,7 +187,7 @@ links := links || sprintf ('<%s>; rel="http://xmlns.com/foaf/0.1/primaryTopic", ', page_resource_uri); links := links || sprintf ('<%s>; rev="describedby", ', page_resource_uri); - links := links || sprintf ('; rel="timegate"\r\n', _resource_); + links := links || sprintf ('; rel="timegate"\r\n', _resource_); -- set for white page if (lower (host) <> 'dbpedia.org') @@ -224,7 +227,8 @@ About: <?V charset_recode (label, 'UTF-8', '_WIDE_') ?> - + + @@ -238,7 +242,7 @@ - + @@ -279,7 +283,8 @@
  •  RDF:
  • N-Triples
    • -
  • N3/Turtle
    • +
  • N3
    • +
  • Turtle
  • JSON
  • XML
  • diff --git a/binsrc/dbpedia/vsp/statics/css/dbpedia.css b/binsrc/dbpedia/vsp/statics/css/dbpedia.css index 6bedd6f9e8..a8dde1c364 100644 --- a/binsrc/dbpedia/vsp/statics/css/dbpedia.css +++ b/binsrc/dbpedia/vsp/statics/css/dbpedia.css @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/dbpedia/vsp/statics/js/dbpedia.js b/binsrc/dbpedia/vsp/statics/js/dbpedia.js index 3822c8c402..59705f69d4 100644 --- a/binsrc/dbpedia/vsp/statics/js/dbpedia.js +++ b/binsrc/dbpedia/vsp/statics/js/dbpedia.js @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/driver/Makefile.am b/binsrc/driver/Makefile.am index 10f89edb7a..0bd2a56b41 100644 --- a/binsrc/driver/Makefile.am +++ b/binsrc/driver/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -22,7 +22,7 @@ # # Driver version and description # -DRIVER_VERS = 07.02.3229 +DRIVER_VERS = 07.02.3230 DRIVER_DESC = OpenLink Virtuoso ODBC Driver diff --git a/binsrc/driver/unixodbc.c b/binsrc/driver/unixodbc.c index 95a2c17f37..2ee3747750 100644 --- a/binsrc/driver/unixodbc.c +++ b/binsrc/driver/unixodbc.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/.gitignore b/binsrc/fct/.gitignore similarity index 100% rename from binsrc/b3s/.gitignore rename to binsrc/fct/.gitignore diff --git a/binsrc/b3s/Makefile.am b/binsrc/fct/Makefile.am similarity index 97% rename from binsrc/b3s/Makefile.am rename to binsrc/fct/Makefile.am index 90437e7f1f..c6351844bd 100644 --- a/binsrc/b3s/Makefile.am +++ b/binsrc/fct/Makefile.am @@ -4,7 +4,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/VirtTripleLoader/.classpath b/binsrc/fct/VirtTripleLoader/.classpath similarity index 99% rename from binsrc/b3s/VirtTripleLoader/.classpath rename to binsrc/fct/VirtTripleLoader/.classpath index df634c1f18..e48dc36665 100644 --- a/binsrc/b3s/VirtTripleLoader/.classpath +++ b/binsrc/fct/VirtTripleLoader/.classpath @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/VirtTripleLoader/.project b/binsrc/fct/VirtTripleLoader/.project similarity index 96% rename from binsrc/b3s/VirtTripleLoader/.project rename to binsrc/fct/VirtTripleLoader/.project index 4dce44e33e..ec01ed109e 100644 --- a/binsrc/b3s/VirtTripleLoader/.project +++ b/binsrc/fct/VirtTripleLoader/.project @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/Logger.java b/binsrc/fct/VirtTripleLoader/src/virtTripleLoaderInit/Logger.java similarity index 96% rename from binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/Logger.java rename to binsrc/fct/VirtTripleLoader/src/virtTripleLoaderInit/Logger.java index e32b731ed1..bad3e82919 100644 --- a/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/Logger.java +++ b/binsrc/fct/VirtTripleLoader/src/virtTripleLoaderInit/Logger.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/VirtTripleLoaderInit.java b/binsrc/fct/VirtTripleLoader/src/virtTripleLoaderInit/VirtTripleLoaderInit.java similarity index 99% rename from binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/VirtTripleLoaderInit.java rename to binsrc/fct/VirtTripleLoader/src/virtTripleLoaderInit/VirtTripleLoaderInit.java index 92a0352dc3..03d112b396 100644 --- a/binsrc/b3s/VirtTripleLoader/src/virtTripleLoaderInit/VirtTripleLoaderInit.java +++ b/binsrc/fct/VirtTripleLoader/src/virtTripleLoaderInit/VirtTripleLoaderInit.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -84,7 +84,7 @@ public class VirtTripleLoaderInit { private static final Integer myMajorVer = 0; private static final Integer myMinorVer = 1; private static final Integer myBuild = 0; - private static final String myCopyright = "Copyright (c) 2008-2018 OpenLink Software"; + private static final String myCopyright = "Copyright (c) 2008-2019 OpenLink Software"; private static final String virtConnectUrlDef = "jdbc:virtuoso://neo:1111"; private static final String virtUserDef = "dba"; diff --git a/binsrc/b3s/b3s_cl_rexec.sql b/binsrc/fct/b3s_cl_rexec.sql similarity index 97% rename from binsrc/b3s/b3s_cl_rexec.sql rename to binsrc/fct/b3s_cl_rexec.sql index 13366a7efa..52213dce5f 100644 --- a/binsrc/b3s/b3s_cl_rexec.sql +++ b/binsrc/fct/b3s_cl_rexec.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/b3snotes.txt b/binsrc/fct/b3snotes.txt similarity index 100% rename from binsrc/b3s/b3snotes.txt rename to binsrc/fct/b3snotes.txt diff --git a/binsrc/b3s/b3sq.sql b/binsrc/fct/b3sq.sql similarity index 99% rename from binsrc/b3s/b3sq.sql rename to binsrc/fct/b3sq.sql index 2d21a74ccf..9f20435426 100644 --- a/binsrc/b3s/b3sq.sql +++ b/binsrc/fct/b3sq.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/bbc_demo_queries.vsp b/binsrc/fct/bbc_demo_queries.vsp similarity index 100% rename from binsrc/b3s/bbc_demo_queries.vsp rename to binsrc/fct/bbc_demo_queries.vsp diff --git a/binsrc/b3s/cl_prx.sql b/binsrc/fct/cl_prx.sql similarity index 86% rename from binsrc/b3s/cl_prx.sql rename to binsrc/fct/cl_prx.sql index a008289f5b..8df15a309a 100644 --- a/binsrc/b3s/cl_prx.sql +++ b/binsrc/fct/cl_prx.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -25,7 +25,7 @@ -- opts=>vector('url_rewrite', 'ext_http_proxy_rule_list1')); create procedure -ext_http_proxy_1 (in "url" varchar := null, +DB.DBA.EXT_HTTP_PROXY_1 (in "url" varchar := null, in exec varchar := null, in header varchar := null, in "force" varchar := null, @@ -134,12 +134,20 @@ end_loop:; else if ("url" not like 'nodeID://%') { - exec (sprintf ('sparql %s %s %s CONSTRUCT { ?s ?p ?o } FROM <%S> WHERE { ?s ?p ?o }', - defs, login, sponge, "url"), stat, msg, vector (), 0, metas, rset); + declare q_ses any; + q_ses := string_output (); + http (sprintf ('sparql %s %s %s CONSTRUCT { ?s ?p ?o } FROM ', defs, login, sponge), q_ses); + http_sparql_obj (__box_flags_tweak ("url", 1), q_ses); + http (' WHERE { ?s ?p ?o }', q_ses); + exec (string_output_string (q_ses), stat, msg, vector (), 0, metas, rset); } else { - exec (sprintf ('sparql %s DESCRIBE <%S>', defs, "url"), stat, msg, vector (), 0, metas, rset); + declare q_ses any; + q_ses := string_output (); + http (sprintf ('sparql %s DESCRIBE ', defs), q_ses); + http_sparql_obj (__box_flags_tweak ("url", 1), q_ses); + exec (string_output_string (q_ses), stat, msg, vector (), 0, metas, rset); } if (stat <> '00000') @@ -149,15 +157,20 @@ end_loop:; commit work; DB.DBA.SPARQL_RESULTS_WRITE (ses, metas, rset, accept, 1); - for select HS_EXPIRATION, HS_LAST_MODIFIED, HS_LAST_ETAG - from DB.DBA.SYS_HTTP_SPONGE where HS_LOCAL_IRI = "url" and HS_PARSER = 'DB.DBA.RDF_LOAD_HTTP_RESPONSE' do + declare expinfo any; + expinfo := SPONGER_GET_EXPIRY_INFO ("url"); + foreach (any rec in expinfo) do { - if (HS_LAST_MODIFIED is not null) - http_header (http_header_get () || sprintf ('Last-Modified: %s\r\n', date_rfc1123 (HS_LAST_MODIFIED))); - if (HS_LAST_ETAG is not null) - http_header (http_header_get () || sprintf ('ETag: %s\r\n', HS_LAST_ETAG)); - if (HS_EXPIRATION is not null) - http_header (http_header_get () || sprintf ('Expires: %s\r\n', date_rfc1123 (HS_EXPIRATION))); + declare last_modified, last_etag, expiration any; + expiration := rec[0]; + last_modified := rec[1]; + last_etag := rec[2]; + if (last_modified is not null) + http_header (http_header_get () || sprintf ('Last-Modified: %s\r\n', date_rfc1123 (last_modified))); + if (last_etag is not null) + http_header (http_header_get () || sprintf ('ETag: %s\r\n', last_etag)); + if (expiration is not null) + http_header (http_header_get () || sprintf ('Expires: %s\r\n', date_rfc1123 (expiration))); } http_header (http_header_get () || sprintf ('Content-Location: %s\r\n', "url")); http (ses); @@ -217,7 +230,7 @@ end_loop:; ; --!AFTER -grant execute on ext_http_proxy_1 to PROXY +grant execute on DB.DBA.EXT_HTTP_PROXY_1 to PROXY ; diff --git a/binsrc/b3s/complete.sql b/binsrc/fct/complete.sql similarity index 87% rename from binsrc/b3s/complete.sql rename to binsrc/fct/complete.sql index 19efcb8127..0eedf03840 100644 --- a/binsrc/b3s/complete.sql +++ b/binsrc/fct/complete.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -238,6 +238,35 @@ urilbl_ac_init_log (in msg varchar) } ; +create procedure +urilbl_ac_init_state(in info integer := 1) +{ + declare sts integer; + declare msg varchar; + + sts := cast (registry_get ('urilbl_ac_init_status') as integer); + msg := case sts + when 0 then 'Entity Lookup table has not been generated.' + when 1 then 'Entity Lookup table (re)generation in progress.' + when 2 then 'Entity Lookup table has been successfully generated.' + when 4711 then 'Entity Lookup table generation failed.' + else sprintf('Entity Lookup table in unknown state: %d', sts) + end; + + if (info = 1) { + if (sts = 2) return; + http (sprintf (' +
    + info + %V Contact the site administrator. +
    + ', msg)); + } else { + http(sprintf ('

    %V 0) http (sprintf ('select ?s%dp as ?c1 count (distinct (?s%d)) as ?c2 ', this_s, this_s), pre); else - http (sprintf ('select ?s%dp as ?c1 count (*) as ?c2 ', this_s), pre); + http (sprintf ('select ?s%dp as ?c1 count (distinct ?s%do) as ?c2 ', this_s, this_s), pre); http (sprintf (' ?s%d ?s%dp ?s%do .', this_s, this_s, this_s), txt); http (sprintf (' group by ?s%dp order by desc 2', this_s), post); @@ -850,7 +850,7 @@ fct_view (in tree any, in this_s int, in txt any, in pre any, in post any, in fu if ('properties-in' = mode) { - http (sprintf ('select ?s%dip as ?c1 count (*) as ?c2 ', this_s), pre); + http (sprintf ('select ?s%dip as ?c1 count (distinct ?s%d) as ?c2 ', this_s, this_s), pre); http (sprintf (' ?s%do ?s%dip ?s%d .', this_s, this_s, this_s), txt); http (sprintf (' group by ?s%dip order by desc 2', this_s), post); } @@ -866,7 +866,7 @@ fct_view (in tree any, in this_s int, in txt any, in pre any, in post any, in fu if (length (fct_inf_clause (tree)) > 0) http (sprintf ('select ?s%dc as ?c1 count (distinct (?s%d)) as ?c2 ', this_s, this_s), pre); else - http (sprintf ('select ?s%dc as ?c1 count (*) as ?c2 ', this_s), pre); + http (sprintf ('select ?s%dc as ?c1 count (distinct ?s%d) as ?c2 ', this_s, this_s), pre); http (sprintf (' ?s%d a ?s%dc .', this_s, this_s), txt); http (sprintf (' group by ?s%dc order by desc 2', this_s), post); } @@ -1040,7 +1040,7 @@ fct_value (in tree any, in this_s int, in txt any) declare t_s varchar; t_s := sprintf ('?s%d', this_s); - http (sprintf (' filter (%s %s %s) .', t_s, op, val)); + http (sprintf (' filter (%s %s %s) .', t_s, op, val), txt); return; } diff --git a/binsrc/b3s/facet.vsp b/binsrc/fct/facet.vsp similarity index 99% rename from binsrc/b3s/facet.vsp rename to binsrc/fct/facet.vsp index c8ee8558a4..c3870b46b8 100644 --- a/binsrc/b3s/facet.vsp +++ b/binsrc/fct/facet.vsp @@ -103,7 +103,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/facet_agg.sql b/binsrc/fct/facet_agg.sql similarity index 99% rename from binsrc/b3s/facet_agg.sql rename to binsrc/fct/facet_agg.sql index 9093f57ca3..79405a5514 100644 --- a/binsrc/b3s/facet_agg.sql +++ b/binsrc/fct/facet_agg.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/facet_doc.html b/binsrc/fct/facet_doc.html similarity index 98% rename from binsrc/b3s/facet_doc.html rename to binsrc/fct/facet_doc.html index 8f6f0e08dc..6456ac5bde 100644 --- a/binsrc/b3s/facet_doc.html +++ b/binsrc/fct/facet_doc.html @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -115,7 +115,7 @@

    More Information

    Powered by OpenLink Virtuoso Linked Data
    - Copyright © 2009-2018 OpenLink Software + Copyright © 2009-2019 OpenLink Software
    diff --git a/binsrc/b3s/facet_svc.sql b/binsrc/fct/facet_svc.sql similarity index 98% rename from binsrc/b3s/facet_svc.sql rename to binsrc/fct/facet_svc.sql index bb0f5b9f95..0ce7b7d875 100644 --- a/binsrc/b3s/facet_svc.sql +++ b/binsrc/fct/facet_svc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -61,7 +61,7 @@ fct_svc_exec (in tree any, in timeout int, in accept varchar, in lines any) declare start_time int; declare sqls, msg, qr, qr2, act varchar; declare ret, md, res, xmlout any; - + http_rewrite (); xmlout := 1; if (accept like '%/sparql-results+%' or accept = 'application/json') xmlout := 0; @@ -175,7 +175,7 @@ create procedure fct_search () __soap_http 'text/html' else { http_status_set (303); - http_header (sprintf ('Location: /sparql?query=%U&format=%U\r\n', fct_query (xtree_doc (cnt)), accept)); + http_header (sprintf ('Location: /sparql?query=%U&format=%U&timeout=%s\r\n', fct_query (xtree_doc (cnt)), accept, registry_get ('fct_timeout_max'))); } ret: return ''; diff --git a/binsrc/b3s/facet_test.sql b/binsrc/fct/facet_test.sql similarity index 98% rename from binsrc/b3s/facet_test.sql rename to binsrc/fct/facet_test.sql index 64f886f498..c79fe4491f 100644 --- a/binsrc/b3s/facet_test.sql +++ b/binsrc/fct/facet_test.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/facet_text.xsl b/binsrc/fct/facet_text.xsl similarity index 96% rename from binsrc/b3s/facet_text.xsl rename to binsrc/fct/facet_text.xsl index 7eba044458..859a99feaf 100644 --- a/binsrc/b3s/facet_text.xsl +++ b/binsrc/fct/facet_text.xsl @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/facet_view.sql b/binsrc/fct/facet_view.sql similarity index 99% rename from binsrc/b3s/facet_view.sql rename to binsrc/fct/facet_view.sql index 1a61b06999..e9463db23e 100644 --- a/binsrc/b3s/facet_view.sql +++ b/binsrc/fct/facet_view.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -871,11 +871,11 @@ fct_pretty_sparql (in q varchar, in lev int := 0) ses := string_output (); --q := sprintf ('%V', q); q := replace (q, '\n', ' '); - q := replace (q, '}', ' } '); - q := replace (q, '{', ' { '); - q := replace (q, ')', ' ) '); - q := replace (q, '(', ' ( '); - q := regexp_replace (q, '\\s\\s+', ' ', 1, null); + --q := replace (q, '}', ' } '); + --q := replace (q, '{', ' { '); + --q := replace (q, ')', ' ) '); + --q := replace (q, '(', ' ( '); + --q := regexp_replace (q, '\\s\\s+', ' ', 1, null); arr := split_and_decode (q, 0, '\0\0 '); inx := 0; fct_pretty_sparql_1 (arr, inx, length (arr), ses, lev); @@ -1677,12 +1677,9 @@ if (isstring (http_param ('dbg_out')))
    - '); if (registry_get ('urilbl_ac_init_status') <> '2') { http (' -
    - info - Lookup data (re)generation in progress. Results will be incomplete. -
    - '); } http (' + '); + urilbl_ac_init_state(1); + http (' + '); + urilbl_ac_init_state(1); + http ('

    @@ -1827,11 +1827,12 @@ fct_open_iri (in tree any, in sid int, in iri varchar) http ('select xmlelement ("result", xmlagg (xmlelement ("row", xmlelement ("column", __ro2sq ("c1")), xmlelement ("column", fct_label ("c1", 0, ''facets'')), xmlelement ("column", xmlattributes (fct_lang ("c2") as "xml:lang", fct_dtp ("c2") as "datatype"), __ro2sq ("c2"))))) from (sparql define output:valmode "LONG" ', txt); - http (sprintf (' %s %s %s select ?c1 ?c2 where { <%s> ?c1 ?c2 } limit 10000) xx', + http (sprintf (' %s %s %s select ?c1 ?c2 where { ', fct_graph_clause (tree), fct_inf_clause (tree), - fct_sas_clause (tree), - iri), txt); + fct_sas_clause (tree) ), txt); + http_sparql_object (__box_flags_tweak (iri, 1), txt); + http (' ?c1 ?c2 } limit 10000) xx', txt); sqls:= '00000'; diff --git a/binsrc/b3s/fct_drop_cond.xsl b/binsrc/fct/fct_drop_cond.xsl similarity index 97% rename from binsrc/b3s/fct_drop_cond.xsl rename to binsrc/fct/fct_drop_cond.xsl index 9c236dd69f..cfc323120c 100644 --- a/binsrc/b3s/fct_drop_cond.xsl +++ b/binsrc/fct/fct_drop_cond.xsl @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/fct_drop_text.xsl b/binsrc/fct/fct_drop_text.xsl similarity index 96% rename from binsrc/b3s/fct_drop_text.xsl rename to binsrc/fct/fct_drop_text.xsl index 0448bcab96..ae8d520a36 100644 --- a/binsrc/b3s/fct_drop_text.xsl +++ b/binsrc/fct/fct_drop_text.xsl @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/fct_inx.sql b/binsrc/fct/fct_inx.sql similarity index 96% rename from binsrc/b3s/fct_inx.sql rename to binsrc/fct/fct_inx.sql index 804eaa41be..60f97c7bf0 100644 --- a/binsrc/b3s/fct_inx.sql +++ b/binsrc/fct/fct_inx.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/fct_req.xsl b/binsrc/fct/fct_req.xsl similarity index 96% rename from binsrc/b3s/fct_req.xsl rename to binsrc/fct/fct_req.xsl index 0bb1f00536..20d64e8e94 100644 --- a/binsrc/b3s/fct_req.xsl +++ b/binsrc/fct/fct_req.xsl @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/fct_resp.xsl b/binsrc/fct/fct_resp.xsl similarity index 97% rename from binsrc/b3s/fct_resp.xsl rename to binsrc/fct/fct_resp.xsl index b3a95c15aa..bce9afa253 100644 --- a/binsrc/b3s/fct_resp.xsl +++ b/binsrc/fct/fct_resp.xsl @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/fct_set_agg.xsl b/binsrc/fct/fct_set_agg.xsl similarity index 96% rename from binsrc/b3s/fct_set_agg.xsl rename to binsrc/fct/fct_set_agg.xsl index c58ef10c1b..dbf991bec1 100644 --- a/binsrc/b3s/fct_set_agg.xsl +++ b/binsrc/fct/fct_set_agg.xsl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/fct_set_default.xsl b/binsrc/fct/fct_set_default.xsl similarity index 96% rename from binsrc/b3s/fct_set_default.xsl rename to binsrc/fct/fct_set_default.xsl index 2e94bfe277..f591035f92 100644 --- a/binsrc/b3s/fct_set_default.xsl +++ b/binsrc/fct/fct_set_default.xsl @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/fct_set_graphs.xsl b/binsrc/fct/fct_set_graphs.xsl similarity index 97% rename from binsrc/b3s/fct_set_graphs.xsl rename to binsrc/fct/fct_set_graphs.xsl index 25efb484a2..071fccabc0 100644 --- a/binsrc/b3s/fct_set_graphs.xsl +++ b/binsrc/fct/fct_set_graphs.xsl @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/fct_set_loc.xsl b/binsrc/fct/fct_set_loc.xsl similarity index 98% rename from binsrc/b3s/fct_set_loc.xsl rename to binsrc/fct/fct_set_loc.xsl index 3a24c18c76..03da251224 100644 --- a/binsrc/b3s/fct_set_loc.xsl +++ b/binsrc/fct/fct_set_loc.xsl @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/fct_set_text.xsl b/binsrc/fct/fct_set_text.xsl similarity index 97% rename from binsrc/b3s/fct_set_text.xsl rename to binsrc/fct/fct_set_text.xsl index 05e5fe3682..e127c47664 100644 --- a/binsrc/b3s/fct_set_text.xsl +++ b/binsrc/fct/fct_set_text.xsl @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/fct_set_view.xsl b/binsrc/fct/fct_set_view.xsl similarity index 99% rename from binsrc/b3s/fct_set_view.xsl rename to binsrc/fct/fct_set_view.xsl index 2ad50dee19..bf226acede 100644 --- a/binsrc/b3s/fct_set_view.xsl +++ b/binsrc/fct/fct_set_view.xsl @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/fct_strip_loc.xsl b/binsrc/fct/fct_strip_loc.xsl similarity index 97% rename from binsrc/b3s/fct_strip_loc.xsl rename to binsrc/fct/fct_strip_loc.xsl index 8d493aac0e..0645a68198 100644 --- a/binsrc/b3s/fct_strip_loc.xsl +++ b/binsrc/fct/fct_strip_loc.xsl @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/fct_vsp.xsl b/binsrc/fct/fct_vsp.xsl similarity index 99% rename from binsrc/b3s/fct_vsp.xsl rename to binsrc/fct/fct_vsp.xsl index 6e8dfcccb5..c9fec0c671 100644 --- a/binsrc/b3s/fct_vsp.xsl +++ b/binsrc/fct/fct_vsp.xsl @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -319,12 +319,14 @@ + - of total  diff --git a/binsrc/b3s/grants.sql b/binsrc/fct/grants.sql similarity index 98% rename from binsrc/b3s/grants.sql rename to binsrc/fct/grants.sql index 8b0ea41fb3..248c019878 100644 --- a/binsrc/b3s/grants.sql +++ b/binsrc/fct/grants.sql @@ -1,5 +1,4 @@ USER_SET_QUALIFIER ('SPARQL', 'DB'); -grant select on DB.DBA.SYS_HTTP_SPONGE to "SPARQL_SELECT"; grant select on WS.WS.SYS_DAV_RES to "SPARQL_SELECT"; grant insert,select,update,delete on DB.DBA.fct_state to "SPARQL_SELECT"; grant insert,select,update,delete on DB.DBA.fct_log to "SPARQL_SELECT"; @@ -52,6 +51,7 @@ grant execute on DB.DBA.DAV_SEARCH_PATH to "SPARQL_SELECT"; grant execute on DB.DBA.VT_INC_INDEX_DB_DBA_RDF_OBJ to "SPARQL_SELECT"; grant execute on DB.DBA.fct_do_desc_rset to "SPARQL_SELECT"; grant execute on b3s_lbl_order to "SPARQL_SELECT"; +grant execute on DB.DBA.FCT_GRAPH_USAGE_SUMMARY to "SPARQL_SELECT"; grant execute on DB.DBA.RDF_SPONGE_AUTH to "SPARQL_SELECT"; grant execute on b3s_u2w to "SPARQL_SELECT"; grant execute on DB.DBA.lp_score_ck to "SPARQL_SELECT"; diff --git a/binsrc/b3s/images/LoDLogo.gif b/binsrc/fct/images/LoDLogo.gif similarity index 100% rename from binsrc/b3s/images/LoDLogo.gif rename to binsrc/fct/images/LoDLogo.gif diff --git a/binsrc/b3s/images/atom_doc.png b/binsrc/fct/images/atom_doc.png similarity index 100% rename from binsrc/b3s/images/atom_doc.png rename to binsrc/fct/images/atom_doc.png diff --git a/binsrc/b3s/images/banbck1.png b/binsrc/fct/images/banbck1.png similarity index 100% rename from binsrc/b3s/images/banbck1.png rename to binsrc/fct/images/banbck1.png diff --git a/binsrc/b3s/images/bg_header.png b/binsrc/fct/images/bg_header.png similarity index 100% rename from binsrc/b3s/images/bg_header.png rename to binsrc/fct/images/bg_header.png diff --git a/binsrc/b3s/images/button_bar_back1.png b/binsrc/fct/images/button_bar_back1.png similarity index 100% rename from binsrc/b3s/images/button_bar_back1.png rename to binsrc/fct/images/button_bar_back1.png diff --git a/binsrc/b3s/images/creativecommons.png b/binsrc/fct/images/creativecommons.png similarity index 100% rename from binsrc/b3s/images/creativecommons.png rename to binsrc/fct/images/creativecommons.png diff --git a/binsrc/b3s/images/csv_doc.png b/binsrc/fct/images/csv_doc.png similarity index 100% rename from binsrc/b3s/images/csv_doc.png rename to binsrc/fct/images/csv_doc.png diff --git a/binsrc/b3s/images/cxml_doc.png b/binsrc/fct/images/cxml_doc.png similarity index 100% rename from binsrc/b3s/images/cxml_doc.png rename to binsrc/fct/images/cxml_doc.png diff --git a/binsrc/b3s/images/dlg_title_bkg.png b/binsrc/fct/images/dlg_title_bkg.png similarity index 100% rename from binsrc/b3s/images/dlg_title_bkg.png rename to binsrc/fct/images/dlg_title_bkg.png diff --git a/binsrc/b3s/images/fct-linkout-16-blk.png b/binsrc/fct/images/fct-linkout-16-blk.png similarity index 100% rename from binsrc/b3s/images/fct-linkout-16-blk.png rename to binsrc/fct/images/fct-linkout-16-blk.png diff --git a/binsrc/b3s/images/fct-linkout-16-blue.png b/binsrc/fct/images/fct-linkout-16-blue.png similarity index 100% rename from binsrc/b3s/images/fct-linkout-16-blue.png rename to binsrc/fct/images/fct-linkout-16-blue.png diff --git a/binsrc/b3s/images/ftbck.png b/binsrc/fct/images/ftbck.png similarity index 100% rename from binsrc/b3s/images/ftbck.png rename to binsrc/fct/images/ftbck.png diff --git a/binsrc/b3s/images/goout.gif b/binsrc/fct/images/goout.gif similarity index 100% rename from binsrc/b3s/images/goout.gif rename to binsrc/fct/images/goout.gif diff --git a/binsrc/b3s/images/html_doc.png b/binsrc/fct/images/html_doc.png similarity index 100% rename from binsrc/b3s/images/html_doc.png rename to binsrc/fct/images/html_doc.png diff --git a/binsrc/b3s/images/info.png b/binsrc/fct/images/info.png similarity index 100% rename from binsrc/b3s/images/info.png rename to binsrc/fct/images/info.png diff --git a/binsrc/b3s/images/json_doc.png b/binsrc/fct/images/json_doc.png similarity index 100% rename from binsrc/b3s/images/json_doc.png rename to binsrc/fct/images/json_doc.png diff --git a/binsrc/b3s/images/jsonld_doc.png b/binsrc/fct/images/jsonld_doc.png similarity index 100% rename from binsrc/b3s/images/jsonld_doc.png rename to binsrc/fct/images/jsonld_doc.png diff --git a/binsrc/b3s/images/link_16.png b/binsrc/fct/images/link_16.png similarity index 100% rename from binsrc/b3s/images/link_16.png rename to binsrc/fct/images/link_16.png diff --git a/binsrc/b3s/images/lod-datasets_2009-03-27_colored.png b/binsrc/fct/images/lod-datasets_2009-03-27_colored.png similarity index 100% rename from binsrc/b3s/images/lod-datasets_2009-03-27_colored.png rename to binsrc/fct/images/lod-datasets_2009-03-27_colored.png diff --git a/binsrc/b3s/images/messagebox_info.png b/binsrc/fct/images/messagebox_info.png similarity index 100% rename from binsrc/b3s/images/messagebox_info.png rename to binsrc/fct/images/messagebox_info.png diff --git a/binsrc/b3s/images/n3turtle_doc.png b/binsrc/fct/images/n3turtle_doc.png similarity index 100% rename from binsrc/b3s/images/n3turtle_doc.png rename to binsrc/fct/images/n3turtle_doc.png diff --git a/binsrc/b3s/images/notify-throbber.gif b/binsrc/fct/images/notify-throbber.gif similarity index 100% rename from binsrc/b3s/images/notify-throbber.gif rename to binsrc/fct/images/notify-throbber.gif diff --git a/binsrc/b3s/images/ntriples_doc.png b/binsrc/fct/images/ntriples_doc.png similarity index 100% rename from binsrc/b3s/images/ntriples_doc.png rename to binsrc/fct/images/ntriples_doc.png diff --git a/binsrc/b3s/images/od_80x15_red_green.png b/binsrc/fct/images/od_80x15_red_green.png similarity index 100% rename from binsrc/b3s/images/od_80x15_red_green.png rename to binsrc/fct/images/od_80x15_red_green.png diff --git a/binsrc/b3s/images/openlink150_on_blue.gif b/binsrc/fct/images/openlink150_on_blue.gif similarity index 100% rename from binsrc/b3s/images/openlink150_on_blue.gif rename to binsrc/fct/images/openlink150_on_blue.gif diff --git a/binsrc/b3s/images/openlink_site_logo.png b/binsrc/fct/images/openlink_site_logo.png similarity index 100% rename from binsrc/b3s/images/openlink_site_logo.png rename to binsrc/fct/images/openlink_site_logo.png diff --git a/binsrc/b3s/images/openlinklogo_wstrap_2008.png b/binsrc/fct/images/openlinklogo_wstrap_2008.png similarity index 100% rename from binsrc/b3s/images/openlinklogo_wstrap_2008.png rename to binsrc/fct/images/openlinklogo_wstrap_2008.png diff --git a/binsrc/b3s/images/openlinklogo_wstrap_2008_no_motto.png b/binsrc/fct/images/openlinklogo_wstrap_2008_no_motto.png similarity index 100% rename from binsrc/b3s/images/openlinklogo_wstrap_2008_no_motto.png rename to binsrc/fct/images/openlinklogo_wstrap_2008_no_motto.png diff --git a/binsrc/b3s/images/r_0.png b/binsrc/fct/images/r_0.png similarity index 100% rename from binsrc/b3s/images/r_0.png rename to binsrc/fct/images/r_0.png diff --git a/binsrc/b3s/images/r_1.png b/binsrc/fct/images/r_1.png similarity index 100% rename from binsrc/b3s/images/r_1.png rename to binsrc/fct/images/r_1.png diff --git a/binsrc/b3s/images/r_10.png b/binsrc/fct/images/r_10.png similarity index 100% rename from binsrc/b3s/images/r_10.png rename to binsrc/fct/images/r_10.png diff --git a/binsrc/b3s/images/r_2.png b/binsrc/fct/images/r_2.png similarity index 100% rename from binsrc/b3s/images/r_2.png rename to binsrc/fct/images/r_2.png diff --git a/binsrc/b3s/images/r_3.png b/binsrc/fct/images/r_3.png similarity index 100% rename from binsrc/b3s/images/r_3.png rename to binsrc/fct/images/r_3.png diff --git a/binsrc/b3s/images/r_4.png b/binsrc/fct/images/r_4.png similarity index 100% rename from binsrc/b3s/images/r_4.png rename to binsrc/fct/images/r_4.png diff --git a/binsrc/b3s/images/r_5.png b/binsrc/fct/images/r_5.png similarity index 100% rename from binsrc/b3s/images/r_5.png rename to binsrc/fct/images/r_5.png diff --git a/binsrc/b3s/images/r_6.png b/binsrc/fct/images/r_6.png similarity index 100% rename from binsrc/b3s/images/r_6.png rename to binsrc/fct/images/r_6.png diff --git a/binsrc/b3s/images/r_7.png b/binsrc/fct/images/r_7.png similarity index 100% rename from binsrc/b3s/images/r_7.png rename to binsrc/fct/images/r_7.png diff --git a/binsrc/b3s/images/r_8.png b/binsrc/fct/images/r_8.png similarity index 100% rename from binsrc/b3s/images/r_8.png rename to binsrc/fct/images/r_8.png diff --git a/binsrc/b3s/images/r_9.png b/binsrc/fct/images/r_9.png similarity index 100% rename from binsrc/b3s/images/r_9.png rename to binsrc/fct/images/r_9.png diff --git a/binsrc/b3s/images/rdf-icon.gif b/binsrc/fct/images/rdf-icon.gif similarity index 100% rename from binsrc/b3s/images/rdf-icon.gif rename to binsrc/fct/images/rdf-icon.gif diff --git a/binsrc/b3s/images/rdf_w3c.png b/binsrc/fct/images/rdf_w3c.png similarity index 100% rename from binsrc/b3s/images/rdf_w3c.png rename to binsrc/fct/images/rdf_w3c.png diff --git a/binsrc/b3s/images/rdf_w3c.svg b/binsrc/fct/images/rdf_w3c.svg similarity index 100% rename from binsrc/b3s/images/rdf_w3c.svg rename to binsrc/fct/images/rdf_w3c.svg diff --git a/binsrc/b3s/images/rdf_w3c_300.png b/binsrc/fct/images/rdf_w3c_300.png similarity index 100% rename from binsrc/b3s/images/rdf_w3c_300.png rename to binsrc/fct/images/rdf_w3c_300.png diff --git a/binsrc/b3s/images/rdf_w3c_500.png b/binsrc/fct/images/rdf_w3c_500.png similarity index 100% rename from binsrc/b3s/images/rdf_w3c_500.png rename to binsrc/fct/images/rdf_w3c_500.png diff --git a/binsrc/b3s/images/rdf_w3c_742.png b/binsrc/fct/images/rdf_w3c_742.png similarity index 100% rename from binsrc/b3s/images/rdf_w3c_742.png rename to binsrc/fct/images/rdf_w3c_742.png diff --git a/binsrc/b3s/images/rdf_w3c_742_trans.png b/binsrc/fct/images/rdf_w3c_742_trans.png similarity index 100% rename from binsrc/b3s/images/rdf_w3c_742_trans.png rename to binsrc/fct/images/rdf_w3c_742_trans.png diff --git a/binsrc/b3s/images/sponge.png b/binsrc/fct/images/sponge.png similarity index 100% rename from binsrc/b3s/images/sponge.png rename to binsrc/fct/images/sponge.png diff --git a/binsrc/b3s/images/sw-cube.png b/binsrc/fct/images/sw-cube.png similarity index 100% rename from binsrc/b3s/images/sw-cube.png rename to binsrc/fct/images/sw-cube.png diff --git a/binsrc/b3s/images/sw-rdf-blue.png b/binsrc/fct/images/sw-rdf-blue.png similarity index 100% rename from binsrc/b3s/images/sw-rdf-blue.png rename to binsrc/fct/images/sw-rdf-blue.png diff --git a/binsrc/b3s/images/sw-rdf-gray.png b/binsrc/fct/images/sw-rdf-gray.png similarity index 100% rename from binsrc/b3s/images/sw-rdf-gray.png rename to binsrc/fct/images/sw-rdf-gray.png diff --git a/binsrc/b3s/images/sw-sparql-blue.png b/binsrc/fct/images/sw-sparql-blue.png similarity index 100% rename from binsrc/b3s/images/sw-sparql-blue.png rename to binsrc/fct/images/sw-sparql-blue.png diff --git a/binsrc/b3s/images/sw-vert-v.png b/binsrc/fct/images/sw-vert-v.png similarity index 100% rename from binsrc/b3s/images/sw-vert-v.png rename to binsrc/fct/images/sw-vert-v.png diff --git a/binsrc/b3s/images/sw-vert-v.svg b/binsrc/fct/images/sw-vert-v.svg similarity index 100% rename from binsrc/b3s/images/sw-vert-v.svg rename to binsrc/fct/images/sw-vert-v.svg diff --git a/binsrc/b3s/images/sw-vert-v_780_trans.png b/binsrc/fct/images/sw-vert-v_780_trans.png similarity index 100% rename from binsrc/b3s/images/sw-vert-v_780_trans.png rename to binsrc/fct/images/sw-vert-v_780_trans.png diff --git a/binsrc/b3s/images/tab_page_back1.png b/binsrc/fct/images/tab_page_back1.png similarity index 100% rename from binsrc/b3s/images/tab_page_back1.png rename to binsrc/fct/images/tab_page_back1.png diff --git a/binsrc/b3s/images/tablv1default.png b/binsrc/fct/images/tablv1default.png similarity index 100% rename from binsrc/b3s/images/tablv1default.png rename to binsrc/fct/images/tablv1default.png diff --git a/binsrc/b3s/images/tablv1sel.png b/binsrc/fct/images/tablv1sel.png similarity index 100% rename from binsrc/b3s/images/tablv1sel.png rename to binsrc/fct/images/tablv1sel.png diff --git a/binsrc/b3s/images/thrb.gif b/binsrc/fct/images/thrb.gif similarity index 100% rename from binsrc/b3s/images/thrb.gif rename to binsrc/fct/images/thrb.gif diff --git a/binsrc/b3s/images/virt_power_no_border.png b/binsrc/fct/images/virt_power_no_border.png similarity index 100% rename from binsrc/b3s/images/virt_power_no_border.png rename to binsrc/fct/images/virt_power_no_border.png diff --git a/binsrc/b3s/images/xml_doc.png b/binsrc/fct/images/xml_doc.png similarity index 100% rename from binsrc/b3s/images/xml_doc.png rename to binsrc/fct/images/xml_doc.png diff --git a/binsrc/b3s/install.html b/binsrc/fct/install.html similarity index 100% rename from binsrc/b3s/install.html rename to binsrc/fct/install.html diff --git a/binsrc/b3s/isparql_describe.xsl b/binsrc/fct/isparql_describe.xsl similarity index 97% rename from binsrc/b3s/isparql_describe.xsl rename to binsrc/fct/isparql_describe.xsl index 46a4b8780f..132984e282 100644 --- a/binsrc/b3s/isparql_describe.xsl +++ b/binsrc/fct/isparql_describe.xsl @@ -7,7 +7,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/make_vad.sh b/binsrc/fct/make_vad.sh similarity index 99% rename from binsrc/b3s/make_vad.sh rename to binsrc/fct/make_vad.sh index 23a77b22cc..d41b1e44de 100755 --- a/binsrc/b3s/make_vad.sh +++ b/binsrc/fct/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -258,7 +258,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/binsrc/b3s/ns.sql b/binsrc/fct/ns.sql similarity index 98% rename from binsrc/b3s/ns.sql rename to binsrc/fct/ns.sql index 5e132f4b8d..8f8a13d691 100644 --- a/binsrc/b3s/ns.sql +++ b/binsrc/fct/ns.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/nsdecl.sql b/binsrc/fct/nsdecl.sql similarity index 99% rename from binsrc/b3s/nsdecl.sql rename to binsrc/fct/nsdecl.sql index 3f9f1ce790..2d93428680 100644 --- a/binsrc/b3s/nsdecl.sql +++ b/binsrc/fct/nsdecl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/open.xsl b/binsrc/fct/open.xsl similarity index 97% rename from binsrc/b3s/open.xsl rename to binsrc/fct/open.xsl index 12f34eadb6..7d1d24eaea 100644 --- a/binsrc/b3s/open.xsl +++ b/binsrc/fct/open.xsl @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/opensearchdescription.vsp b/binsrc/fct/opensearchdescription.vsp similarity index 98% rename from binsrc/b3s/opensearchdescription.vsp rename to binsrc/fct/opensearchdescription.vsp index d7191aa15c..2cd129788a 100644 --- a/binsrc/b3s/opensearchdescription.vsp +++ b/binsrc/fct/opensearchdescription.vsp @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/oplweb.owl b/binsrc/fct/oplweb.owl similarity index 100% rename from binsrc/b3s/oplweb.owl rename to binsrc/fct/oplweb.owl diff --git a/binsrc/b3s/post_install.html b/binsrc/fct/post_install.html similarity index 100% rename from binsrc/b3s/post_install.html rename to binsrc/fct/post_install.html diff --git a/binsrc/b3s/rdfdesc/description.sql b/binsrc/fct/rdfdesc/description.sql similarity index 80% rename from binsrc/b3s/rdfdesc/description.sql rename to binsrc/fct/rdfdesc/description.sql index 8ba5bff3d3..afe1be396a 100644 --- a/binsrc/b3s/rdfdesc/description.sql +++ b/binsrc/fct/rdfdesc/description.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -152,23 +152,28 @@ b3s_handle_ses (inout _path any, inout _lines any, inout _params any) create procedure b3s_e_type (in subj varchar) { + declare stat, msg any; declare meta, data, ll any; declare i int; - declare stat, msg any; ll := 'http://www.w3.org/2002/07/owl#Thing'; if (length (subj)) - { + { + declare q_txt any; stat := '00000'; data := null; - exec (sprintf ('sparql select ?tp where { <%s> a ?tp }', subj), stat, msg, vector (), 100, meta, data); + q_txt := string_output (); + http ('sparql select ?tp where { ', q_txt); + http_sparql_object (__box_flags_tweak (subj, 1), q_txt); + http (' a ?tp }', q_txt); + exec (string_output_string (q_txt), stat, msg, vector (), 100, meta, data); if (length (data)) { for (i := 0; i < length (data); i := i + 1) { - if (data[i][0] is not null) + if (data[i][0] is not null and __box_flags (data[i][0]) = 1) return data[i][0]; } } @@ -183,6 +188,7 @@ b3s_type (in subj varchar, out url varchar, out c_iri varchar) { + declare stat, msg any; declare meta, data, ll any; declare i int; @@ -192,9 +198,12 @@ b3s_type (in subj varchar, if (length (subj)) { - exec (sprintf ('sparql select ?l ?tp %s where { <%s> a ?tp optional { ?tp rdfs:label ?l } }', _from, subj), - null, null, vector (), 100, meta, data); - + declare q_txt any; + q_txt := string_output (); + http ('sparql select ?l ?tp ' || _from || ' where { ', q_txt); + http_sparql_object (__box_flags_tweak (subj, 1), q_txt); + http (' a ?tp optional { ?tp rdfs:label ?l } }', q_txt); + exec (string_output_string (q_txt), stat, msg, vector (), 100, meta, data); if (length (data)) { for (i := 0; i < length (data); i := i + 1) @@ -241,18 +250,24 @@ create procedure b3s_find_class_type (in _s varchar, in _f varchar, inout types_ return 1; } - declare stmt, st, msg varchar; + declare st, msg varchar; declare meta,data any; + declare q_txt any; data := null; st := '00000'; msg:= ''; - - stmt := sprintf ('sparql select ?to %s where { quad map virtrdf:DefaultQuadMap { ?to a <%s> }}', _f, _s); - - exec (stmt, st, msg, vector(), 1, meta, data); - + q_txt := string_output (); + http ('sparql select ?to ' || _f || ' where { quad map virtrdf:DefaultQuadMap { ?to a ', q_txt); + http_sparql_object (__box_flags_tweak (_s, 1), q_txt); + http (' }}', q_txt); + exec (string_output_string (q_txt), st, msg, vector(), 1, meta, data); + if (length (data)) return 1; + q_txt := string_output (); + http ('sparql select ?to ' || _f || ' where { graph ?g { ?to a ', q_txt); + http_sparql_object (__box_flags_tweak (_s, 1), q_txt); + http (' }}', q_txt); + exec (string_output_string (q_txt), st, msg, vector(), 1, meta, data); if (length (data)) return 1; - return 0; } ; @@ -277,71 +292,59 @@ create procedure b3s_uri_local_part (in uri varchar) -- vector (vector (, ,

    ', src); + } else { + if(mt like '%html%') { + abody := (select top 1 __rdf_sqlval_of_obj(O) from RDF_QUAD + where S=iri_to_id(_url) + and P=iri_to_id('http://bblfish.net/work/atom-owl/2006-06-06/#body')); + } + } + if(abody is not null) { + abody := cast(abody as varchar); + if(length(abody)>5) { + declare lbl, vlbl any; + lbl := ''; + if ((registry_get ('fct_desc_value_labels') = '1' or registry_get ('fct_desc_value_labels') = 0) and (__tag (_object) = 243 or (isstring (_object) and __box_flags (_object) = 1))) + lbl := b3s_label (_url, langs, 1); + if ((not isstring(lbl)) or length (lbl) = 0) + lbl := b3s_uri_curie(_url); + http (sprintf ('', robotsrel, rdfa, b3s_http_url (_url, sid, _from))); + vlbl := charset_recode (lbl, 'UTF-8', '_WIDE_'); + http_value (case when vlbl <> 0 then vlbl else lbl end); + http (sprintf ('')); + if (b3s_o_is_out (prop)) + http (sprintf (' ', _url)); + http(sprintf('
    %s
    ', cast(abody as varchar))); + } + } else { + goto usual_iri; + } } else if (http_mime_type (_url) like 'image/%' or http_mime_type (_url) = 'application/x-openlink-photo' or b3s_o_is_img (prop)) { @@ -941,12 +1006,11 @@ again: lbl := b3s_uri_curie(_url); -- XXX: must encode as wide label to print correctly --http (sprintf ('%V', rdfa, b3s_http_url (_url, sid, _from), lbl)); - http (sprintf ('', b3s_http_url (_url, sid, _from))); + http (sprintf ('', robotsrel, rdfa, b3s_http_url (_url, sid, _from))); vlbl := charset_recode (lbl, 'UTF-8', '_WIDE_'); http_value (case when vlbl <> 0 then vlbl else lbl end); http (sprintf ('')); - http (sprintf ('', rdfa, case when flag = 0 then _url else subj end)); - if (b3s_o_is_out (prop) and flag = 0) + if (b3s_o_is_out (prop)) http (sprintf (' ', _url)); } @@ -993,7 +1057,7 @@ again: else http_value (vlbl); http (''); - lang := ''; + --lang := ''; } else if (__tag (_object) = 211) { @@ -1039,7 +1103,7 @@ again: if (lang is not NULL and lang <> '') { - http (sprintf ('(%s)', lang)); + http (sprintf (' (%s)', lang)); } http (''); @@ -1134,8 +1198,13 @@ fct_make_selector (in subj any, in sid integer) create procedure fct_make_curie (in url varchar, in lines any) { declare curie, chost, dhost varchar; - if (__proc_exists ('WS.CURI.curi_make_curi') is null) + declare len integer; + + len := cast (registry_get('c_uri_min_url_len') as integer); + if (len = 0) len := 255; + if (__proc_exists ('WS.CURI.curi_make_curi') is null OR length(url) < len) return url; + curie := WS.CURI.curi_make_curi (url); dhost := registry_get ('URIQADefaultHost'); chost := http_request_header(lines, 'Host', null, dhost); @@ -1260,6 +1329,66 @@ create procedure b3s_lbl_order (in p any, in lbl_order_pref_id int := 0) } ; + +create function DB.DBA.FCT_GRAPH_USAGE_SUMMARY (in subj_iri any, in fld varchar, in lim integer := 20) returns any +{ + declare qr varchar; + declare q_txt, tot_dict, phy_dict, quad_maps, rset, tmp_res, res any; + declare tot_dict_size, ctr, len integer; + quad_maps := case fld when 'S' then sparql_quad_maps_for_quad (NULL, uname(subj_iri), NULL, NULL) else sparql_quad_maps_for_quad (NULL, NULL, NULL, uname(subj_iri)) end; + tot_dict_size := lim + length (quad_maps) * 2; + tot_dict := dict_new (tot_dict_size); + phy_dict := dict_new (lim); + qr := 'sparql define input:storage "" +select str(?g) count (*) +where + { graph ?g { ' || case fld when 'S' then '`iri(??)`' else '?s' end || ' ?p ' || case fld when 'O' then '`iri(??)`' else '?o' end || ' + } } group by ?g order by desc 2 limit ' || cast (tot_dict_size as varchar); + rset := null; + exec (qr, null, null, vector (subj_iri), vector ('max_rows', lim), null, rset); + foreach (any g_and_cnt in rset) do + { + dict_put (phy_dict, g_and_cnt[0], g_and_cnt[1]); + dict_inc_or_put (tot_dict, g_and_cnt[0], g_and_cnt[1]); + } + foreach (any qm_item in quad_maps) do + { + declare qm any; + declare stat, msg varchar; + declare inx, rset_len integer; + qm := qm_item[0]; + if (qm = UNAME'http://www.openlinksw.com/schemas/virtrdf#DefaultQuadMap') + goto done; + q_txt := string_output(); + http ('sparql select str(?g) count (1) where { graph ?g { quad map ', q_txt); + http_sparql_object (qm, q_txt); + http (' { ', q_txt); + if ('O' = fld) http ('?s ?p ', q_txt); + http_sparql_object (__box_flags_tweak (subj_iri, 1), q_txt); + if ('S' = fld) http (' ?p ?o', q_txt); + http (' } } } limit ' || tot_dict_size, q_txt); + stat := '00000'; + rset := null; + exec (string_output_string (q_txt), stat, msg, vector(), vector ('use_cache', 1, 'max_rows', tot_dict_size), null, rset); + rset_len := length (rset); + --dbg_obj_princ (string_output_string (q_txt)); + --dbg_obj_princ (stat, msg, rset_len); + for (inx := 0; inx < rset_len; inx := inx + 1) + dict_inc_or_put (tot_dict, rset[inx][0], rset[inx][1]); + } +done: ; + tmp_res := dict_to_vector (tot_dict, 2); + len := length (tmp_res) / 2; + res := make_array (len, 'any'); + for (ctr := 0; ctr < len; ctr := ctr + 1) + res[ctr] := vector (tmp_res[ctr*2], tmp_res[ctr*2+1], dict_get (phy_dict, tmp_res[ctr*2], 0)); + rowvector_digit_sort (res, 1, 0); + if (len > lim) + return subseq (res, 0, lim); + return res; +} +; + create procedure b3s_gs_check_needed () { declare gs_user_id integer; diff --git a/binsrc/b3s/rdfdesc/description.vsp b/binsrc/fct/rdfdesc/description.vsp similarity index 89% rename from binsrc/b3s/rdfdesc/description.vsp rename to binsrc/fct/rdfdesc/description.vsp index f34c7428e7..a77d4cbda3 100644 --- a/binsrc/b3s/rdfdesc/description.vsp +++ b/binsrc/fct/rdfdesc/description.vsp @@ -15,7 +15,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -67,6 +67,7 @@ declare stat, msg varchar; declare metas, rset any; declare auto_sponge_on_empty_graph int; + declare q_txt any; if (registry_get ('fct_auto_sponge') = '1') auto_sponge_on_empty_graph := 1; @@ -183,14 +184,21 @@ again: page := atoi (get_keyword ('gp', params, '1')) - 1; else page := atoi (get_keyword ('p', params, '1')) - 1; + + -- Sanity checks + if (page is not null) { + if (page < 0) page := 0; + if (page > _last) page := _last; + } + --topof := ''; b3s_dbg_out (dbg_out, 'sid : ' || sid); b3s_dbg_out (dbg_out, 'gr : ' || gr); arr := rfc1808_parse_uri (gr); - if (gr[0] <> '#'[0] and arr[0] = '' and arr[1] = '' and arr[2] <> '') - gr := 'http://' || gr; +-- if (gr[0] <> '#'[0] and arr[0] = '' and arr[1] = '' and arr[2] <> '') +-- gr := 'http://' || gr; arr := rfc1808_parse_uri (gr); arr [5] := ''; @@ -257,25 +265,25 @@ again: -- if (get_keyword ('sp', params) = '1' and 0 = length (_F)) if (get_keyword ('sp', params) = '1') { - DB.DBA.EXEC_AS (sprintf ('sparql define get:error-recovery "signal" define input:storage "" define get:soft "add" SELECT * from <%s> where { ?x ?y ?z . }', _G), 'SPARQL', 1); + q_txt := string_output (); + http ('sparql define get:error-recovery "signal" define input:storage "" define get:soft "add" SELECT * from ', q_txt); + http_sparql_object (__box_flags_tweak (_G, 1), q_txt); + http (' where { ?x ?y ?z . }', q_txt); + DB.DBA.EXEC_AS (string_output_string (q_txt), 'SPARQL', 1); + DB.DBA.VT_INC_INDEX_DB_DBA_RDF_OBJ (); sp_done := 1; } - -- else if ((get_keyword ('sr', params) is not null or get_keyword ('sponger:get', params) is not null) and 0 = length (_F)) else if ((get_keyword ('sr', params) is not null or get_keyword ('sponger:get', params) is not null)) { declare refr varchar; if (get_keyword ('sr', params, '') = 'clean') { refr := 0; - if (exists (select 1 from SYS_HTTP_SPONGE where HS_ORIGIN_URI = doc)) + if (DB.DBA.SPONGER_DOCUMENT_IS_SPONGED (doc)) { - -- Checks whether any Sponger ACLs will prevent sponging, even if the user's graph permissions allow it. - -- if (SPONGING_ALLOWED()) -- only available on develop/7.x branch - { - -- We're user SPARQL at this point - DB.DBA.EXEC_AS (sprintf ('sparql clear graph <%s>', _G), 'dba'); - } + -- We're user SPARQL at this point + DB.DBA.EXEC_AS (sprintf ('sparql clear graph <%s>', _G), 'dba'); } } else @@ -289,7 +297,7 @@ again: if (sp_done) { http_status_set (302); - http_header (sprintf ('Location: /describe/?url=%U%s\r\n', _G, ses_parms)); + http_header (sprintf ('Location: /describe/?url=%U%s\r\n', page_resource_uri, ses_parms)); return; } } @@ -347,10 +355,11 @@ again: rdf_link := sprintf ('/sparql?query=%U', __box_flags_tweak (sprintf ('define sql:describe-mode "CBD" %s DESCRIBE <%s>', b3s_render_inf_clause(), _S), 2)); __box_flags_set (rdf_link, 2); - declare __res_desc, qs, qv, best_variant, accept varchar; + declare __res_desc, qs, qv, best_variant, accept, protocol varchar; declare best_q, curr float; declare inx int; + protocol := 'http'; if (is_https_ctx()) protocol := 'https'; accept := http_request_header_full (lines, 'Accept', 'text/html'); if (accept = '*/*') accept := 'text/html'; @@ -377,12 +386,12 @@ again: http_rewrite (); http_status_set (406); http_header ('Alternates: '); - http_header (http_header_get () || sprintf ('{ "http://%{WSHost}s/describe/?url=%U" 0.5 {type text/html}}', gr)); + http_header (http_header_get () || sprintf ('{ "%s://%{WSHost}s/describe/?url=%U" 0.5 {type text/html}}', protocol, gr)); inx := 0; foreach (varchar q in qs) do { if (q not in ('text/html', 'application/xhtml+xml')) - http_header (http_header_get () || sprintf (', { "http://%{WSHost}s%s&format=%U" %.2f {type %s}}', rdf_link, q, qv[inx], q)); + http_header (http_header_get () || sprintf (', { "%s://%{WSHost}s%s&format=%U" %.2f {type %s}}', protocol, rdf_link, q, qv[inx], q)); inx := inx + 1; } http_header (http_header_get () || '\r\n'); @@ -392,7 +401,7 @@ again: { http_rewrite (); http_status_set (303); - http_header (sprintf ('TCN: choice\r\nVary: negotiate,accept\r\nLocation: http://%{WSHost}s%s&format=%U\r\n', rdf_link, best_variant)); + http_header (sprintf ('TCN: choice\r\nVary: negotiate,accept\r\nLocation: %s://%{WSHost}s%s&format=%U\r\n', protocol, rdf_link, best_variant)); return; } __res_desc := b3s_uri_curie(page_resource_uri); @@ -433,7 +442,7 @@ again: ?> - + About: <?vsp if (length (label)) http_value (label); else http_value (b3s_uri_curie (page_resource_uri));?> @@ -452,7 +461,7 @@ again: - +
    @@ -464,11 +473,11 @@ again:
  • Facets (new session)
    • -
  • Description
    • +
  • Description
  • Metadata
    • -
  • Settings +
  • Settings
'); + } + else + { + http_request_status ('HTTP/1.1 404 Not Found'); http (''); } + + } ?>
'); + http_value (err); + http ('

No further information is available.

diff --git a/binsrc/b3s/rdfdesc/usage.vsp b/binsrc/fct/rdfdesc/usage.vsp similarity index 80% rename from binsrc/b3s/rdfdesc/usage.vsp rename to binsrc/fct/rdfdesc/usage.vsp index 57134862e3..7548fe8bdc 100644 --- a/binsrc/b3s/rdfdesc/usage.vsp +++ b/binsrc/fct/rdfdesc/usage.vsp @@ -15,7 +15,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -40,9 +40,10 @@ declare dbg_enable varchar; declare dbg_out any; declare inf_rule varchar; - declare ses_parms varchar; + declare ses_params varchar; declare pageUrl varchar; declare user_permissions int; + declare q_txt any; white_page := 1; @@ -74,7 +75,7 @@ if (inf_rule is null) { inf_rule := 'b3sifp'; } - ses_parms := b3s_render_ses_params(); + ses_params := b3s_render_ses_params (); host := http_request_header (http_request_header (), 'Host'); langs := http_request_header_full (lines, 'Accept-Language', 'en'); @@ -85,7 +86,7 @@ gr := 'http://' || gr; page_resource_uri := gr; - page_resource_uri := replace (page_resource_uri, '%23', '#'); + --page_resource_uri := replace (page_resource_uri, '%23', '#'); pageUrl := FCT.DBA.build_page_url_on_current_host ('/fct/rdfdesc/usage.vsp', sprintf ('g=%U', page_resource_uri)); @@ -104,8 +105,12 @@ label := b3s_label_get (data, langs); - exec (sprintf ('sparql %s prefix rdfs: prefix dc: - select ?o (lang(?o)) where { <%S> rdfs:comment ?o }', inf, _S), null, null, vector (), 0, meta, data); + q_txt := string_output (); + http (sprintf ('sparql %s prefix rdfs: prefix dc: + select ?o (lang(?o)) where { ', inf), q_txt); + http_sparql_object (__box_flags_tweak (_S, 1), q_txt); + http (' rdfs:comment ?o }', q_txt); + exec (string_output_string (q_txt), null, null, vector (), 0, meta, data); _subject := b3s_label_get (data, langs); rdf_link := sprintf ('/sparql?query=%U', sprintf ('define sql:describe-mode "CBD" %s DESCRIBE <%s>', b3s_render_inf_clause(), _S)); @@ -148,7 +153,7 @@ - + Metadata about: <?vsp http (sprintf ('%s', label)); ?> @@ -168,18 +173,18 @@
  • Facets
    • -
  • Description
    • +
  • Description
  • Metadata
    • -
  • Settings
    • +
  • Settings

    • About: -

     Permalink +  Permalink

    an Entity references as follows:

    @@ -194,19 +199,19 @@
    Subject of Sentences In Document + href="?g=&tp=1">Subject of Sentences In Document
    Object of Sentences In Document + href="?g=&tp=2">Object of Sentences In Document
    Explicit Coreferences + href="?g=&tp=3">Explicit Coreferences
    Implicit Coreferences + href="?g=&tp=4">Implicit Coreferences
    @@ -217,59 +222,66 @@ declare qr varchar; declare tgr any; tgr := vector (); - if (tp = 1) -- refd in data sets + if (tp in (1, 2)) -- refd in data sets { - qr := 'sparql define input:storage "" select ?g count (*) where { graph ?g { `iri(??)` ?p ?o }} group by ?g order by desc 2 limit 20'; + declare graph_usages any; + declare row_ctr, row_count integer; + graph_usages := DB.DBA.FCT_GRAPH_USAGE_SUMMARY (_S, case tp when 1 then 'S' else 'O' end, 20); http ('
    Graph IRICount
    Graph IRICount
    %V'); + http (case when phy = tot then sprintf ('%d triples', tot) when phy = 0 then sprintf ('%d virtual triples', tot) else sprintf ('%d triples: %d physical + %d virtual', tot, phy, tot - phy) end); + http ('
    %sRank
    %V%.6g
    %s%s%sRank
    %V%d%V%.6g%V%V%V%V%V%V%.06g%s
    \n'); + http('\n'); + for (SELECT TOP 10 ULLOG_TS, ULLOG_MSG FROM URILBL_CPL_LOG ORDER BY 1 DESC) do { + http (sprintf (' \n', ULLOG_TS, ULLOG_MSG)); + } + http('
    DateMessage
    %V%V
    \n'); + } + ?> +

    + Note:The function urilbl_ac_init_db() should be run periodically as the data grows to regenerate the lookup table. +

    + +

    + See also: +

    +

    + +
    +

    To close this page, press + + or use the "back" button of the browser. +

    +
    + + + diff --git a/binsrc/fct/vad_version b/binsrc/fct/vad_version new file mode 100644 index 0000000000..b4c4be8f07 --- /dev/null +++ b/binsrc/fct/vad_version @@ -0,0 +1 @@ +1.16.101 diff --git a/binsrc/b3s/virt_rdf_label.sql b/binsrc/fct/virt_rdf_label.sql similarity index 99% rename from binsrc/b3s/virt_rdf_label.sql rename to binsrc/fct/virt_rdf_label.sql index b21f97f889..036b96be71 100644 --- a/binsrc/b3s/virt_rdf_label.sql +++ b/binsrc/fct/virt_rdf_label.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/www/about.html b/binsrc/fct/www/about.html similarity index 98% rename from binsrc/b3s/www/about.html rename to binsrc/fct/www/about.html index 58b4a0c0ea..f08cd09eca 100644 --- a/binsrc/b3s/www/about.html +++ b/binsrc/fct/www/about.html @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/www/dlistall.vsp b/binsrc/fct/www/dlistall.vsp similarity index 99% rename from binsrc/b3s/www/dlistall.vsp rename to binsrc/fct/www/dlistall.vsp index 7fb7a48ee8..ea0fdb367a 100644 --- a/binsrc/b3s/www/dlistall.vsp +++ b/binsrc/fct/www/dlistall.vsp @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/www/listall.vsp b/binsrc/fct/www/listall.vsp similarity index 98% rename from binsrc/b3s/www/listall.vsp rename to binsrc/fct/www/listall.vsp index c913e3b18d..8dbeba0589 100644 --- a/binsrc/b3s/www/listall.vsp +++ b/binsrc/fct/www/listall.vsp @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/www/nspref.vsp b/binsrc/fct/www/nspref.vsp similarity index 98% rename from binsrc/b3s/www/nspref.vsp rename to binsrc/fct/www/nspref.vsp index 9b3a029175..edc7769e3a 100644 --- a/binsrc/b3s/www/nspref.vsp +++ b/binsrc/fct/www/nspref.vsp @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/www/search.sql b/binsrc/fct/www/search.sql similarity index 98% rename from binsrc/b3s/www/search.sql rename to binsrc/fct/www/search.sql index d8ac30d4d5..5c0e8b3e38 100644 --- a/binsrc/b3s/www/search.sql +++ b/binsrc/fct/www/search.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -264,8 +264,8 @@ create procedure get_curie (in val any) return val; res := null; - if (strstr (val, 'http://dbpedia.org/resource/') = 0 ) res := 'dbpedia'; - if (strstr (val, 'http://dbpedia.org/property/') = 0 ) res := 'dbpprop'; + if (strstr (val, 'http://dbpedia.org/resource/') = 0 ) res := 'dbr'; + if (strstr (val, 'http://dbpedia.org/property/') = 0 ) res := 'dbp'; if (strstr (val, 'http://dbpedia.openlinksw.com/wikicompany/') = 0 ) res := 'wikicompany'; if (strstr (val, 'http://dbpedia.org/class/yago/') = 0 ) res := 'yago'; if (strstr (val, 'http://www.w3.org/2003/01/geo/wgs84_pos#') = 0 ) res := 'geo'; @@ -284,7 +284,7 @@ create procedure get_curie (in val any) if (strstr (val, 'http://purl.org/ontology/bibo/') = 0 ) res := 'bibo'; if (strstr (val, 'http://purl.org/goodrelations/v1#') = 0 ) res := 'gr'; if (strstr (val, 'http://linkedgeodata.org/vocabulary#') = 0 ) res := 'lgv'; - if (strstr (val, 'http://dbpedia.org/resource/Category:') = 0 ) res := 'category'; + if (strstr (val, 'http://dbpedia.org/resource/Category:') = 0 ) res := 'dbc'; if (strstr (val, 'http://www.georss.org/georss/') = 0 ) res := 'grs'; if (res is null) @@ -858,17 +858,17 @@ s3 := '\')) . 'sparql SELECT ?road ?lat ?long WHERE ' || ' { ' || ' { ' || --- ' ?services dbpprop:road ?road . ' || +-- ' ?services dbp:road ?road . ' || ' ?road a yago:MotorwaysInEngland . ' || - ' ?services dbpprop:lat ?lat . ' || - ' ?services dbpprop:long ?long . ' || + ' ?services dbp:lat ?lat . ' || + ' ?services dbp:long ?long . ' || ' } ' || ' UNION ' || ' { ' || --- ' ?services dbpprop:road ?road . ' || +-- ' ?services dbp:road ?road . ' || ' ?road a yago:MotorwaysInScotland . ' || - ' ?services dbpprop:lat ?lat . ' || - ' ?services dbpprop:long ?long . ' || + ' ?services dbp:lat ?lat . ' || + ' ?services dbp:long ?long . ' || ' } ' || ' FILTER (?lat > '; validate_input(val); @@ -927,7 +927,7 @@ s3 := '\')) . } else if ( smode='17' ) { - if (isnull(val) or val = '') val := 'category:History_of_Wisconsin'; + if (isnull(val) or val = '') val := 'dbc:History_of_Wisconsin'; if (isnull(val2) or val2 = '') val2 := 'en'; if (isnull(val3) or val3 = '') val3 := 'en'; if (isnull(val4) or val4 = '') val4 := 'http://dbpedia.org/resource/Category:Metropolitan_areas_of_Wisconsin'; @@ -953,7 +953,7 @@ s3 := '\')) . s2 := concat (val, ' . '); s3 := ' ?c skos:broaderTransitive ?trans ' || ' OPTION ( TRANSITIVE, t_distinct, t_in (?c), t_out (?trans), t_max (3), t_step ( ''step_no'' ) as ?dist ) . '|| - ' ?m dbpprop:abstract ?d . ' || + ' ?m dbp:abstract ?d . ' || ' ?m grs:point ?p . ' || ' FILTER ( lang(?n) = "'; s4 := concat(val2, '" ) . FILTER ( lang(?d) = "', val3, '" ) '); diff --git a/binsrc/b3s/www/search.vsp b/binsrc/fct/www/search.vsp similarity index 99% rename from binsrc/b3s/www/search.vsp rename to binsrc/fct/www/search.vsp index 83d3292e17..875439cf24 100644 --- a/binsrc/b3s/www/search.vsp +++ b/binsrc/fct/www/search.vsp @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/b3s/www/style.css b/binsrc/fct/www/style.css similarity index 95% rename from binsrc/b3s/www/style.css rename to binsrc/fct/www/style.css index afb9f2dad9..ee35dc9027 100644 --- a/binsrc/b3s/www/style.css +++ b/binsrc/fct/www/style.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -73,3 +73,5 @@ a.rdf_source img { vertical-align: middle;margin-right: 5px;} #ft_l { float: left;} #ft_r { float: right;} #ft_l label { margin-right: 5px;} + +div.content.embedded { padding: 0.25em; height: 105%; margin-bottom: 1em; display: block; float: none; clear: both; } diff --git a/binsrc/hibernate/Makefile.am b/binsrc/hibernate/Makefile.am index 089d32caf7..cd31a91910 100644 --- a/binsrc/hibernate/Makefile.am +++ b/binsrc/hibernate/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hibernate/virtuoso_dialect/VirtuosoDialect.java b/binsrc/hibernate/virtuoso_dialect/VirtuosoDialect.java index d59a60384f..24e74e8a7b 100644 --- a/binsrc/hibernate/virtuoso_dialect/VirtuosoDialect.java +++ b/binsrc/hibernate/virtuoso_dialect/VirtuosoDialect.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/Makefile.am b/binsrc/hosting/Makefile.am index 0c77df137d..380ee6abe0 100644 --- a/binsrc/hosting/Makefile.am +++ b/binsrc/hosting/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -18,7 +18,7 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # # -SUBDIRS = . perl python ruby php mono +SUBDIRS = . perl python ruby php mono proj4 geos shapefileio # ---------------------------------------------------------------------- # diff --git a/binsrc/hosting/fcgi/GNUmakefile b/binsrc/hosting/fcgi/GNUmakefile index ecfda46e8e..d22ebae14c 100644 --- a/binsrc/hosting/fcgi/GNUmakefile +++ b/binsrc/hosting/fcgi/GNUmakefile @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/fcgi/cgi_fcgi.c b/binsrc/hosting/fcgi/cgi_fcgi.c index 8b1b0e0a6f..21edf2520e 100644 --- a/binsrc/hosting/fcgi/cgi_fcgi.c +++ b/binsrc/hosting/fcgi/cgi_fcgi.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/fcgi/hosting_fcgi.c b/binsrc/hosting/fcgi/hosting_fcgi.c index cd6f7a6e4b..6e677f475d 100644 --- a/binsrc/hosting/fcgi/hosting_fcgi.c +++ b/binsrc/hosting/fcgi/hosting_fcgi.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/fcgi/hosting_fcgi.h b/binsrc/hosting/fcgi/hosting_fcgi.h index ce79da2908..93e6d62d3c 100644 --- a/binsrc/hosting/fcgi/hosting_fcgi.h +++ b/binsrc/hosting/fcgi/hosting_fcgi.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/geos/.gitignore b/binsrc/hosting/geos/.gitignore new file mode 100644 index 0000000000..462e98c684 --- /dev/null +++ b/binsrc/hosting/geos/.gitignore @@ -0,0 +1 @@ +sql_code_geos.c diff --git a/binsrc/hosting/geos/Makefile.am b/binsrc/hosting/geos/Makefile.am new file mode 100644 index 0000000000..1234487244 --- /dev/null +++ b/binsrc/hosting/geos/Makefile.am @@ -0,0 +1,64 @@ +# +# This file is part of the OpenLink Software Virtuoso Open-Source (VOS) +# project. +# +# Copyright (C) 1998-2019 OpenLink Software +# +# This project is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; only version 2 of the License, dated June 1991. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# + +if WITH_GEOS +hosting_LTLIBRARIES = geos.la +endif + +noinst_HEADERS = $(srcdir)/geos_plugin.h + +geos_la_SOURCES = \ + $(srcdir)/geos_plugin.cpp \ + $(srcdir)/geos_export_from_virtgeo.cpp \ + $(srcdir)/geos_import_to_virtgeo.cpp \ + $(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c + +geos_la_CXXFLAGS = @VIRT_AM_CFLAGS@ +geos_la_CXXFLAGS += -D_USRDLL +geos_la_CXXFLAGS += -I$(top_srcdir)/libsrc +geos_la_CXXFLAGS += -I$(top_srcdir)/libsrc/Dk +geos_la_CXXFLAGS += -I$(top_srcdir)/libsrc/Wi +geos_la_CXXFLAGS += -I$(top_srcdir)/libsrc/plugin +geos_la_CXXFLAGS += -I$(top_srcdir)/libsrc/langfunc +geos_la_CXXFLAGS += -I$(top_srcdir)/libsrc/odbcsdk/include +geos_la_CXXFLAGS += @GEOS_CPPFLAGS@ + +geos_la_CFLAGS = @VIRT_AM_CFLAGS@ +geos_la_CFLAGS += -D_USRDLL +geos_la_CFLAGS += -I$(top_srcdir)/libsrc +geos_la_CFLAGS += -I$(top_srcdir)/libsrc/Dk +geos_la_CFLAGS += -I$(top_srcdir)/libsrc/Wi +geos_la_CFLAGS += -I$(top_srcdir)/libsrc/plugin +geos_la_CFLAGS += -I$(top_srcdir)/libsrc/langfunc +geos_la_CFLAGS += -I$(top_srcdir)/libsrc/odbcsdk/include + +geos_la_LDFLAGS = -module -avoid-version -export-dynamic +geos_la_LDFLAGS += -export-symbols geos.exp +geos_la_LIBADD = @GEOS_LDFLAGS@ @GEOS_LIBS@ -lm + +# ---------------------------------------------------------------------- +# +# Additional files to distribute +# +# ---------------------------------------------------------------------- +EXTRA_DIST = \ + geos.exp \ + geos.sql diff --git a/binsrc/hosting/geos/geos.exp b/binsrc/hosting/geos/geos.exp new file mode 100644 index 0000000000..2509210866 --- /dev/null +++ b/binsrc/hosting/geos/geos.exp @@ -0,0 +1,2 @@ +geos_check +sqls_define_geos diff --git a/binsrc/hosting/geos/geos.sql b/binsrc/hosting/geos/geos.sql new file mode 100644 index 0000000000..7d6f7a5156 --- /dev/null +++ b/binsrc/hosting/geos/geos.sql @@ -0,0 +1,15 @@ +create procedure DB.DBA.GEOS_SELF_TEST_RESULT (in status varchar, in txt varchar, in err_state varchar, in err_message varchar) +{ + dbg_obj_princ ('DB.DBA.GEOS_SELF_TEST:\t', status, '\t', txt, '\t', err_state, '\t', err_messsage); + result (status, txt, err_state, err_message); +} +; + +create procedure DB.DBA.GEOS_SELF_TEST () +{ + declare STATUS, TXT, ERR_STATE, ERR_MESSAGE varchar; + result_names (STATUS, TXT, ERR_STATE, ERR_MESSAGE); + DB.DBA.GEOS_SELF_TEST_RESULT ('', 'Starting tests...', '', ''); + DB.DBA.GEOS_SELF_TEST_RESULT ('', 'Tests complete.', '', ''); +} +; diff --git a/binsrc/hosting/geos/geos_export_from_virtgeo.cpp b/binsrc/hosting/geos/geos_export_from_virtgeo.cpp new file mode 100644 index 0000000000..c7b4a53d1b --- /dev/null +++ b/binsrc/hosting/geos/geos_export_from_virtgeo.cpp @@ -0,0 +1,256 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "geos_plugin.h" + +geos::geom::Geometry* +geo_exporter_to_geos::export_one (geo_t *g) +{ + try + { + if (g->geo_flags & GEO_A_M) + { + blocking_error = srv_make_new_error ("22023", "GEO20", "Unable to export geometry of type %d to GEOS library: M ordinate is not supported by GEOS", GEO_TYPE (g->geo_flags)); + return NULL; + } + bool hasZ = g->geo_flags & GEO_A_Z; + if (hasZ) inputDimension = 3; + else inputDimension = 2; + int SRID = GEO_SRID (g->geo_srcode); + geos::geom::Geometry *result; + switch (GEO_TYPE_NO_ZM (g->geo_flags)) + { + case GEO_NULL_SHAPE: result = factory.createEmptyGeometry (); break; + case GEO_POINT: result = export_Point (g); break; + case GEO_LINESTRING: result = export_LineString (g); break; + case GEO_POLYGON: result = export_Polygon (g); break; + case GEO_POINTLIST: result = export_MultiPoint (g); break; + case GEO_MULTI_LINESTRING: result = export_MultiLineString (g); break; + case GEO_MULTI_POLYGON: result = export_MultiPolygon (g); break; + case GEO_COLLECTION: result = export_GeometryCollection (g); break; + case GEO_BOX: + { + geoc Xs[5], Ys[5]; + geo_t stub_ring, *stub_rings[1], stub; + Xs[0] = Xs[3] = Xs[4] = g->XYbox.Xmin; + Xs[1] = Xs[2] = g->XYbox.Xmax; + Ys[0] = Ys[1] = Ys[4] = g->XYbox.Ymin; + Ys[2] = Xs[3] = g->XYbox.Ymax; + memcpy (&stub_ring, g, box_length_inline (g)); + stub_ring.geo_flags &= ~GEO_BOX; stub_ring.geo_flags |= GEO_RING; + stub_ring._.pline.len = 5; + stub_ring._.pline.Xs = Xs; + stub_ring._.pline.Ys = Ys; + memcpy (&stub, g, box_length_inline (g)); + stub.geo_flags &= ~GEO_BOX; stub.geo_flags |= GEO_POLYGON; + stub._.parts.len = 1; + stub_rings[0] = &stub_ring; + stub._.parts.items = stub_rings; + result = export_Polygon (&stub); + break; + } + default: + blocking_error = srv_make_new_error ("22023", "GEO20", "Unable to export geometry of type %d to GEOS library: type is not supported by GEOS", GEO_TYPE (g->geo_flags)); + return NULL; + } + result->setSRID(SRID); + return result; + } + catch (const geos::util::GEOSException &gexxx) + { + if (NULL == blocking_error) + blocking_error = srv_make_new_error ("22023", "GEO20", "Unable to export geometry of type %d to GEOS library: GEOS error: %s", GEO_TYPE (g->geo_flags), gexxx.what()); + return NULL; + } +} + +geos::geom::Point * +geo_exporter_to_geos::export_Point (geo_t *g) +{ + geoc x = g->XYbox.Xmin, y= g->XYbox.Ymin; + if(inputDimension == 3) + return factory.createPoint (Coordinate (x, y, g->_.point.point_ZMbox.Zmin)); + return factory.createPoint (Coordinate (x, y)); +} + +geos::geom::LineString * +geo_exporter_to_geos::export_LineString (geo_t *g) +{ + geos::geom::CoordinateSequence *pts = export_CoordinateSequence (g->_.pline.len, g->_.pline.Xs, g->_.pline.Ys, (g->geo_flags & GEO_A_Z) ? g->_.pline.Zs : NULL, 0); + return factory.createLineString(pts); +} + +geos::geom::LinearRing * +geo_exporter_to_geos::export_LinearRing (geo_t *g) +{ + geos::geom::CoordinateSequence *pts; + int len = g->_.pline.len; + int lastidx = len-1; + if ((g->_.pline.Xs[0] == g->_.pline.Xs[lastidx]) && (g->_.pline.Ys[0] == g->_.pline.Ys[lastidx])) + pts = export_CoordinateSequence (len, g->_.pline.Xs, g->_.pline.Ys, (g->geo_flags & GEO_A_Z) ? g->_.pline.Zs : NULL, 0); + else + { + pts = export_CoordinateSequence (len, g->_.pline.Xs, g->_.pline.Ys, (g->geo_flags & GEO_A_Z) ? g->_.pline.Zs : NULL, 1); + pts->setOrdinate (len, 0, g->_.pline.Xs[0]); + pts->setOrdinate (len, 1, g->_.pline.Ys[0]); + if (g->geo_flags & GEO_A_Z) + pts->setOrdinate (len, 2, g->_.pline.Zs[0]); + } + return factory.createLinearRing(pts); +} + +geos::geom::Geometry * +geo_exporter_to_geos::export_Polygon (geo_t *g) +{ + int numRings = g->_.parts.len; + geos::geom::LinearRing *shell = NULL; + std::vector*holes = NULL; + try + { + if (numRings <= 0) + return factory.createEmptyGeometry (); + else + { + geo_t *g_shell = g->_.parts.items[0]; + if ((GEO_NULL_SHAPE == GEO_TYPE_NO_ZM(g_shell->geo_flags)) || (2 >= g_shell->_.pline.len)) + return factory.createEmptyGeometry (); + shell = export_LinearRing (g_shell); + if (numRings > 1) + { + holes = new std::vector(numRings - 1); + int out_idx = 0; + for (int i = 1; i < numRings; i++) + { + geo_t *g_hole = g->_.parts.items[i]; + if ((GEO_NULL_SHAPE == GEO_TYPE_NO_ZM(g_hole->geo_flags)) || (2 >= g_hole->_.pline.len)) + holes->resize(holes->size()-1); + else + holes[0][out_idx++] = (geos::geom::Geometry *)export_LinearRing (g_hole); + } + if (!holes->size()) + { + delete holes; + holes = NULL; + } + } + } + return factory.createPolygon(shell, holes); + } + catch (...) + { + if (NULL != shell) + { + for (unsigned int i=0; isize(); i++) + delete holes[0][i]; + delete holes; + } + delete shell; + throw; + } +} + +geos::geom::MultiPoint * +geo_exporter_to_geos::export_MultiPoint(geo_t *g) +{ + int numGeoms = g->_.pline.len; + std::vector *geoms = new std::vector(numGeoms); + for (int i = 0; i_.pline.Xs[i], y= g->_.pline.Ys[i]; + geos::geom::Geometry *point = ( + (inputDimension == 3) ? + factory.createPoint (Coordinate (x, y, g->_.pline.Zs[i])) : + factory.createPoint (Coordinate (x, y)) ); + geoms[0][i] = point; + } + return factory.createMultiPoint(geoms); +} + +geos::geom::MultiLineString * +geo_exporter_to_geos::export_MultiLineString (geo_t *g) +{ + int numGeoms = g->_.parts.len; + std::vector *geoms = new std::vector(numGeoms); + for (int i=0; i_.parts.items[i]); + return factory.createMultiLineString (geoms); +} + +geos::geom::MultiPolygon * +geo_exporter_to_geos::export_MultiPolygon (geo_t *g) +{ + int numGeoms = g->_.parts.len; + std::vector *geoms = new std::vector(numGeoms); + try + { + for (int i=0; i_.parts.items[i]); + return factory.createMultiPolygon (geoms); + } + catch (...) + { + for (int i=0; i_.parts.len; + std::vector *geoms = new std::vector(numGeoms); + try + { + for (int i=0; i_.parts.items[i]); + if (NULL == geoms[0][i]) + { + while (i--) delete geoms[0][i]; + delete geoms; + return NULL; + } + } + return factory.createGeometryCollection (geoms); + } + catch (...) + { + for (int i=0; icreate(len + spare_len_at_end, (NULL != Zs_or_null) ? 3 : 2); + for (int i = 0; i < len; i++) + seq->setOrdinate (i, 0, Xs[i]); + for (int i = 0; i < len; i++) + seq->setOrdinate (i, 1, Ys[i]); + if (NULL != Zs_or_null) + for (int i = 0; i < len; i++) + seq->setOrdinate (i, 2, Zs_or_null[i]); + return seq; +} diff --git a/binsrc/hosting/geos/geos_import_to_virtgeo.cpp b/binsrc/hosting/geos/geos_import_to_virtgeo.cpp new file mode 100644 index 0000000000..82574a5b4e --- /dev/null +++ b/binsrc/hosting/geos/geos_import_to_virtgeo.cpp @@ -0,0 +1,115 @@ +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "geos_plugin.h" + +geo_t * +geo_importer_from_geos::import_one(const Geometry &geom) +{ + outputDimension = defaultOutputDimension; + if ( outputDimension > geom.getCoordinateDimension() ) + outputDimension = geom.getCoordinateDimension(); + + if ( const geos::geom::Point* x = dynamic_cast(&geom) ) + return import_Point (*x); + if ( const geos::geom::LineString* x = dynamic_cast(&geom) ) + return import_LineString (*x, GEO_LINESTRING); + if ( const geos::geom::Polygon* x = dynamic_cast(&geom) ) + return import_Polygon (*x); + if ( const geos::geom::MultiPoint* x = dynamic_cast(&geom) ) + return import_MultiPoint (*x); + if ( const geos::geom::MultiLineString* x = dynamic_cast(&geom) ) + return import_GeometryCollection (*x, GEO_MULTI_LINESTRING); + if ( const geos::geom::MultiPolygon* x = dynamic_cast(&geom) ) + return import_GeometryCollection (*x, GEO_MULTI_POLYGON); + if ( const geos::geom::GeometryCollection* x = dynamic_cast(&geom) ) + return import_GeometryCollection (*x, GEO_COLLECTION); + assert(0); // Unknown Geometry type +} + +geo_t * +geo_importer_from_geos::import_Point(const geos::geom::Point &geom) +{ + geo_t *g = geo_alloc ((3 == outputDimension) ? GEO_POINT_Z : GEO_POINT, 0, GEO_SRCODE_OF_SRID (geom.getSRID())); + if (geom.isEmpty()) + { + g->XYbox.Xmin = g->XYbox.Xmax = g->XYbox.Ymin = g->XYbox.Ymax = geoc_FARAWAY; + if (3 == outputDimension) + g->_.point.point_ZMbox.Zmin = g->_.point.point_ZMbox.Zmax = geoc_FARAWAY; + } + else + { + const Coordinate* c = geom.getCoordinate(); + g->XYbox.Xmin = g->XYbox.Xmax = c->x; + g->XYbox.Ymin = g->XYbox.Ymax = c->y; + if (3 == outputDimension) + g->_.point.point_ZMbox.Zmin = g->_.point.point_ZMbox.Zmax = c->z; + } + return g; +} + +geo_t * +geo_importer_from_geos::import_LineString (const geos::geom::LineString &geom, int geo_type_no_zm) +{ + const geos::geom::CoordinateSequence* cs = geom.getCoordinatesRO(); + int len = cs->size(); + geo_t *g = geo_alloc (geo_type_no_zm | ((3 == outputDimension) ? GEO_A_Z : 0), len, GEO_SRCODE_OF_SRID (geom.getSRID())); + for (int i = 0; i < len; i++) g->_.pline.Xs[i] = (*cs)[i].x; + for (int i = 0; i < len; i++) g->_.pline.Ys[i] = (*cs)[i].y; + if (3 == outputDimension) + for (int i = 0; i < len; i++) g->_.pline.Zs[i] = (*cs)[i].z; + geo_calc_bounding (g, GEO_CALC_BOUNDING_DO_ALL); + return g; +} + +geo_t * +geo_importer_from_geos::import_MultiPoint (const geos::geom::MultiPoint &geom) +{ + int len = geom.getNumGeometries(); + geo_t *g = geo_alloc ((3 == outputDimension) ? GEO_POINTLIST_Z : GEO_POINTLIST, len, GEO_SRCODE_OF_SRID (geom.getSRID())); + for (int i = 0; i < len; i++) g->_.pline.Xs[i] = geom.getGeometryN(i)->getCoordinate()->x; + for (int i = 0; i < len; i++) g->_.pline.Ys[i] = geom.getGeometryN(i)->getCoordinate()->y; + if (3 == outputDimension) + for (int i = 0; i < len; i++) g->_.pline.Zs[i] = geom.getGeometryN(i)->getCoordinate()->z; + geo_calc_bounding (g, GEO_CALC_BOUNDING_DO_ALL); + return g; +} + +geo_t * +geo_importer_from_geos::import_Polygon (const geos::geom::Polygon &geom) +{ + int len = (geom.isEmpty() ? 0 : (1 + geom.getNumInteriorRing())); + geo_t *g = geo_alloc ((3 == outputDimension) ? GEO_POLYGON_Z : GEO_POLYGON, len, GEO_SRCODE_OF_SRID (geom.getSRID())); + if (0 < len) + { + const geos::geom::LineString* ls = geom.getExteriorRing(); + g->_.parts.items[0] = import_LineString (*ls, GEO_RING); + } + for (int i = 1; i < len; i++) + g->_.parts.items[i] = import_LineString (*(geom.getInteriorRingN (i - 1)), GEO_RING); + geo_calc_bounding (g, GEO_CALC_BOUNDING_DO_ALL & ~(GEO_CALC_BOUNDING_TRANSITIVE)); + return g; +} + +geo_t * +geo_importer_from_geos::import_GeometryCollection (const GeometryCollection &geom, int geo_type_no_zm) +{ + int len = geom.getNumGeometries(); + geo_t *g = geo_alloc (geo_type_no_zm | ((3 == outputDimension) ? GEO_A_Z : 0), len, GEO_SRCODE_OF_SRID (geom.getSRID())); + for (int i = 0; i < len; i++) + g->_.parts.items[i] = import_one (*(geom.getGeometryN(i))); + geo_calc_bounding (g, GEO_CALC_BOUNDING_DO_ALL & ~(GEO_CALC_BOUNDING_TRANSITIVE)); + return g; +} diff --git a/binsrc/hosting/geos/geos_plugin.cpp b/binsrc/hosting/geos/geos_plugin.cpp new file mode 100644 index 0000000000..a93f113b60 --- /dev/null +++ b/binsrc/hosting/geos/geos_plugin.cpp @@ -0,0 +1,1348 @@ +/* + * $Id$ + * + * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) + * project. + * + * Copyright (C) 1998-2019 OpenLink Software + * + * This project is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; only version 2 of the License, dated June 1991. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#define PLUGIN_VERSION "1.0" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "sqlver.h" +#include "geos_plugin.h" + + +extern "C" { + unit_version_t * geos_check (unit_version_t * in, void *appdata); + void virt_geos_postponed_action (char *mode); + void virt_geos_plugin_connect (void *data); +}; + + +dk_mutex_t *srid2GeometryFactory_mtx; +static dk_hash_t *srid2GeometryFactory; + +geos::geom::GeometryFactory * +get_GeometryFactory_by_srid (int srcode) +{ + static const geos::geom::PrecisionModel *pm; + int srid = GEO_SRID (srcode); + geos::geom::GeometryFactory *gf; + mutex_enter (srid2GeometryFactory_mtx); + gf = (geos::geom::GeometryFactory *)gethash ((void *)((ptrlong)(srid)), srid2GeometryFactory); + if (NULL == gf) + { + if (NULL == pm) + pm = new geos::geom::PrecisionModel(geos::geom::PrecisionModel::FLOATING); + gf = new geos::geom::GeometryFactory (pm, srid); + sethash ((void *)((ptrlong)(srid)), srid2GeometryFactory, gf); + } + mutex_leave (srid2GeometryFactory_mtx); + return gf; +} + +geos::geom::Geometry * +export_geo_as_Geometry (geo_t *g) +{ + geos::geom::GeometryFactory *gf = get_GeometryFactory_by_srid (g->geo_srcode); + switch (GEO_TYPE (g->geo_flags)) + { + case GEO_NULL_SHAPE: + return gf->createEmptyGeometry (); + case GEO_POINT: + return gf->createPoint (geos::geom::Coordinate (g->XYbox.Xmin, g->XYbox.Ymin)); + case GEO_POINT_Z: + return gf->createPoint (geos::geom::Coordinate (g->XYbox.Xmin, g->XYbox.Ymin, g->_.point.point_ZMbox.Zmin)); + case GEO_BOX: /* but not case GEO_BOX_Z: */ + case GEO_LINESTRING: case GEO_LINESTRING_Z: + case GEO_POLYGON: case GEO_POLYGON_Z: + case GEO_POINTLIST: case GEO_POINTLIST_Z: + case GEO_MULTI_LINESTRING: case GEO_MULTI_LINESTRING_Z: case GEO_MULTI_POLYGON: case GEO_MULTI_POLYGON_Z: case GEO_COLLECTION: case GEO_COLLECTION_Z: + { + geos::geom::Geometry *res; + caddr_t err = NULL; +#if 0 + dk_session_t *wkb_ses = strses_allocate(); + wkb_print (g, wkb_ses, 1, 0); + caddr_t wkb_varchar = strses_string (wkb_ses); + dk_free_box ((caddr_t)wkb_ses); + try + { + std::string wkb_strg (wkb_varchar, box_length (wkb_varchar) - 1); + std::istringstream wkb_iss (wkb_strg); + res = geos::io::WKBReader (*gf).read (wkb_iss); + } + catch (const geos::util::GEOSException &x) + { + err = srv_make_new_error ("22023", "GEO19", "Can not export a geometry of type %d to GEOS plugin: %s", GEO_TYPE(g->geo_flags), x.what()); + } + catch (...) + { + err = srv_make_new_error ("22023", "GEO19", "Can not export a geometry of type %d to GEOS plugin: generic error", GEO_TYPE(g->geo_flags)); + } +#else + { + geo_exporter_to_geos gexp (*gf); + res = gexp.export_one (g); + err = gexp.blocking_error; + } +#endif + if (NULL != err) + sqlr_resignal (err); + return res; + } + default: + sqlr_new_error ("22023", "GEO17", "Can not export a geometry of type %d to GEOS plugin", GEO_TYPE(g->geo_flags)); + } + return NULL; +} + +/*! Gets a geometry arument of BIF as an exported geometry, ready to use in GEOS. +This is longjmp/throw borderline! It means this should be the last operation that can call sqlr_new_error() and at the same time it should before making any stack variables that should be freed by stack unwinding. */ +std::auto_ptr +bif_Geometry_auto_ptr_arg (caddr_t * qst, state_slot_t ** args, int inx, const char * f, int tp) +{ + geo_t *arg = bif_geo_arg (qst, args, inx, f, tp); + if (NULL == arg) + return std::auto_ptr(NULL); + return std::auto_ptr (export_geo_as_Geometry (arg)); +} + +#define GEO_ARGPAIR_NULL_ARG1 0x1 +#define GEO_ARGPAIR_NULL_ARG2 0x2 +#define GEO_ARGPAIR_NOT_MAY_INTERSECT 0x4 +/*! Gets two geometry aruments of BIF as two exported geometries, ready to use in GEOS. +This can not be made by two calls of bif_Geometry_auto_ptr_arg () because in that case we get second bif_geo_arg() after export_geo_as_Geometry() and it violates the longjmp/throw borderline rule. +As a benefit, this can try to transfrom second argument to get SRIDs of \c arg1 and \c arg2 compatible, when desired and needed. +In case of nonzero \c nulls_if_not_may_intersect the function will also check geometries for may_intersect() and if they're not then return NULLs instead of geometries, instantly. +The function returns 0 if everything is fine, otherwise bitwise OR bits GEO_ARGPAIR_NULL_ARG1 if first argument is NULL, GEO_ARGPAIR_NULL_ARG2 if second argument is NULL, GEO_ARGPAIR_NOT_MAY_INTERSECT if they were geometries but may_intersect() returns false. + */ +int +bif_Geometry_auto_ptr_argpair (caddr_t * qst, state_slot_t ** args, int inx1, int inx2, const char * f, int tp, int adjust_arg2_srid, int nulls_if_not_may_intersect, std::auto_ptr *arg1_ret, std::auto_ptr *arg2_ret) +{ + geo_t *arg1 = bif_geo_arg (qst, args, inx1, f, tp); + geo_t *arg2 = bif_geo_arg (qst, args, inx2, f, tp); + geo_t *arg2_cvt = NULL; + arg2_ret->reset (); + QR_RESET_CTX + { + if ((DV_GEO == DV_TYPE_OF (arg1)) && (DV_GEO == DV_TYPE_OF (arg2))) + { + int srid1 = GEO_SRID (arg1->geo_srcode); + int srid2 = GEO_SRID (arg2->geo_srcode); + if (srid2 != srid1) + { + caddr_t err = NULL; + arg2_cvt = geo_get_default_srid_transform_cbk() (qst, arg2, srid1, &err); + if (NULL != err) + sqlr_resignal (err); + if (nulls_if_not_may_intersect && !geo_pred (arg1, arg2_cvt, GSOP_MAY_INTERSECT, 0)) + { + arg1_ret->reset(); + POP_QR_RESET; + return GEO_ARGPAIR_NOT_MAY_INTERSECT; + } + arg1_ret->reset ((NULL == arg1) ? NULL : export_geo_as_Geometry (arg1)); + arg2_ret->reset (export_geo_as_Geometry (arg2_cvt)); + } + else + { + if (nulls_if_not_may_intersect && !geo_pred (arg1, arg2, GSOP_MAY_INTERSECT, 0)) + { + arg1_ret->reset(); + POP_QR_RESET; + return GEO_ARGPAIR_NOT_MAY_INTERSECT; + } + } + } + arg1_ret->reset ((NULL == arg1) ? NULL : export_geo_as_Geometry (arg1)); + if (NULL == arg2_ret->get()) + arg2_ret->reset ((NULL == arg2) ? NULL : export_geo_as_Geometry (arg2)); + } + QR_RESET_CODE + { + caddr_t err = thr_get_error_code (THREAD_CURRENT_THREAD); + POP_QR_RESET; + arg1_ret->reset(); + arg2_ret->reset(); + dk_free_box ((caddr_t)arg2_cvt); + sqlr_resignal (err); + } + END_QR_RESET + return (((NULL == arg1) ? GEO_ARGPAIR_NULL_ARG1 : 0x0) | ((NULL == arg2) ? GEO_ARGPAIR_NULL_ARG2 : 0x0)); +} + +/*! Gets a geometry arument of BIF as an exported geometry, ready to use in GEOS or report. If the arg is not a geometry, no error signalled, just \c fail_ret is set to nonzero. +This is longjmp/throw borderline! It means this should be the last operation that can call sqlr_new_error() and at the same time it should before making any stack variables that should be freed by stack unwinding. */ +std::auto_ptr +bif_Geometry_auto_ptr_arg_nosignal (caddr_t * qst, state_slot_t ** args, int inx, const char * f, int tp, int *fail_ret) +{ + geo_t *arg = bif_geo_arg (qst, args, inx, f, (tp & ~GEO_ARG_NULLABLE) | GEO_ARG_NONGEO_AS_IS); + fail_ret[0] = 0; + switch (DV_TYPE_OF (arg)) + { + case DV_GEO: + return std::auto_ptr (export_geo_as_Geometry (arg)); + case DV_DB_NULL: + if (tp & GEO_ARG_NULLABLE) + return std::auto_ptr(NULL); + /* no break */ + default: + fail_ret[0] = 1; + return std::auto_ptr(NULL); + } +} + +/*! Gets two geometry aruments of BIF as two exported geometries, ready to use in GEOS. +This is to bif_Geometry_auto_ptr_arg_nosignal() as bif_Geometry_auto_ptr_argpair() is to bif_Geometry_auto_ptr_arg() and the rationale is the same +The function returns 0 if everything is fine, otherwise bitwise OR bits GEO_ARGPAIR_NULL_ARG1 if first argument is NULL, GEO_ARGPAIR_NULL_ARG2 if second argument is NULL, GEO_ARGPAIR_NOT_MAY_INTERSECT if they were geometries but may_intersect() returns false. + */ +int +bif_Geometry_auto_ptr_argpair_nosignal (caddr_t * qst, state_slot_t ** args, int inx1, int inx2, const char * f, int tp, int adjust_arg2_srid, int nulls_if_not_may_intersect, std::auto_ptr *arg1_ret, std::auto_ptr *arg2_ret) +{ + geo_t *arg1 = bif_geo_arg (qst, args, inx1, f, (tp & ~GEO_ARG_NULLABLE) | GEO_ARG_NONGEO_AS_IS); + geo_t *arg2 = bif_geo_arg (qst, args, inx2, f, (tp & ~GEO_ARG_NULLABLE) | GEO_ARG_NONGEO_AS_IS); + geo_t *arg2_cvt = NULL; + int ret = 0; + arg1_ret->reset (); + arg2_ret->reset (); + switch (DV_TYPE_OF (arg2)) + { + case DV_GEO: + QR_RESET_CTX + { + if (DV_GEO == DV_TYPE_OF (arg1)) + { + int srid1 = GEO_SRID (arg1->geo_srcode); + int srid2 = GEO_SRID (arg2->geo_srcode); + if (srid2 != srid1) + { + caddr_t err = NULL; + arg2_cvt = geo_get_default_srid_transform_cbk() (qst, arg2, srid1, &err); + if (NULL != err) + sqlr_resignal (err); + if (nulls_if_not_may_intersect && !geo_pred (arg1, arg2_cvt, GSOP_MAY_INTERSECT, 0)) + { + POP_QR_RESET; + return GEO_ARGPAIR_NOT_MAY_INTERSECT; + } + arg2_ret->reset (export_geo_as_Geometry (arg2_cvt)); + } + else + { + if (nulls_if_not_may_intersect && !geo_pred (arg1, arg2, GSOP_MAY_INTERSECT, 0)) + { + POP_QR_RESET; + return GEO_ARGPAIR_NOT_MAY_INTERSECT; + } + } + } + if (NULL == arg2_ret->get()) + arg2_ret->reset ((NULL == arg2) ? NULL : export_geo_as_Geometry (arg2)); + } + QR_RESET_CODE + { + caddr_t err = thr_get_error_code (THREAD_CURRENT_THREAD); + POP_QR_RESET; + arg1_ret->reset(); + arg2_ret->reset(); + dk_free_box ((caddr_t)arg2_cvt); + sqlr_resignal (err); + } + END_QR_RESET + break; + case DV_DB_NULL: + if (tp & GEO_ARG_NULLABLE) + break; + /* no break */ + default: + ret |= GEO_ARGPAIR_NULL_ARG2; + break; + } + switch (DV_TYPE_OF (arg1)) + { + case DV_GEO: + arg1_ret->reset(export_geo_as_Geometry (arg1)); + break; + case DV_DB_NULL: + if (tp & GEO_ARG_NULLABLE) + break; + /* no break */ + default: + ret |= GEO_ARGPAIR_NULL_ARG1; + break; + } + return ret; +} + +geo_t * +import_Coordinate_as_geo (const geos::geom::Coordinate *c, int num_of_dims, int srid) +{ + int g_zm_flags = 0; + switch (num_of_dims) + { + case 3: g_zm_flags = GEO_A_Z; break; + case 4: g_zm_flags = GEO_A_Z | GEO_A_M; break; + } + geo_t *res = geo_alloc (GEO_POINT | g_zm_flags, 0, GEO_SRCODE_OF_SRID (srid)); + res->XYbox.Xmin = res->XYbox.Xmax = c->x; + res->XYbox.Ymin = res->XYbox.Ymax = c->y; + if (g_zm_flags & GEO_A_Z) + res->_.point.point_ZMbox.Zmin = res->_.point.point_ZMbox.Zmax = c->z; + return res; +} + +geo_t * +import_Geometry_as_geo (const geos::geom::Geometry *geom) +{ + switch (geom->getGeometryTypeId()) + { + case GEOS_POINT: + return import_Coordinate_as_geo (geom->getCoordinate (), geom->getCoordinateDimension(), geom->getSRID ()); + case GEOS_LINESTRING: + case GEOS_POLYGON: + case GEOS_MULTIPOINT: + case GEOS_MULTILINESTRING: + case GEOS_MULTIPOLYGON: + case GEOS_GEOMETRYCOLLECTION: + { + geo_importer_from_geos gimp (geom->getCoordinateDimension()); + geo_t *res = gimp.import_one (*geom); + return res; + } + default: + sqlr_new_error ("22023", "GEO18", "Can not import a geometry of (GEOS) type %d to Virtuoso", geom->getGeometryTypeId()); + } + return NULL; +} + +static caddr_t +bif_geos_version (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + return box_dv_short_string (geos::geom::geosversion().c_str()); +} + +static caddr_t +bif_geos_loopback (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + std::auto_ptr arg1 = bif_Geometry_auto_ptr_arg (qst, args, 0, "GEOS loopback", GEO_ARG_ANY_NONNULL); + return (caddr_t)import_Geometry_as_geo (arg1.get()); +} + +static caddr_t +bif_geos_get_coordinate (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + std::auto_ptr arg1 = bif_Geometry_auto_ptr_arg (qst, args, 0, "GEOS getCoordinate", GEO_ARG_ANY_NONNULL); + const geos::geom::Coordinate *c = arg1.get()->getCoordinate(); + if (NULL == c) + return NEW_DB_NULL; + return (caddr_t)import_Coordinate_as_geo (c, arg1.get()->getCoordinateDimension(), arg1.get()->getSRID()); +} + +#define BIF_GEXXX(gexxx,unwind,bifname) do { \ + if (((query_instance_t *)qst)->qi_query->qr_no_cast_error && strstr (gexxx.what(), " does not support ")) \ + return NEW_DB_NULL; \ + unwind; \ + sqlr_new_error ("22023", "GEO22", "Error in \"%s\"() function: %s", (bifname), gexxx.what()); \ + return NULL; \ + } while (0); + +#define CATCH_BIF_GEXXX(unwind,bifname) catch (const geos::util::GEOSException &gexxx) { BIF_GEXXX(gexxx,unwind,bifname) } + +static caddr_t +bif_geos_get_centroid (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + std::auto_ptr arg1 = bif_Geometry_auto_ptr_arg (qst, args, 0, "GEOS getCentroid", GEO_ARG_ANY_NONNULL); + std::auto_ptr res; + try { res = std::auto_ptr (arg1.get()->getCentroid()); } + CATCH_BIF_GEXXX((arg1.reset()), "GEOS getCentroid") + if (NULL == res.get()) + return NEW_DB_NULL; + return (caddr_t)import_Geometry_as_geo (res.get()); +} + +static caddr_t +bif_geos_distance (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + std::auto_ptrarg1, arg2; + bif_Geometry_auto_ptr_argpair (qst, args, 0, 1, "GEOS distance", GEO_ARG_ANY_NONNULL, 1, 0, &arg1, &arg2); + double res; + try { res = arg1.get()->distance(arg2.get()); } + CATCH_BIF_GEXXX((arg1.reset()), "GEOS distance") + return box_double (res); +} + +static caddr_t +bif_geos_buffer (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + std::auto_ptr arg1 = bif_Geometry_auto_ptr_arg (qst, args, 0, "GEOS buffer", GEO_ARG_ANY_NONNULL); + double buf_val = bif_double_arg (qst, args, 1, "GEOS buffer"); + std::auto_ptr res; + try { res = std::auto_ptr (arg1.get()->buffer(buf_val)); } + CATCH_BIF_GEXXX((arg1.reset()), "GEOS buffer") + return (caddr_t)import_Geometry_as_geo (res.get()); +} + +static caddr_t +bif_geos_convex_hull (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + std::auto_ptr arg1 = bif_Geometry_auto_ptr_arg (qst, args, 0, "GEOS convexHull", GEO_ARG_ANY_NONNULL); + std::auto_ptr res; + try { res = std::auto_ptr (arg1.get()->convexHull()); } + CATCH_BIF_GEXXX((arg1.reset()), "GEOS convexHull") + if (NULL == res.get()) + return NEW_DB_NULL; + return (caddr_t)import_Geometry_as_geo (res.get()); +} + +static caddr_t +bif_geos_envelope (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ + caddr_t res = bif_st_get_bounding_box_impl (qst, err_ret, args, 1, "GEOS envelope", GEO_ARG_ANY_NULLABLE); + if (NULL == res) + { + geo_t *empty_res = geo_alloc (GEO_BOX, 0, GEO_SRCODE_DEFAULT); + GEO_XYBOX_SET_EMPTY (empty_res->XYbox); + return (caddr_t)empty_res; + } + if (DV_GEO != DV_TYPE_OF (res)) + return NEW_DB_NULL; + return res; +} + +static caddr_t +bif_geos_boundary (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + std::auto_ptr arg1 = bif_Geometry_auto_ptr_arg (qst, args, 0, "GEOS boundary", GEO_ARG_ANY_NONNULL); + std::auto_ptr res; + try { res = std::auto_ptr (arg1.get()->getBoundary()); } + CATCH_BIF_GEXXX((arg1.reset()), "GEOS boundary") + if (NULL == res.get()) + return NEW_DB_NULL; + return (caddr_t)import_Geometry_as_geo (res.get()); +} + +#define GEO_UOM_GridSpacing 0 +#define GEO_UOM_degree 0x11 +#define GEO_UOM_radian 0x21 +#define GEO_UOM_meter 0x10 +#define GEO_UOM_Kilometer 0x20 +#define GEO_UOM_Yard 0x30 +#define GEO_UOM_MileUSStatute 0x40 + +#define GEO_UOM_IS_LINEAR(uom) ((GEO_UOM_GridSpacing != (uom)) && (!((uom)&0x1))) +#define GEO_UOM_IS_ANGULAR(uom) ((GEO_UOM_GridSpacing != (uom)) && ((uom)&0x1)) + +int +bif_geo_uom_arg (caddr_t * qst, state_slot_t ** args, int arg_idx, const char *fname) +{ + caddr_t dist = bif_string_or_uname_or_iri_id_arg (qst, args, arg_idx, fname); + caddr_t dist_iri; + int res = -1; + caddr_t err = NULL; + if (DV_IRI_ID == (DV_TYPE_OF (dist))) + { + iri_id_t iid = unbox_iri_id (dist); + if (min_bnode_iri_id () <= iid) + sqlr_new_error ("22023", "GEO23", "Blank node IRI ID is not a valid IRI for unit of measure"); + dist_iri = key_id_to_iri ((query_instance_t *)qst, iid); + if (!dist_iri) + { + if (0 == iid) dist_iri = box_dv_uname_string ("nodeID://0"); + else if (8192 == iid) dist_iri = box_dv_uname_string ("nodeID://8192"); + else rdf_handle_invalid_iri_id (qst, "Invalid IRI_ID #i", iid); + } + else + box_flags (dist_iri) = BF_IRI; + } + else + dist_iri = dist; + if (!strncmp (dist_iri, OPENGIS_DEF_UOM_GS_NS_URI, OPENGIS_DEF_UOM_GS_NS_URI_LEN)) + { + const char *tail = dist_iri + OPENGIS_DEF_UOM_GS_NS_URI_LEN; + if (!strcmp (tail, "GridSpacing")) res = GEO_UOM_GridSpacing; + else if (!strcmp (tail, "degree")) res = GEO_UOM_degree; + else if (!strcmp (tail, "radian")) res = GEO_UOM_radian; + else if (!strcmp (tail, "metre")) res = GEO_UOM_meter; + else if (!strcmp (tail, "meter")) res = GEO_UOM_meter; + else if (!strcmp (tail, "Kilometer")) res = GEO_UOM_Kilometer; + else if (!strcmp (tail, "Yard")) res = GEO_UOM_Yard; + else if (!strcmp (tail, "MileUSStatute")) res = GEO_UOM_MileUSStatute; + } + if (-1 == res) + err = srv_make_new_error ("22023", "GEO23", "Unsupported unit of measure <%.50s>", dist_iri); + if (dist_iri != dist) + dk_free_box (dist_iri); + if (NULL != err) + sqlr_resignal (err); + return res; +} + +double +km_to_linear_uom (double km, int uom) +{ + switch (uom) + { + case GEO_UOM_meter: return 1000.0 * km; + case GEO_UOM_Kilometer: return km; + case GEO_UOM_Yard: return (1000.0/0.9144) * km; + case GEO_UOM_MileUSStatute: return (1.0/1.6093472186944) * km; + } + GPF_T; + return 0; +} + +static caddr_t +bif_geos_s_srs_distance (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + static const char *bifname = "GEOS silent SRS distance"; + int uom = bif_geo_uom_arg (qst, args, 2, bifname); + std::auto_ptr arg1, arg2; + int argfail = bif_Geometry_auto_ptr_argpair_nosignal (qst, args, 0, 1, bifname, GEO_ARG_ANY_NONNULL, 1, 0, &arg1, &arg2); + if (argfail) + return NEW_DB_NULL; + double shape_dist; + try { shape_dist = arg1.get()->distance(arg2.get()); } + CATCH_BIF_GEXXX((arg1.reset(), arg2.reset()), bifname) + if (shape_dist <= 0) + return box_double (0); + if (GEO_UOM_GridSpacing == uom) + return box_double (shape_dist); /* exact shape_dist */ + caddr_t pj_err = NULL; + int srid = arg1.get()->getSRID(); + void *pj = geo_get_default_pj_by_srid_or_string_cbk()(qst, &pj_err, srid, NULL, bifname, "first shape"); + if (pj_err) + { + arg1.reset(); arg2.reset(); sqlr_resignal (pj_err); + } + int islatlong = geo_get_default_pj_is_latlong_cbk()(pj); + int isgeocentric = ((0 < islatlong) ? 0 : geo_get_default_pj_is_geocent_cbk()(pj)); + if ((-1 == islatlong) || (-1 == isgeocentric)) + { + arg1.reset(); arg2.reset(); sqlr_new_error ("22023", "GEO23", "Unknown SRID %d; consider using plugin proj4 or similar", srid); + } + if (!(islatlong || isgeocentric)) + { + arg1.reset(); arg2.reset(); + sqlr_new_error ("22023", "GEO23", "SRID %d is neither latlong nor geocentric, the only supported UOM (unit of measure) for it is <" OPENGIS_DEF_UOM_GS_NS_URI "GridSpacing>", srid); + } + std::auto_ptr arg1cen(arg1.get()->getCentroid()); + std::auto_ptr arg2cen(arg2.get()->getCentroid()); + double cen1x = arg1cen.get()->getX(); + double cen2x = arg2cen.get()->getX(); + if (fabs (cen2x-cen1x) > 135) /* What if shapes become "closer" to each other if measured from the other side of globe? Let's slide one of them 360 right to see if it is so. */ + { + std::auto_ptr arg1shifted, arg2shifted; + if (cen1x < 0) + { + geo_t *a1s = bif_geo_arg (qst, args, 0, bifname, GEO_ARG_ANY_NONNULL); + if (geo_long360add (a1s) & GEO_LONG360ADD_SOME_CHANGED) + arg1shifted.reset (export_geo_as_Geometry (a1s)); + } + else if (cen2x < 0) + { + geo_t *a2s = bif_geo_arg (qst, args, 0, bifname, GEO_ARG_ANY_NONNULL); + if (geo_long360add (a2s) & GEO_LONG360ADD_SOME_CHANGED) + arg2shifted.reset (export_geo_as_Geometry (a2s)); + } + try { + if (arg1shifted.get()) + { + double dist_shifted = arg1shifted.get()->distance(arg2.get()); + if (dist_shifted <= 0) + return box_double (0); + if (dist_shifted < shape_dist) + { + shape_dist = dist_shifted; + arg1 = arg1shifted; + arg1cen.reset(arg1.get()->getCentroid()); + } + } + else if (arg2shifted.get()) + { + double dist_shifted = arg1.get()->distance(arg2shifted.get()); + if (dist_shifted <= 0) + return box_double (0); + if (dist_shifted < shape_dist) + { + shape_dist = dist_shifted; + arg2 = arg2shifted; + arg2cen.reset(arg2.get()->getCentroid()); + } + } + } + CATCH_BIF_GEXXX((arg1.reset(), arg2.reset(), arg1shifted.reset(), arg2shifted.reset()), bifname) + } + double cen_dist; + try { cen_dist = arg1cen.get()->distance(arg2cen.get()); } + CATCH_BIF_GEXXX((arg1.reset(), arg2.reset(), arg1cen.reset(), arg2cen.reset()), bifname) + if (shape_dist > 1.001 * cen_dist) + { + if (GEO_UOM_IS_LINEAR(uom)) + return box_double (km_to_linear_uom (shape_dist / KM_TO_DEG, uom)); + if (GEO_UOM_degree == uom) + return box_double (shape_dist); + if (GEO_UOM_radian == uom) + return box_double (DEG_TO_RAD * shape_dist); + } + else + { + if (GEO_UOM_IS_LINEAR(uom)) + return box_double (km_to_linear_uom (haversine_deg_km (arg1cen.get()->getX(), arg1cen.get()->getY(), arg2cen.get()->getX(), arg2cen.get()->getY()) * shape_dist / cen_dist, uom)); + if (GEO_UOM_degree == uom) + return box_double (haversine_deg_deg (arg1cen.get()->getX(), arg1cen.get()->getY(), arg2cen.get()->getX(), arg2cen.get()->getY()) * shape_dist / cen_dist); + if (GEO_UOM_radian == uom) + return box_double (DEG_TO_RAD * haversine_deg_deg (arg1cen.get()->getX(), arg1cen.get()->getY(), arg2cen.get()->getX(), arg2cen.get()->getY()) * shape_dist / cen_dist); + } + arg1.reset(); arg2.reset(); arg1cen.reset(); arg2cen.reset(); + sqlr_new_error ("22023", "GEO23", "Unit of measure is not supported by %s(), sorry", bifname); + return NULL; +} + + +static caddr_t +bif_geos_s_buffer (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + int arg_err; + std::auto_ptr arg1 = bif_Geometry_auto_ptr_arg_nosignal (qst, args, 0, "GEOS silent buffer", GEO_ARG_ANY_NONNULL, &arg_err); + if (arg_err) + return NEW_DB_NULL; + double buf_val = bif_double_arg (qst, args, 1, "GEOS silent buffer"); + std::auto_ptr res; + try { res = std::auto_ptr (arg1.get()->buffer(buf_val)); } + CATCH_BIF_GEXXX((arg1.reset()), "GEOS silent buffer") + return (caddr_t)import_Geometry_as_geo (res.get()); +} + +static caddr_t +bif_geos_s_convex_hull (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + int arg_err; + std::auto_ptr arg1 = bif_Geometry_auto_ptr_arg_nosignal (qst, args, 0, "GEOS silent convexHull", GEO_ARG_ANY_NONNULL, &arg_err); + if (arg_err) + return NEW_DB_NULL; + std::auto_ptr res; + try { res = std::auto_ptr (arg1.get()->convexHull()); } + CATCH_BIF_GEXXX((arg1.reset()), "GEOS silent convexHull") + if (NULL == res.get()) + return NEW_DB_NULL; + return (caddr_t)import_Geometry_as_geo (res.get()); +} + +static caddr_t +bif_geos_s_envelope (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ + caddr_t res = bif_st_get_bounding_box_impl (qst, err_ret, args, 1, "GEOS silent envelope", GEO_ARG_ANY_NULLABLE | GEO_ARG_NONGEO_AS_IS); + if (NULL == res) + { + geo_t *empty_res = geo_alloc (GEO_BOX, 0, GEO_SRCODE_DEFAULT); + GEO_XYBOX_SET_EMPTY (empty_res->XYbox); + return (caddr_t)empty_res; + } + if (DV_GEO != DV_TYPE_OF (res)) + return NEW_DB_NULL; + return res; +} + +static caddr_t +bif_geos_s_boundary (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + int arg_err; + std::auto_ptr arg1 = bif_Geometry_auto_ptr_arg_nosignal (qst, args, 0, "GEOS silent boundary", GEO_ARG_ANY_NONNULL, &arg_err); + if (arg_err) + return NEW_DB_NULL; + std::auto_ptr res; + try { res = std::auto_ptr (arg1.get()->getBoundary()); } + CATCH_BIF_GEXXX((arg1.reset()), "GEOS silent boundary") + if (NULL == res.get()) + return NEW_DB_NULL; + return (caddr_t)import_Geometry_as_geo (res.get()); +} + +static caddr_t +bif_geos_get_srid_iri (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ + geo_t *arg1 = bif_geo_arg (qst, args, 0, "GEOS get SRID IRI", GEO_ARG_ANY_NULLABLE | GEO_ARG_NONGEO_AS_IS); + if (DV_GEO != DV_TYPE_OF (arg1)) + return NEW_DB_NULL; + ptrlong srid = GEO_SRID (arg1->geo_srcode); + caddr_t res = geo_sr_srid_to_iri (srid); + if (NULL == res) + return NEW_DB_NULL; + return res; +} + +void +geo_dimensions_int (geo_t *g, int *topo_dim_ret, int *coord_mask_ret) +{ + int type = GEO_TYPE_MASK & (g->geo_flags); + int local_dim; + coord_mask_ret[0] |= (g->geo_flags & (GEO_A_Z | GEO_A_M)); + if (GEO_A_RINGS & type) + local_dim = 2; + else if (GEO_POINT == GEO_TYPE_CORE (type)) + local_dim = 0; + else if (GEO_NULL_SHAPE == GEO_TYPE_CORE (type)) + local_dim = -1; + else + local_dim = 1; + if (topo_dim_ret[0] < local_dim) + topo_dim_ret[0] = local_dim; + if ((GEO_A_ARRAY & type) && (GEO_UNDEFTYPE == GEO_TYPE_CORE (type))) + { + int ctr; + for (ctr = g->_.parts.len; ctr--; /* no step */) + { + geo_dimensions_int (g->_.parts.items[ctr], topo_dim_ret, coord_mask_ret); + if (2 == topo_dim_ret[0]) + return; + } + } +} + + +static caddr_t +bif_geos_topo_dimension (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + geo_t *arg1 = bif_geo_arg (qst, args, 0, "GEOS topological dimension", GEO_ARG_ANY_NULLABLE | GEO_ARG_NONGEO_AS_IS); + if (DV_GEO != DV_TYPE_OF (arg1)) + return NEW_DB_NULL; + int topo_dim = -1, coord_mask = 0; + geo_dimensions_int (arg1, &topo_dim, &coord_mask); + return box_num ((topo_dim < 0) ? 0 : topo_dim); +} + +static caddr_t +bif_geos_coord_dimension (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + geo_t *arg1 = bif_geo_arg (qst, args, 0, "GEOS coordinate dimension", GEO_ARG_ANY_NULLABLE | GEO_ARG_NONGEO_AS_IS); + if (DV_GEO != DV_TYPE_OF (arg1)) + return NEW_DB_NULL; + int topo_dim = -1, coord_mask = 0; + geo_dimensions_int (arg1, &topo_dim, &coord_mask); + return box_num (2 + ((coord_mask & GEO_A_Z) ? 1 : 0) + ((coord_mask & GEO_A_M) ? 1 : 0)); +} + +static caddr_t +bif_geos_spat_dimension (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + geo_t *arg1 = bif_geo_arg (qst, args, 0, "GEOS spatial dimension", GEO_ARG_ANY_NULLABLE | GEO_ARG_NONGEO_AS_IS); + if (DV_GEO != DV_TYPE_OF (arg1)) + return NEW_DB_NULL; + int topo_dim = -1, coord_mask = 0; + geo_dimensions_int (arg1, &topo_dim, &coord_mask); + return box_num (2 + ((coord_mask & GEO_A_Z) ? 1 : 0)); +} + +static caddr_t +bif_geos_is_empty (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + geo_t *arg1 = bif_geo_arg (qst, args, 0, "GEOS isEmpty", GEO_ARG_ANY_NULLABLE | GEO_ARG_NONGEO_AS_IS); + if (DV_GEO != DV_TYPE_OF (arg1)) + return NEW_DB_NULL; + int topo_dim = 0, coord_mask = 0; + geo_dimensions_int (arg1, &topo_dim, &coord_mask); + return box_num ((0 > topo_dim) ? 1 : 0); +} + +static caddr_t +bif_geos_is_simple (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + int arg_err; + std::auto_ptr arg1 = bif_Geometry_auto_ptr_arg_nosignal (qst, args, 0, "GEOS isSimple", GEO_ARG_ANY_NONNULL, &arg_err); + if (arg_err) + return NEW_DB_NULL; + int res; + try + { + if (0 == arg1.get()->getNumGeometries()) + res = 0; + else + res = arg1.get()->isSimple(); + } + CATCH_BIF_GEXXX((arg1.reset()), "GEOS isSimple") + return box_num (res ? 1 : 0); +} + +static caddr_t +bif_geos_is_unsupported (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + caddr_t res = NULL; + caddr_t catched = NULL; + QR_RESET_CTX + { + int arg_err; + std::auto_ptr arg1 = bif_Geometry_auto_ptr_arg_nosignal (qst, args, 0, "GEOS isUnsupported", GEO_ARG_ANY_NONNULL, &arg_err); + if (arg_err) + res = box_dv_short_string ("22023The argument is not a geometry"); + else + { + int issimple; + try { issimple = arg1.get()->isSimple(); } + CATCH_BIF_GEXXX((arg1.reset()), "GEOS isUnsupported") + } + } + QR_RESET_CODE + { + du_thread_t * self = THREAD_CURRENT_THREAD; + catched = thr_get_error_code (self); + } + END_QR_RESET; + if (res) + return res; + if (catched) + { + res = box_dv_short_strconcat (ERR_STATE (catched), ERR_MESSAGE (catched)); + dk_free_tree (catched); + return res; + } + return box_num (0); +} + +static caddr_t +bif_geos_as_wkt (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + geo_t *arg1 = bif_geo_arg (qst, args, 0, "GEOS asWKT", GEO_ARG_ANY_NULLABLE | GEO_ARG_NONGEO_AS_IS); + if (DV_GEO != DV_TYPE_OF (arg1)) + return NEW_DB_NULL; + dk_session_t *ses = strses_allocate (); + QR_RESET_CTX + { + ptrlong srid = GEO_SRID (arg1->geo_srcode); + caddr_t srid_iri = geo_sr_srid_to_iri (srid); + if (NULL != srid_iri) + { + session_buffered_write_char ('<', ses); + SES_PRINT (ses, srid_iri); + session_buffered_write_char ('>', ses); + session_buffered_write_char (' ', ses); + } + else + { + char buf[30]; + sprintf (buf, "SRID=%ld; ", (long)srid); + SES_PRINT (ses, buf); + } + ewkt_print_sf12 (arg1, ses); + } + QR_RESET_CODE + { + caddr_t err = thr_get_error_code (THREAD_CURRENT_THREAD); + POP_QR_RESET; + strses_free (ses); + sqlr_resignal (err); + } + END_QR_RESET; + caddr_t str = strses_string (ses); + dk_free_box ((caddr_t)ses); + return (caddr_t)str; +} + + +typedef bool (geos::geom::Geometry::* Geometry_g2g_relation_membptr_t) (const geos::geom::Geometry *that) const; + +static caddr_t +bif_geos_g2g_relation (caddr_t * qst, caddr_t * err, state_slot_t ** args, Geometry_g2g_relation_membptr_t op_membptr, int disjoin_always_false, const char *bifname) +{ + std::auto_ptrarg1, arg2; + int argfail = bif_Geometry_auto_ptr_argpair (qst, args, 0, 1, bifname, GEO_ARG_ANY_NONNULL, 1, disjoin_always_false, &arg1, &arg2); + if (argfail & GEO_ARGPAIR_NOT_MAY_INTERSECT) + return box_num (0); + int res; + try { res = ((arg1.get())->*op_membptr)(arg2.get()); } + CATCH_BIF_GEXXX((arg1.reset(), arg2.reset()), bifname) + return box_num (res); +} + +static caddr_t bif_geos_disjoint (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_relation (qst, err, args, &geos::geom::Geometry::disjoint , 0, "GEOS disjoint" ); } +static caddr_t bif_geos_touches (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_relation (qst, err, args, &geos::geom::Geometry::touches , 1, "GEOS touches" ); } +static caddr_t bif_geos_intersects (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_relation (qst, err, args, &geos::geom::Geometry::intersects , 1, "GEOS intersects" ); } +static caddr_t bif_geos_crosses (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_relation (qst, err, args, &geos::geom::Geometry::crosses , 1, "GEOS crosses" ); } +static caddr_t bif_geos_within (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_relation (qst, err, args, &geos::geom::Geometry::within , 1, "GEOS within" ); } +static caddr_t bif_geos_contains (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_relation (qst, err, args, &geos::geom::Geometry::contains , 1, "GEOS contains" ); } +static caddr_t bif_geos_overlaps (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_relation (qst, err, args, &geos::geom::Geometry::overlaps , 1, "GEOS overlaps" ); } +static caddr_t bif_geos_equals (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_relation (qst, err, args, &geos::geom::Geometry::equals , 1, "GEOS equals" ); } + +static caddr_t +bif_geos_g2g_silent_relation (caddr_t * qst, caddr_t * err, state_slot_t ** args, Geometry_g2g_relation_membptr_t op_membptr, int disjoin_always_false, const char *bifname) +{ + std::auto_ptr arg1, arg2; + int argfail = bif_Geometry_auto_ptr_argpair_nosignal (qst, args, 0, 1, bifname, GEO_ARG_ANY_NONNULL, 1, disjoin_always_false, &arg1, &arg2); + if (argfail) + return box_num (0); + int res; + try { res = ((arg1.get())->*op_membptr)(arg2.get()); } + CATCH_BIF_GEXXX((arg1.reset(), arg2.reset()), bifname) + return box_num (res); +} + +static caddr_t bif_geos_s_disjoint (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_silent_relation (qst, err, args, &geos::geom::Geometry::disjoint , 0, "GEOS silent disjoint" ); } +static caddr_t bif_geos_s_touches (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_silent_relation (qst, err, args, &geos::geom::Geometry::touches , 1, "GEOS silent touches" ); } +static caddr_t bif_geos_s_intersects (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_silent_relation (qst, err, args, &geos::geom::Geometry::intersects , 1, "GEOS silent intersects" ); } +static caddr_t bif_geos_s_crosses (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_silent_relation (qst, err, args, &geos::geom::Geometry::crosses , 1, "GEOS silent crosses" ); } +static caddr_t bif_geos_s_within (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_silent_relation (qst, err, args, &geos::geom::Geometry::within , 1, "GEOS silent within" ); } +static caddr_t bif_geos_s_contains (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_silent_relation (qst, err, args, &geos::geom::Geometry::contains , 1, "GEOS silent contains" ); } +static caddr_t bif_geos_s_overlaps (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_silent_relation (qst, err, args, &geos::geom::Geometry::overlaps , 1, "GEOS silent overlaps" ); } +static caddr_t bif_geos_s_equals (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_g2g_silent_relation (qst, err, args, &geos::geom::Geometry::equals , 1, "GEOS silent equals" ); } + +static caddr_t +bif_geos_relate1 (caddr_t * qst, caddr_t * err, state_slot_t ** args, const char *de9im_pattern, const char *bifname) +{ + std::auto_ptr arg1, arg2; + int argfail = bif_Geometry_auto_ptr_argpair_nosignal (qst, args, 0, 1, bifname, GEO_ARG_ANY_NONNULL, 1, 1, &arg1, &arg2); + if (argfail) + return box_num (0); + int res; + try { res = (arg1.get())->relate(arg2.get(), de9im_pattern); } + CATCH_BIF_GEXXX((arg1.reset(), arg2.reset()), bifname) + return box_num (res); +} + +static caddr_t bif_geos_sf_eq (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_relate1 (qst, err, args, "T*F**FFF*" , "GEOS SF equals" ); } +static caddr_t bif_geos_eh_overlap (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_relate1 (qst, err, args, "T*T***T**" , "GEOS Egenohofer overlap" ); } +static caddr_t bif_geos_eh_inside (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_relate1 (qst, err, args, "TFF*FFT**" , "GEOS Egenohofer inside" ); } +static caddr_t bif_geos_eh_contains (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_relate1 (qst, err, args, "T*TFF*FF*" , "GEOS Egenohofer contains" ); } + +static caddr_t +bif_geos_rcc8 (caddr_t * qst, caddr_t * err, state_slot_t ** args, const char *de9im_pattern, int disjoin_always_false, const char *bifname) +{ + std::auto_ptr arg1, arg2; + int argfail = bif_Geometry_auto_ptr_argpair_nosignal (qst, args, 0, 1, bifname, GEO_ARG_ANY_NONNULL, 1, disjoin_always_false, &arg1, &arg2); + if (argfail) + return box_num (0); + if ((2 != (arg1.get())->getDimension()) || (2 != (arg2.get())->getDimension())) + return box_num (0); + int res; + try { res = (arg1.get())->relate(arg2.get(), de9im_pattern); } + CATCH_BIF_GEXXX((arg1.reset(), arg2.reset()), bifname) + return box_num (res); +} + +static caddr_t bif_geos_rcc8_eq (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_rcc8 (qst, err, args, "TFFFTFFFT" , 1, "GEOS RCC8 eq" ); } +static caddr_t bif_geos_rcc8_dc (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_rcc8 (qst, err, args, "FFTFFTTTT" , 0, "GEOS RCC8 dc" ); } +static caddr_t bif_geos_rcc8_ec (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_rcc8 (qst, err, args, "FFTFTTTTT" , 1, "GEOS RCC8 ec" ); } +static caddr_t bif_geos_rcc8_po (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_rcc8 (qst, err, args, "TTTTTTTTT" , 1, "GEOS RCC8 po" ); } +static caddr_t bif_geos_rcc8_tppi (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_rcc8 (qst, err, args, "TTTFTTFFT" , 1, "GEOS RCC8 tppi" ); } +static caddr_t bif_geos_rcc8_tpp (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_rcc8 (qst, err, args, "TFFTTFTTT" , 1, "GEOS RCC8 tpp" ); } +static caddr_t bif_geos_rcc8_ntpp (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_rcc8 (qst, err, args, "TFFTFFTTT" , 1, "GEOS RCC8 ntpp" ); } +static caddr_t bif_geos_rcc8_ntppi (caddr_t * qst, caddr_t * err, state_slot_t ** args) { return bif_geos_rcc8 (qst, err, args, "TTTFFTFFT" , 1, "GEOS RCC8 ntppi" ); } + + +/*! Calculates OR of list of DE-9IM patterns filtered by dimensions +Syntax of each pattern is A/BCDDDDDDDDD where A and B are dimensions of arguments for which the DDDDDDDDD matrix should be checked, +A is '0' means left is point, B is '2' means right is area, '*' means any dimension is OK etc. +C tells what to do: +--- 'z' means return false, +--- '=' means return the result of relate() with matrix even if it is false, +--- ',' means return the result of relate() with matrix if true, try the rest of patterns if it is false, don't use this in last pattern of the array! +*/ +static caddr_t +bif_geos_relateX (caddr_t * qst, caddr_t * err, state_slot_t ** args, const char *ttde9im_patterns[], int disjoin_always_false, const char *bifname) +{ + std::auto_ptr arg1, arg2; + int argfail = bif_Geometry_auto_ptr_argpair_nosignal (qst, args, 0, 1, bifname, GEO_ARG_ANY_NONNULL, 1, disjoin_always_false, &arg1, &arg2); + if (argfail) + return box_num (0); + int res; + try { + const char **ttde9im_tail = ttde9im_patterns; + while (1) + { + const char *pat = (ttde9im_tail++)[0]; + if ((pat[0] != '*') && ((pat[0]-'0') != (arg1.get())->getDimension())) + continue; + if ((pat[2] != '*') && ((pat[2]-'0') != (arg2.get())->getDimension())) + continue; + if ('z' == pat[3]) + return box_num (0); + res = (arg1.get())->relate(arg2.get(), pat + 4); + if (res || (pat[3] == '=')) + return box_num (res); + } + } + catch (const geos::util::GEOSException &gexxx) + { + sqlr_new_error ("22023", "GEO22", "GEOS %s() error: %s", bifname, gexxx.what()); + return NULL; + } + return box_num (0); +} + +static caddr_t bif_geos_sf_touches (caddr_t * qst, caddr_t * err, state_slot_t ** args) { + const char *pats[] = { "0/0z" , "*/*,FT*******" , "*/*,F**T*****" , "*/*=F***T****" }; + return bif_geos_relateX (qst, err, args, pats, 1, "GEOS SF touches" ); } + +static caddr_t bif_geos_sf_crosses (caddr_t * qst, caddr_t * err, state_slot_t ** args) { + const char *pats[] = { "0/1=T*T***T**" , "0/2=T*T***T**" , "1/2=T*T***T**" , "1/1=0********" , "*/*z" }; + return bif_geos_relateX (qst, err, args, pats, 1, "GEOS SF crosses" ); } + +static caddr_t bif_geos_eh_covers (caddr_t * qst, caddr_t * err, state_slot_t ** args) { + const char *pats[] = { "1/1=T*TFT*FF*" , "2/1=T*TFT*FF*" , "2/2=T*TFT*FF*" , "*/*z" }; + return bif_geos_relateX (qst, err, args, pats, 1, "GEOS Egenhofer covers" ); } + +static caddr_t bif_geos_eh_covered_by (caddr_t * qst, caddr_t * err, state_slot_t ** args) { + const char *pats[] = { "1/1=TFF*TFT**" , "1/2=TFF*TFT**" , "2/2=TFF*TFT**" , "*/*z" }; + return bif_geos_relateX (qst, err, args, pats, 1, "GEOS Egenhofer coveredBy" ); } + +static caddr_t +bif_geos_equals_exact (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + double tolerance = bif_double_arg (qst, args, 2, "GEOS equalsExact"); + std::auto_ptrarg1, arg2; + int argfail = bif_Geometry_auto_ptr_argpair (qst, args, 0, 1, "GEOS equalsExact", GEO_ARG_ANY_NONNULL, 1, 1, &arg1, &arg2); + int res; + if (argfail) + return box_num (0); + try { res = (arg1.get())->equalsExact(arg2.get(), tolerance); } + CATCH_BIF_GEXXX((arg1.reset(), arg2.reset()), "GEOS equalsExact") + return box_num (res); +} + +#define F_OR_STAR(c) (('F' == (c)) || ('*' == (c))) +#define F_OR_STAR_IN_ALL_0134(p) (F_OR_STAR((p)[0]) && F_OR_STAR((p)[1]) && F_OR_STAR((p)[3]) && F_OR_STAR((p)[4])) + +static caddr_t +bif_geos_relate (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + caddr_t de9im_pattern_strg = ((2 < BOX_ELEMENTS (args)) ? bif_string_arg (qst, args, 2, "GEOS relate") : NULL); + int disjoin_always_false = ((NULL != de9im_pattern_strg) && !F_OR_STAR_IN_ALL_0134(de9im_pattern_strg)); + std::auto_ptrarg1, arg2; + int argfail = bif_Geometry_auto_ptr_argpair (qst, args, 0, 1, "GEOS relate", GEO_ARG_ANY_NONNULL, 1, disjoin_always_false, &arg1, &arg2); + if (argfail & GEO_ARGPAIR_NOT_MAY_INTERSECT) + return box_num (0); + caddr_t res; + if (NULL == arg1.get()) + { + if (NULL == arg2.get()) + { + arg1.reset (get_GeometryFactory_by_srid (SRID_DEFAULT)->createEmptyGeometry()); + arg2.reset (get_GeometryFactory_by_srid (SRID_DEFAULT)->createEmptyGeometry()); + } + else + arg1.reset (arg2.get()->getFactory()->createEmptyGeometry()); + } + else + { + if (NULL == arg2.get()) + arg2.reset (arg1.get()->getFactory()->createEmptyGeometry()); + } + try + { + if (NULL != de9im_pattern_strg) + res = box_num (arg1.get()->relate(arg2.get(), de9im_pattern_strg)); + else + { + geos::geom::IntersectionMatrix *im = arg1.get()->relate(arg2.get()); + res = box_dv_short_string (im->toString().c_str()); + delete im; + } + } + CATCH_BIF_GEXXX((arg1.reset(), arg2.reset()), "GEOS relate") + return res; +} + +static caddr_t +bif_geos_s_relate (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + caddr_t de9im_pattern_strg = ((2 < BOX_ELEMENTS (args)) ? bif_string_arg (qst, args, 2, "GEOS silent relate") : NULL); + int disjoin_always_false = ((NULL != de9im_pattern_strg) && !F_OR_STAR_IN_ALL_0134(de9im_pattern_strg)); + std::auto_ptr arg1, arg2; + int argfail = bif_Geometry_auto_ptr_argpair_nosignal (qst, args, 0, 1, "GEOS silent relate", GEO_ARG_ANY_NONNULL, 1, disjoin_always_false, &arg1, &arg2); + if (argfail & GEO_ARGPAIR_NOT_MAY_INTERSECT) + return box_num (0); + caddr_t res; + if (NULL == arg1.get()) + { + if (NULL == arg2.get()) + { + arg1.reset (get_GeometryFactory_by_srid (SRID_DEFAULT)->createEmptyGeometry()); + arg2.reset (get_GeometryFactory_by_srid (SRID_DEFAULT)->createEmptyGeometry()); + } + else + arg1.reset (arg2.get()->getFactory()->createEmptyGeometry()); + } + else + { + if (NULL == arg2.get()) + arg2.reset (arg1.get()->getFactory()->createEmptyGeometry()); + } + try + { + if (NULL != de9im_pattern_strg) + res = box_num (arg1.get()->relate(arg2.get(), de9im_pattern_strg)); + else + { + geos::geom::IntersectionMatrix *im = arg1.get()->relate(arg2.get()); + res = box_dv_short_string (im->toString().c_str()); + delete im; + } + } + CATCH_BIF_GEXXX((arg1.reset(), arg2.reset()), "GEOS silent relate") + return res; +} + +typedef geos::geom::Geometry *(geos::geom::Geometry::* Geometry_g2g_combination_membptr_t) (const geos::geom::Geometry *that) const; + +static caddr_t +bif_geos_g2g_combination (caddr_t * qst, caddr_t * err, state_slot_t ** args, Geometry_g2g_combination_membptr_t op_membptr, const char *bifname) +{ + std::auto_ptrarg1, arg2; + bif_Geometry_auto_ptr_argpair (qst, args, 0, 1, bifname, GEO_ARG_ANY_NONNULL, 1, 0, &arg1, &arg2); + std::auto_ptr res; + try { res = std::auto_ptr (((arg1.get())->*op_membptr)(arg2.get())); } + CATCH_BIF_GEXXX((arg1.reset(), arg2.reset()), bifname) + if (NULL == res.get()) + return NEW_DB_NULL; + return (caddr_t)import_Geometry_as_geo (res.get()); +} + +static caddr_t +bif_geos_union (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + return bif_geos_g2g_combination (qst, err, args, &geos::geom::Geometry::Union, "GEOS Union"); +} + +static caddr_t +bif_geos_intersection (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + return bif_geos_g2g_combination (qst, err, args, &geos::geom::Geometry::intersection, "GEOS intersection"); +} + +static caddr_t +bif_geos_difference (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + return bif_geos_g2g_combination (qst, err, args, &geos::geom::Geometry::difference, "GEOS difference"); +} + +static caddr_t +bif_geos_sym_difference (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + return bif_geos_g2g_combination (qst, err, args, &geos::geom::Geometry::symDifference, "GEOS symDifference"); +} + +static caddr_t +bif_geos_s_g2g_combination (caddr_t * qst, caddr_t * err, state_slot_t ** args, Geometry_g2g_combination_membptr_t op_membptr, const char *bifname) +{ + geo_t *raw_arg1 = bif_geo_arg (qst, args, 0, bifname, GEO_ARG_ANY_NONNULL | GEO_ARG_NONGEO_AS_IS); + geo_t *raw_arg2 = bif_geo_arg (qst, args, 1, bifname, GEO_ARG_ANY_NONNULL | GEO_ARG_NONGEO_AS_IS); + int nulls = 0; + switch (DV_TYPE_OF (raw_arg1)) { case DV_GEO: break; case DV_DB_NULL: nulls |= 1; break; default: return NEW_DB_NULL; } + switch (DV_TYPE_OF (raw_arg2)) { case DV_GEO: break; case DV_DB_NULL: nulls |= 2; break; default: return NEW_DB_NULL; } + if (nulls) + return box_num (nulls); + std::auto_ptr arg1 (export_geo_as_Geometry (raw_arg1)); + std::auto_ptr arg2 (export_geo_as_Geometry (raw_arg2)); + std::auto_ptr res; + try { res = std::auto_ptr (((arg1.get())->*op_membptr)(arg2.get())); } + CATCH_BIF_GEXXX((arg1.reset(), arg2.reset()), bifname) + if (NULL == res.get()) + return NEW_DB_NULL; + return (caddr_t)import_Geometry_as_geo (res.get()); +} + +static caddr_t +bif_geos_s_union (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + const char *fname = "GEOS silent Union"; + caddr_t res = bif_geos_s_g2g_combination (qst, err, args, &geos::geom::Geometry::Union, fname); + if (DV_LONG_INT != DV_TYPE_OF (res)) + return res; + switch (unbox (res)) { case 1: return box_copy_tree (bif_arg (qst, args, 1, fname)); case 2: return box_copy_tree (bif_arg (qst, args, 0, fname)); default: return NEW_DB_NULL; } +} + +static caddr_t +bif_geos_s_intersection (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + const char *fname = "GEOS silent intersection"; + caddr_t res = bif_geos_s_g2g_combination (qst, err, args, &geos::geom::Geometry::intersection, fname); + if (DV_LONG_INT != DV_TYPE_OF (res)) + return res; + return NEW_DB_NULL; +} + +static caddr_t +bif_geos_s_difference (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + const char *fname = "GEOS silent difference"; + caddr_t res = bif_geos_s_g2g_combination (qst, err, args, &geos::geom::Geometry::difference, fname); + if (DV_LONG_INT != DV_TYPE_OF (res)) + return res; + switch (unbox (res)) { case 2: return box_copy_tree (bif_arg (qst, args, 0, fname)); default: return NEW_DB_NULL; } +} + +static caddr_t +bif_geos_s_sym_difference (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + const char *fname = "GEOS silent symDifference"; + caddr_t res = bif_geos_s_g2g_combination (qst, err, args, &geos::geom::Geometry::symDifference, fname); + if (DV_LONG_INT != DV_TYPE_OF (res)) + return res; + switch (unbox (res)) { case 1: return box_copy_tree (bif_arg (qst, args, 1, fname)); case 2: return box_copy_tree (bif_arg (qst, args, 0, fname)); default: return NEW_DB_NULL; } +} + +#define BINARY_BOOL_RELATION BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_RET_TYPE, _gate._bt_integer._ptr, BMD_IS_PURE +#define BINARY_BOOL_SILENT_RELATION BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_RET_TYPE, _gate._bt_integer_nn._ptr, BMD_IS_PURE + +#define DF_DR_GS_ALIASES(name) BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI name, BMD_ALIAS, OPENGIS_DEF_RULE_GS_NS_URI name , BMD_ALIAS, OPENGIS_ONT_GS_NS_URI name +#define DF_GS_ALIASES(name) BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI name, BMD_ALIAS, OPENGIS_ONT_GS_NS_URI name + +extern "C" +void +virt_geos_pre_log_action (char *mode) +{ + bif_define_ex ("GEOS version" , bif_geos_version , BMD_ALIAS, "GEOS-version" ,BMD_MIN_ARGCOUNT, 0, BMD_MAX_ARGCOUNT, 0, BMD_RET_TYPE, _gate._bt_varchar._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS loopback" , bif_geos_loopback , BMD_ALIAS, "GEOS-loopback" ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS getCoordinate" , bif_geos_get_coordinate , BMD_ALIAS, "GEOS-getCoordinate" ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS getCentroid" , bif_geos_get_centroid , BMD_ALIAS, "GEOS-getCentroid" ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS distance" , bif_geos_distance , BMD_ALIAS, "GEOS-distance" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_RET_TYPE, _gate._bt_double._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS buffer" , bif_geos_buffer , BMD_ALIAS, "GEOS-buffer" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 3, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS convexHull" , bif_geos_convex_hull , BMD_ALIAS, "GEOS-convexHull" ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS envelope" , bif_geos_envelope , BMD_ALIAS, "GEOS-envelope" ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS boundary" , bif_geos_boundary , BMD_ALIAS, "GEOS-boundary" ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS silent SRS distance" , bif_geos_s_srs_distance , BMD_ALIAS, "GEOS-silent-SRS-distance", BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI "distance" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 3, BMD_RET_TYPE, _gate._bt_double._ptr, BMD_USES_INDEX, BMD_OUT_OF_PARTITION, BMD_DONE); + bif_define_ex ("GEOS silent buffer" , bif_geos_s_buffer , BMD_ALIAS, "GEOS-silent-buffer" , BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI "buffer" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 3, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS silent convexHull" , bif_geos_s_convex_hull , BMD_ALIAS, "GEOS-silent-convexHull" , BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI "convexHull" ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS silent envelope" , bif_geos_s_envelope , BMD_ALIAS, "GEOS-silent-envelope" , BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI "envelope" ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS silent boundary" , bif_geos_s_boundary , BMD_ALIAS, "GEOS-silent-boundary" , BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI "boundary" ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + + bif_define_ex ("GEOS get SRID IRI" , bif_geos_get_srid_iri , BMD_ALIAS, "GEOS-get-SRID-IRI" , BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI "getSRID" ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_varchar._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS topologicalDimension" , bif_geos_topo_dimension , BMD_ALIAS, "GEOS-topologicalDimension" , DF_GS_ALIASES("dimension") ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_integer._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS coordinateDimension" , bif_geos_coord_dimension , BMD_ALIAS, "GEOS-coordinateDimension" , DF_GS_ALIASES("coordinateDimension") ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_integer._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS spatialDimension" , bif_geos_spat_dimension , BMD_ALIAS, "GEOS-spatialDimension" , DF_GS_ALIASES("spatialDimension") ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_integer._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS isEmpty" , bif_geos_is_empty , BMD_ALIAS, "GEOS-isEmpty" , DF_GS_ALIASES("isEmpty") ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_integer._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS isSimple" , bif_geos_is_simple , BMD_ALIAS, "GEOS-isSimple" , DF_GS_ALIASES("isSimple") ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_integer._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS isUnsupported" , bif_geos_is_unsupported , BMD_ALIAS, "GEOS-isUnsupported" ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS asWKT" , bif_geos_as_wkt , BMD_ALIAS, "GEOS-asWKT" , DF_GS_ALIASES("hasSerialization") , DF_GS_ALIASES("asWKT") ,BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + + bif_define_ex ("GEOS disjoint" , bif_geos_disjoint , BMD_ALIAS, "GEOS-disjoint" , BINARY_BOOL_RELATION, BMD_DONE); + bif_define_ex ("GEOS touches" , bif_geos_touches , BMD_ALIAS, "GEOS-touches" , BINARY_BOOL_RELATION, BMD_DONE); + bif_define_ex ("GEOS intersects" , bif_geos_intersects , BMD_ALIAS, "GEOS-intersects" , BINARY_BOOL_RELATION, BMD_DONE); + bif_define_ex ("GEOS crosses" , bif_geos_crosses , BMD_ALIAS, "GEOS-crosses" , BINARY_BOOL_RELATION, BMD_DONE); + bif_define_ex ("GEOS within" , bif_geos_within , BMD_ALIAS, "GEOS-within" , BINARY_BOOL_RELATION, BMD_DONE); + bif_define_ex ("GEOS contains" , bif_geos_contains , BMD_ALIAS, "GEOS-contains" , BINARY_BOOL_RELATION, BMD_DONE); + bif_define_ex ("GEOS overlaps" , bif_geos_overlaps , BMD_ALIAS, "GEOS-overlaps" , BINARY_BOOL_RELATION, BMD_DONE); + bif_define_ex ("GEOS equals" , bif_geos_equals , BMD_ALIAS, "GEOS-equals" , BINARY_BOOL_RELATION, BMD_DONE); + + bif_define_ex ("GEOS silent disjoint" , bif_geos_s_disjoint , BMD_ALIAS, "GEOS-silent-disjoint" , DF_DR_GS_ALIASES("sfDisjoint"), DF_DR_GS_ALIASES("ehDisjoint") , BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS silent touches" , bif_geos_s_touches , BMD_ALIAS, "GEOS-silent-touches" , BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS silent intersects" , bif_geos_s_intersects , BMD_ALIAS, "GEOS-silent-intersects" , DF_DR_GS_ALIASES("sfIntersects") , BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS silent crosses" , bif_geos_s_crosses , BMD_ALIAS, "GEOS-silent-crosses" , BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS silent within" , bif_geos_s_within , BMD_ALIAS, "GEOS-silent-within" , DF_DR_GS_ALIASES("sfWithin"), BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS silent contains" , bif_geos_s_contains , BMD_ALIAS, "GEOS-silent-contains" , DF_DR_GS_ALIASES("sfContains"), BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS silent overlaps" , bif_geos_s_overlaps , BMD_ALIAS, "GEOS-silent-overlaps" , DF_DR_GS_ALIASES("sfOverlaps"), BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS silent equals" , bif_geos_s_equals , BMD_ALIAS, "GEOS-silent-equals" , BINARY_BOOL_SILENT_RELATION, BMD_DONE); + + bif_define_ex ("GEOS RCC8 eq" , bif_geos_rcc8_eq , BMD_ALIAS, "GEOS-RCC8-eq" , DF_DR_GS_ALIASES("rcc8eq" ), BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS RCC8 dc" , bif_geos_rcc8_dc , BMD_ALIAS, "GEOS-RCC8-dc" , DF_DR_GS_ALIASES("rcc8dc" ), BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS RCC8 ec" , bif_geos_rcc8_ec , BMD_ALIAS, "GEOS-RCC8-ec" , DF_DR_GS_ALIASES("rcc8ec" ), BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS RCC8 po" , bif_geos_rcc8_po , BMD_ALIAS, "GEOS-RCC8-po" , DF_DR_GS_ALIASES("rcc8po" ), BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS RCC8 tppi" , bif_geos_rcc8_tppi , BMD_ALIAS, "GEOS-RCC8-tppi" , DF_DR_GS_ALIASES("rcc8tppi" ), BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS RCC8 tpp" , bif_geos_rcc8_tpp , BMD_ALIAS, "GEOS-RCC8-tpp" , DF_DR_GS_ALIASES("rcc8tpp" ), BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS RCC8 ntpp" , bif_geos_rcc8_ntpp , BMD_ALIAS, "GEOS-RCC8-ntpp" , DF_DR_GS_ALIASES("rcc8ntpp" ), BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS RCC8 ntppi" , bif_geos_rcc8_ntppi , BMD_ALIAS, "GEOS-RCC8-ntppi" , DF_DR_GS_ALIASES("rcc8ntppi" ), BINARY_BOOL_SILENT_RELATION, BMD_DONE); + + bif_define_ex ("GEOS OGC equals" , bif_geos_sf_eq , BMD_ALIAS, "GEOS-OGC-equals", DF_DR_GS_ALIASES("sfEquals"), DF_DR_GS_ALIASES("ehEquals"), BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS SF touches" , bif_geos_sf_touches , BMD_ALIAS, "GEOS-SF-touches", BMD_ALIAS, "GEOS Egenhofer meet", BMD_ALIAS, "GEOS-Egenhofer-meet" , DF_DR_GS_ALIASES("sfTouches"), DF_DR_GS_ALIASES("ehMeet") ,BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS SF crosses" , bif_geos_sf_crosses , BMD_ALIAS, "GEOS-SF-crosses", DF_DR_GS_ALIASES("sfCrosses") ,BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS Egenohofer overlap" , bif_geos_eh_overlap , BMD_ALIAS, "GEOS-Egenohofer-overlap" , DF_DR_GS_ALIASES("ehOverlap") ,BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS Egenohofer inside" , bif_geos_eh_inside , BMD_ALIAS, "GEOS-Egenohofer-inside" , DF_DR_GS_ALIASES("ehInside") ,BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS Egenohofer contains" , bif_geos_eh_contains , BMD_ALIAS, "GEOS-Egenohofer-contains" , DF_DR_GS_ALIASES("ehContains") ,BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS Egenhofer covers" , bif_geos_eh_covers , BMD_ALIAS, "GEOS-Egenhofer-covers", DF_DR_GS_ALIASES("ehCovers") ,BINARY_BOOL_SILENT_RELATION, BMD_DONE); + bif_define_ex ("GEOS Egenhofer coveredBy" , bif_geos_eh_covered_by , BMD_ALIAS, "GEOS-Egenhofer-coveredBy", DF_DR_GS_ALIASES("ehCoveredBy") ,BINARY_BOOL_SILENT_RELATION, BMD_DONE); + + bif_define_ex ("GEOS silent relate" , bif_geos_s_relate , BMD_ALIAS, "GEOS-silent-relate" , BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI "relate" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 3, BMD_RET_TYPE, _gate._bt_any._ptr, BMD_IS_PURE, BMD_DONE); + + bif_define_ex ("GEOS equalsExact" , bif_geos_equals_exact , BMD_ALIAS, "GEOS-equalsExact" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_RET_TYPE, _gate._bt_integer_nn._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS relate" , bif_geos_relate , BMD_ALIAS, "GEOS-relate" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 3, BMD_RET_TYPE, _gate._bt_any._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS union" , bif_geos_union , BMD_ALIAS, "GEOS-union" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS intersection" , bif_geos_intersection , BMD_ALIAS, "GEOS-intersection" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS difference" , bif_geos_difference , BMD_ALIAS, "GEOS-difference" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS symDifference" , bif_geos_sym_difference , BMD_ALIAS, "GEOS-symDifference" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS silent union" , bif_geos_s_union , BMD_ALIAS, "GEOS-silent-union" , BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI "union" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS silent intersection" , bif_geos_s_intersection , BMD_ALIAS, "GEOS-silent-intersection" , BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI "intersection" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS silent difference" , bif_geos_s_difference , BMD_ALIAS, "GEOS-silent-difference" , BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI "difference" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("GEOS silent symDifference" , bif_geos_s_sym_difference , BMD_ALIAS, "GEOS-silent-symDifference" , BMD_ALIAS, OPENGIS_DEF_FUNCTION_GS_NS_URI "symDifference" ,BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_RET_TYPE, _gate._bt_any_box._ptr, BMD_IS_PURE, BMD_DONE); + srid2GeometryFactory_mtx = mutex_allocate (); + srid2GeometryFactory = hash_table_allocate (5000); +} + + +extern "C" +void +virt_geos_postponed_action (char *mode) +{ +} + +extern "C" +void +virt_geos_plugin_connect (void *data) +{ + dk_set_push (get_srv_global_init_pre_log_actions_ptr(), (void *)virt_geos_pre_log_action); + dk_set_push (get_srv_global_init_postponed_actions_ptr(), (void *)virt_geos_postponed_action); +} + +static unit_version_t virt_geos_version = { + PLAIN_PLUGIN_TYPE, /*!< Title of unit, filled by unit */ + PLUGIN_VERSION "." DBMS_SRV_GEN_MAJOR DBMS_SRV_GEN_MINOR, /*!< Version number, filled by unit */ + "OpenLink Software", /*!< Plugin's developer, filled by unit */ + "GEOS plugin based on Geometry Engine Open Source library from Open Source Geospatial Foundation", /*!< Any additional info, filled by unit */ + 0, /*!< Error message, filled by unit loader */ + 0, /*!< Name of file with unit's code, filled by unit loader */ + virt_geos_plugin_connect, /*!< Pointer to connection function, cannot be 0 */ + 0, /*!< Pointer to disconnection function, or 0 */ + 0, /*!< Pointer to activation function, or 0 */ + 0, /*!< Pointer to deactivation function, or 0 */ + &_gate +}; + + +extern "C" +unit_version_t *CALLBACK +geos_check (unit_version_t * in, void *appdata) +{ + return &virt_geos_version; +} diff --git a/binsrc/hosting/geos/geos_plugin.h b/binsrc/hosting/geos/geos_plugin.h new file mode 100644 index 0000000000..2ab7a0acb0 --- /dev/null +++ b/binsrc/hosting/geos/geos_plugin.h @@ -0,0 +1,51 @@ +#ifndef GEOS_PLUGIN_H +#define GEOS_PLUGIN_H + +#include +#include +#include +#include +#include + +extern "C" { +#include "Dk.h" +#include "geo.h" +#include "import_gate_virtuoso.h" +}; + +class geo_exporter_to_geos { + const geos::geom::GeometryFactory &factory; +public: + geo_exporter_to_geos(geos::geom::GeometryFactory const& f): factory(f), blocking_error (NULL) {} + geos::geom::Geometry* export_one(geo_t *g); + caddr_t blocking_error; +private: + unsigned int inputDimension; + geos::geom::Point *export_Point (geo_t *g); + geos::geom::LineString *export_LineString (geo_t *g); + geos::geom::LinearRing *export_LinearRing (geo_t *g); + geos::geom::Geometry *export_Polygon (geo_t *g); /*!< \returns either a polygon or an empty geometry */ + geos::geom::MultiPoint *export_MultiPoint (geo_t *g); + geos::geom::MultiLineString *export_MultiLineString (geo_t *g); + geos::geom::MultiPolygon *export_MultiPolygon (geo_t *g); + geos::geom::GeometryCollection *export_GeometryCollection (geo_t *g); + geos::geom::CoordinateSequence *export_CoordinateSequence (int len, geoc *Xs, geoc *Ys, geoc *Zs_or_null, int spare_len_at_end); + geo_exporter_to_geos(const geo_exporter_to_geos& other); // to make the type noncopyable + geo_exporter_to_geos& operator=(const geo_exporter_to_geos& rhs); // to make the type noncopyable +}; + +class geo_importer_from_geos { +public: + geo_importer_from_geos (int dims): defaultOutputDimension(dims), outputDimension (dims) {} + geo_t *import_one (const geos::geom::Geometry &geom); +private: + int defaultOutputDimension; + int outputDimension; + geo_t *import_Point (const geos::geom::Point &p); + geo_t *import_LineString (const geos::geom::LineString &ls, int geo_type_no_zm); + geo_t *import_MultiPoint (const geos::geom::MultiPoint &ls); + geo_t *import_Polygon (const geos::geom::Polygon &p); + geo_t *import_GeometryCollection (const geos::geom::GeometryCollection &c, int geo_type_no_zm); +}; + +#endif // #ifndef GEOS_PLUGIN_H diff --git a/binsrc/hosting/mono/Makefile.am b/binsrc/hosting/mono/Makefile.am index e8b196597e..234641ff18 100644 --- a/binsrc/hosting/mono/Makefile.am +++ b/binsrc/hosting/mono/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/basec.c b/binsrc/hosting/mono/basec.c index 715670a1f7..df9c556700 100644 --- a/binsrc/hosting/mono/basec.c +++ b/binsrc/hosting/mono/basec.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/clr.def b/binsrc/hosting/mono/clr.def index 1e8aae63a4..63cf49c05e 100644 --- a/binsrc/hosting/mono/clr.def +++ b/binsrc/hosting/mono/clr.def @@ -8,7 +8,7 @@ ; This file is part of the OpenLink Software Virtuoso Open-Source (VOS) ; project. ; -; Copyright (C) 1998-2018 OpenLink Software +; Copyright (C) 1998-2019 OpenLink Software ; ; This project is free software; you can redistribute it and/or modify it ; under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/clr_ll_api.h b/binsrc/hosting/mono/clr_ll_api.h index f87c5876e7..5a84e17bea 100644 --- a/binsrc/hosting/mono/clr_ll_api.h +++ b/binsrc/hosting/mono/clr_ll_api.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/dotnet.cpp b/binsrc/hosting/mono/dotnet.cpp index 17507e6bf0..06f2b2e154 100644 --- a/binsrc/hosting/mono/dotnet.cpp +++ b/binsrc/hosting/mono/dotnet.cpp @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/import_clr.sql b/binsrc/hosting/mono/import_clr.sql index 65abe43e70..f85421dd6f 100644 --- a/binsrc/hosting/mono/import_clr.sql +++ b/binsrc/hosting/mono/import_clr.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/mono.c b/binsrc/hosting/mono/mono.c index 512b906b66..279379cfe5 100644 --- a/binsrc/hosting/mono/mono.c +++ b/binsrc/hosting/mono/mono.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/mono.h b/binsrc/hosting/mono/mono.h index 3902d53c18..33fde2eac6 100644 --- a/binsrc/hosting/mono/mono.h +++ b/binsrc/hosting/mono/mono.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/mono_type.xsl b/binsrc/hosting/mono/mono_type.xsl index e9298292ee..e7870f42f2 100644 --- a/binsrc/hosting/mono/mono_type.xsl +++ b/binsrc/hosting/mono/mono_type.xsl @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/tests/Makefile.am b/binsrc/hosting/mono/tests/Makefile.am index e4492afdf9..94f7c24e69 100644 --- a/binsrc/hosting/mono/tests/Makefile.am +++ b/binsrc/hosting/mono/tests/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/tests/Point.cs b/binsrc/hosting/mono/tests/Point.cs index 2c614a7429..31c6881fd1 100644 --- a/binsrc/hosting/mono/tests/Point.cs +++ b/binsrc/hosting/mono/tests/Point.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/tests/Point_ho_s_10.cs b/binsrc/hosting/mono/tests/Point_ho_s_10.cs index f1b2f376a8..0bbb46ba24 100644 --- a/binsrc/hosting/mono/tests/Point_ho_s_10.cs +++ b/binsrc/hosting/mono/tests/Point_ho_s_10.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/tests/clr_suite_types.sql b/binsrc/hosting/mono/tests/clr_suite_types.sql index 82255b3634..19e16cc272 100644 --- a/binsrc/hosting/mono/tests/clr_suite_types.sql +++ b/binsrc/hosting/mono/tests/clr_suite_types.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/tests/clr_test2.sql b/binsrc/hosting/mono/tests/clr_test2.sql index 981a7b8cd8..80c9541f72 100644 --- a/binsrc/hosting/mono/tests/clr_test2.sql +++ b/binsrc/hosting/mono/tests/clr_test2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/tests/sample.cs b/binsrc/hosting/mono/tests/sample.cs index af30f610ee..dfe82bdd67 100644 --- a/binsrc/hosting/mono/tests/sample.cs +++ b/binsrc/hosting/mono/tests/sample.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/tests/tax.cs b/binsrc/hosting/mono/tests/tax.cs index e9f7f0f88f..ccc486219f 100644 --- a/binsrc/hosting/mono/tests/tax.cs +++ b/binsrc/hosting/mono/tests/tax.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/tests/tclrsrv.sh b/binsrc/hosting/mono/tests/tclrsrv.sh index e3299d22f8..cb32bcdbed 100755 --- a/binsrc/hosting/mono/tests/tclrsrv.sh +++ b/binsrc/hosting/mono/tests/tclrsrv.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/tests/test_point_clr.sql b/binsrc/hosting/mono/tests/test_point_clr.sql index 706338438e..798077719e 100644 --- a/binsrc/hosting/mono/tests/test_point_clr.sql +++ b/binsrc/hosting/mono/tests/test_point_clr.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/tests/test_tax_clr.sql b/binsrc/hosting/mono/tests/test_tax_clr.sql index 2779c931a3..d3048c77df 100644 --- a/binsrc/hosting/mono/tests/test_tax_clr.sql +++ b/binsrc/hosting/mono/tests/test_tax_clr.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/virt_http.cs b/binsrc/hosting/mono/virt_http.cs index 53ada78ffc..da7dc544c8 100644 --- a/binsrc/hosting/mono/virt_http.cs +++ b/binsrc/hosting/mono/virt_http.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/mono/virtclr.cs b/binsrc/hosting/mono/virtclr.cs index 4306550446..50e119f401 100644 --- a/binsrc/hosting/mono/virtclr.cs +++ b/binsrc/hosting/mono/virtclr.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/perl/Makefile.am b/binsrc/hosting/perl/Makefile.am index da5342038d..63f92dbec4 100644 --- a/binsrc/hosting/perl/Makefile.am +++ b/binsrc/hosting/perl/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/perl/hosting_perl.c b/binsrc/hosting/perl/hosting_perl.c index bafa2a9b30..0b0816bbae 100644 --- a/binsrc/hosting/perl/hosting_perl.c +++ b/binsrc/hosting/perl/hosting_perl.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/perl/pl_to_c.awk b/binsrc/hosting/perl/pl_to_c.awk index 05c8eca4cf..6a392a9943 100644 --- a/binsrc/hosting/perl/pl_to_c.awk +++ b/binsrc/hosting/perl/pl_to_c.awk @@ -3,7 +3,7 @@ BEGIN { # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/perl/virt_handler.pm b/binsrc/hosting/perl/virt_handler.pm index e489513ec2..2a6210980d 100644 --- a/binsrc/hosting/perl/virt_handler.pm +++ b/binsrc/hosting/perl/virt_handler.pm @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/php/Makefile.am b/binsrc/hosting/php/Makefile.am index 0ed1f8efff..b07b900700 100644 --- a/binsrc/hosting/php/Makefile.am +++ b/binsrc/hosting/php/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/php/hosting_php.c b/binsrc/hosting/php/hosting_php.c index 6d61686bc2..c39ebe1d76 100644 --- a/binsrc/hosting/php/hosting_php.c +++ b/binsrc/hosting/php/hosting_php.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/proj4/.gitignore b/binsrc/hosting/proj4/.gitignore new file mode 100644 index 0000000000..d10142c040 --- /dev/null +++ b/binsrc/hosting/proj4/.gitignore @@ -0,0 +1,2 @@ +*.exp +sql_code_proj4.c diff --git a/binsrc/hosting/proj4/Makefile.am b/binsrc/hosting/proj4/Makefile.am new file mode 100644 index 0000000000..e2408b31f2 --- /dev/null +++ b/binsrc/hosting/proj4/Makefile.am @@ -0,0 +1,69 @@ +# +# This file is part of the OpenLink Software Virtuoso Open-Source (VOS) +# project. +# +# Copyright (C) 1998-2019 OpenLink Software +# +# This project is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; only version 2 of the License, dated June 1991. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# + +if WITH_PROJ4 +hosting_LTLIBRARIES = proj4.la +endif + +GEN=$(SHELL) ${top_srcdir}/bin/generate + +proj4_la_SOURCES = \ + proj4_plugin.c \ + sql_code_proj4.c \ + $(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c + +BUILT_SOURCES = sql_code_proj4.c + +proj4_la_CFLAGS = @VIRT_AM_CFLAGS@ +proj4_la_CFLAGS += -D_USRDLL +proj4_la_CFLAGS += -I$(top_srcdir)/libsrc +proj4_la_CFLAGS += -I$(top_srcdir)/libsrc/Dk +proj4_la_CFLAGS += -I$(top_srcdir)/libsrc/Wi +proj4_la_CFLAGS += -I$(top_srcdir)/libsrc/plugin +proj4_la_CFLAGS += -I$(top_srcdir)/libsrc/langfunc +proj4_la_CFLAGS += -I$(top_srcdir)/libsrc/odbcsdk/include +proj4_la_CFLAGS += @PROJ4_CPPFLAGS@ + +proj4_la_LDFLAGS = -module -avoid-version -export-dynamic +proj4_la_LDFLAGS += -export-symbols proj4.exp +proj4_la_LIBADD = @PROJ4_LDFLAGS@ @PROJ4_LIBS@ -lm + +sql_code_proj4.c: proj4.sql proj4_init.sql $(SQL_AWK_DEPS) Makefile.am + $(GEN) $(GAWK) -o $@ \ + -f $(top_srcdir)/libsrc/Wi/sql_to_c.awk \ + -v init_name=_proj4 \ + -v extra_include=import_gate_virtuoso.h \ + -v pl_stats=$(PLSTATS) \ + proj4_init.sql proj4.sql + +.PHONY: generated +generated: sql_code_proj4.c + + +# ---------------------------------------------------------------------- +# +# Additional files to distribute +# +# ---------------------------------------------------------------------- +EXTRA_DIST = \ + $(srcdir)/proj4.exp \ + $(srcdir)/proj4.sql \ + $(srcdir)/proj4_init.sql diff --git a/binsrc/hosting/proj4/proj4.exp b/binsrc/hosting/proj4/proj4.exp new file mode 100644 index 0000000000..f6428bab69 --- /dev/null +++ b/binsrc/hosting/proj4/proj4.exp @@ -0,0 +1 @@ +proj4_check diff --git a/binsrc/hosting/proj4/proj4.sql b/binsrc/hosting/proj4/proj4.sql new file mode 100644 index 0000000000..7eb2064c47 --- /dev/null +++ b/binsrc/hosting/proj4/proj4.sql @@ -0,0 +1,269 @@ +--drop table DB.DBA.SYS_PROJ4_SRIDS; + +create table DB.DBA.SYS_PROJ4_SRIDS ( + SR_ID integer, + SR_FAMILY varchar not null, + SR_TAG varchar, + SR_ORIGIN varchar not null, + SR_IRI IRI_ID_8, + SR_PROJ4_STRING varchar not null, + SR_WKT varchar, + SR_COMMENT varchar, + SR_PROJ4_XML any, + primary key (SR_ID, SR_FAMILY) ) +alter index SYS_PROJ4_SRIDS on DB.DBA.SYS_PROJ4_SRIDS partition cluster REPLICATED +create unique index SYS_PROJ4_SRIDS_TAG_FAMILY on DB.DBA.SYS_PROJ4_SRIDS (SR_TAG, SR_FAMILY) +alter index SYS_PROJ4_SRIDS_TAG_FAMILY on DB.DBA.SYS_PROJ4_SRIDS partition cluster REPLICATED +; + +grant select on DB.DBA.SYS_PROJ4_SRIDS to public +; + +create table DB.DBA.SYS_PROJ4_SR_IRIS ( + SRI_IRI varchar not null primary key, + SRI_SR_ID integer, + SRI_FAMILY_OF_IRI varchar, + SRI_CONFLICTING_SR_ID integer, + SRI_CONFLICTING_FAMILY varchar ) +alter index SYS_PROJ4_SR_IRIS on DB.DBA.SYS_PROJ4_SR_IRIS partition cluster REPLICATED +; + +create function DB.DBA.PROJ4_SPLIT_INIT_FILE (in content varchar, in path varchar) +{ + declare lines, records any; + declare linectr, linecount integer; + declare comment, init, tag varchar; + vectorbld_init (records); + lines := split_and_decode (content, 0, '\0\0\n'); + linecount := length (lines); + linectr := 0; + comment := ''; + init := ''; + tag := ''; + while (linectr < linecount) + { + declare line varchar; + declare pos integer; + declare init_items, norm_init_ses any; + declare ictr, icount integer; + line := trim (lines [linectr], ' \t\r'); linectr := linectr + 1; + if (line = '') + { + comment := ''; + goto next_line; + } + pos := strchr (line, '#'); + if (pos is not null) + { + if (comment <> '') + comment := comment || '\n' || trim (subseq (line, pos+1), ' \t'); + else + comment := trim (subseq (line, pos+1), ' \t'); + line := subseq (line, 0, pos); + } + if (line = '') + goto next_line; + if (line[0] = '<'[0]) + { + pos := strchr (line, '>'); + if (pos is null) + signal ('22023', '"<" without ">" at line ' || linectr+1 || ' of file ' || path); + if (pos = 1) + { + if (tag = '') + signal ('22023', '"<>" without opening at line ' || linectr+1 || ' of file ' || path); + if (init = '') + signal ('22023', 'Empty init string between "<' || tag || '>" and "<>" at line ' || linectr+1 || ' of file ' || path); + if (length (line) > 2) + signal ('22023', 'Unexpected characters after "<>" at line ' || linectr+1 || ' of file ' || path); + goto process_record; + } + tag := subseq (line, 1, pos); + line := trim (subseq (line, pos + 1), ' \t'); + } + if (line = '') + goto next_line; + pos := strstr (line, '<>'); + if (pos is null) + { + if (tag = '') + signal ('22023', 'Some text found that is neither "#comment" nor part of init string between "" and "<>", at line ' || linectr+1 || ' of file ' || path); + if (init = '') + init := line; + else + init := init || ' ' || line; + goto next_line; + } + if (tag = '') + signal ('22023', '"<>" without opening at line ' || linectr+1 || ' of file ' || path); + if (init = '') + init := trim (subseq (line, 0, pos), ' \t'); + else + init := init || ' ' || trim (subseq (line, 0, pos), ' \t'); + if (init = '') + signal ('22023', 'Empty init string between "<' || tag || '>" and "<>" at line ' || linectr+1 || ' of file ' || path); + if (length (line) > pos + 2) + signal ('22023', 'Unexpected characters after "<>" at line ' || linectr+1 || ' of file ' || path); +process_record: ; + init := replace (init, '\t', ' '); + while (strstr (init, ' ') is not null) init := replace (init, ' ', ' '); + init_items := split_and_decode (init, 0, '\0\0 '); + icount := length (init_items); + for (ictr := 0; ictr < icount; ictr := ictr + 1) + { + declare itm varchar; + itm := init_items[ictr]; + if (strchr (itm, '=') is not null and itm[0] <> '+'[0]) + itm := '+' || itm; + init_items[ictr] := itm; + } + gvector_sort (init_items, 1, 0, 1); + norm_init_ses := string_output(); + for (ictr := 0; ictr < icount; ictr := ictr + 1) + { + if (ictr) http (' ', norm_init_ses); + http (init_items[ictr], norm_init_ses); + } + init := string_output_string (norm_init_ses); + vectorbld_acc (records, vector ('tag', tag, 'init', init, 'comment', comment, 'linectr', linectr)); + comment := ''; + init := ''; + tag := ''; +next_line: ; + } + vectorbld_final (records); + return records; +} +; + +create procedure DB.DBA.PROJ4_LOAD_INIT_FILE (in path varchar, in _sr_family varchar) +{ + declare content varchar; + declare records any; + content := file_to_string (path); + records := DB.DBA.PROJ4_SPLIT_INIT_FILE (content, path); + foreach (any rec in records) do + { + declare init, tag varchar; + tag := get_keyword ('tag', rec); + init := get_keyword ('init', rec); + insert soft DB.DBA.SYS_PROJ4_SRIDS (SR_ID, SR_FAMILY, SR_TAG, SR_ORIGIN, SR_IRI, SR_PROJ4_STRING, SR_WKT, SR_COMMENT, SR_PROJ4_XML) + values (case when (regexp_like (tag, '^([0-9])*\044')) then cast (tag as integer) else null end, + _sr_family, tag, path, null, init, null, get_keyword ('comment', rec), null); + } + -- dbg_obj_princ (records); +} +; + +create procedure DB.DBA.PROJ4_LOAD_SYS_SRIDS (in projdir varchar := '/usr/share/proj', in only_if_empty_table integer := 0) +{ + if (only_if_empty_table) + { + if (exists (select 1 from DB.DBA.SYS_PROJ4_SRIDS)) + return; + { + whenever sqlstate '*' goto err1; + log_message ('Initializing DB.DBA.SYS_PROJ4_SRIDS'); + log_message ('... checking for data files in "' || projdir || '"'); + DB.DBA.PROJ4_LOAD_SYS_SRIDS (projdir, 0); + if (exists (select 1 from DB.DBA.SYS_PROJ4_SRIDS)) + log_message ('DB.DBA.SYS_PROJ4_SRIDS now contains ' || (select count(1) from DB.DBA.SYS_PROJ4_SRIDS) || ' spatial reference systems'); + return; + } +err1: + if (__SQL_STATE <> '42000' and __SQL_STATE <> '39000') + log_message ('Error during initial setup of DB.DBA.SYS_PROJ4_SRIDS data: ' || __SQL_STATE || ': ' || __SQL_MESSAGE); + rollback work; + + whenever sqlstate '*' goto err2; + + delete from DB.DBA.SYS_PROJ4_SRIDS; + commit work; + + log_message ('... using built-in data'); + DB.DBA.PROJ4_INIT_DATA(); + + commit work; + return; + +err2: + rollback work; + log_message ('Error during loading of built-in data into DB.DBA.SYS_PROJ4_SRIDS: ' || __SQL_STATE || ': ' || __SQL_MESSAGE); + return; + } + DB.DBA.PROJ4_LOAD_INIT_FILE (projdir || '/epsg', 'EPSG'); + DB.DBA.PROJ4_LOAD_INIT_FILE (projdir || '/esri', 'ESRI'); + DB.DBA.PROJ4_LOAD_INIT_FILE (projdir || '/esri.extra', 'ESRI'); + DB.DBA.PROJ4_LOAD_INIT_FILE (projdir || '/nad83', 'NAD83'); + DB.DBA.PROJ4_LOAD_INIT_FILE (projdir || '/nad27', 'NAD27'); + commit work; +} +; + +create procedure DB.DBA.PROJ4_BEST_SR_PROJ4_STRING_BY_SR_ID (in srid integer, out proj4_string varchar, out family varchar) +{ + declare family_priority_list any; + family_priority_list := vector ('PG', 'EPSG', 'ESRI', 'NAD83', 'NAD27'); + foreach (varchar fam in family_priority_list) do + { + declare strg varchar; + strg := (select SR_PROJ4_STRING from DB.DBA.SYS_PROJ4_SRIDS where SR_ID = srid and SR_FAMILY=fam); + if (strg is not null) + { + proj4_string := strg; + family := fam; + return; + } + } + proj4_string := NULL; + family := NULL; +} +; + +create procedure DB.DBA.PROJ4_LOAD_SYS_SR_IRIS_ENUM_GROUP (in family varchar, in iri_format_string varchar) +{ + for (select SR_ID as srid, SR_PROJ4_STRING as fam_proj4_string from DB.DBA.SYS_PROJ4_SRIDS where SR_FAMILY=family for update) do + { + declare best_proj4_string, best_family varchar; + DB.DBA.PROJ4_BEST_SR_PROJ4_STRING_BY_SR_ID (srid, best_proj4_string, best_family); + if (best_proj4_string = fam_proj4_string) + insert replacing DB.DBA.SYS_PROJ4_SR_IRIS (SRI_IRI, SRI_SR_ID, SRI_FAMILY_OF_IRI, SRI_CONFLICTING_SR_ID, SRI_CONFLICTING_FAMILY) + values (sprintf (iri_format_string, srid), srid, family, NULL, NULL); + else + insert replacing DB.DBA.SYS_PROJ4_SR_IRIS (SRI_IRI, SRI_SR_ID, SRI_FAMILY_OF_IRI, SRI_CONFLICTING_SR_ID, SRI_CONFLICTING_FAMILY) + values (sprintf (iri_format_string, srid), NULL, family, srid, best_family); + commit work; + } +} +; + +create procedure DB.DBA.PROJ4_LOAD_SYS_SR_IRIS () +{ + insert replacing DB.DBA.SYS_PROJ4_SR_IRIS (SRI_IRI, SRI_SR_ID, SRI_FAMILY_OF_IRI, SRI_CONFLICTING_SR_ID, SRI_CONFLICTING_FAMILY) + values ('http://www.opengis.net/def/crs/OGC/1.3/CRS84', 4326, 'OGC/1.3', NULL, NULL); + commit work; + DB.DBA.PROJ4_LOAD_SYS_SR_IRIS_ENUM_GROUP ('EPSG', 'http://www.opengis.net/def/crs/EPSG/0/%d'); +} +; + +create procedure DB.DBA.PROJ4_FILL_SR_IRI_TO_SRID_DICT () +{ + for (select SRI_IRI, SRI_SR_ID from DB.DBA.SYS_PROJ4_SR_IRIS) do + { + dict_put ("Proj4 get_sr_iri_to_srid_dict"(), SRI_IRI, SRI_SR_ID); + dict_put ("Proj4 get_sr_srid_to_iri_dict"(), SRI_SR_ID, SRI_IRI); + log_text ('dict_put ("Proj4 get_sr_iri_to_srid_dict"(), ?, ?)', SRI_IRI, SRI_SR_ID); + log_text ('dict_put ("Proj4 get_sr_srid_to_iri_dict"(), ?, ?)', SRI_SR_ID, SRI_IRI); + } +} +; + +--delete from DB.DBA.SYS_PROJ4_SRIDS; +DB.DBA.PROJ4_LOAD_SYS_SRIDS ('/usr/share/proj', 1) +; + +DB.DBA.PROJ4_LOAD_SYS_SR_IRIS () +; + +DB.DBA.PROJ4_FILL_SR_IRI_TO_SRID_DICT () +; diff --git a/binsrc/hosting/proj4/proj4_init.sql b/binsrc/hosting/proj4/proj4_init.sql new file mode 100644 index 0000000000..1e0ecea99d --- /dev/null +++ b/binsrc/hosting/proj4/proj4_init.sql @@ -0,0 +1,9261 @@ +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_1() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(101,'NAD27','101','proj4_data/nad27',NULL,'+datum=NAD27 +k=.99996 +lat_0=30d30 +lon_0=-85d50 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'101: alabama east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(101,'NAD83','101','proj4_data/nad83',NULL,'+datum=NAD83 +k=.99996 +lat_0=30d30 +lon_0=-85d50 +proj=tmerc +x_0=200000 +y_0=0 no_defs',NULL,'101: alabama east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102,'NAD27','102','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999333333333333 +lat_0=30 +lon_0=-87d30 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'102: alabama west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102,'NAD83','102','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999333333333333 +lat_0=30 +lon_0=-87d30 +proj=tmerc +x_0=600000 +y_0=0 no_defs',NULL,'102: alabama west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(201,'NAD27','201','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=31 +lon_0=-110d10 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'201: arizona east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(201,'NAD83','201','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=31 +lon_0=-110d10 +proj=tmerc +x_0=213360 +y_0=0 no_defs',NULL,'201: arizona east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(202,'NAD27','202','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=31 +lon_0=-111d55 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'202: arizona central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(202,'NAD83','202','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=31 +lon_0=-111d55 +proj=tmerc +x_0=213360 +y_0=0 no_defs',NULL,'202: arizona central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(203,'NAD27','203','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999333333333333 +lat_0=31 +lon_0=-113d45 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'203: arizona west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(203,'NAD83','203','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999333333333333 +lat_0=31 +lon_0=-113d45 +proj=tmerc +x_0=213360 +y_0=0 no_defs',NULL,'203: arizona west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(301,'NAD27','301','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=34d20 +lat_1=36d14 +lat_2=34d56 +lon_0=-92 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'301: arkansas north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(301,'NAD83','301','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=34d20 +lat_1=36d14 +lat_2=34d56 +lon_0=-92 +proj=lcc +x_0=400000 +y_0=0 no_defs',NULL,'301: arkansas north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(302,'NAD27','302','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=32d40 +lat_1=34d46 +lat_2=33d18 +lon_0=-92 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'302: arkansas south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(302,'NAD83','302','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=32d40 +lat_1=34d46 +lat_2=33d18 +lon_0=-92 +proj=lcc +x_0=400000 +y_0=400000 no_defs',NULL,'302: arkansas south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(401,'NAD27','401','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=39d20 +lat_1=41d40 +lat_2=40 +lon_0=-122 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'401: california i: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(401,'NAD83','401','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=39d20 +lat_1=41d40 +lat_2=40 +lon_0=-122 +proj=lcc +x_0=2000000 +y_0=500000 no_defs',NULL,'401: california i: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(402,'NAD27','402','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=37d40 +lat_1=39d50 +lat_2=38d20 +lon_0=-122 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'402: california ii: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(402,'NAD83','402','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=37d40 +lat_1=39d50 +lat_2=38d20 +lon_0=-122 +proj=lcc +x_0=2000000 +y_0=500000 no_defs',NULL,'402: california ii: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(403,'NAD27','403','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=36d30 +lat_1=38d26 +lat_2=37d4 +lon_0=-120d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'403: california iii: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(403,'NAD83','403','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=36d30 +lat_1=38d26 +lat_2=37d4 +lon_0=-120d30 +proj=lcc +x_0=2000000 +y_0=500000 no_defs',NULL,'403: california iii: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(404,'NAD27','404','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=35d20 +lat_1=37d15 +lat_2=36 +lon_0=-119 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'404: california iv: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(404,'NAD83','404','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=35d20 +lat_1=37d15 +lat_2=36 +lon_0=-119 +proj=lcc +x_0=2000000 +y_0=500000 no_defs',NULL,'404: california iv: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(405,'NAD27','405','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=33d30 +lat_1=35d28 +lat_2=34d2 +lon_0=-118 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'405: california v: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(405,'NAD83','405','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=33d30 +lat_1=35d28 +lat_2=34d2 +lon_0=-118 +proj=lcc +x_0=2000000 +y_0=500000 no_defs',NULL,'405: california v: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(406,'NAD27','406','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=32d10 +lat_1=33d53 +lat_2=32d47 +lon_0=-116d15 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'406: california vi: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(406,'NAD83','406','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=32d10 +lat_1=33d53 +lat_2=32d47 +lon_0=-116d15 +proj=lcc +x_0=2000000 +y_0=500000 no_defs',NULL,'406: california vi: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(407,'NAD27','407','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=34d8 +lat_1=34d25 +lat_2=33d52 +lon_0=-118d20 +proj=lcc +x_0=1276106.450596901 +y_0=1268253.006858014 no_defs',NULL,'407: california vii: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(501,'NAD27','501','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=39d20 +lat_1=40d47 +lat_2=39d43 +lon_0=-105d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'501: colorado north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(501,'NAD83','501','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=39d20 +lat_1=40d47 +lat_2=39d43 +lon_0=-105d30 +proj=lcc +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'501: colorado north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(502,'NAD27','502','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=37d50 +lat_1=39d45 +lat_2=38d27 +lon_0=-105d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'502: colorado central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(502,'NAD83','502','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=37d50 +lat_1=39d45 +lat_2=38d27 +lon_0=-105d30 +proj=lcc +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'502: colorado central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(503,'NAD27','503','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=36d40 +lat_1=38d26 +lat_2=37d14 +lon_0=-105d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'503: colorado south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(503,'NAD83','503','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=36d40 +lat_1=38d26 +lat_2=37d14 +lon_0=-105d30 +proj=lcc +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'503: colorado south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(600,'NAD27','600','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=40d50 +lat_1=41d52 +lat_2=41d12 +lon_0=-72d45 +proj=lcc +x_0=182880.3657607315 +y_0=0 no_defs',NULL,'600: connecticut ---: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(600,'NAD83','600','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=40d50 +lat_1=41d52 +lat_2=41d12 +lon_0=-72d45 +proj=lcc +x_0=304800.6096 +y_0=152400.3048 no_defs',NULL,'600: connecticut ---: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(700,'NAD27','700','proj4_data/nad27',NULL,'+datum=NAD27 +k=.999995 +lat_0=38 +lon_0=-75d25 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'700: delaware ---: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(700,'NAD83','700','proj4_data/nad83',NULL,'+datum=NAD83 +k=.999995 +lat_0=38 +lon_0=-75d25 +proj=tmerc +x_0=200000 +y_0=0 no_defs',NULL,'700: delaware ---: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(901,'NAD27','901','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999411764705882 +lat_0=24d20 +lon_0=-81 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'901: florida east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(901,'NAD83','901','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999411764705882 +lat_0=24d20 +lon_0=-81 +proj=tmerc +x_0=200000 +y_0=0 no_defs',NULL,'901: florida east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(902,'NAD27','902','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999411764705882 +lat_0=24d20 +lon_0=-82 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'902: florida west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(902,'NAD83','902','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999411764705882 +lat_0=24d20 +lon_0=-82 +proj=tmerc +x_0=200000 +y_0=0 no_defs',NULL,'902: florida west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(903,'NAD27','903','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=29 +lat_1=30d45 +lat_2=29d35 +lon_0=-84d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'903: florida north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(903,'NAD83','903','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=29 +lat_1=30d45 +lat_2=29d35 +lon_0=-84d30 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'903: florida north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1001,'NAD27','1001','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=30 +lon_0=-82d10 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'1001: georgia east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1001,'NAD83','1001','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=30 +lon_0=-82d10 +proj=tmerc +x_0=200000 +y_0=0 no_defs',NULL,'1001: georgia east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1002,'NAD27','1002','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=30 +lon_0=-84d10 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'1002: georgia west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1002,'NAD83','1002','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=30 +lon_0=-84d10 +proj=tmerc +x_0=700000 +y_0=0 no_defs',NULL,'1002: georgia west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1101,'NAD27','1101','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999473684210526 +lat_0=41d40 +lon_0=-112d10 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'1101: idaho east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1101,'NAD83','1101','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999473684210526 +lat_0=41d40 +lon_0=-112d10 +proj=tmerc +x_0=200000 +y_0=0 no_defs',NULL,'1101: idaho east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1102,'NAD27','1102','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999473684210526 +lat_0=41d40 +lon_0=-114 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'1102: idaho central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1102,'NAD83','1102','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999473684210526 +lat_0=41d40 +lon_0=-114 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'1102: idaho central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1103,'NAD27','1103','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999333333333333 +lat_0=41d40 +lon_0=-115d45 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'1103: idaho west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1103,'NAD83','1103','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999333333333333 +lat_0=41d40 +lon_0=-115d45 +proj=tmerc +x_0=800000 +y_0=0 no_defs',NULL,'1103: idaho west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1201,'NAD27','1201','proj4_data/nad27',NULL,'+datum=NAD27 +k=.999975 +lat_0=36d40 +lon_0=-88d20 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'1201: illinois east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1201,'NAD83','1201','proj4_data/nad83',NULL,'+datum=NAD83 +k=.999975 +lat_0=36d40 +lon_0=-88d20 +proj=tmerc +x_0=300000 +y_0=0 no_defs',NULL,'1201: illinois east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1202,'NAD27','1202','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999411764705882 +lat_0=36d40 +lon_0=-90d10 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'1202: illinois west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1202,'NAD83','1202','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999411764705882 +lat_0=36d40 +lon_0=-90d10 +proj=tmerc +x_0=700000 +y_0=0 no_defs',NULL,'1202: illinois west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1301,'NAD27','1301','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999666666666667 +lat_0=37d30 +lon_0=-85d40 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'1301: indiana east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1301,'NAD83','1301','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999666666666667 +lat_0=37d30 +lon_0=-85d40 +proj=tmerc +x_0=100000 +y_0=250000 no_defs',NULL,'1301: indiana east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1302,'NAD27','1302','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999666666666667 +lat_0=37d30 +lon_0=-87d5 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'1302: indiana west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1302,'NAD83','1302','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999666666666667 +lat_0=37d30 +lon_0=-87d5 +proj=tmerc +x_0=900000 +y_0=250000 no_defs',NULL,'1302: indiana west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1401,'NAD27','1401','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=41d30 +lat_1=43d16 +lat_2=42d4 +lon_0=-93d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'1401: iowa north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1401,'NAD83','1401','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=41d30 +lat_1=43d16 +lat_2=42d4 +lon_0=-93d30 +proj=lcc +x_0=1500000 +y_0=1000000 no_defs',NULL,'1401: iowa north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1402,'NAD27','1402','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=40 +lat_1=41d47 +lat_2=40d37 +lon_0=-93d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'1402: iowa south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1402,'NAD83','1402','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=40 +lat_1=41d47 +lat_2=40d37 +lon_0=-93d30 +proj=lcc +x_0=500000 +y_0=0 no_defs',NULL,'1402: iowa south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1501,'NAD27','1501','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=38d20 +lat_1=39d47 +lat_2=38d43 +lon_0=-98 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'1501: kansas north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1501,'NAD83','1501','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=38d20 +lat_1=39d47 +lat_2=38d43 +lon_0=-98 +proj=lcc +x_0=400000 +y_0=0 no_defs',NULL,'1501: kansas north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1502,'NAD27','1502','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=36d40 +lat_1=38d34 +lat_2=37d16 +lon_0=-98d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'1502: kansas south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1502,'NAD83','1502','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=36d40 +lat_1=38d34 +lat_2=37d16 +lon_0=-98d30 +proj=lcc +x_0=400000 +y_0=400000 no_defs',NULL,'1502: kansas south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1601,'NAD27','1601','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=37d30 +lat_1=38d58 +lat_2=37d58 +lon_0=-84d15 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'1601: kentucky north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1601,'NAD83','1601','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=37d30 +lat_1=38d58 +lat_2=37d58 +lon_0=-84d15 +proj=lcc +x_0=500000 +y_0=0 no_defs',NULL,'1601: kentucky north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1602,'NAD27','1602','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=36d20 +lat_1=37d56 +lat_2=36d44 +lon_0=-85d45 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'1602: kentucky south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1602,'NAD83','1602','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=36d20 +lat_1=37d56 +lat_2=36d44 +lon_0=-85d45 +proj=lcc +x_0=500000 +y_0=500000 no_defs',NULL,'1602: kentucky south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1701,'NAD27','1701','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=30d40 +lat_1=32d40 +lat_2=31d10 +lon_0=-92d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'1701: louisiana north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1701,'NAD83','1701','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=30d30 +lat_1=32d40 +lat_2=31d10 +lon_0=-92d30 +proj=lcc +x_0=1000000 +y_0=0 no_defs',NULL,'1701: louisiana north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1702,'NAD27','1702','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=28d40 +lat_1=30d42 +lat_2=29d18 +lon_0=-91d20 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'1702: louisiana south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1702,'NAD83','1702','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=28d30 +lat_1=30d42 +lat_2=29d18 +lon_0=-91d20 +proj=lcc +x_0=1000000 +y_0=0 no_defs',NULL,'1702: louisiana south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1703,'NAD27','1703','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=25d40 +lat_1=27d50 +lat_2=26d10 +lon_0=-91d20 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'1703: louisiana offshore: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1703,'NAD83','1703','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=25d30 +lat_1=27d50 +lat_2=26d10 +lon_0=-91d20 +proj=lcc +x_0=1000000 +y_0=0 no_defs',NULL,'1703: louisiana offshore: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1801,'NAD27','1801','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=43d50 +lon_0=-68d30 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'1801: maine east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1801,'NAD83','1801','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=43d40 +lon_0=-68d30 +proj=tmerc +x_0=300000 +y_0=0 no_defs',NULL,'1801: maine east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1802,'NAD27','1802','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999666666666667 +lat_0=42d50 +lon_0=-70d10 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'1802: maine west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1802,'NAD83','1802','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999666666666667 +lat_0=42d50 +lon_0=-70d10 +proj=tmerc +x_0=900000 +y_0=0 no_defs',NULL,'1802: maine west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1900,'NAD27','1900','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=37d50 +lat_1=39d27 +lat_2=38d18 +lon_0=-77 +proj=lcc +x_0=243840.4876809754 +y_0=0 no_defs',NULL,'1900: maryland ---: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(1900,'NAD83','1900','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=37d40 +lat_1=39d27 +lat_2=38d18 +lon_0=-77 +proj=lcc +x_0=400000 +y_0=0 no_defs',NULL,'1900: maryland ---: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2000,'EPSG','2000','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9995000000000001 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +units=m +x_0=400000 +y_0=0',NULL,'Anguilla 1957 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2000,'ESRI','2000','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999500 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +units=m +x_0=400000 +y_0=0 no_defs',NULL,'Anguilla 1957 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2001,'EPSG','2001','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9995000000000001 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=-255,-15,71,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'Antigua 1943 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2001,'ESRI','2001','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999500 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=-255,-15,71,0,0,0,0 +units=m +x_0=400000 +y_0=0 no_defs',NULL,'Antigua 1943 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2001,'NAD27','2001','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=41 +lat_1=42d41 +lat_2=41d43 +lon_0=-71d30 +proj=lcc +x_0=182880.3657607315 +y_0=0 no_defs',NULL,'2001: massachusetts mainland: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2001,'NAD83','2001','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=41 +lat_1=42d41 +lat_2=41d43 +lon_0=-71d30 +proj=lcc +x_0=200000 +y_0=750000 no_defs',NULL,'2001: massachusetts mainland: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2002,'EPSG','2002','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9995000000000001 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=725,685,536,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'Dominica 1945 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2002,'ESRI','2002','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999500 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=725,685,536,0,0,0,0 +units=m +x_0=400000 +y_0=0 no_defs',NULL,'Dominica 1945 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2002,'NAD27','2002','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=41 +lat_1=41d29 +lat_2=41d17 +lon_0=-70d30 +proj=lcc +x_0=60960.12192024384 +y_0=0 no_defs',NULL,'2002: massachusetts island: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2002,'NAD83','2002','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=41 +lat_1=41d29 +lat_2=41d17 +lon_0=-70d30 +proj=lcc +x_0=500000 +y_0=0 no_defs',NULL,'2002: massachusetts island: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2003,'EPSG','2003','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9995000000000001 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=72,213.7,93,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'Grenada 1953 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2003,'ESRI','2003','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999500 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=72,213.7,93,0,0,0,0 +units=m +x_0=400000 +y_0=0 no_defs',NULL,'Grenada 1953 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2004,'EPSG','2004','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9995000000000001 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=174,359,365,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'Montserrat 1958 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2004,'ESRI','2004','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999500 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=174,359,365,0,0,0,0 +units=m +x_0=400000 +y_0=0 no_defs',NULL,'Montserrat 58 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2005,'EPSG','2005','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9995000000000001 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=9,183,236,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'St. Kitts 1955 / British West Indies Grid',''); +} +; + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_2() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2005,'ESRI','2005','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999500 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=9,183,236,0,0,0,0 +units=m +x_0=400000 +y_0=0 no_defs',NULL,'St Kitts 1955 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2006,'EPSG','2006','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9995000000000001 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=-149,128,296,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'St. Lucia 1955 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2006,'ESRI','2006','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999500 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=-149,128,296,0,0,0,0 +units=m +x_0=400000 +y_0=0 no_defs',NULL,'St Lucia 1955 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2007,'EPSG','2007','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9995000000000001 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=195.671,332.517,274.607,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'St. Vincent 45 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2007,'ESRI','2007','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999500 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +units=m +x_0=400000 +y_0=0 no_defs',NULL,'St Vincent 45 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2008,'EPSG','2008','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-55.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(CGQ77) / SCoPQ zone 2 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2008,'ESRI','2008','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-55.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(CGQ77) / SCoPQ zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2009,'EPSG','2009','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-58.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(CGQ77) / SCoPQ zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2009,'ESRI','2009','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-58.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(CGQ77) / SCoPQ zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2010,'EPSG','2010','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-61.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(CGQ77) / SCoPQ zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2010,'ESRI','2010','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-61.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(CGQ77) / SCoPQ zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2011,'EPSG','2011','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-64.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(CGQ77) / SCoPQ zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2011,'ESRI','2011','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-64.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(CGQ77) / SCoPQ zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2012,'EPSG','2012','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-67.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(CGQ77) / SCoPQ zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2012,'ESRI','2012','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-67.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(CGQ77) / SCoPQ zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2013,'EPSG','2013','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-70.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(CGQ77) / SCoPQ zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2013,'ESRI','2013','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-70.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(CGQ77) / SCoPQ zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2014,'EPSG','2014','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-73.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(CGQ77) / SCoPQ zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2014,'ESRI','2014','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-73.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(CGQ77) / SCoPQ zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2015,'EPSG','2015','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-76.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(CGQ77) / SCoPQ zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2015,'ESRI','2015','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-76.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(CGQ77) / SCoPQ zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2016,'EPSG','2016','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-79.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(CGQ77) / SCoPQ zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2016,'ESRI','2016','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-79.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(CGQ77) / SCoPQ zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2017,'EPSG','2017','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-73.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(76) / MTM zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2017,'ESRI','2017','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-73.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(76) / MTM zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2018,'EPSG','2018','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-76.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(76) / MTM zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2018,'ESRI','2018','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-76.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(76) / MTM zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2019,'EPSG','2019','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-79.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(76) / MTM zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2019,'ESRI','2019','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-79.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(76) / MTM zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2020,'EPSG','2020','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-82.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(76) / MTM zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2020,'ESRI','2020','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-82.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(76) / MTM zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2021,'EPSG','2021','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-81 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(76) / MTM zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2021,'ESRI','2021','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-81 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(76) / MTM zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2022,'EPSG','2022','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-84 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(76) / MTM zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2022,'ESRI','2022','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-84 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(76) / MTM zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2023,'EPSG','2023','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-87 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(76) / MTM zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2023,'ESRI','2023','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-87 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(76) / MTM zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2024,'EPSG','2024','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-90 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(76) / MTM zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2024,'ESRI','2024','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-90 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(76) / MTM zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2025,'EPSG','2025','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-93 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(76) / MTM zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2025,'ESRI','2025','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-93 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(76) / MTM zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2026,'EPSG','2026','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9999 +lat_0=0 +lon_0=-96 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27(76) / MTM zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2026,'ESRI','2026','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-96 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27(76) / MTM zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2027,'EPSG','2027','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=15',NULL,'NAD27(76) / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2027,'ESRI','2027','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=15 no_defs',NULL,'NAD27(76) / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2028,'EPSG','2028','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=16',NULL,'NAD27(76) / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2028,'ESRI','2028','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=16 no_defs',NULL,'NAD27(76) / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2029,'EPSG','2029','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=17',NULL,'NAD27(76) / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2029,'ESRI','2029','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=17 no_defs',NULL,'NAD27(76) / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2030,'EPSG','2030','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=18',NULL,'NAD27(76) / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2030,'ESRI','2030','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=18 no_defs',NULL,'NAD27(76) / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2031,'EPSG','2031','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=17',NULL,'NAD27(CGQ77) / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2031,'ESRI','2031','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=17 no_defs',NULL,'NAD27(CGQ77) / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2032,'EPSG','2032','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=18',NULL,'NAD27(CGQ77) / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2032,'ESRI','2032','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=18 no_defs',NULL,'NAD27(CGQ77) / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2033,'EPSG','2033','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=19',NULL,'NAD27(CGQ77) / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2033,'ESRI','2033','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=19 no_defs',NULL,'NAD27(CGQ77) / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2034,'EPSG','2034','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=20',NULL,'NAD27(CGQ77) / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2034,'ESRI','2034','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=20 no_defs',NULL,'NAD27(CGQ77) / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2035,'EPSG','2035','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=21',NULL,'NAD27(CGQ77) / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2035,'ESRI','2035','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=21 no_defs',NULL,'NAD27(CGQ77) / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2036,'EPSG','2036','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999912 +lat_0=46.5 +lon_0=-66.5 +no_defs +proj=sterea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=7500000',NULL,'NAD83(CSRS98) / New Brunswick Stereo (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2036,'ESRI','2036','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999912 +lat_0=46.5 +lon_0=-66.5 +no_defs +proj=stere +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=7500000 no_defs',NULL,'NAD83(CSRS98) / New Brunswick Stereo',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2037,'EPSG','2037','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'NAD83(CSRS98) / UTM zone 19N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2037,'ESRI','2037','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=19 no_defs',NULL,'NAD83(CSRS98) / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2038,'EPSG','2038','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20',NULL,'NAD83(CSRS98) / UTM zone 20N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2038,'ESRI','2038','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20 no_defs',NULL,'NAD83(CSRS98) / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2039,'EPSG','2039','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000067 +lat_0=31.73439361111111 +lon_0=35.20451694444445 +no_defs +proj=tmerc +towgs84=-48,55,52,0,0,0,0 +units=m +x_0=219529.584 +y_0=626907.39',NULL,'Israel 1993 / Israeli TM Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2039,'ESRI','2039','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000007 +lat_0=31.73439361111111 +lon_0=35.20451694444445 +no_defs +proj=tmerc +units=m +x_0=219529.584 +y_0=626907.39 no_defs',NULL,'Israel / Israeli TM Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2040,'EPSG','2040','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-125,53,467,0,0,0,0 +units=m +zone=30',NULL,'Locodjo 1965 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2040,'ESRI','2040','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-125,53,467,0,0,0,0 +units=m +zone=30 no_defs',NULL,'Locodjo 1965 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2041,'EPSG','2041','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-124.76,53,466.79,0,0,0,0 +units=m +zone=30',NULL,'Abidjan 1987 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2041,'ESRI','2041','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-124.76,53,466.79,0,0,0,0 +units=m +zone=30 no_defs',NULL,'Abidjan 1987 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2042,'EPSG','2042','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-125,53,467,0,0,0,0 +units=m +zone=29',NULL,'Locodjo 1965 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2042,'ESRI','2042','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-125,53,467,0,0,0,0 +units=m +zone=29 no_defs',NULL,'Locodjo 1965 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2043,'EPSG','2043','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-124.76,53,466.79,0,0,0,0 +units=m +zone=29',NULL,'Abidjan 1987 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2043,'ESRI','2043','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-124.76,53,466.79,0,0,0,0 +units=m +zone=29 no_defs',NULL,'Abidjan 1987 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2044,'EPSG','2044','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=-17.51,-108.32,-62.39,0,0,0,0 +units=m +x_0=18500000 +y_0=0',NULL,'Hanoi 1972 / Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2044,'ESRI','2044','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=-17.51,-108.32,-62.39,0,0,0,0 +units=m +x_0=18500000 +y_0=0 no_defs',NULL,'Hanoi 1972 / Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2045,'EPSG','2045','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=-17.51,-108.32,-62.39,0,0,0,0 +units=m +x_0=19500000 +y_0=0',NULL,'Hanoi 1972 / Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2045,'ESRI','2045','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=-17.51,-108.32,-62.39,0,0,0,0 +units=m +x_0=19500000 +y_0=0 no_defs',NULL,'Hanoi 1972 / Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2046,'EPSG','2046','proj4_data/epsg',NULL,'+axis=wsu +ellps=WGS84 +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Hartebeesthoek94 / Lo15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2047,'EPSG','2047','proj4_data/epsg',NULL,'+axis=wsu +ellps=WGS84 +k=1 +lat_0=0 +lon_0=17 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Hartebeesthoek94 / Lo17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2048,'EPSG','2048','proj4_data/epsg',NULL,'+axis=wsu +ellps=WGS84 +k=1 +lat_0=0 +lon_0=19 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Hartebeesthoek94 / Lo19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2049,'EPSG','2049','proj4_data/epsg',NULL,'+axis=wsu +ellps=WGS84 +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Hartebeesthoek94 / Lo21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2050,'EPSG','2050','proj4_data/epsg',NULL,'+axis=wsu +ellps=WGS84 +k=1 +lat_0=0 +lon_0=23 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Hartebeesthoek94 / Lo23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2051,'EPSG','2051','proj4_data/epsg',NULL,'+axis=wsu +ellps=WGS84 +k=1 +lat_0=0 +lon_0=25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Hartebeesthoek94 / Lo25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2052,'EPSG','2052','proj4_data/epsg',NULL,'+axis=wsu +ellps=WGS84 +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Hartebeesthoek94 / Lo27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2053,'EPSG','2053','proj4_data/epsg',NULL,'+axis=wsu +ellps=WGS84 +k=1 +lat_0=0 +lon_0=29 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Hartebeesthoek94 / Lo29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2054,'EPSG','2054','proj4_data/epsg',NULL,'+axis=wsu +ellps=WGS84 +k=1 +lat_0=0 +lon_0=31 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Hartebeesthoek94 / Lo31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2055,'EPSG','2055','proj4_data/epsg',NULL,'+axis=wsu +ellps=WGS84 +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Hartebeesthoek94 / Lo33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2056,'EPSG','2056','proj4_data/epsg',NULL,'+ellps=bessel +k_0=1 +lat_0=46.95240555555556 +lon_0=7.439583333333333 +no_defs +proj=somerc +towgs84=674.374,15.056,405.346,0,0,0,0 +units=m +x_0=2600000 +y_0=1200000',NULL,'CH1903+ / LV95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2056,'ESRI','2056','proj4_data/esri',NULL,'+alpha=90 +ellps=bessel +k=1 +lat_0=46.95240555555556 +lonc=7.439583333333333 +no_defs +proj=omerc +towgs84=674.374,15.056,405.346,0,0,0,0 +units=m +x_0=2600000 +y_0=1200000 no_defs',NULL,'Hartebeesthoek94 / Lo15\12Hartebeesthoek94 / Lo17\12Hartebeesthoek94 / Lo19\12Hartebeesthoek94 / Lo21\12Hartebeesthoek94 / Lo23\12Hartebeesthoek94 / Lo25\12Hartebeesthoek94 / Lo27\12Hartebeesthoek94 / Lo29\12Hartebeesthoek94 / Lo31\12Hartebeesthoek94 / Lo33\12CH1903+ / LV95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2057,'EPSG','2057','proj4_data/epsg',NULL,'+alpha=0.5716611944444444 +ellps=intl +gamma=0.5716611944444444 +k=0.999895934 +lat_0=27.51882880555555 +lonc=52.60353916666667 +no_defs +proj=omerc +towgs84=-133.63,-157.5,-158.62,0,0,0,0 +units=m +x_0=658377.437 +y_0=3044969.194',NULL,'Rassadiran / Nakhl e Taqi',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2057,'ESRI','2057','proj4_data/esri',NULL,'+alpha=0.5716611944444444 +ellps=intl +k=0.999895934 +lat_0=27.51882880555555 +lonc=52.60353916666667 +no_defs +proj=omerc +towgs84=-133.63,-157.5,-158.62,0,0,0,0 +units=m +x_0=658377.437 +y_0=3044969.194 no_defs',NULL,'Rassadiran / Nakhl e Taqi',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2058,'EPSG','2058','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-117,-132,-164,0,0,0,0 +units=m +zone=38',NULL,'ED50(ED77) / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2058,'ESRI','2058','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=38 no_defs',NULL,'ED50(ED77) / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2059,'EPSG','2059','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-117,-132,-164,0,0,0,0 +units=m +zone=39',NULL,'ED50(ED77) / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2059,'ESRI','2059','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=39 no_defs',NULL,'ED50(ED77) / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2060,'EPSG','2060','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-117,-132,-164,0,0,0,0 +units=m +zone=40',NULL,'ED50(ED77) / UTM zone 40N',''); +} +; + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_3() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2060,'ESRI','2060','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=40 no_defs',NULL,'ED50(ED77) / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2061,'EPSG','2061','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-117,-132,-164,0,0,0,0 +units=m +zone=41',NULL,'ED50(ED77) / UTM zone 41N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2061,'ESRI','2061','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=41 no_defs',NULL,'ED50(ED77) / UTM zone 41N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2062,'EPSG','2062','proj4_data/epsg',NULL,'+a=6378298.3 +b=6356657.142669561 +k_0=0.9988085293 +lat_0=40 +lat_1=40 +lon_0=0 +no_defs +pm=madrid +proj=lcc +units=m +x_0=600000 +y_0=600000',NULL,'Madrid 1870 (Madrid) / Spain',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2062,'ESRI','2062','proj4_data/esri',NULL,'+a=6378298.3 +b=6356657.142669562 +k_0=0.9988085293 +lat_0=40 +lat_1=40 +lon_0=-3.687938888888889 +no_defs +pm=madrid +proj=lcc +units=m +x_0=600000 +y_0=600000 no_defs',NULL,'Madrid 1870 (Madrid) / Spain',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2063,'EPSG','2063','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-23,259,-9,0,0,0,0 +units=m +zone=28',NULL,'Dabola 1981 / UTM zone 28N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2063,'ESRI','2063','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-23,259,-9,0,0,0,0 +units=m +zone=28 no_defs',NULL,'Dabola 1981 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2064,'EPSG','2064','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-23,259,-9,0,0,0,0 +units=m +zone=29',NULL,'Dabola 1981 / UTM zone 29N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2064,'ESRI','2064','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-23,259,-9,0,0,0,0 +units=m +zone=29 no_defs',NULL,'Dabola 1981 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2065,'EPSG','2065','proj4_data/epsg',NULL,'+alpha=30.28813972222222 +ellps=bessel +k=0.9999 +lat_0=49.5 +lon_0=42.5 +no_defs +pm=ferro +proj=krovak +towgs84=589,76,480,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'S-JTSK (Ferro) / Krovak',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2065,'ESRI','2065','proj4_data/esri',NULL,'+alpha=30.28813972222222 +ellps=bessel +k=0.9999 +lat_0=49.5 +lon_0=24.83333333333333 +no_defs +pm=ferro +proj=krovak +units=m +x_0=0 +y_0=0 no_defs',NULL,'S-JTSK (Ferro) / Krovak',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2066,'EPSG','2066','proj4_data/epsg',NULL,'+a=6378293.645208759 +b=6356617.987679838 +lat_0=11.25217861111111 +lon_0=-60.68600888888889 +no_defs +proj=cass +to_meter=0.201166195164 +x_0=37718.66159325 +y_0=36209.91512952',NULL,'Mount Dillon / Tobago Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2066,'ESRI','2066','proj4_data/esri',NULL,'+a=6378293.63683822 +b=6356617.979337744 +lat_0=11.25217861111111 +lon_0=-60.68600888888889 +no_defs +proj=cass +to_meter=0.2011661949 +x_0=37718.66154375 +y_0=36209.915082 no_defs',NULL,'Mount Dillon / Tobago Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2067,'EPSG','2067','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-0.465,372.095,171.736,0,0,0,0 +units=m +zone=20',NULL,'Naparima 1955 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2067,'ESRI','2067','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=20 no_defs',NULL,'Naparima 1955 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2068,'EPSG','2068','proj4_data/epsg',NULL,'+ellps=intl +k=0.9999 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'ELD79 / Libya zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2068,'ESRI','2068','proj4_data/esri',NULL,'+ellps=intl +k=0.999900 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'ELD79 / Libya zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2069,'EPSG','2069','proj4_data/epsg',NULL,'+ellps=intl +k=0.9999 +lat_0=0 +lon_0=11 +no_defs +proj=tmerc +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'ELD79 / Libya zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2069,'ESRI','2069','proj4_data/esri',NULL,'+ellps=intl +k=0.999900 +lat_0=0 +lon_0=11 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'ELD79 / Libya zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2070,'EPSG','2070','proj4_data/epsg',NULL,'+ellps=intl +k=0.9999 +lat_0=0 +lon_0=13 +no_defs +proj=tmerc +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'ELD79 / Libya zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2070,'ESRI','2070','proj4_data/esri',NULL,'+ellps=intl +k=0.999900 +lat_0=0 +lon_0=13 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'ELD79 / Libya zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2071,'EPSG','2071','proj4_data/epsg',NULL,'+ellps=intl +k=0.9999 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'ELD79 / Libya zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2071,'ESRI','2071','proj4_data/esri',NULL,'+ellps=intl +k=0.999900 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'ELD79 / Libya zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2072,'EPSG','2072','proj4_data/epsg',NULL,'+ellps=intl +k=0.9999 +lat_0=0 +lon_0=17 +no_defs +proj=tmerc +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'ELD79 / Libya zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2072,'ESRI','2072','proj4_data/esri',NULL,'+ellps=intl +k=0.999900 +lat_0=0 +lon_0=17 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'ELD79 / Libya zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2073,'EPSG','2073','proj4_data/epsg',NULL,'+ellps=intl +k=0.9999 +lat_0=0 +lon_0=19 +no_defs +proj=tmerc +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'ELD79 / Libya zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2073,'ESRI','2073','proj4_data/esri',NULL,'+ellps=intl +k=0.999900 +lat_0=0 +lon_0=19 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'ELD79 / Libya zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2074,'EPSG','2074','proj4_data/epsg',NULL,'+ellps=intl +k=0.9999 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'ELD79 / Libya zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2074,'ESRI','2074','proj4_data/esri',NULL,'+ellps=intl +k=0.999900 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'ELD79 / Libya zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2075,'EPSG','2075','proj4_data/epsg',NULL,'+ellps=intl +k=0.9999 +lat_0=0 +lon_0=23 +no_defs +proj=tmerc +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'ELD79 / Libya zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2075,'ESRI','2075','proj4_data/esri',NULL,'+ellps=intl +k=0.999900 +lat_0=0 +lon_0=23 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'ELD79 / Libya zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2076,'EPSG','2076','proj4_data/epsg',NULL,'+ellps=intl +k=0.9999 +lat_0=0 +lon_0=25 +no_defs +proj=tmerc +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'ELD79 / Libya zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2076,'ESRI','2076','proj4_data/esri',NULL,'+ellps=intl +k=0.999900 +lat_0=0 +lon_0=25 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'ELD79 / Libya zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2077,'EPSG','2077','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +zone=32',NULL,'ELD79 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2077,'ESRI','2077','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=32 no_defs',NULL,'ELD79 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2078,'EPSG','2078','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +zone=33',NULL,'ELD79 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2078,'ESRI','2078','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=33 no_defs',NULL,'ELD79 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2079,'EPSG','2079','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +zone=34',NULL,'ELD79 / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2079,'ESRI','2079','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=34 no_defs',NULL,'ELD79 / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2080,'EPSG','2080','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +zone=35',NULL,'ELD79 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2080,'ESRI','2080','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=35 no_defs',NULL,'ELD79 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2081,'EPSG','2081','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-90 +lon_0=-69 +no_defs +proj=tmerc +units=m +x_0=2500000 +y_0=0',NULL,'Chos Malal 1914 / Argentina 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2081,'ESRI','2081','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-90 +lon_0=-69 +no_defs +proj=tmerc +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'Chos Malal 1914 / Argentina zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2082,'EPSG','2082','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-90 +lon_0=-69 +no_defs +proj=tmerc +towgs84=27.5,14,186.4,0,0,0,0 +units=m +x_0=2500000 +y_0=0',NULL,'Pampa del Castillo / Argentina 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2082,'ESRI','2082','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-90 +lon_0=-69 +no_defs +proj=tmerc +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'Pampa del Castillo / Argentina zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2083,'EPSG','2083','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-90 +lon_0=-69 +no_defs +proj=tmerc +towgs84=16,196,93,0,0,0,0 +units=m +x_0=2500000 +y_0=0',NULL,'Hito XVIII 1963 / Argentina 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2083,'ESRI','2083','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-90 +lon_0=-69 +no_defs +proj=tmerc +towgs84=18.38,192.45,96.82,0.056,-0.142,-0.2,-0.0013 +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'Hito XVIII 1963 / Argentina zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2084,'EPSG','2084','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=16,196,93,0,0,0,0 +units=m +zone=19',NULL,'Hito XVIII 1963 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2084,'ESRI','2084','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=18.38,192.45,96.82,0.056,-0.142,-0.2,-0.0013 +units=m +zone=19 no_defs',NULL,'Hito XVIII 1963 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2085,'EPSG','2085','proj4_data/epsg',NULL,'+datum=NAD27 +k_0=0.99993602 +lat_0=22.35 +lat_1=22.35 +lon_0=-81 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=280296.016',NULL,'NAD27 / Cuba Norte (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2085,'ESRI','2085','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k_0=0.99993602 +lat_0=22.35 +lat_1=22.35 +lon_0=-81 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=280296.016 no_defs',NULL,'NAD27 / Cuba Norte',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2086,'EPSG','2086','proj4_data/epsg',NULL,'+datum=NAD27 +k_0=0.99994848 +lat_0=20.71666666666667 +lat_1=20.71666666666667 +lon_0=-76.83333333333333 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=229126.939',NULL,'NAD27 / Cuba Sur (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2086,'ESRI','2086','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k_0=0.99994848 +lat_0=20.71666666666667 +lat_1=20.71666666666667 +lon_0=-76.83333333333333 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=229126.939 no_defs',NULL,'NAD27 / Cuba Sur',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2087,'EPSG','2087','proj4_data/epsg',NULL,'+ellps=intl +k=0.9996 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ELD79 / TM 12 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2087,'ESRI','2087','proj4_data/esri',NULL,'+ellps=intl +k=0.999600 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ELD79 / TM 12 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2088,'EPSG','2088','proj4_data/epsg',NULL,'+datum=carthage +k=0.9996 +lat_0=0 +lon_0=11 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Carthage / TM 11 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2088,'ESRI','2088','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k=0.999600 +lat_0=0 +lon_0=11 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Carthage / TM 11 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2089,'EPSG','2089','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=38',NULL,'Yemen NGN96 / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2089,'ESRI','2089','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=38 no_defs',NULL,'Yemen NGN96 / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2090,'EPSG','2090','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=39',NULL,'Yemen NGN96 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2090,'ESRI','2090','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=39 no_defs',NULL,'Yemen NGN96 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2091,'EPSG','2091','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=-76,-138,67,0,0,0,0 +units=m +x_0=8500000 +y_0=0',NULL,'South Yemen / Gauss Kruger zone 8 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2091,'ESRI','2091','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=-76,-138,67,0,0,0,0 +units=m +x_0=8500000 +y_0=0 no_defs',NULL,'South Yemen / Gauss Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2092,'EPSG','2092','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=-76,-138,67,0,0,0,0 +units=m +x_0=9500000 +y_0=0',NULL,'South Yemen / Gauss Kruger zone 9 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2092,'ESRI','2092','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=-76,-138,67,0,0,0,0 +units=m +x_0=9500000 +y_0=0 no_defs',NULL,'South Yemen / Gauss Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2093,'EPSG','2093','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=106 +no_defs +proj=tmerc +towgs84=-17.51,-108.32,-62.39,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Hanoi 1972 / GK 106 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2093,'ESRI','2093','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=106 +no_defs +proj=tmerc +towgs84=-17.51,-108.32,-62.39,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Hanoi 1972 / GK 106 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2094,'EPSG','2094','proj4_data/epsg',NULL,'+ellps=WGS72 +k=0.9996 +lat_0=0 +lon_0=106 +no_defs +proj=tmerc +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +x_0=500000 +y_0=0',NULL,'WGS 72BE / TM 106 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2094,'ESRI','2094','proj4_data/esri',NULL,'+ellps=WGS72 +k=0.999600 +lat_0=0 +lon_0=106 +no_defs +proj=tmerc +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'WGS 72BE / TM 106 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2095,'EPSG','2095','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-173,253,27,0,0,0,0 +units=m +zone=28',NULL,'Bissau / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2095,'ESRI','2095','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-173,253,27,0,0,0,0 +units=m +zone=28 no_defs',NULL,'Bissau / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2096,'EPSG','2096','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000',NULL,'Korean 1985 / East Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2096,'ESRI','2096','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=38 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000 no_defs',NULL,'Korean 1985 / Korea East Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2097,'EPSG','2097','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=127 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000',NULL,'Korean 1985 / Central Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2097,'ESRI','2097','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=38 +lon_0=127 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000 no_defs',NULL,'Korean 1985 / Korea Central Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2098,'EPSG','2098','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=125 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000',NULL,'Korean 1985 / West Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2098,'ESRI','2098','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=38 +lon_0=125 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000 no_defs',NULL,'Korean 1985 / Korea West Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2099,'EPSG','2099','proj4_data/epsg',NULL,'+ellps=helmert +lat_0=25.38236111111111 +lon_0=50.76138888888889 +no_defs +proj=cass +units=m +x_0=100000 +y_0=100000',NULL,'Qatar 1948 / Qatar Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2099,'ESRI','2099','proj4_data/esri',NULL,'+ellps=helmert +lat_0=25.38236111111111 +lon_0=50.76138888888889 +no_defs +proj=cass +units=m +x_0=100000 +y_0=100000 no_defs',NULL,'Qatar 1948 / Qatar Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2100,'EPSG','2100','proj4_data/epsg',NULL,'+datum=GGRS87 +k=0.9996 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'GGRS87 / Greek Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2100,'ESRI','2100','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999600 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=-199.87,74.79,246.62,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'GGRS87 / Greek Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2101,'EPSG','2101','proj4_data/epsg',NULL,'+ellps=intl +k_0=1 +lat_0=10.16666666666667 +lat_1=10.16666666666667 +lon_0=-71.60561777777777 +no_defs +proj=lcc +units=m +x_0=0 +y_0=-52684.972',NULL,'Lake / Maracaibo Grid M1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2101,'ESRI','2101','proj4_data/esri',NULL,'+ellps=intl +k_0=1 +lat_0=10.16666666666667 +lat_1=10.16666666666667 +lon_0=-71.60561777777777 +no_defs +proj=lcc +units=m +x_0=0 +y_0=-52684.972 no_defs',NULL,'Lake / Maracaibo Grid M1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2101,'NAD27','2101','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999428571428571 +lat_0=41d30 +lon_0=-83d40 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'2101: michigan east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2102,'EPSG','2102','proj4_data/epsg',NULL,'+ellps=intl +k_0=1 +lat_0=10.16666666666667 +lat_1=10.16666666666667 +lon_0=-71.60561777777777 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=147315.028',NULL,'Lake / Maracaibo Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2102,'ESRI','2102','proj4_data/esri',NULL,'+ellps=intl +k_0=1 +lat_0=10.16666666666667 +lat_1=10.16666666666667 +lon_0=-71.60561777777777 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=147315.028 no_defs',NULL,'Lake / Maracaibo Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2102,'NAD27','2102','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999090909090909 +lat_0=41d30 +lon_0=-85d45 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'2102: michigan central/m: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2103,'EPSG','2103','proj4_data/epsg',NULL,'+ellps=intl +k_0=1 +lat_0=10.16666666666667 +lat_1=10.16666666666667 +lon_0=-71.60561777777777 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=447315.028',NULL,'Lake / Maracaibo Grid M3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2103,'ESRI','2103','proj4_data/esri',NULL,'+ellps=intl +k_0=1 +lat_0=10.16666666666667 +lat_1=10.16666666666667 +lon_0=-71.60561777777777 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=447315.028 no_defs',NULL,'Lake / Maracaibo Grid M3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2103,'NAD27','2103','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999090909090909 +lat_0=41d30 +lon_0=-88d45 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'2103: michigan west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2104,'EPSG','2104','proj4_data/epsg',NULL,'+ellps=intl +k_0=1 +lat_0=10.16666666666667 +lat_1=10.16666666666667 +lon_0=-71.60561777777777 +no_defs +proj=lcc +units=m +x_0=-17044 +y_0=-23139.97',NULL,'Lake / Maracaibo La Rosa Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2104,'ESRI','2104','proj4_data/esri',NULL,'+ellps=intl +k_0=1 +lat_0=10.16666666666667 +lat_1=10.16666666666667 +lon_0=-71.60561777777777 +no_defs +proj=lcc +units=m +x_0=-17044 +y_0=-23139.97 no_defs',NULL,'Lake / Maracaibo La Rosa Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2105,'EPSG','2105','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=-36.87972222222222 +lon_0=174.7641666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Mount Eden 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2105,'ESRI','2105','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=-36.87972222222222 +lon_0=174.7641666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Mount Eden Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2106,'EPSG','2106','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-37.76111111111111 +lon_0=176.4661111111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Bay of Plenty 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2106,'ESRI','2106','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-37.76111111111111 +lon_0=176.4661111111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Bay of Plenty Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2107,'EPSG','2107','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-38.62444444444444 +lon_0=177.8855555555556 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Poverty Bay 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2107,'ESRI','2107','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-38.62444444444444 +lon_0=177.8855555555556 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Poverty Bay Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2108,'EPSG','2108','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-39.65083333333333 +lon_0=176.6736111111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Hawkes Bay 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2108,'ESRI','2108','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-39.65083333333333 +lon_0=176.6736111111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Hawkes Bay Circuit 2000',''); +} +; + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_4() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2109,'EPSG','2109','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-39.13555555555556 +lon_0=174.2277777777778 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Taranaki 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2109,'ESRI','2109','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-39.13555555555556 +lon_0=174.2277777777778 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Taranaki Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2110,'EPSG','2110','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-39.51222222222222 +lon_0=175.64 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Tuhirangi 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2110,'ESRI','2110','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-39.51222222222222 +lon_0=175.64 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Tuhirangi Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2111,'EPSG','2111','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-40.24194444444444 +lon_0=175.4880555555555 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Wanganui 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2111,'ESRI','2111','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-40.24194444444444 +lon_0=175.4880555555555 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Wanganui Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2111,'NAD27','2111','proj4_data/nad27',NULL,'+a=6378450.047 +es=.006768657997291094 +lat_0=44d47 +lat_1=47d5 +lat_2=45d29 +lon_0=-87 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'2111: michigan north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2111,'NAD83','2111','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=44d47 +lat_1=47d5 +lat_2=45d29 +lon_0=-87 +proj=lcc +x_0=8000000 +y_0=0 no_defs',NULL,'2111: michigan north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2112,'EPSG','2112','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-40.92527777777777 +lon_0=175.6472222222222 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Wairarapa 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2112,'ESRI','2112','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-40.92527777777777 +lon_0=175.6472222222222 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Wairarapa Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2112,'NAD27','2112','proj4_data/nad27',NULL,'+a=6378450.047 +es=.006768657997291094 +lat_0=43d19 +lat_1=45d42 +lat_2=44d11 +lon_0=-84d20 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'2112: michigan central/l: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2112,'NAD83','2112','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=43d19 +lat_1=45d42 +lat_2=44d11 +lon_0=-84d22 +proj=lcc +x_0=6000000 +y_0=0 no_defs',NULL,'2112: michigan central/l: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2113,'EPSG','2113','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-41.3011111111111 +lon_0=174.7763888888889 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Wellington 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2113,'ESRI','2113','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-41.3011111111111 +lon_0=174.7763888888889 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Wellington Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2113,'NAD27','2113','proj4_data/nad27',NULL,'+a=6378450.047 +es=.006768657997291094 +lat_0=41d30 +lat_1=43d40 +lat_2=42d6 +lon_0=-84d20 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'2113: michigan south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2113,'NAD83','2113','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=41d30 +lat_1=43d40 +lat_2=42d6 +lon_0=-84d22 +proj=lcc +x_0=4000000 +y_0=0 no_defs',NULL,'2113: michigan south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2114,'EPSG','2114','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-40.71472222222223 +lon_0=172.6719444444444 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Collingwood 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2114,'ESRI','2114','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-40.71472222222223 +lon_0=172.6719444444444 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Collingwood Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2115,'EPSG','2115','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-41.27444444444444 +lon_0=173.2991666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Nelson 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2115,'ESRI','2115','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-41.27444444444444 +lon_0=173.2991666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Nelson Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2116,'EPSG','2116','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-41.28972222222222 +lon_0=172.1088888888889 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Karamea 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2116,'ESRI','2116','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-41.28972222222222 +lon_0=172.1088888888889 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Karamea Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2117,'EPSG','2117','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-41.81055555555555 +lon_0=171.5811111111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Buller 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2117,'ESRI','2117','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-41.81055555555555 +lon_0=171.5811111111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Buller Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2118,'EPSG','2118','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-42.33361111111111 +lon_0=171.5497222222222 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Grey 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2118,'ESRI','2118','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-42.33361111111111 +lon_0=171.5497222222222 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Grey Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2119,'EPSG','2119','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-42.68888888888888 +lon_0=173.01 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Amuri 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2119,'ESRI','2119','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-42.68888888888888 +lon_0=173.01 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Amuri Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2120,'EPSG','2120','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-41.54444444444444 +lon_0=173.8019444444444 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Marlborough 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2120,'ESRI','2120','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-41.54444444444444 +lon_0=173.8019444444444 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Marlborough Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2121,'EPSG','2121','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-42.88611111111111 +lon_0=170.9797222222222 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Hokitika 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2121,'ESRI','2121','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-42.88611111111111 +lon_0=170.9797222222222 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Hokitika Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2122,'EPSG','2122','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-43.11 +lon_0=170.2608333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Okarito 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2122,'ESRI','2122','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-43.11 +lon_0=170.2608333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Okarito Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2123,'EPSG','2123','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-43.97777777777778 +lon_0=168.6061111111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Jacksons Bay 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2123,'ESRI','2123','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-43.97777777777778 +lon_0=168.6061111111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Jacksons Bay Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2124,'EPSG','2124','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-43.59055555555556 +lon_0=172.7269444444445 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Mount Pleasant 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2124,'ESRI','2124','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-43.59055555555556 +lon_0=172.7269444444445 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Mount Pleasant Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2125,'EPSG','2125','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-43.74861111111111 +lon_0=171.3605555555555 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Gawler 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2125,'ESRI','2125','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-43.74861111111111 +lon_0=171.3605555555555 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Gawler Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2126,'EPSG','2126','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-44.40194444444445 +lon_0=171.0572222222222 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Timaru 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2126,'ESRI','2126','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-44.40194444444445 +lon_0=171.0572222222222 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Timaru Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2127,'EPSG','2127','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-44.735 +lon_0=169.4675 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Lindis Peak 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2127,'ESRI','2127','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-44.735 +lon_0=169.4675 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Lindis Peak Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2128,'EPSG','2128','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-45.13277777777778 +lon_0=168.3986111111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Mount Nicholas 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2128,'ESRI','2128','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-45.13277777777778 +lon_0=168.3986111111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Mount Nicholas Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2129,'EPSG','2129','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-45.56361111111111 +lon_0=167.7386111111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Mount York 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2129,'ESRI','2129','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-45.56361111111111 +lon_0=167.7386111111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Mount York Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2130,'EPSG','2130','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-45.81611111111111 +lon_0=170.6283333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Observation Point 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2130,'ESRI','2130','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-45.81611111111111 +lon_0=170.6283333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Observation Point Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2131,'EPSG','2131','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99996 +lat_0=-45.86138888888889 +lon_0=170.2825 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / North Taieri 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2131,'ESRI','2131','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999960 +lat_0=-45.86138888888889 +lon_0=170.2825 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / North Taieri Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2132,'EPSG','2132','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-46.6 +lon_0=168.3427777777778 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Bluff 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2132,'ESRI','2132','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=-46.6 +lon_0=168.3427777777778 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NZGD2000 / Bluff Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2133,'EPSG','2133','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=58',NULL,'NZGD2000 / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2133,'ESRI','2133','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=58 no_defs',NULL,'NZGD2000 / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2134,'EPSG','2134','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=59',NULL,'NZGD2000 / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2134,'ESRI','2134','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=59 no_defs',NULL,'NZGD2000 / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2135,'EPSG','2135','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=60',NULL,'NZGD2000 / UTM zone 60S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2135,'ESRI','2135','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=60 no_defs',NULL,'NZGD2000 / UTM zone 60S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2136,'EPSG','2136','proj4_data/epsg',NULL,'+a=6378300 +b=6356751.689189189 +k=0.99975 +lat_0=4.666666666666667 +lon_0=-1 +no_defs +proj=tmerc +to_meter=0.3047997101815088 +towgs84=-199,32,322,0,0,0,0 +x_0=274319.7391633579 +y_0=0',NULL,'Accra / Ghana National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2136,'ESRI','2136','proj4_data/esri',NULL,'+a=6378300 +b=6356751.689189189 +k=0.999750 +lat_0=4.666666666666667 +lon_0=-1 +no_defs +proj=tmerc +to_meter=0.3047997101815088 +towgs84=-199,32,322,0,0,0,0 +x_0=274319.7391633579 +y_0=0 no_defs',NULL,'Accra / Ghana National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2137,'EPSG','2137','proj4_data/epsg',NULL,'+a=6378300 +b=6356751.689189189 +k=0.9996 +lat_0=0 +lon_0=-1 +no_defs +proj=tmerc +towgs84=-199,32,322,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Accra / TM 1 NW',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2137,'ESRI','2137','proj4_data/esri',NULL,'+a=6378300 +b=6356751.689189189 +k=0.999600 +lat_0=0 +lon_0=-1 +no_defs +proj=tmerc +towgs84=-199,32,322,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Accra / TM 1 NW',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2138,'EPSG','2138','proj4_data/epsg',NULL,'+ellps=clrk66 +lat_0=44 +lat_1=60 +lat_2=46 +lon_0=-68.5 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'NAD27(CGQ77) / Quebec Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2138,'ESRI','2138','proj4_data/esri',NULL,'+ellps=clrk66 +lat_0=44 +lat_1=60 +lat_2=46 +lon_0=-68.5 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'NAD27(CGQ77) / Quebec Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2139,'EPSG','2139','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-55.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS98) / SCoPQ zone 2 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2139,'ESRI','2139','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-55.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS98) / SCoPQ zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2140,'EPSG','2140','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-58.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS98) / MTM zone 3 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2140,'ESRI','2140','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-58.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS98) / MTM zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2141,'EPSG','2141','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-61.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS98) / MTM zone 4 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2141,'ESRI','2141','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-61.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS98) / MTM zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2142,'EPSG','2142','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-64.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS98) / MTM zone 5 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2142,'ESRI','2142','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-64.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS98) / MTM zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2143,'EPSG','2143','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-67.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS98) / MTM zone 6 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2143,'ESRI','2143','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-67.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS98) / MTM zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2144,'EPSG','2144','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-70.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS98) / MTM zone 7 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2144,'ESRI','2144','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-70.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS98) / MTM zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2145,'EPSG','2145','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-73.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS98) / MTM zone 8 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2145,'ESRI','2145','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-73.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS98) / MTM zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2146,'EPSG','2146','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-76.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS98) / MTM zone 9 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2146,'ESRI','2146','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-76.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS98) / MTM zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2147,'EPSG','2147','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-79.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS98) / MTM zone 10 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2147,'ESRI','2147','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-79.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS98) / MTM zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2148,'EPSG','2148','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=21',NULL,'NAD83(CSRS98) / UTM zone 21N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2148,'ESRI','2148','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=21 no_defs',NULL,'NAD83(CSRS98) / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2149,'EPSG','2149','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'NAD83(CSRS98) / UTM zone 18N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2149,'ESRI','2149','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18 no_defs',NULL,'NAD83(CSRS98) / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2150,'EPSG','2150','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=17',NULL,'NAD83(CSRS98) / UTM zone 17N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2150,'ESRI','2150','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=17 no_defs',NULL,'NAD83(CSRS98) / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2151,'EPSG','2151','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=13',NULL,'NAD83(CSRS98) / UTM zone 13N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2151,'ESRI','2151','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=13 no_defs',NULL,'NAD83(CSRS98) / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2152,'EPSG','2152','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=12',NULL,'NAD83(CSRS98) / UTM zone 12N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2152,'ESRI','2152','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=12 no_defs',NULL,'NAD83(CSRS98) / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2153,'EPSG','2153','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=11',NULL,'NAD83(CSRS98) / UTM zone 11N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2153,'ESRI','2153','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=11 no_defs',NULL,'NAD83(CSRS98) / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2154,'EPSG','2154','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=49 +lat_2=44 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=6600000',NULL,'RGF93 / Lambert-93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2154,'ESRI','2154','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=49 +lat_2=44 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=6600000 no_defs',NULL,'RGF93 / Lambert-93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2155,'EPSG','2155','proj4_data/epsg',NULL,'+ellps=clrk66 +k_0=1 +lat_0=-14.26666666666667 +lat_1=-14.26666666666667 +lon_0=170 +no_defs +proj=lcc +towgs84=-115,118,426,0,0,0,0 +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'American Samoa 1962 / American Samoa Lambert (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2155,'ESRI','2155','proj4_data/esri',NULL,'+ellps=clrk66 +k_0=1 +lat_0=-14.26666666666667 +lat_1=-14.26666666666667 +lon_0=170 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=-115,118,426,0,0,0,0 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'American Samoa 1962 / American Samoa Lambert',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_5() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2156,'EPSG','2156','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=59',NULL,'NAD83(HARN) / UTM zone 59S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2156,'ESRI','2156','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=59 no_defs',NULL,'NAD83(HARN) / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2157,'EPSG','2157','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99982 +lat_0=53.5 +lon_0=-8 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=750000',NULL,'IRENET95 / Irish Transverse Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2157,'ESRI','2157','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999820 +lat_0=53.5 +lon_0=-8 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=750000 no_defs',NULL,'IRENET95 / Irish Transverse Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2158,'EPSG','2158','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=29',NULL,'IRENET95 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2158,'ESRI','2158','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=29 no_defs',NULL,'IRENET95 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2159,'EPSG','2159','proj4_data/epsg',NULL,'+a=6378300 +b=6356751.689189189 +k=1 +lat_0=6.666666666666667 +lon_0=-12 +no_defs +proj=tmerc +to_meter=0.3047997101815088 +x_0=152399.8550907544 +y_0=0',NULL,'Sierra Leone 1924 / New Colony Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2159,'ESRI','2159','proj4_data/esri',NULL,'+a=6378300 +b=6356751.689189189 +k=1.000000 +lat_0=6.666666666666667 +lon_0=-12 +no_defs +proj=tmerc +to_meter=0.3047997101815088 +x_0=152399.8550907544 +y_0=0 no_defs',NULL,'Sierra Leone 1924 / New Colony Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2160,'EPSG','2160','proj4_data/epsg',NULL,'+a=6378300 +b=6356751.689189189 +k=1 +lat_0=6.666666666666667 +lon_0=-12 +no_defs +proj=tmerc +to_meter=0.3047997101815088 +x_0=243839.7681452071 +y_0=182879.8261089053',NULL,'Sierra Leone 1924 / New War Office Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2160,'ESRI','2160','proj4_data/esri',NULL,'+a=6378300 +b=6356751.689189189 +k=1.000000 +lat_0=6.666666666666667 +lon_0=-12 +no_defs +proj=tmerc +to_meter=0.3047997101815088 +x_0=243839.7681452071 +y_0=182879.8261089053 no_defs',NULL,'Sierra Leone 1924 / New War Office Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2161,'EPSG','2161','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-88,4,101,0,0,0,0 +units=m +zone=28',NULL,'Sierra Leone 1968 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2161,'ESRI','2161','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-88,4,101,0,0,0,0 +units=m +zone=28 no_defs',NULL,'Sierra Leone 1968 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2162,'EPSG','2162','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-88,4,101,0,0,0,0 +units=m +zone=29',NULL,'Sierra Leone 1968 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2162,'ESRI','2162','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-88,4,101,0,0,0,0 +units=m +zone=29 no_defs',NULL,'Sierra Leone 1968 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2163,'EPSG','2163','proj4_data/epsg',NULL,'+a=6370997 +b=6370997 +lat_0=45 +lon_0=-100 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'US National Atlas Equal Area',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2163,'ESRI','2163','proj4_data/esri',NULL,'+a=6370997 +b=6370997 +lat_0=45 +lon_0=-100 +no_defs +proj=laea +units=m +x_0=0 +y_0=0 no_defs',NULL,'US National Atlas Equal Area',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2164,'EPSG','2164','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9996 +lat_0=0 +lon_0=-5 +no_defs +proj=tmerc +towgs84=-125,53,467,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Locodjo 1965 / TM 5 NW',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2164,'ESRI','2164','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999600 +lat_0=0 +lon_0=-5 +no_defs +proj=tmerc +towgs84=-125,53,467,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Locodjo 1965 / TM 5 NW',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2165,'EPSG','2165','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9996 +lat_0=0 +lon_0=-5 +no_defs +proj=tmerc +towgs84=-124.76,53,466.79,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Abidjan 1987 / TM 5 NW',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2165,'ESRI','2165','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999600 +lat_0=0 +lon_0=-5 +no_defs +proj=tmerc +towgs84=-124.76,53,466.79,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Abidjan 1987 / TM 5 NW',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2166,'EPSG','2166','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=3500000 +y_0=0',NULL,'Pulkovo 1942(83) / Gauss Kruger zone 3 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2166,'ESRI','2166','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=24,-123,-94,0.02,-0.25,-0.13,1.1 +units=m +x_0=3500000 +y_0=0 no_defs',NULL,'Pulkovo 1942(83) / Gauss Kruger zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2167,'EPSG','2167','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=4500000 +y_0=0',NULL,'Pulkovo 1942(83) / Gauss Kruger zone 4 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2167,'ESRI','2167','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=24,-123,-94,0.02,-0.25,-0.13,1.1 +units=m +x_0=4500000 +y_0=0 no_defs',NULL,'Pulkovo 1942(83) / Gauss Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2168,'EPSG','2168','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=5500000 +y_0=0',NULL,'Pulkovo 1942(83) / Gauss Kruger zone 5 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2168,'ESRI','2168','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=24,-123,-94,0.02,-0.25,-0.13,1.1 +units=m +x_0=5500000 +y_0=0 no_defs',NULL,'Pulkovo 1942(83) / Gauss Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2169,'EPSG','2169','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=49.83333333333334 +lon_0=6.166666666666667 +no_defs +proj=tmerc +towgs84=-189.6806,18.3463,-42.7695,-0.33746,-3.09264,2.53861,0.4598 +units=m +x_0=80000 +y_0=100000',NULL,'Luxembourg 1930 / Gauss',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2169,'ESRI','2169','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=49.83333333333334 +lon_0=6.166666666666667 +no_defs +proj=tmerc +towgs84=-193,13.7,-39.3,-0.41,-2.933,2.688,0.43 +units=m +x_0=80000 +y_0=100000 no_defs',NULL,'Luxembourg 1930 / Gauss',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2170,'EPSG','2170','proj4_data/epsg',NULL,'+datum=hermannskogel +k=0.9999 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'MGI / Slovenia Grid (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2170,'ESRI','2170','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'MGI / Slovenia Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2171,'EPSG','2171','proj4_data/epsg',NULL,'+ellps=krass +k=0.9998 +lat_0=50.625 +lon_0=21.08333333333333 +no_defs +proj=sterea +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=4637000 +y_0=5647000',NULL,'Pulkovo 1942(58) / Poland zone I (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2171,'ESRI','2171','proj4_data/esri',NULL,'+ellps=krass +k=0.999800 +lat_0=50.625 +lon_0=21.08333333333333 +no_defs +proj=stere +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=4637000 +y_0=5647000 no_defs',NULL,'Pulkovo 1942(58) / Poland zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2172,'EPSG','2172','proj4_data/epsg',NULL,'+ellps=krass +k=0.9998 +lat_0=53.00194444444445 +lon_0=21.50277777777778 +no_defs +proj=sterea +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=4603000 +y_0=5806000',NULL,'Pulkovo 1942(58) / Poland zone II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2172,'ESRI','2172','proj4_data/esri',NULL,'+ellps=krass +k=0.999800 +lat_0=53.00194444444445 +lon_0=21.50277777777778 +no_defs +proj=stere +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=4603000 +y_0=5806000 no_defs',NULL,'Pulkovo 1942(58) / Poland zone II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2173,'EPSG','2173','proj4_data/epsg',NULL,'+ellps=krass +k=0.9998 +lat_0=53.58333333333334 +lon_0=17.00833333333333 +no_defs +proj=sterea +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=3501000 +y_0=5999000',NULL,'Pulkovo 1942(58) / Poland zone III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2173,'ESRI','2173','proj4_data/esri',NULL,'+ellps=krass +k=0.999800 +lat_0=53.58333333333334 +lon_0=17.00833333333333 +no_defs +proj=stere +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=3501000 +y_0=5999000 no_defs',NULL,'Pulkovo 1942(58) / Poland zone III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2174,'EPSG','2174','proj4_data/epsg',NULL,'+ellps=krass +k=0.9998 +lat_0=51.67083333333333 +lon_0=16.67222222222222 +no_defs +proj=sterea +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=3703000 +y_0=5627000',NULL,'Pulkovo 1942(58) / Poland zone IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2174,'ESRI','2174','proj4_data/esri',NULL,'+ellps=krass +k=0.999800 +lat_0=51.67083333333333 +lon_0=16.67222222222222 +no_defs +proj=stere +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=3703000 +y_0=5627000 no_defs',NULL,'Pulkovo 1942(58) / Poland zone IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2175,'EPSG','2175','proj4_data/epsg',NULL,'+ellps=krass +k=0.999983 +lat_0=0 +lon_0=18.95833333333333 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=237000 +y_0=-4700000',NULL,'Pulkovo 1942(58) / Poland zone V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2175,'ESRI','2175','proj4_data/esri',NULL,'+ellps=krass +k=0.999983 +lat_0=0 +lon_0=18.95833333333333 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=237000 +y_0=-4700000 no_defs',NULL,'Pulkovo 1942(58) / Poland zone V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2176,'EPSG','2176','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999923 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=5500000 +y_0=0',NULL,'ETRS89 / Poland CS2000 zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2176,'ESRI','2176','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999923 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0 no_defs',NULL,'ETRS89 / Poland CS2000 zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2177,'EPSG','2177','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999923 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=6500000 +y_0=0',NULL,'ETRS89 / Poland CS2000 zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2177,'ESRI','2177','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999923 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +units=m +x_0=6500000 +y_0=0 no_defs',NULL,'ETRS89 / Poland CS2000 zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2178,'EPSG','2178','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999923 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=7500000 +y_0=0',NULL,'ETRS89 / Poland CS2000 zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2178,'ESRI','2178','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999923 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=7500000 +y_0=0 no_defs',NULL,'ETRS89 / Poland CS2000 zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2179,'EPSG','2179','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999923 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=8500000 +y_0=0',NULL,'ETRS89 / Poland CS2000 zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2179,'ESRI','2179','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999923 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=8500000 +y_0=0 no_defs',NULL,'ETRS89 / Poland CS2000 zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2180,'EPSG','2180','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9993 +lat_0=0 +lon_0=19 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=-5300000',NULL,'ETRS89 / Poland CS92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2180,'ESRI','2180','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999300 +lat_0=0 +lon_0=19 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=-5300000 no_defs',NULL,'ETRS89 / Poland CS92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2188,'EPSG','2188','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-425,-169,81,0,0,0,0 +units=m +zone=25',NULL,'Azores Occidental 1939 / UTM zone 25N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2188,'ESRI','2188','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=25 no_defs',NULL,'Azores Occidental 1939 / UTM zone 25N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2189,'EPSG','2189','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-104,167,-38,0,0,0,0 +units=m +zone=26',NULL,'Azores Central 1948 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2189,'ESRI','2189','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=26 no_defs',NULL,'Azores Central 1948 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2190,'EPSG','2190','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-203,141,53,0,0,0,0 +units=m +zone=26',NULL,'Azores Oriental 1940 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2190,'ESRI','2190','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=26 no_defs',NULL,'Azores Oriental 1940 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2191,'EPSG','2191','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=28',NULL,'Madeira 1936 / UTM zone 28N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2191,'ESRI','2191','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=28 no_defs',NULL,'Madeira 1936 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2192,'EPSG','2192','proj4_data/epsg',NULL,'+ellps=intl +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=2.337229166666667 +no_defs +proj=lcc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=600000 +y_0=2200000',NULL,'ED50 / France EuroLambert (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2192,'ESRI','2192','proj4_data/esri',NULL,'+ellps=intl +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=2.337229166666667 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=2200000 no_defs',NULL,'ED50 / France EuroLambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2193,'EPSG','2193','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=173 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1600000 +y_0=10000000',NULL,'NZGD2000 / New Zealand Transverse Mercator 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2193,'ESRI','2193','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999600 +lat_0=0 +lon_0=173 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1600000 +y_0=10000000 no_defs',NULL,'NZGD2000 / New Zealand Transverse Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2194,'EPSG','2194','proj4_data/epsg',NULL,'+ellps=clrk66 +k_0=1 +lat_0=-14.26666666666667 +lat_1=-14.26666666666667 +lon_0=-170 +no_defs +proj=lcc +towgs84=-115,118,426,0,0,0,0 +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'American Samoa 1962 / American Samoa Lambert (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2194,'ESRI','2194','proj4_data/esri',NULL,'+ellps=clrk66 +k_0=1 +lat_0=-14.26666666666667 +lat_1=-14.26666666666667 +lon_0=-170 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=-115,118,426,0,0,0,0 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'American Samoa 1962 / American Samoa Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2195,'EPSG','2195','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=2',NULL,'NAD83(HARN) / UTM zone 2S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2195,'ESRI','2195','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=2 no_defs',NULL,'NAD83(HARN) / UTM zone 2S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2196,'EPSG','2196','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=0 +lon_0=9.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'ETRS89 / Kp2000 Jutland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2196,'ESRI','2196','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999950 +lat_0=0 +lon_0=9.5 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'ETRS89 / Kp2000 Jutland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2197,'EPSG','2197','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / Kp2000 Zealand',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2197,'ESRI','2197','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999950 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ETRS89 / Kp2000 Zealand',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2198,'EPSG','2198','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=900000 +y_0=0',NULL,'ETRS89 / Kp2000 Bornholm',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2198,'ESRI','2198','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=900000 +y_0=0 no_defs',NULL,'ETRS89 / Kp2000 Bornholm',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2199,'EPSG','2199','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=-44.183,-0.58,-38.489,-2.3867,-2.7072,3.5196,-8.2703 +units=m +x_0=4500000 +y_0=0',NULL,'Albanian 1987 / Gauss Kruger zone 4 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2199,'ESRI','2199','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0 no_defs',NULL,'Albanian 1987 / Gauss Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2200,'EPSG','2200','proj4_data/epsg',NULL,'+a=6378135 +b=6356750.304921594 +k=0.999912 +lat_0=46.5 +lon_0=-66.5 +no_defs +proj=sterea +units=m +x_0=300000 +y_0=800000',NULL,'ATS77 / New Brunswick Stereographic (ATS77)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2200,'ESRI','2200','proj4_data/esri',NULL,'+a=6378135 +b=6356750.304921594 +k=0.999912 +lat_0=46.5 +lon_0=-66.5 +no_defs +proj=stere +units=m +x_0=300000 +y_0=800000 no_defs',NULL,'ATS77 / New Brunswick Stereographic (ATS77)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2201,'EPSG','2201','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'REGVEN / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2201,'ESRI','2201','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18 no_defs',NULL,'REGVEN / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2201,'NAD27','2201','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=46d30 +lat_1=48d38 +lat_2=47d2 +lon_0=-93d6 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'2201: minnesota north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2201,'NAD83','2201','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=46d30 +lat_1=48d38 +lat_2=47d2 +lon_0=-93d6 +proj=lcc +x_0=800000 +y_0=100000 no_defs',NULL,'2201: minnesota north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2202,'EPSG','2202','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'REGVEN / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2202,'ESRI','2202','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=19 no_defs',NULL,'REGVEN / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2202,'NAD27','2202','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=45 +lat_1=47d3 +lat_2=45d37 +lon_0=-94d15 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'2202: minnesota central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2202,'NAD83','2202','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=45 +lat_1=47d3 +lat_2=45d37 +lon_0=-94d15 +proj=lcc +x_0=800000 +y_0=100000 no_defs',NULL,'2202: minnesota central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2203,'EPSG','2203','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20',NULL,'REGVEN / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2203,'ESRI','2203','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20 no_defs',NULL,'REGVEN / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2203,'NAD27','2203','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=43 +lat_1=45d13 +lat_2=43d47 +lon_0=-94 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'2203: minnesota south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2203,'NAD83','2203','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=43 +lat_1=45d13 +lat_2=43d47 +lon_0=-94 +proj=lcc +x_0=800000 +y_0=100000 no_defs',NULL,'2203: minnesota south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2204,'EPSG','2204','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=34.66666666666666 +lat_1=35.25 +lat_2=36.41666666666666 +lon_0=-86 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=30480.06096012192',NULL,'NAD27 / Tennessee',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2204,'ESRI','2204','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=34.66666666666666 +lat_1=35.25 +lat_2=36.41666666666666 +lon_0=-86 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=30480.06096012192 no_defs',NULL,'NAD27 / Tennessee',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2205,'EPSG','2205','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Kentucky North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2205,'ESRI','2205','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Kentucky North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2206,'EPSG','2206','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=9500000 +y_0=0',NULL,'ED50 / 3-degree Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2206,'ESRI','2206','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=9500000 +y_0=0 no_defs',NULL,'ED50 / 3-degree Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2207,'EPSG','2207','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=10500000 +y_0=0',NULL,'ED50 / 3-degree Gauss-Kruger zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2207,'ESRI','2207','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +units=m +x_0=10500000 +y_0=0 no_defs',NULL,'ED50 / 3-degree Gauss-Kruger zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2208,'EPSG','2208','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=11500000 +y_0=0',NULL,'ED50 / 3-degree Gauss-Kruger zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2208,'ESRI','2208','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +units=m +x_0=11500000 +y_0=0 no_defs',NULL,'ED50 / 3-degree Gauss-Kruger zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2209,'EPSG','2209','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=12500000 +y_0=0',NULL,'ED50 / 3-degree Gauss-Kruger zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2209,'ESRI','2209','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +units=m +x_0=12500000 +y_0=0 no_defs',NULL,'ED50 / 3-degree Gauss-Kruger zone 12',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_6() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2210,'EPSG','2210','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=13500000 +y_0=0',NULL,'ED50 / 3-degree Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2210,'ESRI','2210','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +units=m +x_0=13500000 +y_0=0 no_defs',NULL,'ED50 / 3-degree Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2211,'EPSG','2211','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=14500000 +y_0=0',NULL,'ED50 / 3-degree Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2211,'ESRI','2211','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +units=m +x_0=14500000 +y_0=0 no_defs',NULL,'ED50 / 3-degree Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2212,'EPSG','2212','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=15500000 +y_0=0',NULL,'ED50 / 3-degree Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2212,'ESRI','2212','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +units=m +x_0=15500000 +y_0=0 no_defs',NULL,'ED50 / 3-degree Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2213,'EPSG','2213','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / TM 30 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2213,'ESRI','2213','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999600 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ETRS89 / TM 30 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2214,'EPSG','2214','proj4_data/epsg',NULL,'+ellps=intl +k=0.999 +lat_0=0 +lon_0=10.5 +no_defs +proj=tmerc +towgs84=-206.1,-174.7,-87.7,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'Douala 1948 / AOF west (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2214,'ESRI','2214','proj4_data/esri',NULL,'+ellps=intl +k=0.999000 +lat_0=0 +lon_0=10.5 +no_defs +proj=tmerc +units=m +x_0=1000000 +y_0=1000000 no_defs',NULL,'Douala 1948 / AOF west',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2215,'EPSG','2215','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-70.9,-151.8,-41.4,0,0,0,0 +units=m +zone=32',NULL,'Manoca 1962 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2215,'ESRI','2215','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-70.9,-151.8,-41.4,0,0,0,0 +units=m +zone=32 no_defs',NULL,'Manoca 1962 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2216,'EPSG','2216','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=164,138,-189,0,0,0,0 +units=m +zone=22',NULL,'Qornoq 1927 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2216,'ESRI','2216','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=22 no_defs',NULL,'Qornoq 1927 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2217,'EPSG','2217','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=164,138,-189,0,0,0,0 +units=m +zone=23',NULL,'Qornoq 1927 / UTM zone 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2217,'ESRI','2217','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=23 no_defs',NULL,'Qornoq 1927 / UTM zone 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2219,'EPSG','2219','proj4_data/epsg',NULL,'+a=6378135 +b=6356750.304921594 +no_defs +proj=utm +units=m +zone=19',NULL,'Scoresbysund 1952 / Greenland zone 5 east\12Unable to translate coordinate system EPSG:2218 into PROJ.4 format.\12\12ATS77 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2219,'ESRI','2219','proj4_data/esri',NULL,'+a=6378135 +b=6356750.304921594 +no_defs +proj=utm +units=m +zone=19 no_defs',NULL,'ATS77 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2220,'EPSG','2220','proj4_data/epsg',NULL,'+a=6378135 +b=6356750.304921594 +no_defs +proj=utm +units=m +zone=20',NULL,'ATS77 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2220,'ESRI','2220','proj4_data/esri',NULL,'+a=6378135 +b=6356750.304921594 +no_defs +proj=utm +units=m +zone=20 no_defs',NULL,'ATS77 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2222,'EPSG','2222','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +units=ft +x_0=213360 +y_0=0',NULL,'Scoresbysund 1952 / Greenland zone 6 east\12Unable to translate coordinate system EPSG:2221 into PROJ.4 format.\12\12NAD83 / Arizona East (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2222,'ESRI','2222','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +to_meter=0.3048 +x_0=213360 +y_0=0 no_defs',NULL,'NAD83 / Arizona East (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2223,'EPSG','2223','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +units=ft +x_0=213360 +y_0=0',NULL,'NAD83 / Arizona Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2223,'ESRI','2223','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +to_meter=0.3048 +x_0=213360 +y_0=0 no_defs',NULL,'NAD83 / Arizona Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2224,'EPSG','2224','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999933333 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +units=ft +x_0=213360 +y_0=0',NULL,'NAD83 / Arizona West (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2224,'ESRI','2224','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999933 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +to_meter=0.3048 +x_0=213360 +y_0=0 no_defs',NULL,'NAD83 / Arizona West (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2225,'EPSG','2225','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83 / California zone 1 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2225,'ESRI','2225','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=2000000.0001016 +y_0=500000.0001016001 no_defs',NULL,'NAD83 / California zone 1 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2226,'EPSG','2226','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83 / California zone 2 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2226,'ESRI','2226','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=2000000.0001016 +y_0=500000.0001016001 no_defs',NULL,'NAD83 / California zone 2 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2227,'EPSG','2227','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83 / California zone 3 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2227,'ESRI','2227','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=2000000.0001016 +y_0=500000.0001016001 no_defs',NULL,'NAD83 / California zone 3 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2228,'EPSG','2228','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83 / California zone 4 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2228,'ESRI','2228','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=2000000.0001016 +y_0=500000.0001016001 no_defs',NULL,'NAD83 / California zone 4 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2229,'EPSG','2229','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83 / California zone 5 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2229,'ESRI','2229','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=2000000.0001016 +y_0=500000.0001016001 no_defs',NULL,'NAD83 / California zone 5 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2230,'EPSG','2230','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83 / California zone 6 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2230,'ESRI','2230','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=2000000.0001016 +y_0=500000.0001016001 no_defs',NULL,'NAD83 / California zone 6 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2231,'EPSG','2231','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=39.33333333333334 +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lon_0=-105.5 +no_defs +proj=lcc +units=us-ft +x_0=914401.8288036576 +y_0=304800.6096012192',NULL,'NAD83 / Colorado North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2231,'ESRI','2231','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lon_0=-105.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=914401.8288036576 +y_0=304800.6096012192 no_defs',NULL,'NAD83 / Colorado North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2232,'EPSG','2232','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +units=us-ft +x_0=914401.8288036576 +y_0=304800.6096012192',NULL,'NAD83 / Colorado Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2232,'ESRI','2232','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=914401.8288036576 +y_0=304800.6096012192 no_defs',NULL,'NAD83 / Colorado Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2233,'EPSG','2233','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +units=us-ft +x_0=914401.8288036576 +y_0=304800.6096012192',NULL,'NAD83 / Colorado South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2233,'ESRI','2233','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=914401.8288036576 +y_0=304800.6096012192 no_defs',NULL,'NAD83 / Colorado South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2234,'EPSG','2234','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +units=us-ft +x_0=304800.6096012192 +y_0=152400.3048006096',NULL,'NAD83 / Connecticut (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2234,'ESRI','2234','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=304800.6096012192 +y_0=152400.3048006096 no_defs',NULL,'NAD83 / Connecticut (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2235,'EPSG','2235','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83 / Delaware (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2235,'ESRI','2235','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000.0001016002 +y_0=0 no_defs',NULL,'NAD83 / Delaware (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2236,'EPSG','2236','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83 / Florida East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2236,'ESRI','2236','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000.0001016002 +y_0=0 no_defs',NULL,'NAD83 / Florida East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2237,'EPSG','2237','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83 / Florida West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2237,'ESRI','2237','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000.0001016002 +y_0=0 no_defs',NULL,'NAD83 / Florida West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2238,'EPSG','2238','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / Florida North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2238,'ESRI','2238','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Florida North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2239,'EPSG','2239','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83 / Georgia East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2239,'ESRI','2239','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000.0001016002 +y_0=0 no_defs',NULL,'NAD83 / Georgia East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2240,'EPSG','2240','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=699999.9998983998 +y_0=0',NULL,'NAD83 / Georgia West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2240,'ESRI','2240','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=699999.9998983998 +y_0=0 no_defs',NULL,'NAD83 / Georgia West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2241,'EPSG','2241','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83 / Idaho East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2241,'ESRI','2241','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000.0001016002 +y_0=0 no_defs',NULL,'NAD83 / Idaho East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2242,'EPSG','2242','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83 / Idaho Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2242,'ESRI','2242','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0001016001 +y_0=0 no_defs',NULL,'NAD83 / Idaho Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2243,'EPSG','2243','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999933333 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +units=us-ft +x_0=800000.0001016001 +y_0=0',NULL,'NAD83 / Idaho West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2243,'ESRI','2243','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999933 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=800000.0001016001 +y_0=0 no_defs',NULL,'NAD83 / Idaho West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2244,'EPSG','2244','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=99999.99989839978 +y_0=249364.9987299975',NULL,'NAD83 / Indiana East (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2244,'ESRI','2244','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=99999.99989839978 +y_0=249364.9987299975 no_defs',NULL,'NAD83 / Indiana East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2245,'EPSG','2245','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=900000 +y_0=249364.9987299975',NULL,'NAD83 / Indiana West (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2245,'ESRI','2245','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=900000 +y_0=249364.9987299975 no_defs',NULL,'NAD83 / Indiana West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2246,'EPSG','2246','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83 / Kentucky North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2246,'ESRI','2246','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0001016001 +y_0=0 no_defs',NULL,'NAD83 / Kentucky North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2247,'EPSG','2247','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.33333333333334 +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lon_0=-85.75 +no_defs +proj=lcc +units=us-ft +x_0=500000.0001016001 +y_0=500000.0001016001',NULL,'NAD83 / Kentucky South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2247,'ESRI','2247','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lon_0=-85.75 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0001016001 +y_0=500000.0001016001 no_defs',NULL,'NAD83 / Kentucky South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2248,'EPSG','2248','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37.66666666666666 +lat_1=39.45 +lat_2=38.3 +lon_0=-77 +no_defs +proj=lcc +units=us-ft +x_0=399999.9998983998 +y_0=0',NULL,'NAD83 / Maryland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2248,'ESRI','2248','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.45 +lat_2=38.3 +lon_0=-77 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=399999.9998983998 +y_0=0 no_defs',NULL,'NAD83 / Maryland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2249,'EPSG','2249','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=41 +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lon_0=-71.5 +no_defs +proj=lcc +units=us-ft +x_0=200000.0001016002 +y_0=750000',NULL,'NAD83 / Massachusetts Mainland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2249,'ESRI','2249','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41 +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lon_0=-71.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=200000.0001016002 +y_0=750000 no_defs',NULL,'NAD83 / Massachusetts Mainland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2250,'EPSG','2250','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=41 +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lon_0=-70.5 +no_defs +proj=lcc +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83 / Massachusetts Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2250,'ESRI','2250','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41 +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lon_0=-70.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0001016001 +y_0=0 no_defs',NULL,'NAD83 / Massachusetts Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2251,'EPSG','2251','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=44.78333333333333 +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lon_0=-87 +no_defs +proj=lcc +units=ft +x_0=7999999.999968001 +y_0=0',NULL,'NAD83 / Michigan North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2251,'ESRI','2251','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=44.78333333333333 +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lon_0=-87 +no_defs +proj=lcc +to_meter=0.3048 +x_0=7999999.999968001 +y_0=0 no_defs',NULL,'NAD83 / Michigan North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2252,'EPSG','2252','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=43.31666666666667 +lat_1=45.7 +lat_2=44.18333333333333 +lon_0=-84.36666666666666 +no_defs +proj=lcc +units=ft +x_0=5999999.999976001 +y_0=0',NULL,'NAD83 / Michigan Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2252,'ESRI','2252','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43.31666666666667 +lat_1=45.7 +lat_2=44.18333333333333 +lon_0=-84.36666666666666 +no_defs +proj=lcc +to_meter=0.3048 +x_0=5999999.999976001 +y_0=0 no_defs',NULL,'NAD83 / Michigan Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2253,'EPSG','2253','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=41.5 +lat_1=43.66666666666666 +lat_2=42.1 +lon_0=-84.36666666666666 +no_defs +proj=lcc +units=ft +x_0=3999999.999984 +y_0=0',NULL,'NAD83 / Michigan South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2253,'ESRI','2253','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41.5 +lat_1=43.66666666666666 +lat_2=42.1 +lon_0=-84.36666666666666 +no_defs +proj=lcc +to_meter=0.3048 +x_0=3999999.999984 +y_0=0 no_defs',NULL,'NAD83 / Michigan South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2254,'EPSG','2254','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99995 +lat_0=29.5 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83 / Mississippi East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2254,'ESRI','2254','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999950 +lat_0=29.5 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=300000.0000000001 +y_0=0 no_defs',NULL,'NAD83 / Mississippi East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2255,'EPSG','2255','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99995 +lat_0=29.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=699999.9998983998 +y_0=0',NULL,'NAD83 / Mississippi West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2255,'ESRI','2255','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999950 +lat_0=29.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=699999.9998983998 +y_0=0 no_defs',NULL,'NAD83 / Mississippi West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2256,'EPSG','2256','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=44.25 +lat_1=49 +lat_2=45 +lon_0=-109.5 +no_defs +proj=lcc +units=ft +x_0=599999.9999976 +y_0=0',NULL,'NAD83 / Montana (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2256,'ESRI','2256','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=44.25 +lat_1=49 +lat_2=45 +lon_0=-109.5 +no_defs +proj=lcc +to_meter=0.3048 +x_0=599999.9999976 +y_0=0 no_defs',NULL,'NAD83 / Montana (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2257,'EPSG','2257','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999909091 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=165000 +y_0=0',NULL,'NAD83 / New Mexico East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2257,'ESRI','2257','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999909 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=165000 +y_0=0 no_defs',NULL,'NAD83 / New Mexico East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2258,'EPSG','2258','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83 / New Mexico Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2258,'ESRI','2258','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0001016001 +y_0=0 no_defs',NULL,'NAD83 / New Mexico Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2259,'EPSG','2259','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999916667 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=830000.0001016001 +y_0=0',NULL,'NAD83 / New Mexico West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2259,'ESRI','2259','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999917 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=830000.0001016001 +y_0=0 no_defs',NULL,'NAD83 / New Mexico West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2260,'EPSG','2260','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +units=us-ft +x_0=150000 +y_0=0',NULL,'NAD83 / New York East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2260,'ESRI','2260','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=150000 +y_0=0 no_defs',NULL,'NAD83 / New York East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2261,'EPSG','2261','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999375 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=249999.9998983998 +y_0=0',NULL,'NAD83 / New York Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2261,'ESRI','2261','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=249999.9998983998 +y_0=0 no_defs',NULL,'NAD83 / New York Central (ftUS)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_7() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2262,'EPSG','2262','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999375 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=350000.0001016001 +y_0=0',NULL,'NAD83 / New York West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2262,'ESRI','2262','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=350000.0001016001 +y_0=0 no_defs',NULL,'NAD83 / New York West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2263,'EPSG','2263','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=40.16666666666666 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83 / New York Long Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2263,'ESRI','2263','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=300000.0000000001 +y_0=0 no_defs',NULL,'NAD83 / New York Long Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2264,'EPSG','2264','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=33.75 +lat_1=36.16666666666666 +lat_2=34.33333333333334 +lon_0=-79 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD83 / North Carolina (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2264,'ESRI','2264','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=33.75 +lat_1=36.16666666666666 +lat_2=34.33333333333334 +lon_0=-79 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD83 / North Carolina (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2265,'EPSG','2265','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.43333333333333 +lon_0=-100.5 +no_defs +proj=lcc +units=ft +x_0=599999.9999976 +y_0=0',NULL,'NAD83 / North Dakota North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2265,'ESRI','2265','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.43333333333333 +lon_0=-100.5 +no_defs +proj=lcc +to_meter=0.3048 +x_0=599999.9999976 +y_0=0 no_defs',NULL,'NAD83 / North Dakota North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2266,'EPSG','2266','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=45.66666666666666 +lat_1=47.48333333333333 +lat_2=46.18333333333333 +lon_0=-100.5 +no_defs +proj=lcc +units=ft +x_0=599999.9999976 +y_0=0',NULL,'NAD83 / North Dakota South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2266,'ESRI','2266','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=45.66666666666666 +lat_1=47.48333333333333 +lat_2=46.18333333333333 +lon_0=-100.5 +no_defs +proj=lcc +to_meter=0.3048 +x_0=599999.9999976 +y_0=0 no_defs',NULL,'NAD83 / North Dakota South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2267,'EPSG','2267','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=35 +lat_1=36.76666666666667 +lat_2=35.56666666666667 +lon_0=-98 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / Oklahoma North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2267,'ESRI','2267','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=35 +lat_1=36.76666666666667 +lat_2=35.56666666666667 +lon_0=-98 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Oklahoma North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2268,'EPSG','2268','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=33.33333333333334 +lat_1=35.23333333333333 +lat_2=33.93333333333333 +lon_0=-98 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / Oklahoma South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2268,'ESRI','2268','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=33.33333333333334 +lat_1=35.23333333333333 +lat_2=33.93333333333333 +lon_0=-98 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Oklahoma South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2269,'EPSG','2269','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=ft +x_0=2500000.0001424 +y_0=0',NULL,'NAD83 / Oregon North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2269,'ESRI','2269','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +to_meter=0.3048 +x_0=2500000.0001424 +y_0=0 no_defs',NULL,'NAD83 / Oregon North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2270,'EPSG','2270','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=ft +x_0=1500000.0001464 +y_0=0',NULL,'NAD83 / Oregon South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2270,'ESRI','2270','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +to_meter=0.3048 +x_0=1500000.0001464 +y_0=0 no_defs',NULL,'NAD83 / Oregon South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2271,'EPSG','2271','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=40.16666666666666 +lat_1=41.95 +lat_2=40.88333333333333 +lon_0=-77.75 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / Pennsylvania North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2271,'ESRI','2271','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.95 +lat_2=40.88333333333333 +lon_0=-77.75 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Pennsylvania North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2272,'EPSG','2272','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=39.33333333333334 +lat_1=40.96666666666667 +lat_2=39.93333333333333 +lon_0=-77.75 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / Pennsylvania South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2272,'ESRI','2272','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.96666666666667 +lat_2=39.93333333333333 +lon_0=-77.75 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Pennsylvania South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2273,'EPSG','2273','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=31.83333333333333 +lat_1=34.83333333333334 +lat_2=32.5 +lon_0=-81 +no_defs +proj=lcc +units=ft +x_0=609600 +y_0=0',NULL,'NAD83 / South Carolina (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2273,'ESRI','2273','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=31.83333333333333 +lat_1=34.83333333333334 +lat_2=32.5 +lon_0=-81 +no_defs +proj=lcc +to_meter=0.3048 +x_0=609600 +y_0=0 no_defs',NULL,'NAD83 / South Carolina (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2274,'EPSG','2274','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=34.33333333333334 +lat_1=36.41666666666666 +lat_2=35.25 +lon_0=-86 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / Tennessee (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2274,'ESRI','2274','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.41666666666666 +lat_2=35.25 +lon_0=-86 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Tennessee (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2275,'EPSG','2275','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=34 +lat_1=36.18333333333333 +lat_2=34.65 +lon_0=-101.5 +no_defs +proj=lcc +units=us-ft +x_0=200000.0001016002 +y_0=999999.9998983998',NULL,'NAD83 / Texas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2275,'ESRI','2275','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=34 +lat_1=36.18333333333333 +lat_2=34.65 +lon_0=-101.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=200000.0001016002 +y_0=999999.9998983998 no_defs',NULL,'NAD83 / Texas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2276,'EPSG','2276','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=31.66666666666667 +lat_1=33.96666666666667 +lat_2=32.13333333333333 +lon_0=-98.5 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=2000000.0001016',NULL,'NAD83 / Texas North Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2276,'ESRI','2276','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=31.66666666666667 +lat_1=33.96666666666667 +lat_2=32.13333333333333 +lon_0=-98.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=600000 +y_0=2000000.0001016 no_defs',NULL,'NAD83 / Texas North Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2277,'EPSG','2277','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=29.66666666666667 +lat_1=31.88333333333333 +lat_2=30.11666666666667 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=us-ft +x_0=699999.9998983998 +y_0=3000000',NULL,'NAD83 / Texas Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2277,'ESRI','2277','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=29.66666666666667 +lat_1=31.88333333333333 +lat_2=30.11666666666667 +lon_0=-100.3333333333333 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=699999.9998983998 +y_0=3000000 no_defs',NULL,'NAD83 / Texas Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2278,'EPSG','2278','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=27.83333333333333 +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lon_0=-99 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=3999999.9998984',NULL,'NAD83 / Texas South Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2278,'ESRI','2278','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=27.83333333333333 +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lon_0=-99 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=600000 +y_0=3999999.9998984 no_defs',NULL,'NAD83 / Texas South Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2279,'EPSG','2279','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-98.5 +no_defs +proj=lcc +units=us-ft +x_0=300000.0000000001 +y_0=5000000.0001016',NULL,'NAD83 / Texas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2279,'ESRI','2279','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-98.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=300000.0000000001 +y_0=5000000.0001016 no_defs',NULL,'NAD83 / Texas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2280,'EPSG','2280','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=ft +x_0=500000.0001504 +y_0=999999.9999960001',NULL,'NAD83 / Utah North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2280,'ESRI','2280','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +to_meter=0.3048 +x_0=500000.0001504 +y_0=999999.9999960001 no_defs',NULL,'NAD83 / Utah North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2281,'EPSG','2281','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=ft +x_0=500000.0001504 +y_0=1999999.999992',NULL,'NAD83 / Utah Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2281,'ESRI','2281','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +to_meter=0.3048 +x_0=500000.0001504 +y_0=1999999.999992 no_defs',NULL,'NAD83 / Utah Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2282,'EPSG','2282','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=ft +x_0=500000.0001504 +y_0=2999999.999988',NULL,'NAD83 / Utah South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2282,'ESRI','2282','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +to_meter=0.3048 +x_0=500000.0001504 +y_0=2999999.999988 no_defs',NULL,'NAD83 / Utah South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2283,'EPSG','2283','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37.66666666666666 +lat_1=39.2 +lat_2=38.03333333333333 +lon_0=-78.5 +no_defs +proj=lcc +units=us-ft +x_0=3500000.0001016 +y_0=2000000.0001016',NULL,'NAD83 / Virginia North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2283,'ESRI','2283','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.2 +lat_2=38.03333333333333 +lon_0=-78.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=3500000.0001016 +y_0=2000000.0001016 no_defs',NULL,'NAD83 / Virginia North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2284,'EPSG','2284','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.33333333333334 +lat_1=37.96666666666667 +lat_2=36.76666666666667 +lon_0=-78.5 +no_defs +proj=lcc +units=us-ft +x_0=3500000.0001016 +y_0=999999.9998983998',NULL,'NAD83 / Virginia South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2284,'ESRI','2284','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.96666666666667 +lat_2=36.76666666666667 +lon_0=-78.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=3500000.0001016 +y_0=999999.9998983998 no_defs',NULL,'NAD83 / Virginia South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2285,'EPSG','2285','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.5 +lon_0=-120.8333333333333 +no_defs +proj=lcc +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83 / Washington North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2285,'ESRI','2285','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.5 +lon_0=-120.8333333333333 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0001016001 +y_0=0 no_defs',NULL,'NAD83 / Washington North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2286,'EPSG','2286','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=45.33333333333334 +lat_1=47.33333333333334 +lat_2=45.83333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83 / Washington South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2286,'ESRI','2286','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=45.33333333333334 +lat_1=47.33333333333334 +lat_2=45.83333333333334 +lon_0=-120.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0001016001 +y_0=0 no_defs',NULL,'NAD83 / Washington South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2287,'EPSG','2287','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=45.16666666666666 +lat_1=46.76666666666667 +lat_2=45.56666666666667 +lon_0=-90 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / Wisconsin North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2287,'ESRI','2287','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=45.16666666666666 +lat_1=46.76666666666667 +lat_2=45.56666666666667 +lon_0=-90 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Wisconsin North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2288,'EPSG','2288','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / Wisconsin Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2288,'ESRI','2288','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Wisconsin Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2289,'EPSG','2289','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=42 +lat_1=44.06666666666667 +lat_2=42.73333333333333 +lon_0=-90 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / Wisconsin South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2289,'ESRI','2289','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=42 +lat_1=44.06666666666667 +lat_2=42.73333333333333 +lon_0=-90 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Wisconsin South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2290,'EPSG','2290','proj4_data/epsg',NULL,'+a=6378135 +b=6356750.304921594 +k=0.999912 +lat_0=47.25 +lon_0=-63 +no_defs +proj=sterea +units=m +x_0=700000 +y_0=400000',NULL,'ATS77 / Prince Edward Isl. Stereographic (ATS77)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2290,'ESRI','2290','proj4_data/esri',NULL,'+a=6378135 +b=6356750.304921594 +k=0.999912 +lat_0=47.25 +lon_0=-63 +no_defs +proj=stere +units=m +x_0=700000 +y_0=400000 no_defs',NULL,'ATS77 / Prince Edward Isl. Stereographic (ATS77)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2291,'EPSG','2291','proj4_data/epsg',NULL,'+a=6378135 +b=6356750.304921594 +k=0.999912 +lat_0=47.25 +lon_0=-63 +no_defs +proj=sterea +units=m +x_0=400000 +y_0=800000',NULL,'NAD83(CSRS98) / Prince Edward Isl. Stereographic (NAD83) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2291,'ESRI','2291','proj4_data/esri',NULL,'+a=6378135 +b=6356750.304921594 +k=0.999912 +lat_0=47.25 +lon_0=-63 +no_defs +proj=stere +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NAD83(CSRS98) / Prince Edward Isl. Stereographic (NAD83)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2292,'EPSG','2292','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999912 +lat_0=47.25 +lon_0=-63 +no_defs +proj=sterea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NAD83(CSRS98) / Prince Edward Isl. Stereographic (NAD83) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2292,'ESRI','2292','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999912 +lat_0=47.25 +lon_0=-63 +no_defs +proj=stere +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NAD83(CSRS98) / Prince Edward Isl. Stereographic (NAD83)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2294,'EPSG','2294','proj4_data/epsg',NULL,'+a=6378135 +b=6356750.304921594 +k=0.9999 +lat_0=0 +lon_0=-61.5 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0',NULL,'ATS77 / MTM Nova Scotia zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2294,'ESRI','2294','proj4_data/esri',NULL,'+a=6378135 +b=6356750.304921594 +k=0.999900 +lat_0=0 +lon_0=-61.5 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0 no_defs',NULL,'ATS77 / MTM Nova Scotia zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2295,'EPSG','2295','proj4_data/epsg',NULL,'+a=6378135 +b=6356750.304921594 +k=0.9999 +lat_0=0 +lon_0=-64.5 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0',NULL,'ATS77 / MTM Nova Scotia zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2295,'ESRI','2295','proj4_data/esri',NULL,'+a=6378135 +b=6356750.304921594 +k=0.999900 +lat_0=0 +lon_0=-64.5 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0 no_defs',NULL,'ATS77 / MTM Nova Scotia zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2301,'NAD27','2301','proj4_data/nad27',NULL,'+datum=NAD27 +k=.99996 +lat_0=29d40 +lon_0=-88d50 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'2301: mississippi east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2301,'NAD83','2301','proj4_data/nad83',NULL,'+datum=NAD83 +k=.99995 +lat_0=29d30 +lon_0=-88d50 +proj=tmerc +x_0=300000 +y_0=0 no_defs',NULL,'2301: mississippi east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2302,'NAD27','2302','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999411764705882 +lat_0=30d30 +lon_0=-90d20 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'2302: mississippi west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2302,'NAD83','2302','proj4_data/nad83',NULL,'+datum=NAD83 +k=.99995 +lat_0=29d30 +lon_0=-90d20 +proj=tmerc +x_0=700000 +y_0=0 no_defs',NULL,'2302: mississippi west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2308,'EPSG','2308','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9996 +lat_0=0 +lon_0=109 +no_defs +proj=tmerc +towgs84=-377,681,-50,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'Ammassalik 1958 / Greenland zone 7 east\12Unable to translate coordinate system EPSG:2296 into PROJ.4 format.\12\12Qornoq 1927 / Greenland zone 1 east (deprecated)\12Unable to translate coordinate system EPSG:2297 into PROJ.4 format.\12\12Qornoq 1927 / Greenland zone 2 east (deprecated)\12Unable to translate coordinate system EPSG:2298 into PROJ.4 format.\12\12Qornoq 1927 / Greenland zone 2 west\12Unable to translate coordinate system EPSG:2299 into PROJ.4 format.\12\12Qornoq 1927 / Greenland zone 3 east (deprecated)\12Unable to translate coordinate system EPSG:2300 into PROJ.4 format.\12\12Qornoq 1927 / Greenland zone 3 west\12Unable to translate coordinate system EPSG:2301 into PROJ.4 format.\12\12Qornoq 1927 / Greenland zone 4 east (deprecated)\12Unable to translate coordinate system EPSG:2302 into PROJ.4 format.\12\12Qornoq 1927 / Greenland zone 4 west\12Unable to translate coordinate system EPSG:2303 into PROJ.4 format.\12\12Qornoq 1927 / Greenland zone 5 west\12Unable to translate coordinate system EPSG:2304 into PROJ.4 format.\12\12Qornoq 1927 / Greenland zone 6 west\12Unable to translate coordinate system EPSG:2305 into PROJ.4 format.\12\12Qornoq 1927 / Greenland zone 7 west\12Unable to translate coordinate system EPSG:2306 into PROJ.4 format.\12\12Qornoq 1927 / Greenland zone 8 east\12Unable to translate coordinate system EPSG:2307 into PROJ.4 format.\12\12Batavia / TM 109 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2308,'ESRI','2308','proj4_data/esri',NULL,'+ellps=bessel +k=0.999600 +lat_0=0 +lon_0=109 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000 no_defs',NULL,'Batavia / TM 109 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2309,'EPSG','2309','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.9996 +lat_0=0 +lon_0=116 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'WGS 84 / TM 116 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2309,'ESRI','2309','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +k=0.999600 +lat_0=0 +lon_0=116 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000 no_defs',NULL,'WGS 84 / TM 116 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2310,'EPSG','2310','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.9996 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'WGS 84 / TM 132 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2310,'ESRI','2310','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +k=0.999600 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000 no_defs',NULL,'WGS 84 / TM 132 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2311,'EPSG','2311','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.9996 +lat_0=0 +lon_0=6 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'WGS 84 / TM 6 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2311,'ESRI','2311','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +k=0.999600 +lat_0=0 +lon_0=6 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'WGS 84 / TM 6 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2312,'EPSG','2312','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=33',NULL,'Garoua / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2312,'ESRI','2312','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=33 no_defs',NULL,'Garoua / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2313,'EPSG','2313','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=33',NULL,'Kousseri / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2313,'ESRI','2313','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=33 no_defs',NULL,'Kousseri / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2314,'EPSG','2314','proj4_data/epsg',NULL,'+a=6378293.645208759 +b=6356617.987679838 +lat_0=10.44166666666667 +lon_0=-61.33333333333334 +no_defs +proj=cass +to_meter=0.3047972654 +towgs84=-61.702,284.488,472.052,0,0,0,0 +x_0=86501.46392052001 +y_0=65379.0134283',NULL,'Trinidad 1903 / Trinidad Grid (ftCla)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2314,'ESRI','2314','proj4_data/esri',NULL,'+a=6378293.63683822 +b=6356617.979337744 +lat_0=10.44166666666667 +lon_0=-61.33333333333334 +no_defs +proj=cass +to_meter=0.304797265 +towgs84=-61.702,284.488,472.052,0,0,0,0 +x_0=86501.46380699999 +y_0=65379.01334249999 no_defs',NULL,'Trinidad 1903 / Trinidad Grid (ftCla)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2315,'EPSG','2315','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-148,136,90,0,0,0,0 +units=m +zone=19',NULL,'Campo Inchauspe / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2315,'ESRI','2315','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=19 no_defs',NULL,'Campo Inchauspe / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2316,'EPSG','2316','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-148,136,90,0,0,0,0 +units=m +zone=20',NULL,'Campo Inchauspe / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2316,'ESRI','2316','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=20 no_defs',NULL,'Campo Inchauspe / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2317,'EPSG','2317','proj4_data/epsg',NULL,'+ellps=intl +lat_0=6 +lat_1=9 +lat_2=3 +lon_0=-66 +no_defs +proj=lcc +towgs84=-288,175,-376,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'PSAD56 / ICN Regional',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2317,'ESRI','2317','proj4_data/esri',NULL,'+ellps=intl +lat_0=6 +lat_1=9 +lat_2=3 +lon_0=-66 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=1000000 no_defs',NULL,'PSAD56 / ICN Regional',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2318,'EPSG','2318','proj4_data/epsg',NULL,'+ellps=intl +lat_0=25.08951 +lat_1=17 +lat_2=33 +lon_0=48 +no_defs +proj=lcc +towgs84=-143,-236,7,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Ain el Abd / Aramco Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2318,'ESRI','2318','proj4_data/esri',NULL,'+ellps=intl +lat_0=25.08951 +lat_1=17 +lat_2=33 +lon_0=48 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Ain el Abd / Aramco Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2319,'EPSG','2319','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ED50 / TM27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2319,'ESRI','2319','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ED50 / TM27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2320,'EPSG','2320','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ED50 / TM30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2320,'ESRI','2320','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ED50 / TM30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2321,'EPSG','2321','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ED50 / TM33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2321,'ESRI','2321','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ED50 / TM33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2322,'EPSG','2322','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ED50 / TM36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2322,'ESRI','2322','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ED50 / TM36',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_8() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2323,'EPSG','2323','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ED50 / TM39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2323,'ESRI','2323','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ED50 / TM39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2324,'EPSG','2324','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ED50 / TM42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2324,'ESRI','2324','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ED50 / TM42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2325,'EPSG','2325','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ED50 / TM45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2325,'ESRI','2325','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ED50 / TM45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2326,'EPSG','2326','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=22.31213333333334 +lon_0=114.1785555555556 +no_defs +proj=tmerc +towgs84=-162.619,-276.959,-161.764,0.067753,-2.243649,-1.158827,-1.094246 +units=m +x_0=836694.05 +y_0=819069.8',NULL,'Hong Kong 1980 Grid System',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2326,'ESRI','2326','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=22.31213333333334 +lon_0=114.1785555555556 +no_defs +proj=tmerc +towgs84=-162.619,-276.959,-161.764,0.067753,-2.24365,-1.15883,-1.09425 +units=m +x_0=836694.05 +y_0=819069.8 no_defs',NULL,'Hong Kong 1980 Grid System',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2327,'EPSG','2327','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=13500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2327,'ESRI','2327','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=13500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2328,'EPSG','2328','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=14500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2328,'ESRI','2328','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=14500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2329,'EPSG','2329','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=15500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2329,'ESRI','2329','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=15500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2330,'EPSG','2330','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=16500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2330,'ESRI','2330','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=16500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2331,'EPSG','2331','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=17500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2331,'ESRI','2331','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=17500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2332,'EPSG','2332','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=18500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2332,'ESRI','2332','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=18500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2333,'EPSG','2333','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=19500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2333,'ESRI','2333','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=19500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2334,'EPSG','2334','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=20500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2334,'ESRI','2334','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=20500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2335,'EPSG','2335','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=21500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2335,'ESRI','2335','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=21500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2336,'EPSG','2336','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=22500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2336,'ESRI','2336','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=22500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2337,'EPSG','2337','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=23500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2337,'ESRI','2337','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=23500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2338,'EPSG','2338','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2338,'ESRI','2338','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2339,'EPSG','2339','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2339,'ESRI','2339','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2340,'EPSG','2340','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2340,'ESRI','2340','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2341,'EPSG','2341','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2341,'ESRI','2341','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2342,'EPSG','2342','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2342,'ESRI','2342','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2343,'EPSG','2343','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2343,'ESRI','2343','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2344,'EPSG','2344','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2344,'ESRI','2344','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2345,'EPSG','2345','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2345,'ESRI','2345','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2346,'EPSG','2346','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2346,'ESRI','2346','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2347,'EPSG','2347','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2347,'ESRI','2347','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2348,'EPSG','2348','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2348,'ESRI','2348','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2349,'EPSG','2349','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=25500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2349,'ESRI','2349','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=25500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2350,'EPSG','2350','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=26500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2350,'ESRI','2350','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=26500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2351,'EPSG','2351','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=27500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2351,'ESRI','2351','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=27500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2352,'EPSG','2352','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=28500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2352,'ESRI','2352','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=28500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2353,'EPSG','2353','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=29500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2353,'ESRI','2353','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=29500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2354,'EPSG','2354','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=30500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2354,'ESRI','2354','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=30500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2355,'EPSG','2355','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=31500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2355,'ESRI','2355','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=31500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2356,'EPSG','2356','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=32500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2356,'ESRI','2356','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=32500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2357,'EPSG','2357','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=33500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2357,'ESRI','2357','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=33500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2358,'EPSG','2358','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=34500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2358,'ESRI','2358','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=34500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2359,'EPSG','2359','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=35500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 35',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2359,'ESRI','2359','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=35500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 35',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2360,'EPSG','2360','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=36500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2360,'ESRI','2360','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=36500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2361,'EPSG','2361','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=37500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 37',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2361,'ESRI','2361','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=37500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 37',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2362,'EPSG','2362','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=38500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2362,'ESRI','2362','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=38500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2363,'EPSG','2363','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=39500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2363,'ESRI','2363','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=39500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2364,'EPSG','2364','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=40500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2364,'ESRI','2364','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=40500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2365,'EPSG','2365','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=41500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 41',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2365,'ESRI','2365','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=41500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 41',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2366,'EPSG','2366','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=42500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2366,'ESRI','2366','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=42500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2367,'EPSG','2367','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=43500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 43',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2367,'ESRI','2367','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=43500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 43',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2368,'EPSG','2368','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=44500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2368,'ESRI','2368','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=44500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2369,'EPSG','2369','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=45500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2369,'ESRI','2369','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=45500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger zone 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2370,'EPSG','2370','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2370,'ESRI','2370','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2371,'EPSG','2371','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 78E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2371,'ESRI','2371','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 78E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2372,'EPSG','2372','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2372,'ESRI','2372','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 81E',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_9() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2373,'EPSG','2373','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 84E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2373,'ESRI','2373','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 84E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2374,'EPSG','2374','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2374,'ESRI','2374','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2375,'EPSG','2375','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 90E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2375,'ESRI','2375','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 90E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2376,'EPSG','2376','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2376,'ESRI','2376','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2377,'EPSG','2377','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 96E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2377,'ESRI','2377','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 96E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2378,'EPSG','2378','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2378,'ESRI','2378','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2379,'EPSG','2379','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 102E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2379,'ESRI','2379','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 102E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2380,'EPSG','2380','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2380,'ESRI','2380','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2381,'EPSG','2381','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 108E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2381,'ESRI','2381','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 108E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2382,'EPSG','2382','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2382,'ESRI','2382','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2383,'EPSG','2383','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 114E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2383,'ESRI','2383','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 114E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2384,'EPSG','2384','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2384,'ESRI','2384','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2385,'EPSG','2385','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 120E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2385,'ESRI','2385','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 120E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2386,'EPSG','2386','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2386,'ESRI','2386','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2387,'EPSG','2387','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 126E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2387,'ESRI','2387','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 126E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2388,'EPSG','2388','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2388,'ESRI','2388','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2389,'EPSG','2389','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 132E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2389,'ESRI','2389','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 132E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2390,'EPSG','2390','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2390,'ESRI','2390','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Xian 1980 / 3-degree Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2391,'EPSG','2391','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=-96.062,-82.428,-121.753,4.801,0.345,-1.376,1.496 +units=m +x_0=1500000 +y_0=0',NULL,'KKJ / Finland zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2391,'ESRI','2391','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=-90.7,-106.1,-119.2,4.09,0.218,-1.05,1.37 +units=m +x_0=1500000 +y_0=0 no_defs',NULL,'KKJ / Finland zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2392,'EPSG','2392','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=-96.062,-82.428,-121.753,4.801,0.345,-1.376,1.496 +units=m +x_0=2500000 +y_0=0',NULL,'KKJ / Finland zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2392,'ESRI','2392','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=-90.7,-106.1,-119.2,4.09,0.218,-1.05,1.37 +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'KKJ / Finland zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2393,'EPSG','2393','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=-96.062,-82.428,-121.753,4.801,0.345,-1.376,1.496 +units=m +x_0=3500000 +y_0=0',NULL,'KKJ / Finland Uniform Coordinate System',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2393,'ESRI','2393','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=-90.7,-106.1,-119.2,4.09,0.218,-1.05,1.37 +units=m +x_0=3500000 +y_0=0 no_defs',NULL,'KKJ / Finland Uniform Coordinate System',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2394,'EPSG','2394','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=-96.062,-82.428,-121.753,4.801,0.345,-1.376,1.496 +units=m +x_0=4500000 +y_0=0',NULL,'KKJ / Finland zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2394,'ESRI','2394','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=-90.7,-106.1,-119.2,4.09,0.218,-1.05,1.37 +units=m +x_0=4500000 +y_0=0 no_defs',NULL,'KKJ / Finland zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2395,'EPSG','2395','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=-76,-138,67,0,0,0,0 +units=m +x_0=8500000 +y_0=0',NULL,'South Yemen / Gauss-Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2395,'ESRI','2395','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=-76,-138,67,0,0,0,0 +units=m +x_0=8500000 +y_0=0 no_defs',NULL,'South Yemen / Gauss-Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2396,'EPSG','2396','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=-76,-138,67,0,0,0,0 +units=m +x_0=9500000 +y_0=0',NULL,'South Yemen / Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2396,'ESRI','2396','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=-76,-138,67,0,0,0,0 +units=m +x_0=9500000 +y_0=0 no_defs',NULL,'South Yemen / Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2397,'EPSG','2397','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=3500000 +y_0=0',NULL,'Pulkovo 1942(83) / 3-degree Gauss-Kruger zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2397,'ESRI','2397','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=24,-123,-94,0.02,-0.25,-0.13,1.1 +units=m +x_0=3500000 +y_0=0 no_defs',NULL,'Pulkovo 1942(83) / Gauss-Kruger zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2398,'EPSG','2398','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=4500000 +y_0=0',NULL,'Pulkovo 1942(83) / 3-degree Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2398,'ESRI','2398','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=24,-123,-94,0.02,-0.25,-0.13,1.1 +units=m +x_0=4500000 +y_0=0 no_defs',NULL,'Pulkovo 1942(83) / Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2399,'EPSG','2399','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=5500000 +y_0=0',NULL,'Pulkovo 1942(83) / 3-degree Gauss-Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2399,'ESRI','2399','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=24,-123,-94,0.02,-0.25,-0.13,1.1 +units=m +x_0=5500000 +y_0=0 no_defs',NULL,'Pulkovo 1942(83) / Gauss-Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2400,'EPSG','2400','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=15.80827777777778 +no_defs +proj=tmerc +towgs84=414.1,41.3,603.1,-0.855,2.141,-7.023,0 +units=m +x_0=1500000 +y_0=0',NULL,'RT90 2.5 gon W (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2400,'ESRI','2400','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=15.80827777777778 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0 no_defs',NULL,'RT90 2.5 gon W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2401,'EPSG','2401','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=25500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2401,'ESRI','2401','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=25500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2401,'NAD27','2401','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999333333333333 +lat_0=35d50 +lon_0=-90d30 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'2401: missouri east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2401,'NAD83','2401','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999333333333333 +lat_0=35d50 +lon_0=-90d30 +proj=tmerc +x_0=250000 +y_0=0 no_defs',NULL,'2401: missouri east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2402,'EPSG','2402','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=26500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2402,'ESRI','2402','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=26500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2402,'NAD27','2402','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999333333333333 +lat_0=35d50 +lon_0=-92d30 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'2402: missouri central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2402,'NAD83','2402','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999333333333333 +lat_0=35d50 +lon_0=-92d30 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'2402: missouri central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2403,'EPSG','2403','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=27500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2403,'ESRI','2403','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=27500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2403,'NAD27','2403','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999411764705882 +lat_0=36d10 +lon_0=-94d30 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'2403: missouri west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2403,'NAD83','2403','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999411764705882 +lat_0=36d10 +lon_0=-94d30 +proj=tmerc +x_0=850000 +y_0=0 no_defs',NULL,'2403: missouri west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2404,'EPSG','2404','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=28500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2404,'ESRI','2404','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=28500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2405,'EPSG','2405','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=29500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2405,'ESRI','2405','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=29500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2406,'EPSG','2406','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=30500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2406,'ESRI','2406','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=30500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2407,'EPSG','2407','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=31500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2407,'ESRI','2407','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=31500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2408,'EPSG','2408','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=32500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2408,'ESRI','2408','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=32500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2409,'EPSG','2409','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=33500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2409,'ESRI','2409','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=33500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2410,'EPSG','2410','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=34500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2410,'ESRI','2410','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=34500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2411,'EPSG','2411','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=35500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 35',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2411,'ESRI','2411','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=35500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 35',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2412,'EPSG','2412','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=36500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2412,'ESRI','2412','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=36500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2413,'EPSG','2413','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=37500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 37',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2413,'ESRI','2413','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=37500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 37',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2414,'EPSG','2414','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=38500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2414,'ESRI','2414','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=38500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2415,'EPSG','2415','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=39500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2415,'ESRI','2415','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=39500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2416,'EPSG','2416','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=40500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2416,'ESRI','2416','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=40500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2417,'EPSG','2417','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=41500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 41',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2417,'ESRI','2417','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=41500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 41',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2418,'EPSG','2418','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=42500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2418,'ESRI','2418','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=42500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2419,'EPSG','2419','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=43500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 43',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2419,'ESRI','2419','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=43500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 43',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_10() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2420,'EPSG','2420','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=44500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2420,'ESRI','2420','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=44500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2421,'EPSG','2421','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=45500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2421,'ESRI','2421','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=45500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger zone 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2422,'EPSG','2422','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2422,'ESRI','2422','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2423,'EPSG','2423','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 78E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2423,'ESRI','2423','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 78E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2424,'EPSG','2424','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2424,'ESRI','2424','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2425,'EPSG','2425','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 84E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2425,'ESRI','2425','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 84E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2426,'EPSG','2426','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2426,'ESRI','2426','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2427,'EPSG','2427','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 90E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2427,'ESRI','2427','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 90E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2428,'EPSG','2428','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2428,'ESRI','2428','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2429,'EPSG','2429','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 96E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2429,'ESRI','2429','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 96E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2430,'EPSG','2430','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2430,'ESRI','2430','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2431,'EPSG','2431','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 102E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2431,'ESRI','2431','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 102E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2432,'EPSG','2432','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2432,'ESRI','2432','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2433,'EPSG','2433','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 108E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2433,'ESRI','2433','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 108E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2434,'EPSG','2434','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2434,'ESRI','2434','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2435,'EPSG','2435','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 114E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2435,'ESRI','2435','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 114E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2436,'EPSG','2436','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2436,'ESRI','2436','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2437,'EPSG','2437','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 120E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2437,'ESRI','2437','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 120E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2438,'EPSG','2438','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2438,'ESRI','2438','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2439,'EPSG','2439','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 126E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2439,'ESRI','2439','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 126E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2440,'EPSG','2440','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2440,'ESRI','2440','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2441,'EPSG','2441','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 132E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2441,'ESRI','2441','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 132E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2442,'EPSG','2442','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2442,'ESRI','2442','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / 3-degree Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2443,'EPSG','2443','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=33 +lon_0=129.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2443,'ESRI','2443','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=33 +lon_0=129.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2444,'EPSG','2444','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=33 +lon_0=131 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2444,'ESRI','2444','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=33 +lon_0=131 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2445,'EPSG','2445','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=36 +lon_0=132.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2445,'ESRI','2445','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=36 +lon_0=132.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2446,'EPSG','2446','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=33 +lon_0=133.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2446,'ESRI','2446','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=33 +lon_0=133.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2447,'EPSG','2447','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=36 +lon_0=134.3333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2447,'ESRI','2447','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=36 +lon_0=134.3333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2448,'EPSG','2448','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=36 +lon_0=136 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS VI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2448,'ESRI','2448','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=36 +lon_0=136 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS VI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2449,'EPSG','2449','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=36 +lon_0=137.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS VII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2449,'ESRI','2449','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=36 +lon_0=137.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS VII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2450,'EPSG','2450','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=36 +lon_0=138.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS VIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2450,'ESRI','2450','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=36 +lon_0=138.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS VIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2451,'EPSG','2451','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=36 +lon_0=139.8333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS IX',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2451,'ESRI','2451','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=36 +lon_0=139.8333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS IX',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2452,'EPSG','2452','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=40 +lon_0=140.8333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS X',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2452,'ESRI','2452','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=40 +lon_0=140.8333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS X',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2453,'EPSG','2453','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=44 +lon_0=140.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS XI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2453,'ESRI','2453','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=44 +lon_0=140.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS XI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2454,'EPSG','2454','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=44 +lon_0=142.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS XII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2454,'ESRI','2454','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=44 +lon_0=142.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS XII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2455,'EPSG','2455','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=44 +lon_0=144.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS XIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2455,'ESRI','2455','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=44 +lon_0=144.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS XIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2456,'EPSG','2456','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=26 +lon_0=142 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS XIV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2456,'ESRI','2456','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=26 +lon_0=142 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS XIV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2457,'EPSG','2457','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=26 +lon_0=127.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS XV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2457,'ESRI','2457','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=26 +lon_0=127.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS XV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2458,'EPSG','2458','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=26 +lon_0=124 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS XVI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2458,'ESRI','2458','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=26 +lon_0=124 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS XVI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2459,'EPSG','2459','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=26 +lon_0=131 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS XVII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2459,'ESRI','2459','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=26 +lon_0=131 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS XVII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2460,'EPSG','2460','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=20 +lon_0=136 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS XVIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2460,'ESRI','2460','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=20 +lon_0=136 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS XVIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2461,'EPSG','2461','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=26 +lon_0=154 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'JGD2000 / Japan Plane Rectangular CS XIX',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2461,'ESRI','2461','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=26 +lon_0=154 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0 no_defs',NULL,'JGD2000 / Japan Plane Rectangular CS XIX',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2462,'EPSG','2462','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=-44.183,-0.58,-38.489,-2.3867,-2.7072,3.5196,-8.2703 +units=m +x_0=4500000 +y_0=0',NULL,'Albanian 1987 / Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2462,'ESRI','2462','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0 no_defs',NULL,'Albanian 1987 / Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2463,'EPSG','2463','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 21E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2463,'ESRI','2463','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 21E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2464,'EPSG','2464','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 27E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2464,'ESRI','2464','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 27E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2465,'EPSG','2465','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 33E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2465,'ESRI','2465','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 33E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2466,'EPSG','2466','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 39E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2466,'ESRI','2466','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 39E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2467,'EPSG','2467','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 45E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2467,'ESRI','2467','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 45E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2468,'EPSG','2468','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 51E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2468,'ESRI','2468','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 51E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2469,'EPSG','2469','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 57E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2469,'ESRI','2469','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 57E',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_11() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2470,'EPSG','2470','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 63E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2470,'ESRI','2470','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 63E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2471,'EPSG','2471','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 69E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2471,'ESRI','2471','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 69E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2472,'EPSG','2472','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2472,'ESRI','2472','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2473,'EPSG','2473','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2473,'ESRI','2473','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2474,'EPSG','2474','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2474,'ESRI','2474','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2475,'EPSG','2475','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2475,'ESRI','2475','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2476,'EPSG','2476','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2476,'ESRI','2476','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2477,'EPSG','2477','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2477,'ESRI','2477','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2478,'EPSG','2478','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2478,'ESRI','2478','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2479,'EPSG','2479','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2479,'ESRI','2479','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2480,'EPSG','2480','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2480,'ESRI','2480','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2481,'EPSG','2481','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2481,'ESRI','2481','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2482,'EPSG','2482','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2482,'ESRI','2482','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2483,'EPSG','2483','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 141E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2483,'ESRI','2483','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 141E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2484,'EPSG','2484','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 147E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2484,'ESRI','2484','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 147E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2485,'EPSG','2485','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 153E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2485,'ESRI','2485','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 153E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2486,'EPSG','2486','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 159E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2486,'ESRI','2486','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 159E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2487,'EPSG','2487','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 165E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2487,'ESRI','2487','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 165E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2488,'EPSG','2488','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 171E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2488,'ESRI','2488','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 171E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2489,'EPSG','2489','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 177E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2489,'ESRI','2489','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 177E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2490,'EPSG','2490','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 177W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2490,'ESRI','2490','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 177W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2491,'EPSG','2491','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger CM 171W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2491,'ESRI','2491','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger CM 171W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2492,'EPSG','2492','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 9E (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2492,'ESRI','2492','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 9E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2493,'EPSG','2493','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 15E (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2493,'ESRI','2493','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 15E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2494,'EPSG','2494','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 21E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2494,'ESRI','2494','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 21E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2495,'EPSG','2495','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 27E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2495,'ESRI','2495','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 27E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2496,'EPSG','2496','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 33E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2496,'ESRI','2496','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 33E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2497,'EPSG','2497','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 39E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2497,'ESRI','2497','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 39E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2498,'EPSG','2498','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 45E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2498,'ESRI','2498','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 45E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2499,'EPSG','2499','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 51E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2499,'ESRI','2499','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 51E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2500,'EPSG','2500','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 57E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2500,'ESRI','2500','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 57E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2500,'NAD83','2500','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=44d15 +lat_1=49 +lat_2=45 +lon_0=-109d30 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'2500: montana: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2501,'EPSG','2501','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 63E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2501,'ESRI','2501','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 63E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2501,'NAD27','2501','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=47 +lat_1=48d43 +lat_2=47d51 +lon_0=-109d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'2501: montana north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2502,'EPSG','2502','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 69E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2502,'ESRI','2502','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 69E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2502,'NAD27','2502','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=45d50 +lat_1=47d53 +lat_2=46d27 +lon_0=-109d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'2502: montana central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2503,'EPSG','2503','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2503,'ESRI','2503','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2503,'NAD27','2503','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=44 +lat_1=46d24 +lat_2=44d52 +lon_0=-109d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'2503: montana south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2504,'EPSG','2504','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2504,'ESRI','2504','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2505,'EPSG','2505','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2505,'ESRI','2505','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2506,'EPSG','2506','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2506,'ESRI','2506','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2507,'EPSG','2507','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2507,'ESRI','2507','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2508,'EPSG','2508','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2508,'ESRI','2508','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2509,'EPSG','2509','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2509,'ESRI','2509','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2510,'EPSG','2510','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2510,'ESRI','2510','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2511,'EPSG','2511','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2511,'ESRI','2511','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2512,'EPSG','2512','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2512,'ESRI','2512','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2513,'EPSG','2513','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2513,'ESRI','2513','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2514,'EPSG','2514','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 141E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2514,'ESRI','2514','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 141E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2515,'EPSG','2515','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 147E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2515,'ESRI','2515','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 147E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2516,'EPSG','2516','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 153E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2516,'ESRI','2516','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 153E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2517,'EPSG','2517','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 159E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2517,'ESRI','2517','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 159E',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_12() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2518,'EPSG','2518','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 165E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2518,'ESRI','2518','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 165E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2519,'EPSG','2519','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 171E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2519,'ESRI','2519','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 171E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2520,'EPSG','2520','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 177E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2520,'ESRI','2520','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 177E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2521,'EPSG','2521','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 177W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2521,'ESRI','2521','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 177W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2522,'EPSG','2522','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger CM 171W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2522,'ESRI','2522','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger CM 171W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2523,'EPSG','2523','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=7500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2523,'ESRI','2523','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=7500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2524,'EPSG','2524','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=8500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2524,'ESRI','2524','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=8500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2525,'EPSG','2525','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=9500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2525,'ESRI','2525','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=9500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2526,'EPSG','2526','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=10500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2526,'ESRI','2526','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +units=m +x_0=10500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2527,'EPSG','2527','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=11500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2527,'ESRI','2527','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +units=m +x_0=11500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2528,'EPSG','2528','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=12500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2528,'ESRI','2528','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +units=m +x_0=12500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2529,'EPSG','2529','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=13500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2529,'ESRI','2529','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +units=m +x_0=13500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2530,'EPSG','2530','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=14500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2530,'ESRI','2530','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +units=m +x_0=14500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2531,'EPSG','2531','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=15500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2531,'ESRI','2531','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +units=m +x_0=15500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2532,'EPSG','2532','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=48 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=16500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2532,'ESRI','2532','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=48 +no_defs +proj=tmerc +units=m +x_0=16500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2533,'EPSG','2533','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=17500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2533,'ESRI','2533','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +units=m +x_0=17500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2534,'EPSG','2534','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=54 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=18500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2534,'ESRI','2534','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=54 +no_defs +proj=tmerc +units=m +x_0=18500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2535,'EPSG','2535','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=19500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2535,'ESRI','2535','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +units=m +x_0=19500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2536,'EPSG','2536','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=60 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=20500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2536,'ESRI','2536','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=60 +no_defs +proj=tmerc +units=m +x_0=20500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2537,'EPSG','2537','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=21500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2537,'ESRI','2537','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +units=m +x_0=21500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2538,'EPSG','2538','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=66 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=22500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2538,'ESRI','2538','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=66 +no_defs +proj=tmerc +units=m +x_0=22500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2539,'EPSG','2539','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=23500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2539,'ESRI','2539','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +units=m +x_0=23500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2540,'EPSG','2540','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=72 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=24500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2540,'ESRI','2540','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=72 +no_defs +proj=tmerc +units=m +x_0=24500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2541,'EPSG','2541','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=25500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2541,'ESRI','2541','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=25500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2542,'EPSG','2542','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=26500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2542,'ESRI','2542','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=26500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2543,'EPSG','2543','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=27500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2543,'ESRI','2543','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=27500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2544,'EPSG','2544','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=28500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2544,'ESRI','2544','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=28500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2545,'EPSG','2545','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=29500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2545,'ESRI','2545','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=29500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2546,'EPSG','2546','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=30500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2546,'ESRI','2546','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=30500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2547,'EPSG','2547','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=31500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2547,'ESRI','2547','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=31500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2548,'EPSG','2548','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=32500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2548,'ESRI','2548','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=32500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2549,'EPSG','2549','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=33500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2549,'ESRI','2549','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=33500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2550,'EPSG','2550','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=utm +south +towgs84=-404.78,685.68,45.47,0,0,0,0 +units=m +zone=50',NULL,'Samboja / UTM zone 50S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2550,'ESRI','2550','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=utm +south +towgs84=-404.78,685.68,45.47,0,0,0,0 +units=m +zone=50 no_defs',NULL,'Samboja / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2551,'EPSG','2551','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=34500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2551,'ESRI','2551','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=34500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2552,'EPSG','2552','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=35500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 35',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2552,'ESRI','2552','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=35500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 35',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2553,'EPSG','2553','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=36500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2553,'ESRI','2553','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=36500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2554,'EPSG','2554','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=37500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 37',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2554,'ESRI','2554','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=37500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 37',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2555,'EPSG','2555','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=38500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2555,'ESRI','2555','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=38500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2556,'EPSG','2556','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=39500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2556,'ESRI','2556','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=39500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2557,'EPSG','2557','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=40500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2557,'ESRI','2557','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=40500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2558,'EPSG','2558','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=41500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 41',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2558,'ESRI','2558','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=41500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 41',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2559,'EPSG','2559','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=42500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2559,'ESRI','2559','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=42500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2560,'EPSG','2560','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=43500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 43',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2560,'ESRI','2560','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=43500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 43',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2561,'EPSG','2561','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=44500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2561,'ESRI','2561','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=44500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2562,'EPSG','2562','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=45500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2562,'ESRI','2562','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=45500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2563,'EPSG','2563','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=138 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=46500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 46',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2563,'ESRI','2563','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=138 +no_defs +proj=tmerc +units=m +x_0=46500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 46',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2564,'EPSG','2564','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=47500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 47',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2564,'ESRI','2564','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +units=m +x_0=47500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 47',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2565,'EPSG','2565','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=144 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=48500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2565,'ESRI','2565','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=144 +no_defs +proj=tmerc +units=m +x_0=48500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2566,'EPSG','2566','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=49500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2566,'ESRI','2566','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +units=m +x_0=49500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2567,'EPSG','2567','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=150 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=50500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2567,'ESRI','2567','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=150 +no_defs +proj=tmerc +units=m +x_0=50500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 50',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_13() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2568,'EPSG','2568','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=51500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 51',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2568,'ESRI','2568','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +units=m +x_0=51500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 51',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2569,'EPSG','2569','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=156 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=52500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2569,'ESRI','2569','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=156 +no_defs +proj=tmerc +units=m +x_0=52500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2570,'EPSG','2570','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=53500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 53',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2570,'ESRI','2570','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +units=m +x_0=53500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 53',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2571,'EPSG','2571','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=162 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=54500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2571,'ESRI','2571','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=162 +no_defs +proj=tmerc +units=m +x_0=54500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2572,'EPSG','2572','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=55500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 55',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2572,'ESRI','2572','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +units=m +x_0=55500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 55',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2573,'EPSG','2573','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=168 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=56500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2573,'ESRI','2573','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=168 +no_defs +proj=tmerc +units=m +x_0=56500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2574,'EPSG','2574','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=57500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 57',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2574,'ESRI','2574','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +units=m +x_0=57500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 57',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2575,'EPSG','2575','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=174 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=58500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2575,'ESRI','2575','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=174 +no_defs +proj=tmerc +units=m +x_0=58500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2576,'EPSG','2576','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=59500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 59',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2576,'ESRI','2576','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +units=m +x_0=59500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 59',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2577,'EPSG','2577','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=180 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=60000000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 60 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2577,'ESRI','2577','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=180 +no_defs +proj=tmerc +units=m +x_0=60000000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 60',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2578,'EPSG','2578','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=61500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 61',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2578,'ESRI','2578','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=m +x_0=61500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 61',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2579,'EPSG','2579','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-174 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=62500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 62',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2579,'ESRI','2579','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-174 +no_defs +proj=tmerc +units=m +x_0=62500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 62',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2580,'EPSG','2580','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=63500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 63',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2580,'ESRI','2580','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +units=m +x_0=63500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 63',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2581,'EPSG','2581','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-168 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=64500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 64',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2581,'ESRI','2581','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-168 +no_defs +proj=tmerc +units=m +x_0=64500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 64',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2582,'EPSG','2582','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 21E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2582,'ESRI','2582','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 21E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2583,'EPSG','2583','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 24E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2583,'ESRI','2583','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 24E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2584,'EPSG','2584','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 27E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2584,'ESRI','2584','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 27E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2585,'EPSG','2585','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 30E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2585,'ESRI','2585','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 30E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2586,'EPSG','2586','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 33E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2586,'ESRI','2586','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 33E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2587,'EPSG','2587','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 36E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2587,'ESRI','2587','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 36E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2588,'EPSG','2588','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 39E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2588,'ESRI','2588','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 39E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2589,'EPSG','2589','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 42E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2589,'ESRI','2589','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 42E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2590,'EPSG','2590','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 45E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2590,'ESRI','2590','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 45E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2591,'EPSG','2591','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=48 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 48E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2591,'ESRI','2591','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=48 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 48E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2592,'EPSG','2592','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 51E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2592,'ESRI','2592','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 51E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2593,'EPSG','2593','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=54 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 54E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2593,'ESRI','2593','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=54 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 54E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2594,'EPSG','2594','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 57E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2594,'ESRI','2594','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 57E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2595,'EPSG','2595','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=60 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 60E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2595,'ESRI','2595','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=60 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 60E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2596,'EPSG','2596','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 63E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2596,'ESRI','2596','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 63E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2597,'EPSG','2597','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=66 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 66E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2597,'ESRI','2597','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=66 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 66E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2598,'EPSG','2598','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 69E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2598,'ESRI','2598','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 69E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2599,'EPSG','2599','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=72 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 72E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2599,'ESRI','2599','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=72 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 72E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2600,'EPSG','2600','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9998 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Lietuvos Koordinoei Sistema 1994 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2600,'ESRI','2600','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999800 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Lietuvos Koordinoei Sistema 1994',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2600,'NAD83','2600','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=39d50 +lat_1=43 +lat_2=40 +lon_0=-100 +proj=lcc +x_0=500000 +y_0=0 no_defs',NULL,'2600: nebraska: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2601,'EPSG','2601','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2601,'ESRI','2601','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2601,'NAD27','2601','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=41d20 +lat_1=42d49 +lat_2=41d51 +lon_0=-100 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'2601: nebraska north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2602,'EPSG','2602','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 78E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2602,'ESRI','2602','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 78E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2602,'NAD27','2602','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=39d40 +lat_1=41d43 +lat_2=40d17 +lon_0=-99d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'2602: nebraska south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2603,'EPSG','2603','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2603,'ESRI','2603','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2604,'EPSG','2604','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 84E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2604,'ESRI','2604','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 84E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2605,'EPSG','2605','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2605,'ESRI','2605','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2606,'EPSG','2606','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 90E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2606,'ESRI','2606','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 90E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2607,'EPSG','2607','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2607,'ESRI','2607','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2608,'EPSG','2608','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 96E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2608,'ESRI','2608','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 96E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2609,'EPSG','2609','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2609,'ESRI','2609','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2610,'EPSG','2610','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 102E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2610,'ESRI','2610','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 102E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2611,'EPSG','2611','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2611,'ESRI','2611','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2612,'EPSG','2612','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 108E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2612,'ESRI','2612','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 108E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2613,'EPSG','2613','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2613,'ESRI','2613','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2614,'EPSG','2614','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 114E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2614,'ESRI','2614','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 114E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2615,'EPSG','2615','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2615,'ESRI','2615','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2616,'EPSG','2616','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 120E',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_14() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2616,'ESRI','2616','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 120E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2617,'EPSG','2617','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2617,'ESRI','2617','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2618,'EPSG','2618','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 126E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2618,'ESRI','2618','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 126E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2619,'EPSG','2619','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2619,'ESRI','2619','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2620,'EPSG','2620','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 132E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2620,'ESRI','2620','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 132E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2621,'EPSG','2621','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2621,'ESRI','2621','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2622,'EPSG','2622','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=138 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 138E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2622,'ESRI','2622','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=138 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 138E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2623,'EPSG','2623','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 141E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2623,'ESRI','2623','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 141E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2624,'EPSG','2624','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=144 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 144E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2624,'ESRI','2624','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=144 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 144E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2625,'EPSG','2625','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 147E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2625,'ESRI','2625','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 147E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2626,'EPSG','2626','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=150 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 150E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2626,'ESRI','2626','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=150 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 150E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2627,'EPSG','2627','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 153E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2627,'ESRI','2627','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 153E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2628,'EPSG','2628','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=156 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 156E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2628,'ESRI','2628','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=156 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 156E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2629,'EPSG','2629','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 159E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2629,'ESRI','2629','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 159E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2630,'EPSG','2630','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=162 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 162E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2630,'ESRI','2630','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=162 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 162E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2631,'EPSG','2631','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 165E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2631,'ESRI','2631','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 165E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2632,'EPSG','2632','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=168 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 168E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2632,'ESRI','2632','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=168 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 168E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2633,'EPSG','2633','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 171E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2633,'ESRI','2633','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 171E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2634,'EPSG','2634','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=174 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 174E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2634,'ESRI','2634','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=174 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 174E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2635,'EPSG','2635','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 177E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2635,'ESRI','2635','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 177E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2636,'EPSG','2636','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=180 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 180E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2636,'ESRI','2636','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=180 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 180E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2637,'EPSG','2637','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 177W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2637,'ESRI','2637','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 177W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2638,'EPSG','2638','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-174 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 174W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2638,'ESRI','2638','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-174 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 174W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2639,'EPSG','2639','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 171W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2639,'ESRI','2639','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 171W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2640,'EPSG','2640','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-168 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 168W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2640,'ESRI','2640','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-168 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 168W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2641,'EPSG','2641','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=7500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2641,'ESRI','2641','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=7500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2642,'EPSG','2642','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=8500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2642,'ESRI','2642','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=8500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2643,'EPSG','2643','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=9500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2643,'ESRI','2643','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=9500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2644,'EPSG','2644','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=10500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2644,'ESRI','2644','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +units=m +x_0=10500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2645,'EPSG','2645','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=11500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2645,'ESRI','2645','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +units=m +x_0=11500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2646,'EPSG','2646','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=12500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2646,'ESRI','2646','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +units=m +x_0=12500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2647,'EPSG','2647','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=13500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2647,'ESRI','2647','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +units=m +x_0=13500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2648,'EPSG','2648','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=14500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2648,'ESRI','2648','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +units=m +x_0=14500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2649,'EPSG','2649','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=15500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2649,'ESRI','2649','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +units=m +x_0=15500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2650,'EPSG','2650','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=48 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=16500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2650,'ESRI','2650','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=48 +no_defs +proj=tmerc +units=m +x_0=16500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2651,'EPSG','2651','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=17500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2651,'ESRI','2651','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +units=m +x_0=17500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2652,'EPSG','2652','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=54 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=18500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2652,'ESRI','2652','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=54 +no_defs +proj=tmerc +units=m +x_0=18500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2653,'EPSG','2653','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=19500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2653,'ESRI','2653','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +units=m +x_0=19500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2654,'EPSG','2654','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=60 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=20500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2654,'ESRI','2654','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=60 +no_defs +proj=tmerc +units=m +x_0=20500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2655,'EPSG','2655','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=21500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2655,'ESRI','2655','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +units=m +x_0=21500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2656,'EPSG','2656','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=66 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=22500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2656,'ESRI','2656','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=66 +no_defs +proj=tmerc +units=m +x_0=22500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2657,'EPSG','2657','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=23500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2657,'ESRI','2657','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +units=m +x_0=23500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2658,'EPSG','2658','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=72 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=24500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2658,'ESRI','2658','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=72 +no_defs +proj=tmerc +units=m +x_0=24500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2659,'EPSG','2659','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=25500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2659,'ESRI','2659','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=25500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2660,'EPSG','2660','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=26500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2660,'ESRI','2660','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=26500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2661,'EPSG','2661','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=27500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2661,'ESRI','2661','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=27500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2662,'EPSG','2662','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=28500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2662,'ESRI','2662','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=28500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2663,'EPSG','2663','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=29500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2663,'ESRI','2663','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=29500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2664,'EPSG','2664','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=30500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2664,'ESRI','2664','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=30500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2665,'EPSG','2665','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=31500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2665,'ESRI','2665','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=31500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2666,'EPSG','2666','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=32500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 32',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_15() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2666,'ESRI','2666','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=32500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2667,'EPSG','2667','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=33500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2667,'ESRI','2667','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=33500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2668,'EPSG','2668','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=34500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2668,'ESRI','2668','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=34500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2669,'EPSG','2669','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=35500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 35',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2669,'ESRI','2669','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=35500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 35',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2670,'EPSG','2670','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=36500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2670,'ESRI','2670','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=36500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2671,'EPSG','2671','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=37500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 37',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2671,'ESRI','2671','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=37500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 37',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2672,'EPSG','2672','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=38500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2672,'ESRI','2672','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=38500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2673,'EPSG','2673','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=39500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2673,'ESRI','2673','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=39500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2674,'EPSG','2674','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=40500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2674,'ESRI','2674','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=40500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2675,'EPSG','2675','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=41500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 41',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2675,'ESRI','2675','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=41500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 41',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2676,'EPSG','2676','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=42500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2676,'ESRI','2676','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=42500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2677,'EPSG','2677','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=43500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 43',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2677,'ESRI','2677','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=43500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 43',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2678,'EPSG','2678','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=44500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2678,'ESRI','2678','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=44500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2679,'EPSG','2679','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=45500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2679,'ESRI','2679','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=45500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2680,'EPSG','2680','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=138 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=46500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 46',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2680,'ESRI','2680','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=138 +no_defs +proj=tmerc +units=m +x_0=46500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 46',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2681,'EPSG','2681','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=47500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 47',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2681,'ESRI','2681','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +units=m +x_0=47500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 47',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2682,'EPSG','2682','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=144 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=48500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2682,'ESRI','2682','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=144 +no_defs +proj=tmerc +units=m +x_0=48500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2683,'EPSG','2683','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=49500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2683,'ESRI','2683','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +units=m +x_0=49500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2684,'EPSG','2684','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=150 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=50500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2684,'ESRI','2684','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=150 +no_defs +proj=tmerc +units=m +x_0=50500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2685,'EPSG','2685','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=51500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 51',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2685,'ESRI','2685','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +units=m +x_0=51500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 51',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2686,'EPSG','2686','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=156 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=52500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2686,'ESRI','2686','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=156 +no_defs +proj=tmerc +units=m +x_0=52500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2687,'EPSG','2687','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=53500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 53',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2687,'ESRI','2687','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +units=m +x_0=53500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 53',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2688,'EPSG','2688','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=162 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=54500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2688,'ESRI','2688','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=162 +no_defs +proj=tmerc +units=m +x_0=54500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2689,'EPSG','2689','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=55500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 55',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2689,'ESRI','2689','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +units=m +x_0=55500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 55',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2690,'EPSG','2690','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=168 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=56500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2690,'ESRI','2690','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=168 +no_defs +proj=tmerc +units=m +x_0=56500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2691,'EPSG','2691','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=57500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 57',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2691,'ESRI','2691','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +units=m +x_0=57500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 57',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2692,'EPSG','2692','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=174 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=58500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2692,'ESRI','2692','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=174 +no_defs +proj=tmerc +units=m +x_0=58500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2693,'EPSG','2693','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=59500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 59',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2693,'ESRI','2693','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +units=m +x_0=59500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 59',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2694,'EPSG','2694','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=180 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=60000000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 60 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2694,'ESRI','2694','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=180 +no_defs +proj=tmerc +units=m +x_0=60000000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 60',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2695,'EPSG','2695','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=61500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 61',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2695,'ESRI','2695','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=m +x_0=61500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 61',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2696,'EPSG','2696','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-174 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=62500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 62',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2696,'ESRI','2696','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-174 +no_defs +proj=tmerc +units=m +x_0=62500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 62',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2697,'EPSG','2697','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=63500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 63',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2697,'ESRI','2697','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +units=m +x_0=63500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 63',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2698,'EPSG','2698','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-168 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=64500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 64',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2698,'ESRI','2698','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-168 +no_defs +proj=tmerc +units=m +x_0=64500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 64',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2699,'EPSG','2699','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 21E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2699,'ESRI','2699','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 21E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2700,'EPSG','2700','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 24E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2700,'ESRI','2700','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 24E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2701,'EPSG','2701','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 27E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2701,'ESRI','2701','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 27E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2701,'NAD27','2701','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=34d45 +lon_0=-115d35 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'2701: nevada east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2701,'NAD83','2701','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=34d45 +lon_0=-115d35 +proj=tmerc +x_0=200000 +y_0=8000000 no_defs',NULL,'2701: nevada east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2702,'EPSG','2702','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 30E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2702,'ESRI','2702','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 30E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2702,'NAD27','2702','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=34d45 +lon_0=-116d40 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'2702: nevada central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2702,'NAD83','2702','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=34d45 +lon_0=-116d40 +proj=tmerc +x_0=500000 +y_0=6000000 no_defs',NULL,'2702: nevada central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2703,'EPSG','2703','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 33E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2703,'ESRI','2703','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 33E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2703,'NAD27','2703','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=34d45 +lon_0=-118d35 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'2703: nevada west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2703,'NAD83','2703','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=34d45 +lon_0=-118d35 +proj=tmerc +x_0=800000 +y_0=4000000 no_defs',NULL,'2703: nevada west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2704,'EPSG','2704','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 36E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2704,'ESRI','2704','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 36E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2705,'EPSG','2705','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 39E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2705,'ESRI','2705','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 39E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2706,'EPSG','2706','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 42E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2706,'ESRI','2706','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 42E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2707,'EPSG','2707','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 45E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2707,'ESRI','2707','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 45E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2708,'EPSG','2708','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=48 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 48E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2708,'ESRI','2708','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=48 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 48E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2709,'EPSG','2709','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 51E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2709,'ESRI','2709','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 51E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2710,'EPSG','2710','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=54 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 54E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2710,'ESRI','2710','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=54 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 54E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2711,'EPSG','2711','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 57E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2711,'ESRI','2711','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 57E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2712,'EPSG','2712','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=60 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 60E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2712,'ESRI','2712','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=60 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 60E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2713,'EPSG','2713','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 63E',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_16() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2713,'ESRI','2713','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 63E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2714,'EPSG','2714','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=66 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 66E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2714,'ESRI','2714','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=66 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 66E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2715,'EPSG','2715','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 69E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2715,'ESRI','2715','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 69E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2716,'EPSG','2716','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=72 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 72E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2716,'ESRI','2716','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=72 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 72E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2717,'EPSG','2717','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2717,'ESRI','2717','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2718,'EPSG','2718','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 78E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2718,'ESRI','2718','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 78E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2719,'EPSG','2719','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2719,'ESRI','2719','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2720,'EPSG','2720','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 84E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2720,'ESRI','2720','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 84E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2721,'EPSG','2721','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2721,'ESRI','2721','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2722,'EPSG','2722','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 90E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2722,'ESRI','2722','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 90E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2723,'EPSG','2723','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2723,'ESRI','2723','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2724,'EPSG','2724','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 96E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2724,'ESRI','2724','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 96E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2725,'EPSG','2725','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2725,'ESRI','2725','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2726,'EPSG','2726','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 102E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2726,'ESRI','2726','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 102E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2727,'EPSG','2727','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2727,'ESRI','2727','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2728,'EPSG','2728','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 108E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2728,'ESRI','2728','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 108E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2729,'EPSG','2729','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2729,'ESRI','2729','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2730,'EPSG','2730','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 114E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2730,'ESRI','2730','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 114E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2731,'EPSG','2731','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2731,'ESRI','2731','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2732,'EPSG','2732','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 120E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2732,'ESRI','2732','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 120E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2733,'EPSG','2733','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2733,'ESRI','2733','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2734,'EPSG','2734','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 126E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2734,'ESRI','2734','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 126E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2735,'EPSG','2735','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2735,'ESRI','2735','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2736,'EPSG','2736','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +south +towgs84=-80,-100,-228,0,0,0,0 +units=m +zone=36',NULL,'Tete / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2736,'ESRI','2736','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=utm +south +units=m +zone=36 no_defs',NULL,'Tete / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2737,'EPSG','2737','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +south +towgs84=-80,-100,-228,0,0,0,0 +units=m +zone=37',NULL,'Tete / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2737,'ESRI','2737','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=utm +south +units=m +zone=37 no_defs',NULL,'Tete / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2738,'EPSG','2738','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 132E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2738,'ESRI','2738','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 132E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2739,'EPSG','2739','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2739,'ESRI','2739','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2740,'EPSG','2740','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=138 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 138E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2740,'ESRI','2740','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=138 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 138E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2741,'EPSG','2741','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 141E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2741,'ESRI','2741','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 141E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2742,'EPSG','2742','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=144 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 144E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2742,'ESRI','2742','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=144 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 144E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2743,'EPSG','2743','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 147E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2743,'ESRI','2743','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 147E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2744,'EPSG','2744','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=150 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 150E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2744,'ESRI','2744','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=150 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 150E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2745,'EPSG','2745','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 153E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2745,'ESRI','2745','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 153E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2746,'EPSG','2746','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=156 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 156E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2746,'ESRI','2746','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=156 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 156E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2747,'EPSG','2747','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 159E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2747,'ESRI','2747','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 159E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2748,'EPSG','2748','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=162 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 162E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2748,'ESRI','2748','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=162 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 162E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2749,'EPSG','2749','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 165E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2749,'ESRI','2749','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 165E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2750,'EPSG','2750','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=168 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 168E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2750,'ESRI','2750','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=168 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 168E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2751,'EPSG','2751','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 171E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2751,'ESRI','2751','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 171E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2752,'EPSG','2752','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=174 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 174E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2752,'ESRI','2752','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=174 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 174E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2753,'EPSG','2753','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 177E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2753,'ESRI','2753','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 177E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2754,'EPSG','2754','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=180 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 180E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2754,'ESRI','2754','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=180 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 180E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2755,'EPSG','2755','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 177W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2755,'ESRI','2755','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 177W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2756,'EPSG','2756','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-174 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 174W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2756,'ESRI','2756','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-174 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 174W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2757,'EPSG','2757','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 171W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2757,'ESRI','2757','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 171W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2758,'EPSG','2758','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-168 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 168W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2758,'ESRI','2758','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-168 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 168W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2759,'EPSG','2759','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99996 +lat_0=30.5 +lon_0=-85.83333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(HARN) / Alabama East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2759,'ESRI','2759','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999960 +lat_0=30.5 +lon_0=-85.83333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Alabama East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2760,'EPSG','2760','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=30 +lon_0=-87.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Alabama West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2760,'ESRI','2760','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999933 +lat_0=30 +lon_0=-87.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Alabama West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2761,'EPSG','2761','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=213360 +y_0=0',NULL,'NAD83(HARN) / Arizona East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2761,'ESRI','2761','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=213360 +y_0=0 no_defs',NULL,'NAD83(HARN) / Arizona East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2762,'EPSG','2762','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=213360 +y_0=0',NULL,'NAD83(HARN) / Arizona Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2762,'ESRI','2762','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=213360 +y_0=0 no_defs',NULL,'NAD83(HARN) / Arizona Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2763,'EPSG','2763','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=213360 +y_0=0',NULL,'NAD83(HARN) / Arizona West',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_17() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2763,'ESRI','2763','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999933 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=213360 +y_0=0 no_defs',NULL,'NAD83(HARN) / Arizona West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2764,'EPSG','2764','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.23333333333333 +lat_2=34.93333333333333 +lon_0=-92 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'NAD83(HARN) / Arkansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2764,'ESRI','2764','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.23333333333333 +lat_2=34.93333333333333 +lon_0=-92 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Arkansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2765,'EPSG','2765','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=32.66666666666666 +lat_1=34.76666666666667 +lat_2=33.3 +lon_0=-92 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=400000',NULL,'NAD83(HARN) / Arkansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2765,'ESRI','2765','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=32.66666666666666 +lat_1=34.76666666666667 +lat_2=33.3 +lon_0=-92 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=400000 no_defs',NULL,'NAD83(HARN) / Arkansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2766,'EPSG','2766','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(HARN) / California zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2766,'ESRI','2766','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD83(HARN) / California zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2767,'EPSG','2767','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(HARN) / California zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2767,'ESRI','2767','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD83(HARN) / California zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2768,'EPSG','2768','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(HARN) / California zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2768,'ESRI','2768','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD83(HARN) / California zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2769,'EPSG','2769','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(HARN) / California zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2769,'ESRI','2769','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD83(HARN) / California zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2770,'EPSG','2770','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(HARN) / California zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2770,'ESRI','2770','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD83(HARN) / California zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2771,'EPSG','2771','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(HARN) / California zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2771,'ESRI','2771','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD83(HARN) / California zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2772,'EPSG','2772','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=914401.8289 +y_0=304800.6096',NULL,'NAD83(HARN) / Colorado North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2772,'ESRI','2772','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'NAD83(HARN) / Colorado North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2773,'EPSG','2773','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=914401.8289 +y_0=304800.6096',NULL,'NAD83(HARN) / Colorado Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2773,'ESRI','2773','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'NAD83(HARN) / Colorado Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2774,'EPSG','2774','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=914401.8289 +y_0=304800.6096',NULL,'NAD83(HARN) / Colorado South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2774,'ESRI','2774','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'NAD83(HARN) / Colorado South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2775,'EPSG','2775','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800.6096 +y_0=152400.3048',NULL,'NAD83(HARN) / Connecticut',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2775,'ESRI','2775','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800.6096 +y_0=152400.3048 no_defs',NULL,'NAD83(HARN) / Connecticut',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2776,'EPSG','2776','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(HARN) / Delaware',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2776,'ESRI','2776','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Delaware',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2777,'EPSG','2777','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(HARN) / Florida East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2777,'ESRI','2777','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Florida East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2778,'EPSG','2778','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(HARN) / Florida West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2778,'ESRI','2778','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Florida West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2779,'EPSG','2779','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Florida North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2779,'ESRI','2779','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Florida North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2780,'EPSG','2780','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(HARN) / Georgia East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2780,'ESRI','2780','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Georgia East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2781,'EPSG','2781','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=0',NULL,'NAD83(HARN) / Georgia West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2781,'ESRI','2781','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Georgia West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2782,'EPSG','2782','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=18.83333333333333 +lon_0=-155.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Hawaii zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2782,'ESRI','2782','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=18.83333333333333 +lon_0=-155.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Hawaii zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2783,'EPSG','2783','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=20.33333333333333 +lon_0=-156.6666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Hawaii zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2783,'ESRI','2783','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=20.33333333333333 +lon_0=-156.6666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Hawaii zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2784,'EPSG','2784','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999 +lat_0=21.16666666666667 +lon_0=-158 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Hawaii zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2784,'ESRI','2784','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999990 +lat_0=21.16666666666667 +lon_0=-158 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Hawaii zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2785,'EPSG','2785','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999 +lat_0=21.83333333333333 +lon_0=-159.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Hawaii zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2785,'ESRI','2785','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999990 +lat_0=21.83333333333333 +lon_0=-159.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Hawaii zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2786,'EPSG','2786','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=21.66666666666667 +lon_0=-160.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Hawaii zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2786,'ESRI','2786','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=21.66666666666667 +lon_0=-160.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Hawaii zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2787,'EPSG','2787','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(HARN) / Idaho East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2787,'ESRI','2787','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Idaho East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2788,'EPSG','2788','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Idaho Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2788,'ESRI','2788','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Idaho Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2789,'EPSG','2789','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=0',NULL,'NAD83(HARN) / Idaho West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2789,'ESRI','2789','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999933 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Idaho West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2790,'EPSG','2790','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999749999999999 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(HARN) / Illinois East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2790,'ESRI','2790','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999975 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Illinois East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2791,'EPSG','2791','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=0',NULL,'NAD83(HARN) / Illinois West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2791,'ESRI','2791','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999941 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Illinois West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2792,'EPSG','2792','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=250000',NULL,'NAD83(HARN) / Indiana East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2792,'ESRI','2792','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=250000 no_defs',NULL,'NAD83(HARN) / Indiana East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2793,'EPSG','2793','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=900000 +y_0=250000',NULL,'NAD83(HARN) / Indiana West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2793,'ESRI','2793','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=900000 +y_0=250000 no_defs',NULL,'NAD83(HARN) / Indiana West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2794,'EPSG','2794','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.26666666666667 +lat_2=42.06666666666667 +lon_0=-93.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=1000000',NULL,'NAD83(HARN) / Iowa North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2794,'ESRI','2794','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.26666666666667 +lat_2=42.06666666666667 +lon_0=-93.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=1000000 no_defs',NULL,'NAD83(HARN) / Iowa North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2795,'EPSG','2795','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40 +lat_1=41.78333333333333 +lat_2=40.61666666666667 +lon_0=-93.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Iowa South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2795,'ESRI','2795','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=40 +lat_1=41.78333333333333 +lat_2=40.61666666666667 +lon_0=-93.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Iowa South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2796,'EPSG','2796','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=39.78333333333333 +lat_2=38.71666666666667 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'NAD83(HARN) / Kansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2796,'ESRI','2796','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=39.78333333333333 +lat_2=38.71666666666667 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Kansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2797,'EPSG','2797','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.56666666666667 +lat_2=37.26666666666667 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=400000',NULL,'NAD83(HARN) / Kansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2797,'ESRI','2797','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.56666666666667 +lat_2=37.26666666666667 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=400000 no_defs',NULL,'NAD83(HARN) / Kansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2798,'EPSG','2798','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Kentucky North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2798,'ESRI','2798','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Kentucky North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2799,'EPSG','2799','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lon_0=-85.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=500000',NULL,'NAD83(HARN) / Kentucky South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2799,'ESRI','2799','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lon_0=-85.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=500000 no_defs',NULL,'NAD83(HARN) / Kentucky South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2800,'EPSG','2800','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=30.5 +lat_1=32.66666666666666 +lat_2=31.16666666666667 +lon_0=-92.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=0',NULL,'NAD83(HARN) / Louisiana North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2800,'ESRI','2800','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=30.5 +lat_1=32.66666666666666 +lat_2=31.16666666666667 +lon_0=-92.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Louisiana North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2800,'NAD27','2800','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999666666666667 +lat_0=42d30 +lon_0=-71d40 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'2800: new hampshire ---: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2800,'NAD83','2800','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999666666666667 +lat_0=42d30 +lon_0=-71d40 +proj=tmerc +x_0=300000 +y_0=0 no_defs',NULL,'2800: new hampshire ---: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2801,'EPSG','2801','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=28.5 +lat_1=30.7 +lat_2=29.3 +lon_0=-91.33333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=0',NULL,'NAD83(HARN) / Louisiana South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2801,'ESRI','2801','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=28.5 +lat_1=30.7 +lat_2=29.3 +lon_0=-91.33333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Louisiana South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2802,'EPSG','2802','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(HARN) / Maine East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2802,'ESRI','2802','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Maine East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2803,'EPSG','2803','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=900000 +y_0=0',NULL,'NAD83(HARN) / Maine West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2803,'ESRI','2803','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=900000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Maine West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2804,'EPSG','2804','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.45 +lat_2=38.3 +lon_0=-77 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'NAD83(HARN) / Maryland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2804,'ESRI','2804','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.45 +lat_2=38.3 +lon_0=-77 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Maryland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2805,'EPSG','2805','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lon_0=-71.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=750000',NULL,'NAD83(HARN) / Massachusetts Mainland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2805,'ESRI','2805','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lon_0=-71.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=750000 no_defs',NULL,'NAD83(HARN) / Massachusetts Mainland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2806,'EPSG','2806','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lon_0=-70.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Massachusetts Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2806,'ESRI','2806','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lon_0=-70.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Massachusetts Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2807,'EPSG','2807','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44.78333333333333 +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lon_0=-87 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=8000000 +y_0=0',NULL,'NAD83(HARN) / Michigan North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2807,'ESRI','2807','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=44.78333333333333 +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lon_0=-87 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=8000000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Michigan North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2808,'EPSG','2808','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.31666666666667 +lat_1=45.7 +lat_2=44.18333333333333 +lon_0=-84.36666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=6000000 +y_0=0',NULL,'NAD83(HARN) / Michigan Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2808,'ESRI','2808','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43.31666666666667 +lat_1=45.7 +lat_2=44.18333333333333 +lon_0=-84.36666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=6000000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Michigan Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2809,'EPSG','2809','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.66666666666666 +lat_2=42.1 +lon_0=-84.36666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4000000 +y_0=0',NULL,'NAD83(HARN) / Michigan South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2809,'ESRI','2809','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.66666666666666 +lat_2=42.1 +lon_0=-84.36666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4000000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Michigan South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2810,'EPSG','2810','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=100000',NULL,'NAD83(HARN) / Minnesota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2810,'ESRI','2810','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=100000 no_defs',NULL,'NAD83(HARN) / Minnesota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2811,'EPSG','2811','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=100000',NULL,'NAD83(HARN) / Minnesota Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2811,'ESRI','2811','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=100000 no_defs',NULL,'NAD83(HARN) / Minnesota Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2812,'EPSG','2812','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=100000',NULL,'NAD83(HARN) / Minnesota South',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_18() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2812,'ESRI','2812','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=100000 no_defs',NULL,'NAD83(HARN) / Minnesota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2813,'EPSG','2813','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=29.5 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(HARN) / Mississippi East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2813,'ESRI','2813','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999950 +lat_0=29.5 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Mississippi East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2814,'EPSG','2814','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=29.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=0',NULL,'NAD83(HARN) / Mississippi West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2814,'ESRI','2814','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999950 +lat_0=29.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Mississippi West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2815,'EPSG','2815','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=35.83333333333334 +lon_0=-90.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=0',NULL,'NAD83(HARN) / Missouri East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2815,'ESRI','2815','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999933 +lat_0=35.83333333333334 +lon_0=-90.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Missouri East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2816,'EPSG','2816','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=35.83333333333334 +lon_0=-92.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Missouri Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2816,'ESRI','2816','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999933 +lat_0=35.83333333333334 +lon_0=-92.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Missouri Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2817,'EPSG','2817','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=36.16666666666666 +lon_0=-94.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=850000 +y_0=0',NULL,'NAD83(HARN) / Missouri West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2817,'ESRI','2817','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999941 +lat_0=36.16666666666666 +lon_0=-94.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=850000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Missouri West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2818,'EPSG','2818','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44.25 +lat_1=49 +lat_2=45 +lon_0=-109.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Montana',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2818,'ESRI','2818','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=44.25 +lat_1=49 +lat_2=45 +lon_0=-109.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Montana',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2819,'EPSG','2819','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Nebraska',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2819,'ESRI','2819','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Nebraska',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2820,'EPSG','2820','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-115.5833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=8000000',NULL,'NAD83(HARN) / Nevada East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2820,'ESRI','2820','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=34.75 +lon_0=-115.5833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=8000000 no_defs',NULL,'NAD83(HARN) / Nevada East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2821,'EPSG','2821','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-116.6666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=6000000',NULL,'NAD83(HARN) / Nevada Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2821,'ESRI','2821','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=34.75 +lon_0=-116.6666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=6000000 no_defs',NULL,'NAD83(HARN) / Nevada Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2822,'EPSG','2822','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-118.5833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=4000000',NULL,'NAD83(HARN) / Nevada West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2822,'ESRI','2822','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=34.75 +lon_0=-118.5833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=4000000 no_defs',NULL,'NAD83(HARN) / Nevada West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2823,'EPSG','2823','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.5 +lon_0=-71.66666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(HARN) / New Hampshire',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2823,'ESRI','2823','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=42.5 +lon_0=-71.66666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD83(HARN) / New Hampshire',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2824,'EPSG','2824','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'NAD83(HARN) / New Jersey',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2824,'ESRI','2824','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0 no_defs',NULL,'NAD83(HARN) / New Jersey',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2825,'EPSG','2825','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999909091 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=165000 +y_0=0',NULL,'NAD83(HARN) / New Mexico East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2825,'ESRI','2825','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999909 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=165000 +y_0=0 no_defs',NULL,'NAD83(HARN) / New Mexico East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2826,'EPSG','2826','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / New Mexico Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2826,'ESRI','2826','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / New Mexico Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2827,'EPSG','2827','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999916667 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=830000 +y_0=0',NULL,'NAD83(HARN) / New Mexico West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2827,'ESRI','2827','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999917 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=830000 +y_0=0 no_defs',NULL,'NAD83(HARN) / New Mexico West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2828,'EPSG','2828','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'NAD83(HARN) / New York East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2828,'ESRI','2828','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0 no_defs',NULL,'NAD83(HARN) / New York East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2829,'EPSG','2829','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=0',NULL,'NAD83(HARN) / New York Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2829,'ESRI','2829','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=0 no_defs',NULL,'NAD83(HARN) / New York Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2830,'EPSG','2830','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=350000 +y_0=0',NULL,'NAD83(HARN) / New York West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2830,'ESRI','2830','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=350000 +y_0=0 no_defs',NULL,'NAD83(HARN) / New York West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2831,'EPSG','2831','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(HARN) / New York Long Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2831,'ESRI','2831','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD83(HARN) / New York Long Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2832,'EPSG','2832','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.43333333333333 +lon_0=-100.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / North Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2832,'ESRI','2832','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.43333333333333 +lon_0=-100.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / North Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2833,'EPSG','2833','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.66666666666666 +lat_1=47.48333333333333 +lat_2=46.18333333333333 +lon_0=-100.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / North Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2833,'ESRI','2833','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=45.66666666666666 +lat_1=47.48333333333333 +lat_2=46.18333333333333 +lon_0=-100.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / North Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2834,'EPSG','2834','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.66666666666666 +lat_1=41.7 +lat_2=40.43333333333333 +lon_0=-82.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Ohio North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2834,'ESRI','2834','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=39.66666666666666 +lat_1=41.7 +lat_2=40.43333333333333 +lon_0=-82.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Ohio North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2835,'EPSG','2835','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38 +lat_1=40.03333333333333 +lat_2=38.73333333333333 +lon_0=-82.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Ohio South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2835,'ESRI','2835','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=38 +lat_1=40.03333333333333 +lat_2=38.73333333333333 +lon_0=-82.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Ohio South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2836,'EPSG','2836','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=35 +lat_1=36.76666666666667 +lat_2=35.56666666666667 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Oklahoma North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2836,'ESRI','2836','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=35 +lat_1=36.76666666666667 +lat_2=35.56666666666667 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Oklahoma North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2837,'EPSG','2837','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.33333333333334 +lat_1=35.23333333333333 +lat_2=33.93333333333333 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Oklahoma South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2837,'ESRI','2837','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=33.33333333333334 +lat_1=35.23333333333333 +lat_2=33.93333333333333 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Oklahoma South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2838,'EPSG','2838','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=0',NULL,'NAD83(HARN) / Oregon North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2838,'ESRI','2838','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Oregon North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2839,'EPSG','2839','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=0',NULL,'NAD83(HARN) / Oregon South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2839,'ESRI','2839','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Oregon South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2840,'EPSG','2840','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999375 +lat_0=41.08333333333334 +lon_0=-71.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=0',NULL,'NAD83(HARN) / Rhode Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2840,'ESRI','2840','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999994 +lat_0=41.08333333333334 +lon_0=-71.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Rhode Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2841,'EPSG','2841','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.68333333333333 +lat_2=44.41666666666666 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / South Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2841,'ESRI','2841','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.68333333333333 +lat_2=44.41666666666666 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / South Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2842,'EPSG','2842','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42.33333333333334 +lat_1=44.4 +lat_2=42.83333333333334 +lon_0=-100.3333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / South Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2842,'ESRI','2842','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=42.33333333333334 +lat_1=44.4 +lat_2=42.83333333333334 +lon_0=-100.3333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / South Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2843,'EPSG','2843','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.41666666666666 +lat_2=35.25 +lon_0=-86 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Tennessee',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2843,'ESRI','2843','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.41666666666666 +lat_2=35.25 +lon_0=-86 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Tennessee',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2844,'EPSG','2844','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34 +lat_1=36.18333333333333 +lat_2=34.65 +lon_0=-101.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1000000',NULL,'NAD83(HARN) / Texas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2844,'ESRI','2844','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=34 +lat_1=36.18333333333333 +lat_2=34.65 +lon_0=-101.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1000000 no_defs',NULL,'NAD83(HARN) / Texas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2845,'EPSG','2845','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=31.66666666666667 +lat_1=33.96666666666667 +lat_2=32.13333333333333 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=2000000',NULL,'NAD83(HARN) / Texas North Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2845,'ESRI','2845','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=31.66666666666667 +lat_1=33.96666666666667 +lat_2=32.13333333333333 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=2000000 no_defs',NULL,'NAD83(HARN) / Texas North Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2846,'EPSG','2846','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=29.66666666666667 +lat_1=31.88333333333333 +lat_2=30.11666666666667 +lon_0=-100.3333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=3000000',NULL,'NAD83(HARN) / Texas Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2846,'ESRI','2846','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=29.66666666666667 +lat_1=31.88333333333333 +lat_2=30.11666666666667 +lon_0=-100.3333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=3000000 no_defs',NULL,'NAD83(HARN) / Texas Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2847,'EPSG','2847','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=27.83333333333333 +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lon_0=-99 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=4000000',NULL,'NAD83(HARN) / Texas South Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2847,'ESRI','2847','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=27.83333333333333 +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lon_0=-99 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=4000000 no_defs',NULL,'NAD83(HARN) / Texas South Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2848,'EPSG','2848','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=5000000',NULL,'NAD83(HARN) / Texas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2848,'ESRI','2848','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=5000000 no_defs',NULL,'NAD83(HARN) / Texas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2849,'EPSG','2849','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=1000000',NULL,'NAD83(HARN) / Utah North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2849,'ESRI','2849','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=1000000 no_defs',NULL,'NAD83(HARN) / Utah North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2850,'EPSG','2850','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=2000000',NULL,'NAD83(HARN) / Utah Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2850,'ESRI','2850','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=2000000 no_defs',NULL,'NAD83(HARN) / Utah Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2851,'EPSG','2851','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=3000000',NULL,'NAD83(HARN) / Utah South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2851,'ESRI','2851','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=3000000 no_defs',NULL,'NAD83(HARN) / Utah South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2852,'EPSG','2852','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999964286 +lat_0=42.5 +lon_0=-72.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Vermont',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2852,'ESRI','2852','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999964 +lat_0=42.5 +lon_0=-72.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Vermont',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2853,'EPSG','2853','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.2 +lat_2=38.03333333333333 +lon_0=-78.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=2000000',NULL,'NAD83(HARN) / Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2853,'ESRI','2853','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.2 +lat_2=38.03333333333333 +lon_0=-78.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=2000000 no_defs',NULL,'NAD83(HARN) / Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2854,'EPSG','2854','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.96666666666667 +lat_2=36.76666666666667 +lon_0=-78.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=1000000',NULL,'NAD83(HARN) / Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2854,'ESRI','2854','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.96666666666667 +lat_2=36.76666666666667 +lon_0=-78.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=1000000 no_defs',NULL,'NAD83(HARN) / Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2855,'EPSG','2855','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.5 +lon_0=-120.8333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Washington North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2855,'ESRI','2855','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.5 +lon_0=-120.8333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Washington North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2856,'EPSG','2856','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.33333333333334 +lat_1=47.33333333333334 +lat_2=45.83333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Washington South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2856,'ESRI','2856','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=45.33333333333334 +lat_1=47.33333333333334 +lat_2=45.83333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Washington South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2857,'EPSG','2857','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / West Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2857,'ESRI','2857','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / West Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2858,'EPSG','2858','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / West Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2858,'ESRI','2858','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / West Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2859,'EPSG','2859','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.16666666666666 +lat_1=46.76666666666667 +lat_2=45.56666666666667 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Wisconsin North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2859,'ESRI','2859','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=45.16666666666666 +lat_1=46.76666666666667 +lat_2=45.56666666666667 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Wisconsin North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2860,'EPSG','2860','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Wisconsin Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2860,'ESRI','2860','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Wisconsin Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2861,'EPSG','2861','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42 +lat_1=44.06666666666667 +lat_2=42.73333333333333 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Wisconsin South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2861,'ESRI','2861','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=42 +lat_1=44.06666666666667 +lat_2=42.73333333333333 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Wisconsin South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2862,'EPSG','2862','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-105.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(HARN) / Wyoming East',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_19() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2862,'ESRI','2862','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-105.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Wyoming East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2863,'EPSG','2863','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-107.3333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=100000',NULL,'NAD83(HARN) / Wyoming East Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2863,'ESRI','2863','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-107.3333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=100000 no_defs',NULL,'NAD83(HARN) / Wyoming East Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2864,'EPSG','2864','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-108.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Wyoming West Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2864,'ESRI','2864','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-108.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Wyoming West Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2865,'EPSG','2865','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-110.0833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=100000',NULL,'NAD83(HARN) / Wyoming West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2865,'ESRI','2865','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-110.0833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=100000 no_defs',NULL,'NAD83(HARN) / Wyoming West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2866,'EPSG','2866','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=17.83333333333333 +lat_1=18.43333333333333 +lat_2=18.03333333333333 +lon_0=-66.43333333333334 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=200000',NULL,'NAD83(HARN) / Puerto Rico and Virgin Is.',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2866,'ESRI','2866','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=17.83333333333333 +lat_1=18.43333333333333 +lat_2=18.03333333333333 +lon_0=-66.43333333333334 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=200000 no_defs',NULL,'NAD83(HARN) / Puerto Rico & Virgin Is.',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2867,'EPSG','2867','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=213360 +y_0=0',NULL,'NAD83(HARN) / Arizona East (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2867,'ESRI','2867','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=213360 +y_0=0 no_defs',NULL,'NAD83(HARN) / Arizona East (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2868,'EPSG','2868','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=213360 +y_0=0',NULL,'NAD83(HARN) / Arizona Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2868,'ESRI','2868','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=213360 +y_0=0 no_defs',NULL,'NAD83(HARN) / Arizona Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2869,'EPSG','2869','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=213360 +y_0=0',NULL,'NAD83(HARN) / Arizona West (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2869,'ESRI','2869','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999933 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=213360 +y_0=0 no_defs',NULL,'NAD83(HARN) / Arizona West (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2870,'EPSG','2870','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(HARN) / California zone 1 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2870,'ESRI','2870','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=2000000.0001016 +y_0=500000.0001016001 no_defs',NULL,'NAD83(HARN) / California zone 1 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2871,'EPSG','2871','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(HARN) / California zone 2 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2871,'ESRI','2871','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=2000000.0001016 +y_0=500000.0001016001 no_defs',NULL,'NAD83(HARN) / California zone 2 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2872,'EPSG','2872','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(HARN) / California zone 3 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2872,'ESRI','2872','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=2000000.0001016 +y_0=500000.0001016001 no_defs',NULL,'NAD83(HARN) / California zone 3 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2873,'EPSG','2873','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(HARN) / California zone 4 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2873,'ESRI','2873','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=2000000.0001016 +y_0=500000.0001016001 no_defs',NULL,'NAD83(HARN) / California zone 4 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2874,'EPSG','2874','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(HARN) / California zone 5 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2874,'ESRI','2874','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=2000000.0001016 +y_0=500000.0001016001 no_defs',NULL,'NAD83(HARN) / California zone 5 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2875,'EPSG','2875','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(HARN) / California zone 6 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2875,'ESRI','2875','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=2000000.0001016 +y_0=500000.0001016001 no_defs',NULL,'NAD83(HARN) / California zone 6 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2876,'EPSG','2876','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=914401.8288036576 +y_0=304800.6096012192',NULL,'NAD83(HARN) / Colorado North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2876,'ESRI','2876','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lon_0=-105.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=914401.8288036576 +y_0=304800.6096012192 no_defs',NULL,'NAD83(HARN) / Colorado North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2877,'EPSG','2877','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=914401.8288036576 +y_0=304800.6096012192',NULL,'NAD83(HARN) / Colorado Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2877,'ESRI','2877','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=914401.8288036576 +y_0=304800.6096012192 no_defs',NULL,'NAD83(HARN) / Colorado Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2878,'EPSG','2878','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=914401.8288036576 +y_0=304800.6096012192',NULL,'NAD83(HARN) / Colorado South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2878,'ESRI','2878','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=914401.8288036576 +y_0=304800.6096012192 no_defs',NULL,'NAD83(HARN) / Colorado South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2879,'EPSG','2879','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=304800.6096012192 +y_0=152400.3048006096',NULL,'NAD83(HARN) / Connecticut (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2879,'ESRI','2879','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=304800.6096012192 +y_0=152400.3048006096 no_defs',NULL,'NAD83(HARN) / Connecticut (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2880,'EPSG','2880','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(HARN) / Delaware (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2880,'ESRI','2880','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=200000.0001016002 +y_0=0 no_defs',NULL,'NAD83(HARN) / Delaware (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2881,'EPSG','2881','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(HARN) / Florida East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2881,'ESRI','2881','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=200000.0001016002 +y_0=0 no_defs',NULL,'NAD83(HARN) / Florida East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2882,'EPSG','2882','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(HARN) / Florida West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2882,'ESRI','2882','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=200000.0001016002 +y_0=0 no_defs',NULL,'NAD83(HARN) / Florida West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2883,'EPSG','2883','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Florida North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2883,'ESRI','2883','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Florida North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2884,'EPSG','2884','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(HARN) / Georgia East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2884,'ESRI','2884','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=200000.0001016002 +y_0=0 no_defs',NULL,'NAD83(HARN) / Georgia East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2885,'EPSG','2885','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=699999.9998983998 +y_0=0',NULL,'NAD83(HARN) / Georgia West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2885,'ESRI','2885','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=699999.9998983998 +y_0=0 no_defs',NULL,'NAD83(HARN) / Georgia West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2886,'EPSG','2886','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(HARN) / Idaho East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2886,'ESRI','2886','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=200000.0001016002 +y_0=0 no_defs',NULL,'NAD83(HARN) / Idaho East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2887,'EPSG','2887','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(HARN) / Idaho Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2887,'ESRI','2887','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=500000.0001016001 +y_0=0 no_defs',NULL,'NAD83(HARN) / Idaho Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2888,'EPSG','2888','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=800000.0001016001 +y_0=0',NULL,'NAD83(HARN) / Idaho West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2888,'ESRI','2888','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999933 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=800000.0001016001 +y_0=0 no_defs',NULL,'NAD83(HARN) / Idaho West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2889,'EPSG','2889','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=99999.99989839978 +y_0=249364.9987299975',NULL,'NAD83(HARN) / Indiana East (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2889,'ESRI','2889','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=99999.99989839978 +y_0=249364.9987299975 no_defs',NULL,'NAD83(HARN) / Indiana East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2890,'EPSG','2890','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=900000 +y_0=249364.9987299975',NULL,'NAD83(HARN) / Indiana West (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2890,'ESRI','2890','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=900000 +y_0=249364.9987299975 no_defs',NULL,'NAD83(HARN) / Indiana West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2891,'EPSG','2891','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(HARN) / Kentucky North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2891,'ESRI','2891','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=500000.0001016001 +y_0=0 no_defs',NULL,'NAD83(HARN) / Kentucky North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2892,'EPSG','2892','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lon_0=-85.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=500000.0001016001',NULL,'NAD83(HARN) / Kentucky South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2892,'ESRI','2892','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lon_0=-85.75 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=500000.0001016001 +y_0=500000.0001016001 no_defs',NULL,'NAD83(HARN) / Kentucky South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2893,'EPSG','2893','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.45 +lat_2=38.3 +lon_0=-77 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=399999.9998983998 +y_0=0',NULL,'NAD83(HARN) / Maryland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2893,'ESRI','2893','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.45 +lat_2=38.3 +lon_0=-77 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=399999.9998983998 +y_0=0 no_defs',NULL,'NAD83(HARN) / Maryland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2894,'EPSG','2894','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lon_0=-71.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=750000',NULL,'NAD83(HARN) / Massachusetts Mainland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2894,'ESRI','2894','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lon_0=-71.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=200000.0001016002 +y_0=750000 no_defs',NULL,'NAD83(HARN) / Massachusetts Mainland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2895,'EPSG','2895','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lon_0=-70.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(HARN) / Massachusetts Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2895,'ESRI','2895','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lon_0=-70.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=500000.0001016001 +y_0=0 no_defs',NULL,'NAD83(HARN) / Massachusetts Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2896,'EPSG','2896','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44.78333333333333 +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lon_0=-87 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=7999999.999968001 +y_0=0',NULL,'NAD83(HARN) / Michigan North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2896,'ESRI','2896','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=44.78333333333333 +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lon_0=-87 +no_defs +proj=lcc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=7999999.999968001 +y_0=0 no_defs',NULL,'NAD83(HARN) / Michigan North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2897,'EPSG','2897','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.31666666666667 +lat_1=45.7 +lat_2=44.18333333333333 +lon_0=-84.36666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=5999999.999976001 +y_0=0',NULL,'NAD83(HARN) / Michigan Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2897,'ESRI','2897','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43.31666666666667 +lat_1=45.7 +lat_2=44.18333333333333 +lon_0=-84.36666666666666 +no_defs +proj=lcc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=5999999.999976001 +y_0=0 no_defs',NULL,'NAD83(HARN) / Michigan Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2898,'EPSG','2898','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.66666666666666 +lat_2=42.1 +lon_0=-84.36666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=3999999.999984 +y_0=0',NULL,'NAD83(HARN) / Michigan South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2898,'ESRI','2898','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.66666666666666 +lat_2=42.1 +lon_0=-84.36666666666666 +no_defs +proj=lcc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=3999999.999984 +y_0=0 no_defs',NULL,'NAD83(HARN) / Michigan South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2899,'EPSG','2899','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=29.5 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(HARN) / Mississippi East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2899,'ESRI','2899','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999950 +lat_0=29.5 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=300000.0000000001 +y_0=0 no_defs',NULL,'NAD83(HARN) / Mississippi East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2900,'EPSG','2900','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=29.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=699999.9998983998 +y_0=0',NULL,'NAD83(HARN) / Mississippi West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2900,'ESRI','2900','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999950 +lat_0=29.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=699999.9998983998 +y_0=0 no_defs',NULL,'NAD83(HARN) / Mississippi West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2900,'NAD27','2900','proj4_data/nad27',NULL,'+datum=NAD27 +k=.999975 +lat_0=38d50 +lon_0=-74d40 +proj=tmerc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'2900: new jersey ---: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2900,'NAD83','2900','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=38d50 +lon_0=-74d30 +proj=tmerc +x_0=150000 +y_0=0 no_defs',NULL,'2900: new jersey ---: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2901,'EPSG','2901','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44.25 +lat_1=49 +lat_2=45 +lon_0=-109.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=599999.9999976 +y_0=0',NULL,'NAD83(HARN) / Montana (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2901,'ESRI','2901','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=44.25 +lat_1=49 +lat_2=45 +lon_0=-109.5 +no_defs +proj=lcc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=599999.9999976 +y_0=0 no_defs',NULL,'NAD83(HARN) / Montana (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2902,'EPSG','2902','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999909091 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=165000 +y_0=0',NULL,'NAD83(HARN) / New Mexico East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2902,'ESRI','2902','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999909 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=165000 +y_0=0 no_defs',NULL,'NAD83(HARN) / New Mexico East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2903,'EPSG','2903','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(HARN) / New Mexico Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2903,'ESRI','2903','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=500000.0001016001 +y_0=0 no_defs',NULL,'NAD83(HARN) / New Mexico Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2904,'EPSG','2904','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999916667 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=830000.0001016001 +y_0=0',NULL,'NAD83(HARN) / New Mexico West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2904,'ESRI','2904','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999917 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=830000.0001016001 +y_0=0 no_defs',NULL,'NAD83(HARN) / New Mexico West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2905,'EPSG','2905','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=150000 +y_0=0',NULL,'NAD83(HARN) / New York East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2905,'ESRI','2905','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=150000 +y_0=0 no_defs',NULL,'NAD83(HARN) / New York East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2906,'EPSG','2906','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=249999.9998983998 +y_0=0',NULL,'NAD83(HARN) / New York Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2906,'ESRI','2906','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=249999.9998983998 +y_0=0 no_defs',NULL,'NAD83(HARN) / New York Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2907,'EPSG','2907','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=350000.0001016001 +y_0=0',NULL,'NAD83(HARN) / New York West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2907,'ESRI','2907','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=350000.0001016001 +y_0=0 no_defs',NULL,'NAD83(HARN) / New York West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2908,'EPSG','2908','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(HARN) / New York Long Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2908,'ESRI','2908','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=300000.0000000001 +y_0=0 no_defs',NULL,'NAD83(HARN) / New York Long Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2909,'EPSG','2909','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.43333333333333 +lon_0=-100.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=599999.9999976 +y_0=0',NULL,'NAD83(HARN) / North Dakota North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2909,'ESRI','2909','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.43333333333333 +lon_0=-100.5 +no_defs +proj=lcc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=599999.9999976 +y_0=0 no_defs',NULL,'NAD83(HARN) / North Dakota North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2910,'EPSG','2910','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.66666666666666 +lat_1=47.48333333333333 +lat_2=46.18333333333333 +lon_0=-100.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=599999.9999976 +y_0=0',NULL,'NAD83(HARN) / North Dakota South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2910,'ESRI','2910','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=45.66666666666666 +lat_1=47.48333333333333 +lat_2=46.18333333333333 +lon_0=-100.5 +no_defs +proj=lcc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=599999.9999976 +y_0=0 no_defs',NULL,'NAD83(HARN) / North Dakota South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2911,'EPSG','2911','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=35 +lat_1=36.76666666666667 +lat_2=35.56666666666667 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Oklahoma North (ftUS)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_20() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2911,'ESRI','2911','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=35 +lat_1=36.76666666666667 +lat_2=35.56666666666667 +lon_0=-98 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Oklahoma North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2912,'EPSG','2912','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.33333333333334 +lat_1=35.23333333333333 +lat_2=33.93333333333333 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Oklahoma South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2912,'ESRI','2912','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=33.33333333333334 +lat_1=35.23333333333333 +lat_2=33.93333333333333 +lon_0=-98 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Oklahoma South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2913,'EPSG','2913','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=2500000.0001424 +y_0=0',NULL,'NAD83(HARN) / Oregon North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2913,'ESRI','2913','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=2500000.0001424 +y_0=0 no_defs',NULL,'NAD83(HARN) / Oregon North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2914,'EPSG','2914','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=1500000.0001464 +y_0=0',NULL,'NAD83(HARN) / Oregon South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2914,'ESRI','2914','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=1500000.0001464 +y_0=0 no_defs',NULL,'NAD83(HARN) / Oregon South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2915,'EPSG','2915','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.41666666666666 +lat_2=35.25 +lon_0=-86 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Tennessee (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2915,'ESRI','2915','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.41666666666666 +lat_2=35.25 +lon_0=-86 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Tennessee (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2916,'EPSG','2916','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34 +lat_1=36.18333333333333 +lat_2=34.65 +lon_0=-101.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=999999.9998983998',NULL,'NAD83(HARN) / Texas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2916,'ESRI','2916','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=34 +lat_1=36.18333333333333 +lat_2=34.65 +lon_0=-101.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=200000.0001016002 +y_0=999999.9998983998 no_defs',NULL,'NAD83(HARN) / Texas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2917,'EPSG','2917','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=31.66666666666667 +lat_1=33.96666666666667 +lat_2=32.13333333333333 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=2000000.0001016',NULL,'NAD83(HARN) / Texas North Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2917,'ESRI','2917','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=31.66666666666667 +lat_1=33.96666666666667 +lat_2=32.13333333333333 +lon_0=-98.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=600000 +y_0=2000000.0001016 no_defs',NULL,'NAD83(HARN) / Texas North Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2918,'EPSG','2918','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=29.66666666666667 +lat_1=31.88333333333333 +lat_2=30.11666666666667 +lon_0=-100.3333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=699999.9998983998 +y_0=3000000',NULL,'NAD83(HARN) / Texas Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2918,'ESRI','2918','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=29.66666666666667 +lat_1=31.88333333333333 +lat_2=30.11666666666667 +lon_0=-100.3333333333333 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=699999.9998983998 +y_0=3000000 no_defs',NULL,'NAD83(HARN) / Texas Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2919,'EPSG','2919','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=27.83333333333333 +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lon_0=-99 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=3999999.9998984',NULL,'NAD83(HARN) / Texas South Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2919,'ESRI','2919','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=27.83333333333333 +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lon_0=-99 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=600000 +y_0=3999999.9998984 no_defs',NULL,'NAD83(HARN) / Texas South Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2920,'EPSG','2920','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=300000.0000000001 +y_0=5000000.0001016',NULL,'NAD83(HARN) / Texas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2920,'ESRI','2920','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-98.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=300000.0000000001 +y_0=5000000.0001016 no_defs',NULL,'NAD83(HARN) / Texas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2921,'EPSG','2921','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=500000.0001504 +y_0=999999.9999960001',NULL,'NAD83(HARN) / Utah North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2921,'ESRI','2921','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=500000.0001504 +y_0=999999.9999960001 no_defs',NULL,'NAD83(HARN) / Utah North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2922,'EPSG','2922','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=500000.0001504 +y_0=1999999.999992',NULL,'NAD83(HARN) / Utah Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2922,'ESRI','2922','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=500000.0001504 +y_0=1999999.999992 no_defs',NULL,'NAD83(HARN) / Utah Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2923,'EPSG','2923','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=500000.0001504 +y_0=2999999.999988',NULL,'NAD83(HARN) / Utah South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2923,'ESRI','2923','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +to_meter=0.3048 +towgs84=0,0,0,0,0,0,0 +x_0=500000.0001504 +y_0=2999999.999988 no_defs',NULL,'NAD83(HARN) / Utah South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2924,'EPSG','2924','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.2 +lat_2=38.03333333333333 +lon_0=-78.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=3500000.0001016 +y_0=2000000.0001016',NULL,'NAD83(HARN) / Virginia North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2924,'ESRI','2924','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.2 +lat_2=38.03333333333333 +lon_0=-78.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=3500000.0001016 +y_0=2000000.0001016 no_defs',NULL,'NAD83(HARN) / Virginia North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2925,'EPSG','2925','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.96666666666667 +lat_2=36.76666666666667 +lon_0=-78.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=3500000.0001016 +y_0=999999.9998983998',NULL,'NAD83(HARN) / Virginia South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2925,'ESRI','2925','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.96666666666667 +lat_2=36.76666666666667 +lon_0=-78.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=3500000.0001016 +y_0=999999.9998983998 no_defs',NULL,'NAD83(HARN) / Virginia South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2926,'EPSG','2926','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.5 +lon_0=-120.8333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(HARN) / Washington North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2926,'ESRI','2926','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.5 +lon_0=-120.8333333333333 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=500000.0001016001 +y_0=0 no_defs',NULL,'NAD83(HARN) / Washington North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2927,'EPSG','2927','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.33333333333334 +lat_1=47.33333333333334 +lat_2=45.83333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(HARN) / Washington South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2927,'ESRI','2927','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=45.33333333333334 +lat_1=47.33333333333334 +lat_2=45.83333333333334 +lon_0=-120.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=500000.0001016001 +y_0=0 no_defs',NULL,'NAD83(HARN) / Washington South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2928,'EPSG','2928','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.16666666666666 +lat_1=46.76666666666667 +lat_2=45.56666666666667 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Wisconsin North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2928,'ESRI','2928','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=45.16666666666666 +lat_1=46.76666666666667 +lat_2=45.56666666666667 +lon_0=-90 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Wisconsin North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2929,'EPSG','2929','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Wisconsin Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2929,'ESRI','2929','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Wisconsin Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2930,'EPSG','2930','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42 +lat_1=44.06666666666667 +lat_2=42.73333333333333 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Wisconsin South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2930,'ESRI','2930','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=42 +lat_1=44.06666666666667 +lat_2=42.73333333333333 +lon_0=-90 +no_defs +proj=lcc +to_meter=0.3048006096012192 +towgs84=0,0,0,0,0,0,0 +x_0=600000 +y_0=0 no_defs',NULL,'NAD83(HARN) / Wisconsin South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2931,'EPSG','2931','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k=0.9996 +lat_0=0 +lon_0=13 +no_defs +proj=tmerc +towgs84=-106,-87,188,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beduaram / TM 13 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2931,'ESRI','2931','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k=0.999600 +lat_0=0 +lon_0=13 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000001 +y_0=0 no_defs',NULL,'Beduaram / TM 13 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2932,'EPSG','2932','proj4_data/epsg',NULL,'+ellps=intl +k=0.99999 +lat_0=24.45 +lon_0=51.21666666666667 +no_defs +proj=tmerc +towgs84=-119.4248,-303.65872,-11.00061,1.164298,0.174458,1.096259,3.657065 +units=m +x_0=200000 +y_0=300000',NULL,'QND95 / Qatar National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2932,'ESRI','2932','proj4_data/esri',NULL,'+ellps=intl +k=0.999990 +lat_0=24.45 +lon_0=51.21666666666667 +no_defs +proj=tmerc +towgs84=-119.425,-303.659,-11.0006,1.1643,0.174458,1.09626,3.65706 +units=m +x_0=200000 +y_0=300000 no_defs',NULL,'QND95 / Qatar National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2933,'EPSG','2933','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=utm +south +towgs84=-403,684,41,0,0,0,0 +units=m +zone=50',NULL,'Segara / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2933,'ESRI','2933','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=utm +south +towgs84=-404.78,685.68,45.47,0,0,0,0 +units=m +zone=50 no_defs',NULL,'Segara / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2934,'EPSG','2934','proj4_data/epsg',NULL,'+ellps=bessel +k=0.997 +lon_0=110 +no_defs +pm=jakarta +proj=merc +towgs84=-403,684,41,0,0,0,0 +units=m +x_0=3900000 +y_0=900000',NULL,'Segara (Jakarta) / NEIEZ (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2934,'ESRI','2934','proj4_data/esri',NULL,'+ellps=bessel +k=0.997000 +lat_ts=0 +lon_0=216.8077194444444 +no_defs +pm=jakarta +proj=merc +units=m +x_0=3900000 +y_0=900000 no_defs',NULL,'Segara (Jakarta) / NEIEZ',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2935,'EPSG','2935','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0.1166666666666667 +lon_0=41.53333333333333 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=1300000 +y_0=0',NULL,'Pulkovo 1942 / CS63 zone A1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2935,'ESRI','2935','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0.1166666666666667 +lon_0=41.53333333333333 +no_defs +proj=tmerc +units=m +x_0=1300000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / CS63 zone A1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2936,'EPSG','2936','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0.1166666666666667 +lon_0=44.53333333333333 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=2300000 +y_0=0',NULL,'Pulkovo 1942 / CS63 zone A2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2936,'ESRI','2936','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0.1166666666666667 +lon_0=44.53333333333333 +no_defs +proj=tmerc +units=m +x_0=2300000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / CS63 zone A2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2937,'EPSG','2937','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0.1166666666666667 +lon_0=47.53333333333333 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=3300000 +y_0=0',NULL,'Pulkovo 1942 / CS63 zone A3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2937,'ESRI','2937','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0.1166666666666667 +lon_0=47.53333333333333 +no_defs +proj=tmerc +units=m +x_0=3300000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / CS63 zone A3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2938,'EPSG','2938','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0.1166666666666667 +lon_0=50.53333333333333 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=4300000 +y_0=0',NULL,'Pulkovo 1942 / CS63 zone A4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2938,'ESRI','2938','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0.1166666666666667 +lon_0=50.53333333333333 +no_defs +proj=tmerc +units=m +x_0=4300000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / CS63 zone A4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2939,'EPSG','2939','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0.1333333333333333 +lon_0=50.76666666666667 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=2300000 +y_0=0',NULL,'Pulkovo 1942 / CS63 zone K2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2939,'ESRI','2939','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0.1333333333333333 +lon_0=50.76666666666667 +no_defs +proj=tmerc +units=m +x_0=2300000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / CS63 zone K2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2940,'EPSG','2940','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0.1333333333333333 +lon_0=53.76666666666667 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=3300000 +y_0=0',NULL,'Pulkovo 1942 / CS63 zone K3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2940,'ESRI','2940','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0.1333333333333333 +lon_0=53.76666666666667 +no_defs +proj=tmerc +units=m +x_0=3300000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / CS63 zone K3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2941,'EPSG','2941','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0.1333333333333333 +lon_0=56.76666666666667 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=4300000 +y_0=0',NULL,'Pulkovo 1942 / CS63 zone K4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2941,'ESRI','2941','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0.1333333333333333 +lon_0=56.76666666666667 +no_defs +proj=tmerc +units=m +x_0=4300000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / CS63 zone K4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2942,'EPSG','2942','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-499,-249,314,0,0,0,0 +units=m +zone=28',NULL,'Porto Santo / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2942,'ESRI','2942','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=28 no_defs',NULL,'Porto Santo / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2943,'EPSG','2943','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-289,-124,60,0,0,0,0 +units=m +zone=28',NULL,'Selvagem Grande / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2943,'ESRI','2943','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=28 no_defs',NULL,'Selvagem Grande / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2944,'EPSG','2944','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-55.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / SCoPQ zone 2 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2944,'ESRI','2944','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-55.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS) / SCoPQ zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2945,'EPSG','2945','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-58.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2945,'ESRI','2945','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-58.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS) / MTM zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2946,'EPSG','2946','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-61.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2946,'ESRI','2946','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-61.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS) / MTM zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2947,'EPSG','2947','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-64.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2947,'ESRI','2947','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-64.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS) / MTM zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2948,'EPSG','2948','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-67.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2948,'ESRI','2948','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-67.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS) / MTM zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2949,'EPSG','2949','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-70.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2949,'ESRI','2949','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-70.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS) / MTM zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2950,'EPSG','2950','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-73.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2950,'ESRI','2950','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-73.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS) / MTM zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2951,'EPSG','2951','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-76.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2951,'ESRI','2951','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-76.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS) / MTM zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2952,'EPSG','2952','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-79.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2952,'ESRI','2952','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-79.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83(CSRS) / MTM zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2953,'EPSG','2953','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999912 +lat_0=46.5 +lon_0=-66.5 +no_defs +proj=sterea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=7500000',NULL,'NAD83(CSRS) / New Brunswick Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2953,'ESRI','2953','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999912 +lat_0=46.5 +lon_0=-66.5 +no_defs +proj=stere +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=7500000 no_defs',NULL,'NAD83(CSRS) / New Brunswick Stereo',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2954,'EPSG','2954','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999912 +lat_0=47.25 +lon_0=-63 +no_defs +proj=sterea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NAD83(CSRS) / Prince Edward Isl. Stereographic (NAD83)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2954,'ESRI','2954','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999912 +lat_0=47.25 +lon_0=-63 +no_defs +proj=stere +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'NAD83(CSRS) / Prince Edward Isl. Stereographic (NAD83)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2955,'EPSG','2955','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=11',NULL,'NAD83(CSRS) / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2955,'ESRI','2955','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=11 no_defs',NULL,'NAD83(CSRS) / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2956,'EPSG','2956','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=12',NULL,'NAD83(CSRS) / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2956,'ESRI','2956','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=12 no_defs',NULL,'NAD83(CSRS) / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2957,'EPSG','2957','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=13',NULL,'NAD83(CSRS) / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2957,'ESRI','2957','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=13 no_defs',NULL,'NAD83(CSRS) / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2958,'EPSG','2958','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=17',NULL,'NAD83(CSRS) / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2958,'ESRI','2958','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=17 no_defs',NULL,'NAD83(CSRS) / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2959,'EPSG','2959','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'NAD83(CSRS) / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2959,'ESRI','2959','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18 no_defs',NULL,'NAD83(CSRS) / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2960,'EPSG','2960','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'NAD83(CSRS) / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2960,'ESRI','2960','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=19 no_defs',NULL,'NAD83(CSRS) / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2961,'EPSG','2961','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20',NULL,'NAD83(CSRS) / UTM zone 20N',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_21() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2961,'ESRI','2961','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20 no_defs',NULL,'NAD83(CSRS) / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2962,'EPSG','2962','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=21',NULL,'NAD83(CSRS) / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2962,'ESRI','2962','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=21 no_defs',NULL,'NAD83(CSRS) / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2964,'EPSG','2964','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=50 +lat_1=55 +lat_2=65 +lon_0=-154 +no_defs +proj=aea +units=us-ft +x_0=0 +y_0=0',NULL,'Lisbon 1890 (Lisbon) / Portugal Bonne\12Unable to translate coordinate system EPSG:2963 into PROJ.4 format.\12\12NAD27 / Alaska Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2965,'EPSG','2965','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=99999.99989839978 +y_0=249999.9998983998',NULL,'NAD83 / Indiana East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2966,'EPSG','2966','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=900000 +y_0=249999.9998983998',NULL,'NAD83 / Indiana West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2967,'EPSG','2967','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=99999.99989839978 +y_0=249999.9998983998',NULL,'NAD83(HARN) / Indiana East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2968,'EPSG','2968','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=900000 +y_0=249999.9998983998',NULL,'NAD83(HARN) / Indiana West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2969,'EPSG','2969','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=137,248,-430,0,0,0,0 +units=m +zone=20',NULL,'Fort Marigot / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2970,'EPSG','2970','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-467,-16,-300,0,0,0,0 +units=m +zone=20',NULL,'Guadeloupe 1948 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2971,'EPSG','2971','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-186,230,110,0,0,0,0 +units=m +zone=22',NULL,'CSG67 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2972,'EPSG','2972','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=22',NULL,'RGFG95 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2973,'EPSG','2973','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=186,482,151,0,0,0,0 +units=m +zone=20',NULL,'Martinique 1938 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2975,'EPSG','2975','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=40',NULL,'RGR92 / UTM zone 40S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2976,'EPSG','2976','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=162,117,154,0,0,0,0 +units=m +zone=6',NULL,'Tahiti 52 / UTM zone 6S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2977,'EPSG','2977','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=72.438,345.918,79.486,1.6045,0.8823,0.5565,1.3746 +units=m +zone=5',NULL,'Tahaa 54 / UTM zone 5S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2978,'EPSG','2978','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=84,274,65,0,0,0,0 +units=m +zone=7',NULL,'IGN72 Nuku Hiva / UTM zone 7S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2979,'EPSG','2979','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=145,-187,103,0,0,0,0 +units=m +zone=42',NULL,'K0 1949 / UTM zone 42S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2980,'EPSG','2980','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-382,-59,-262,0,0,0,0 +units=m +zone=38',NULL,'Combani 1950 / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2981,'EPSG','2981','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=335.47,222.58,-230.94,0,0,0,0 +units=m +zone=58',NULL,'IGN56 Lifou / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2982,'EPSG','2982','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-13,-348,292,0,0,0,0 +units=m +zone=58',NULL,'IGN72 Grand Terre / UTM zone 58S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2983,'EPSG','2983','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-122.383,-188.696,103.344,3.5107,-4.9668,-5.7047,4.4798 +units=m +zone=58',NULL,'ST87 Ouvea / UTM zone 58S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2984,'EPSG','2984','proj4_data/epsg',NULL,'+ellps=intl +lat_0=-21.5 +lat_1=-20.66666666666667 +lat_2=-22.33333333333333 +lon_0=166 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=300000',NULL,'RGNC 1991 / Lambert New Caledonia (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2987,'EPSG','2987','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +towgs84=30,430,368,0,0,0,0 +units=m +zone=21',NULL,'Petrels 1972 / Terre Adelie Polar Stereographic\12Unable to translate coordinate system EPSG:2985 into PROJ.4 format.\12\12Perroud 1950 / Terre Adelie Polar Stereographic\12Unable to translate coordinate system EPSG:2986 into PROJ.4 format.\12\12Saint Pierre et Miquelon 1950 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2988,'EPSG','2988','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=253,-132,-127,0,0,0,0 +units=m +zone=1',NULL,'MOP78 / UTM zone 1S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2989,'EPSG','2989','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20',NULL,'RRAF 1991 / UTM zone 20N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2990,'EPSG','2990','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-21.11666666666667 +lon_0=55.53333333333333 +no_defs +proj=tmerc +towgs84=94,-948,-1262,0,0,0,0 +units=m +x_0=50000 +y_0=160000',NULL,'Reunion 1947 / TM Reunion (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2991,'EPSG','2991','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=41.75 +lat_1=43 +lat_2=45.5 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0',NULL,'NAD83 / Oregon LCC (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2992,'EPSG','2992','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=41.75 +lat_1=43 +lat_2=45.5 +lon_0=-120.5 +no_defs +proj=lcc +units=ft +x_0=399999.9999984 +y_0=0',NULL,'NAD83 / Oregon GIC Lambert (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2993,'EPSG','2993','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.75 +lat_1=43 +lat_2=45.5 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'NAD83(HARN) / Oregon LCC (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2994,'EPSG','2994','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.75 +lat_1=43 +lat_2=45.5 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=399999.9999984 +y_0=0',NULL,'NAD83(HARN) / Oregon GIC Lambert (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2995,'EPSG','2995','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=287.58,177.78,-135.41,0,0,0,0 +units=m +zone=58',NULL,'IGN53 Mare / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2996,'EPSG','2996','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-13,-348,292,0,0,0,0 +units=m +zone=58',NULL,'ST84 Ile des Pins / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2997,'EPSG','2997','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-480.26,-438.32,-643.429,16.3119,20.1721,-4.0349,-111.7002 +units=m +zone=58',NULL,'ST71 Belep / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2998,'EPSG','2998','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-10.18,-350.43,291.37,0,0,0,0 +units=m +zone=58',NULL,'NEA74 Noumea / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(2999,'EPSG','2999','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-963,510,-359,0,0,0,0 +units=m +zone=38',NULL,'Grand Comoros / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3000,'EPSG','3000','proj4_data/epsg',NULL,'+ellps=bessel +k=0.997 +lon_0=110 +no_defs +proj=merc +towgs84=-403,684,41,0,0,0,0 +units=m +x_0=3900000 +y_0=900000',NULL,'Segara / NEIEZ',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3001,'EPSG','3001','proj4_data/epsg',NULL,'+ellps=bessel +k=0.997 +lon_0=110 +no_defs +proj=merc +towgs84=-377,681,-50,0,0,0,0 +units=m +x_0=3900000 +y_0=900000',NULL,'Batavia / NEIEZ',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3001,'NAD27','3001','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999090909090909 +lat_0=31 +lon_0=-104d20 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'3001: new mexico east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3001,'NAD83','3001','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999090909090909 +lat_0=31 +lon_0=-104d20 +proj=tmerc +x_0=165000 +y_0=0 no_defs',NULL,'3001: new mexico east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3002,'EPSG','3002','proj4_data/epsg',NULL,'+ellps=bessel +k=0.997 +lon_0=110 +no_defs +proj=merc +towgs84=-587.8,519.75,145.76,0,0,0,0 +units=m +x_0=3900000 +y_0=900000',NULL,'Makassar / NEIEZ',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3002,'NAD27','3002','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=31 +lon_0=-106d15 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'3002: new mexico central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3002,'NAD83','3002','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=31 +lon_0=-106d15 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'3002: new mexico central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3003,'EPSG','3003','proj4_data/epsg',NULL,'+ellps=intl +k=0.9996 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=-104.1,-49.1,-9.9,0.971,-2.917,0.714,-11.68 +units=m +x_0=1500000 +y_0=0',NULL,'Monte Mario / Italy zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3003,'NAD27','3003','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999166666666667 +lat_0=31 +lon_0=-107d50 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'3003: new mexico west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3003,'NAD83','3003','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999166666666667 +lat_0=31 +lon_0=-107d50 +proj=tmerc +x_0=830000 +y_0=0 no_defs',NULL,'3003: new mexico west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3004,'EPSG','3004','proj4_data/epsg',NULL,'+ellps=intl +k=0.9996 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=-104.1,-49.1,-9.9,0.971,-2.917,0.714,-11.68 +units=m +x_0=2520000 +y_0=0',NULL,'Monte Mario / Italy zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3005,'EPSG','3005','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=45 +lat_1=50 +lat_2=58.5 +lon_0=-126 +no_defs +proj=aea +units=m +x_0=1000000 +y_0=0',NULL,'NAD83 / BC Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3006,'EPSG','3006','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=33',NULL,'SWEREF99 TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3007,'EPSG','3007','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'SWEREF99 12 00',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3008,'EPSG','3008','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=13.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'SWEREF99 13 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3009,'EPSG','3009','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'SWEREF99 15 00',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3010,'EPSG','3010','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=16.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'SWEREF99 16 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3011,'EPSG','3011','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'SWEREF99 18 00',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3012,'EPSG','3012','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=14.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'SWEREF99 14 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3013,'EPSG','3013','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=15.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'SWEREF99 15 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3014,'EPSG','3014','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=17.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'SWEREF99 17 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3015,'EPSG','3015','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=18.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'SWEREF99 18 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3016,'EPSG','3016','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=20.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'SWEREF99 20 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3017,'EPSG','3017','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=21.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'SWEREF99 21 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3018,'EPSG','3018','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=23.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'SWEREF99 23 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3019,'EPSG','3019','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=11.30827777777778 +no_defs +proj=tmerc +towgs84=414.1,41.3,603.1,-0.855,2.141,-7.023,0 +units=m +x_0=1500000 +y_0=0',NULL,'RT90 7.5 gon V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3020,'EPSG','3020','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=13.55827777777778 +no_defs +proj=tmerc +towgs84=414.1,41.3,603.1,-0.855,2.141,-7.023,0 +units=m +x_0=1500000 +y_0=0',NULL,'RT90 5 gon V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3021,'EPSG','3021','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=15.80827777777778 +no_defs +proj=tmerc +towgs84=414.1,41.3,603.1,-0.855,2.141,-7.023,0 +units=m +x_0=1500000 +y_0=0',NULL,'RT90 2.5 gon V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3022,'EPSG','3022','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=18.05827777777778 +no_defs +proj=tmerc +towgs84=414.1,41.3,603.1,-0.855,2.141,-7.023,0 +units=m +x_0=1500000 +y_0=0',NULL,'RT90 0 gon',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3023,'EPSG','3023','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=20.30827777777778 +no_defs +proj=tmerc +towgs84=414.1,41.3,603.1,-0.855,2.141,-7.023,0 +units=m +x_0=1500000 +y_0=0',NULL,'RT90 2.5 gon O',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3024,'EPSG','3024','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=22.55827777777778 +no_defs +proj=tmerc +towgs84=414.1,41.3,603.1,-0.855,2.141,-7.023,0 +units=m +x_0=1500000 +y_0=0',NULL,'RT90 5 gon O',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3025,'EPSG','3025','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=11.30827777777778 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0',NULL,'RT38 7.5 gon V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3026,'EPSG','3026','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=13.55827777777778 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0',NULL,'RT38 5 gon V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3027,'EPSG','3027','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=15.80827777777778 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0',NULL,'RT38 2.5 gon V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3028,'EPSG','3028','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=18.05827777777778 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0',NULL,'RT38 0 gon',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3029,'EPSG','3029','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=20.30827777777778 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0',NULL,'RT38 2.5 gon O',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3030,'EPSG','3030','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=22.55827777777778 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0',NULL,'RT38 5 gon O',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3031,'EPSG','3031','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-71 +lon_0=0 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / Antarctic Polar Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3032,'EPSG','3032','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-71 +lon_0=70 +no_defs +proj=stere +units=m +x_0=6000000 +y_0=6000000',NULL,'WGS 84 / Australian Antarctic Polar Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3033,'EPSG','3033','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-50 +lat_1=-68.5 +lat_2=-74.5 +lon_0=70 +no_defs +proj=lcc +units=m +x_0=6000000 +y_0=6000000',NULL,'WGS 84 / Australian Antarctic Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3034,'EPSG','3034','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=52 +lat_1=35 +lat_2=65 +lon_0=10 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4000000 +y_0=2800000',NULL,'ETRS89 / LCC Europe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3035,'EPSG','3035','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=52 +lon_0=10 +no_defs +proj=laea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4321000 +y_0=3210000',NULL,'ETRS89 / LAEA Europe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3036,'EPSG','3036','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=36',NULL,'Moznet / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3036,'ESRI','3036','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,-0,-0,-0,0 +units=m +zone=36 no_defs',NULL,'Moznet / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3037,'EPSG','3037','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=37',NULL,'Moznet / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3037,'ESRI','3037','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,-0,-0,-0,0 +units=m +zone=37 no_defs',NULL,'Moznet / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3038,'EPSG','3038','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=26',NULL,'ETRS89 / TM26 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3039,'EPSG','3039','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=27',NULL,'ETRS89 / TM27 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3040,'EPSG','3040','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=28',NULL,'ETRS89 / UTM zone 28N (N-E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3041,'EPSG','3041','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=29',NULL,'ETRS89 / UTM zone 29N (N-E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3042,'EPSG','3042','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=30',NULL,'ETRS89 / UTM zone 30N (N-E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3043,'EPSG','3043','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=31',NULL,'ETRS89 / UTM zone 31N (N-E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3044,'EPSG','3044','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=32',NULL,'ETRS89 / UTM zone 32N (N-E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3045,'EPSG','3045','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=33',NULL,'ETRS89 / UTM zone 33N (N-E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3046,'EPSG','3046','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=34',NULL,'ETRS89 / UTM zone 34N (N-E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3047,'EPSG','3047','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=35',NULL,'ETRS89 / UTM zone 35N (N-E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3048,'EPSG','3048','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=36',NULL,'ETRS89 / UTM zone 36N (N-E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3049,'EPSG','3049','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=37',NULL,'ETRS89 / UTM zone 37N (N-E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3050,'EPSG','3050','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=38',NULL,'ETRS89 / TM38 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3051,'EPSG','3051','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=39',NULL,'ETRS89 / TM39 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3054,'EPSG','3054','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-73,47,-83,0,0,0,0 +units=m +zone=26',NULL,'Reykjavik 1900 / Lambert 1900\12Unable to translate coordinate system EPSG:3052 into PROJ.4 format.\12\12Hjorsey 1955 / Lambert 1955\12Unable to translate coordinate system EPSG:3053 into PROJ.4 format.\12\12Hjorsey 1955 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3055,'EPSG','3055','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-73,47,-83,0,0,0,0 +units=m +zone=27',NULL,'Hjorsey 1955 / UTM zone 27N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3056,'EPSG','3056','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-73,47,-83,0,0,0,0 +units=m +zone=28',NULL,'Hjorsey 1955 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3057,'EPSG','3057','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=65 +lat_1=64.25 +lat_2=65.75 +lon_0=-19 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=500000',NULL,'ISN93 / Lambert 1993',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_22() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3058,'EPSG','3058','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=-8.5 +no_defs +proj=tmerc +towgs84=982.6087,552.753,-540.873,6.6816266,-31.6114924,-19.84816,16.805 +units=m +x_0=50000 +y_0=-7800000',NULL,'Helle 1954 / Jan Mayen Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3059,'EPSG','3059','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=-6000000',NULL,'LKS92 / Latvia TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3060,'EPSG','3060','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-11.64,-348.6,291.98,0,0,0,0 +units=m +zone=58',NULL,'IGN72 Grande Terre / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3061,'EPSG','3061','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-502.862,-247.438,312.724,0,0,0,0 +units=m +zone=28',NULL,'Porto Santo 1995 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3062,'EPSG','3062','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-204.619,140.176,55.226,0,0,0,0 +units=m +zone=26',NULL,'Azores Oriental 1995 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3063,'EPSG','3063','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-106.226,166.366,-37.893,0,0,0,0 +units=m +zone=26',NULL,'Azores Central 1995 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3064,'EPSG','3064','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=32',NULL,'IGM95 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3065,'EPSG','3065','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=33',NULL,'IGM95 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3066,'EPSG','3066','proj4_data/epsg',NULL,'+ellps=intl +k=0.9998 +lat_0=0 +lon_0=37 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=500000 +y_0=-3000000',NULL,'ED50 / Jordan TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3067,'EPSG','3067','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=35',NULL,'ETRS89 / TM35FIN(E,N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3068,'EPSG','3068','proj4_data/epsg',NULL,'+datum=potsdam +lat_0=52.41864827777778 +lon_0=13.62720366666667 +no_defs +proj=cass +units=m +x_0=40000 +y_0=10000',NULL,'DHDN / Soldner Berlin',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3069,'EPSG','3069','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-90 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=-4500000',NULL,'NAD27 / Wisconsin Transverse Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3070,'EPSG','3070','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-90 +no_defs +proj=tmerc +units=m +x_0=520000 +y_0=-4480000',NULL,'NAD83 / Wisconsin Transverse Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3071,'EPSG','3071','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=-90 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=520000 +y_0=-4480000',NULL,'NAD83(HARN) / Wisconsin Transverse Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3072,'EPSG','3072','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99998 +lat_0=43.83333333333334 +lon_0=-67.875 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=0',NULL,'NAD83 / Maine CS2000 East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3073,'EPSG','3073','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99998 +lat_0=43 +lon_0=-69.125 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Maine CS2000 Central (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3074,'EPSG','3074','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99998 +lat_0=42.83333333333334 +lon_0=-70.375 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0',NULL,'NAD83 / Maine CS2000 West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3075,'EPSG','3075','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=43.83333333333334 +lon_0=-67.875 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=0',NULL,'NAD83(HARN) / Maine CS2000 East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3076,'EPSG','3076','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=43 +lon_0=-69.125 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Maine CS2000 Central (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3077,'EPSG','3077','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=42.83333333333334 +lon_0=-70.375 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(HARN) / Maine CS2000 West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3078,'EPSG','3078','proj4_data/epsg',NULL,'+alpha=337.25556 +datum=NAD83 +gamma=337.25556 +k=0.9996 +lat_0=45.30916666666666 +lonc=-86 +no_defs +no_uoff +proj=omerc +units=m +x_0=2546731.496 +y_0=-4354009.816',NULL,'NAD83 / Michigan Oblique Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3079,'EPSG','3079','proj4_data/epsg',NULL,'+alpha=337.25556 +ellps=GRS80 +gamma=337.25556 +k=0.9996 +lat_0=45.30916666666666 +lonc=-86 +no_defs +no_uoff +proj=omerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2546731.496 +y_0=-4354009.816',NULL,'NAD83(HARN) / Michigan Oblique Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3080,'EPSG','3080','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=31.16666666666667 +lat_1=27.41666666666667 +lat_2=34.91666666666666 +lon_0=-100 +no_defs +proj=lcc +units=ft +x_0=914400 +y_0=914400',NULL,'NAD27 / Shackleford',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3081,'EPSG','3081','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=31.16666666666667 +lat_1=27.41666666666667 +lat_2=34.91666666666666 +lon_0=-100 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=1000000',NULL,'NAD83 / Texas State Mapping System',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3082,'EPSG','3082','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=18 +lat_1=27.5 +lat_2=35 +lon_0=-100 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=5000000',NULL,'NAD83 / Texas Centric Lambert Conformal',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3083,'EPSG','3083','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=18 +lat_1=27.5 +lat_2=35 +lon_0=-100 +no_defs +proj=aea +units=m +x_0=1500000 +y_0=6000000',NULL,'NAD83 / Texas Centric Albers Equal Area',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3084,'EPSG','3084','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=18 +lat_1=27.5 +lat_2=35 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=5000000',NULL,'NAD83(HARN) / Texas Centric Lambert Conformal',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3085,'EPSG','3085','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=18 +lat_1=27.5 +lat_2=35 +lon_0=-100 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=6000000',NULL,'NAD83(HARN) / Texas Centric Albers Equal Area',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3086,'EPSG','3086','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=24 +lat_1=24 +lat_2=31.5 +lon_0=-84 +no_defs +proj=aea +units=m +x_0=400000 +y_0=0',NULL,'NAD83 / Florida GDL Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3087,'EPSG','3087','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=24 +lat_1=24 +lat_2=31.5 +lon_0=-84 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'NAD83(HARN) / Florida GDL Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3088,'EPSG','3088','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.33333333333334 +lat_1=37.08333333333334 +lat_2=38.66666666666666 +lon_0=-85.75 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=1000000',NULL,'NAD83 / Kentucky Single Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3089,'EPSG','3089','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.33333333333334 +lat_1=37.08333333333334 +lat_2=38.66666666666666 +lon_0=-85.75 +no_defs +proj=lcc +units=us-ft +x_0=1500000 +y_0=999999.9998983998',NULL,'NAD83 / Kentucky Single Zone (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3090,'EPSG','3090','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.08333333333334 +lat_2=38.66666666666666 +lon_0=-85.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=1000000',NULL,'NAD83(HARN) / Kentucky Single Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3091,'EPSG','3091','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.08333333333334 +lat_2=38.66666666666666 +lon_0=-85.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=1500000 +y_0=999999.9998983998',NULL,'NAD83(HARN) / Kentucky Single Zone (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3092,'EPSG','3092','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=utm +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +zone=51',NULL,'Tokyo / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3093,'EPSG','3093','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=utm +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +zone=52',NULL,'Tokyo / UTM zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3094,'EPSG','3094','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=utm +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +zone=53',NULL,'Tokyo / UTM zone 53N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3095,'EPSG','3095','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=utm +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +zone=54',NULL,'Tokyo / UTM zone 54N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3096,'EPSG','3096','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=utm +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +zone=55',NULL,'Tokyo / UTM zone 55N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3097,'EPSG','3097','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=51',NULL,'JGD2000 / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3098,'EPSG','3098','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=52',NULL,'JGD2000 / UTM zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3099,'EPSG','3099','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=53',NULL,'JGD2000 / UTM zone 53N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3100,'EPSG','3100','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=54',NULL,'JGD2000 / UTM zone 54N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3101,'EPSG','3101','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=55',NULL,'JGD2000 / UTM zone 55N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3101,'NAD27','3101','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999666666666667 +lat_0=40 +lon_0=-74d20 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'3101: new york east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3101,'NAD83','3101','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=38d50 +lon_0=-74d30 +proj=tmerc +x_0=150000 +y_0=0 no_defs',NULL,'3101: new york east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3102,'EPSG','3102','proj4_data/epsg',NULL,'+ellps=clrk66 +k_0=1 +lat_0=-14.26666666666667 +lat_1=-14.26666666666667 +lon_0=-170 +no_defs +proj=lcc +towgs84=-115,118,426,0,0,0,0 +units=us-ft +x_0=152400.3048006096 +y_0=95169.31165862332',NULL,'American Samoa 1962 / American Samoa Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3102,'NAD27','3102','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999375 +lat_0=40 +lon_0=-76d35 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'3102: new york central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3102,'NAD83','3102','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999375 +lat_0=40 +lon_0=-76d35 +proj=tmerc +x_0=250000 +y_0=0 no_defs',NULL,'3102: new york central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3103,'EPSG','3103','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=28',NULL,'Mauritania 1999 / UTM zone 28N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3103,'NAD27','3103','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999375 +lat_0=40 +lon_0=-78d35 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'3103: new york west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3103,'NAD83','3103','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999375 +lat_0=40 +lon_0=-78d35 +proj=tmerc +x_0=350000 +y_0=0 no_defs',NULL,'3103: new york west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3104,'EPSG','3104','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=29',NULL,'Mauritania 1999 / UTM zone 29N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3104,'NAD27','3104','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=40d30 +lat_1=41d2 +lat_2=40d40 +lon_0=-74 +proj=lcc +x_0=609601.2192024384 +y_0=30480.06096012192 no_defs',NULL,'3104: new york long island: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3104,'NAD83','3104','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=40d10 +lat_1=41d2 +lat_2=40d40 +lon_0=-74 +proj=lcc +x_0=300000 +y_0=0 no_defs',NULL,'3104: new york long island: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3105,'EPSG','3105','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=30',NULL,'Mauritania 1999 / UTM zone 30N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3106,'EPSG','3106','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +k=0.9996 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +towgs84=283.7,735.9,261.1,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Gulshan 303 / Bangladesh Transverse Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3107,'EPSG','3107','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=-32 +lat_1=-28 +lat_2=-36 +lon_0=135 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=2000000',NULL,'GDA94 / SA Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3108,'EPSG','3108','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999997 +lat_0=49.5 +lon_0=-2.416666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=47000 +y_0=50000',NULL,'ETRS89 / Guernsey Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3109,'EPSG','3109','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999999000000001 +lat_0=49.225 +lon_0=-2.135 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=40000 +y_0=70000',NULL,'ETRS89 / Jersey Transverse Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3110,'EPSG','3110','proj4_data/epsg',NULL,'+ellps=aust_SA +lat_0=-37 +lat_1=-36 +lat_2=-38 +lon_0=145 +no_defs +proj=lcc +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +x_0=2500000 +y_0=4500000',NULL,'AGD66 / Vicgrid66',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3111,'EPSG','3111','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=-37 +lat_1=-36 +lat_2=-38 +lon_0=145 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=2500000',NULL,'GDA94 / Vicgrid94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3112,'EPSG','3112','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=0 +lat_1=-18 +lat_2=-36 +lon_0=134 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'GDA94 / Geoscience Australia Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3113,'EPSG','3113','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999 +lat_0=-28 +lon_0=153 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=50000 +y_0=100000',NULL,'GDA94 / BCSG02',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3114,'EPSG','3114','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=4.596200416666666 +lon_0=-80.07750791666666 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'MAGNA-SIRGAS / Colombia Far West zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3115,'EPSG','3115','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=4.596200416666666 +lon_0=-77.07750791666666 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'MAGNA-SIRGAS / Colombia West zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3116,'EPSG','3116','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=4.596200416666666 +lon_0=-74.07750791666666 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'MAGNA-SIRGAS / Colombia Bogota zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3117,'EPSG','3117','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=4.596200416666666 +lon_0=-71.07750791666666 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'MAGNA-SIRGAS / Colombia East Central zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3118,'EPSG','3118','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=4.596200416666666 +lon_0=-68.07750791666666 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'MAGNA-SIRGAS / Colombia East zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3119,'EPSG','3119','proj4_data/epsg',NULL,'+ellps=intl +k=0.999 +lat_0=0 +lon_0=10.5 +no_defs +proj=tmerc +towgs84=-206.1,-174.7,-87.7,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'Douala 1948 / AEF west',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3120,'EPSG','3120','proj4_data/epsg',NULL,'+ellps=krass +k=0.9998 +lat_0=50.625 +lon_0=21.08333333333333 +no_defs +proj=sterea +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=4637000 +y_0=5467000',NULL,'Pulkovo 1942(58) / Poland zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3121,'EPSG','3121','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.99995 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=-127.62,-67.24,-47.04,-3.068,4.903,1.578,-1.06 +units=m +x_0=500000 +y_0=0',NULL,'PRS92 / Philippines zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3122,'EPSG','3122','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.99995 +lat_0=0 +lon_0=119 +no_defs +proj=tmerc +towgs84=-127.62,-67.24,-47.04,-3.068,4.903,1.578,-1.06 +units=m +x_0=500000 +y_0=0',NULL,'PRS92 / Philippines zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3123,'EPSG','3123','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.99995 +lat_0=0 +lon_0=121 +no_defs +proj=tmerc +towgs84=-127.62,-67.24,-47.04,-3.068,4.903,1.578,-1.06 +units=m +x_0=500000 +y_0=0',NULL,'PRS92 / Philippines zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3124,'EPSG','3124','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.99995 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=-127.62,-67.24,-47.04,-3.068,4.903,1.578,-1.06 +units=m +x_0=500000 +y_0=0',NULL,'PRS92 / Philippines zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3125,'EPSG','3125','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.99995 +lat_0=0 +lon_0=125 +no_defs +proj=tmerc +towgs84=-127.62,-67.24,-47.04,-3.068,4.903,1.578,-1.06 +units=m +x_0=500000 +y_0=0',NULL,'PRS92 / Philippines zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3126,'EPSG','3126','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=19 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK19FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3127,'EPSG','3127','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=20 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK20FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3128,'EPSG','3128','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK21FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3129,'EPSG','3129','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=22 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK22FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3130,'EPSG','3130','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=23 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK23FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3131,'EPSG','3131','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK24FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3132,'EPSG','3132','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK25FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3133,'EPSG','3133','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=26 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK26FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3134,'EPSG','3134','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK27FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3135,'EPSG','3135','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=28 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK28FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3136,'EPSG','3136','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=29 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK29FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3137,'EPSG','3137','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK30FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3138,'EPSG','3138','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=31 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / ETRS-GK31FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3140,'EPSG','3140','proj4_data/epsg',NULL,'+a=6378306.3696 +b=6356571.996 +lat_0=-18 +lon_0=178 +no_defs +proj=cass +towgs84=98,390,-22,0,0,0,0 +units=link +x_0=109435.392 +y_0=141622.272',NULL,'Vanua Levu 1915 / Vanua Levu Grid\12Unable to translate coordinate system EPSG:3139 into PROJ.4 format.\12\12Viti Levu 1912 / Viti Levu Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3141,'EPSG','3141','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=265.025,384.929,-194.046,0,0,0,0 +units=m +zone=60',NULL,'Fiji 1956 / UTM zone 60S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3142,'EPSG','3142','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=265.025,384.929,-194.046,0,0,0,0 +units=m +zone=1',NULL,'Fiji 1956 / UTM zone 1S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3143,'EPSG','3143','proj4_data/epsg',NULL,'+ellps=WGS72 +k=0.99985 +lat_0=-17 +lon_0=178.75 +no_defs +proj=tmerc +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +x_0=2000000 +y_0=4000000',NULL,'Fiji 1986 / Fiji Map Grid (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3146,'EPSG','3146','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=6500000 +y_0=0',NULL,'FD54 / Faroe Lambert\12Unable to translate coordinate system EPSG:3144 into PROJ.4 format.\12\12ETRS89 / Faroe Lambert\12Unable to translate coordinate system EPSG:3145 into PROJ.4 format.\12\12Pulkovo 1942 / 3-degree Gauss-Kruger zone 6 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3147,'EPSG','3147','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger CM 18E (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3148,'EPSG','3148','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=utm +towgs84=198,881,317,0,0,0,0 +units=m +zone=48',NULL,'Indian 1960 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3148,'ESRI','3148','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=utm +units=m +zone=48 no_defs',NULL,'Indian 1960 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3149,'EPSG','3149','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=utm +towgs84=198,881,317,0,0,0,0 +units=m +zone=49',NULL,'Indian 1960 / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3149,'ESRI','3149','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=utm +units=m +zone=49 no_defs',NULL,'Indian 1960 / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3150,'EPSG','3150','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=6500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 6 (deprecated)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_23() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3151,'EPSG','3151','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger CM 18E (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3152,'EPSG','3152','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999425 +lat_0=0 +lon_0=18.05779 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100178.1808 +y_0=-6500614.7836',NULL,'ST74',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3153,'EPSG','3153','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45 +lat_1=50 +lat_2=58.5 +lon_0=-126 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=0',NULL,'NAD83(CSRS) / BC Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3154,'EPSG','3154','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=7',NULL,'NAD83(CSRS) / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3155,'EPSG','3155','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=8',NULL,'NAD83(CSRS) / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3156,'EPSG','3156','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=9',NULL,'NAD83(CSRS) / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3157,'EPSG','3157','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=10',NULL,'NAD83(CSRS) / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3158,'EPSG','3158','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=14',NULL,'NAD83(CSRS) / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3159,'EPSG','3159','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=15',NULL,'NAD83(CSRS) / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3160,'EPSG','3160','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=16',NULL,'NAD83(CSRS) / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3161,'EPSG','3161','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=0 +lat_1=44.5 +lat_2=53.5 +lon_0=-85 +no_defs +proj=lcc +units=m +x_0=930000 +y_0=6430000',NULL,'NAD83 / Ontario MNR Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3162,'EPSG','3162','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=0 +lat_1=44.5 +lat_2=53.5 +lon_0=-85 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=930000 +y_0=6430000',NULL,'NAD83(CSRS) / Ontario MNR Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3163,'EPSG','3163','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=-21.5 +lat_1=-20.66666666666667 +lat_2=-22.33333333333333 +lon_0=166 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=300000',NULL,'RGNC91-93 / Lambert New Caledonia',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3164,'EPSG','3164','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=-56.263,16.136,-22.856,0,0,0,0 +units=m +zone=58',NULL,'ST87 Ouvea / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3165,'EPSG','3165','proj4_data/epsg',NULL,'+ellps=intl +lat_0=-22.26969175 +lat_1=-22.24469175 +lat_2=-22.29469175 +lon_0=166.44242575 +no_defs +proj=lcc +towgs84=-10.18,-350.43,291.37,0,0,0,0 +units=m +x_0=0.66 +y_0=1.02',NULL,'NEA74 Noumea / Noumea Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3166,'EPSG','3166','proj4_data/epsg',NULL,'+ellps=intl +lat_0=-22.26972222222222 +lat_1=-22.24472222222222 +lat_2=-22.29472222222222 +lon_0=166.4425 +no_defs +proj=lcc +towgs84=-10.18,-350.43,291.37,0,0,0,0 +units=m +x_0=8.313000000000001 +y_0=-2.354',NULL,'NEA74 Noumea / Noumea Lambert 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3167,'EPSG','3167','proj4_data/epsg',NULL,'+a=6377295.664 +alpha=323.0257905 +b=6356094.667915204 +gamma=323.1301023611111 +k=0.99984 +lat_0=4 +lonc=102.25 +no_defs +no_uoff +proj=omerc +to_meter=20.116756 +x_0=40000 +y_0=0',NULL,'Kertau (RSO) / RSO Malaya (ch)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3168,'EPSG','3168','proj4_data/epsg',NULL,'+a=6377295.664 +alpha=323.0257905 +b=6356094.667915204 +gamma=323.1301023611111 +k=0.99984 +lat_0=4 +lonc=102.25 +no_defs +no_uoff +proj=omerc +units=m +x_0=804670.24 +y_0=0',NULL,'Kertau (RSO) / RSO Malaya (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3169,'EPSG','3169','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=57',NULL,'RGNC91-93 / UTM zone 57S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3170,'EPSG','3170','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=58',NULL,'RGNC91-93 / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3171,'EPSG','3171','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=59',NULL,'RGNC91-93 / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3172,'EPSG','3172','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=287.58,177.78,-135.41,0,0,0,0 +units=m +zone=59',NULL,'IGN53 Mare / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3174,'EPSG','3174','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=45.568977 +lat_1=42.122774 +lat_2=49.01518 +lon_0=-84.455955 +no_defs +proj=aea +units=m +x_0=1000000 +y_0=1000000',NULL,'fk89 / Faroe Lambert FK89\12Unable to translate coordinate system EPSG:3173 into PROJ.4 format.\12\12NAD83 / Great Lakes Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3175,'EPSG','3175','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=45.568977 +lat_1=42.122774 +lat_2=49.01518 +lon_0=-83.248627 +no_defs +proj=aea +units=m +x_0=1000000 +y_0=1000000',NULL,'NAD83 / Great Lakes and St Lawrence Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3176,'EPSG','3176','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +k=0.9996 +lat_0=0 +lon_0=106 +no_defs +proj=tmerc +towgs84=198,881,317,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Indian 1960 / TM 106 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3176,'ESRI','3176','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +k=0.999600 +lat_0=0 +lon_0=106 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Indian 1960 / TM 106 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3177,'EPSG','3177','proj4_data/epsg',NULL,'+ellps=intl +k=0.9965000000000001 +lat_0=0 +lon_0=17 +no_defs +proj=tmerc +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +x_0=1000000 +y_0=0',NULL,'LGD2006 / Libya TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3178,'EPSG','3178','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'GR96 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3179,'EPSG','3179','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'GR96 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3180,'EPSG','3180','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20',NULL,'GR96 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3181,'EPSG','3181','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=21',NULL,'GR96 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3182,'EPSG','3182','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=22',NULL,'GR96 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3183,'EPSG','3183','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=23',NULL,'GR96 / UTM zone 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3184,'EPSG','3184','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=24',NULL,'GR96 / UTM zone 24N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3185,'EPSG','3185','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=25',NULL,'GR96 / UTM zone 25N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3186,'EPSG','3186','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=26',NULL,'GR96 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3187,'EPSG','3187','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=27',NULL,'GR96 / UTM zone 27N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3188,'EPSG','3188','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=28',NULL,'GR96 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3189,'EPSG','3189','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=29',NULL,'GR96 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3190,'EPSG','3190','proj4_data/epsg',NULL,'+ellps=intl +k=0.99995 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'LGD2006 / Libya TM zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3191,'EPSG','3191','proj4_data/epsg',NULL,'+ellps=intl +k=0.99995 +lat_0=0 +lon_0=11 +no_defs +proj=tmerc +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'LGD2006 / Libya TM zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3192,'EPSG','3192','proj4_data/epsg',NULL,'+ellps=intl +k=0.99995 +lat_0=0 +lon_0=13 +no_defs +proj=tmerc +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'LGD2006 / Libya TM zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3193,'EPSG','3193','proj4_data/epsg',NULL,'+ellps=intl +k=0.99995 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'LGD2006 / Libya TM zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3194,'EPSG','3194','proj4_data/epsg',NULL,'+ellps=intl +k=0.99995 +lat_0=0 +lon_0=17 +no_defs +proj=tmerc +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'LGD2006 / Libya TM zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3195,'EPSG','3195','proj4_data/epsg',NULL,'+ellps=intl +k=0.99995 +lat_0=0 +lon_0=19 +no_defs +proj=tmerc +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'LGD2006 / Libya TM zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3196,'EPSG','3196','proj4_data/epsg',NULL,'+ellps=intl +k=0.99995 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'LGD2006 / Libya TM zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3197,'EPSG','3197','proj4_data/epsg',NULL,'+ellps=intl +k=0.99995 +lat_0=0 +lon_0=23 +no_defs +proj=tmerc +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'LGD2006 / Libya TM zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3198,'EPSG','3198','proj4_data/epsg',NULL,'+ellps=intl +k=0.99995 +lat_0=0 +lon_0=25 +no_defs +proj=tmerc +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'LGD2006 / Libya TM zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3199,'EPSG','3199','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +zone=32',NULL,'LGD2006 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3200,'EPSG','3200','proj4_data/epsg',NULL,'+ellps=clrk80 +k_0=0.9987864078000001 +lat_0=32.5 +lat_1=32.5 +lon_0=45 +no_defs +proj=lcc +towgs84=-241.54,-163.64,396.06,0,0,0,0 +units=m +x_0=1500000 +y_0=1166200',NULL,'FD58 / Iraq zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3200,'ESRI','3200','proj4_data/esri',NULL,'+ellps=clrk80 +k_0=0.9987864078000001 +lat_0=32.5 +lat_1=32.5 +lon_0=45 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=1166200 no_defs',NULL,'FD58 / Iraq zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3200,'NAD27','3200','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=33d45 +lat_1=36d10 +lat_2=34d20 +lon_0=-79 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3200: north carolina ---: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3200,'NAD83','3200','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=33d45 +lat_1=36d10 +lat_2=34d20 +lon_0=-79 +proj=lcc +x_0=609601.22 +y_0=0 no_defs',NULL,'3200: north carolina ---: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3201,'EPSG','3201','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +zone=33',NULL,'LGD2006 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3202,'EPSG','3202','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +zone=34',NULL,'LGD2006 / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3203,'EPSG','3203','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0 +units=m +zone=35',NULL,'LGD2006 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3204,'EPSG','3204','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-60.66666666666666 +lat_2=-63.33333333333334 +lon_0=-66 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SP19-20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3205,'EPSG','3205','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-60.66666666666666 +lat_2=-63.33333333333334 +lon_0=-54 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SP21-22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3206,'EPSG','3206','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-60.66666666666666 +lat_2=-63.33333333333334 +lon_0=-42 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SP23-24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3207,'EPSG','3207','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=-174 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ01-02',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3208,'EPSG','3208','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=-66 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ19-20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3209,'EPSG','3209','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=-54 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ21-22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3210,'EPSG','3210','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=42 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ37-38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3211,'EPSG','3211','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=54 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ39-40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3212,'EPSG','3212','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=66 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ41-42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3213,'EPSG','3213','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=78 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ43-44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3214,'EPSG','3214','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=90 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ45-46',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3215,'EPSG','3215','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=102 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ47-48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3216,'EPSG','3216','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=114 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ49-50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3217,'EPSG','3217','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=126 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ51-52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3218,'EPSG','3218','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=138 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ53-54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3219,'EPSG','3219','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=150 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ55-56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3220,'EPSG','3220','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-64.66666666666667 +lat_2=-67.33333333333333 +lon_0=162 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SQ57-58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3221,'EPSG','3221','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=-102 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR13-14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3222,'EPSG','3222','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=-90 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR15-16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3223,'EPSG','3223','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=-78 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR17-18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3224,'EPSG','3224','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=-66 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR19-20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3225,'EPSG','3225','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=-18 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR27-28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3226,'EPSG','3226','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=-6 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR29-30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3227,'EPSG','3227','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=6 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR31-32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3228,'EPSG','3228','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=18 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR33-34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3229,'EPSG','3229','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=30 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR35-36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3230,'EPSG','3230','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=42 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR37-38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3231,'EPSG','3231','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=54 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR39-40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3232,'EPSG','3232','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=66 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR41-42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3233,'EPSG','3233','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=78 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR43-44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3234,'EPSG','3234','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=90 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR45-46',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3235,'EPSG','3235','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=102 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR47-48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3236,'EPSG','3236','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=114 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR49-50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3237,'EPSG','3237','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=126 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR51-52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3238,'EPSG','3238','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=138 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR53-54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3239,'EPSG','3239','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=150 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR55-56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3240,'EPSG','3240','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=162 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR57-58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3241,'EPSG','3241','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-68.66666666666667 +lat_2=-71.33333333333333 +lon_0=174 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SR59-60',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3242,'EPSG','3242','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=-153 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS04-06',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3243,'EPSG','3243','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=-135 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS07-09',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3244,'EPSG','3244','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=-117 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS10-12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3245,'EPSG','3245','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=-99 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS13-15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3246,'EPSG','3246','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=-81 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS16-18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3247,'EPSG','3247','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=-63 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS19-21',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_24() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3248,'EPSG','3248','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=-27 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS25-27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3249,'EPSG','3249','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=-9 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS28-30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3250,'EPSG','3250','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=9 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS31-33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3251,'EPSG','3251','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=27 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS34-36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3252,'EPSG','3252','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=45 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS37-39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3253,'EPSG','3253','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=63 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS40-42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3254,'EPSG','3254','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=81 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS43-45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3255,'EPSG','3255','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=99 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS46-48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3256,'EPSG','3256','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=117 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS49-51',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3257,'EPSG','3257','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=135 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS52-54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3258,'EPSG','3258','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=153 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS55-57',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3259,'EPSG','3259','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-72.66666666666667 +lat_2=-75.33333333333333 +lon_0=171 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SS58-60',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3260,'EPSG','3260','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=-168 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST01-04',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3261,'EPSG','3261','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=-144 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST05-08',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3262,'EPSG','3262','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=-120 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST09-12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3263,'EPSG','3263','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=-96 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST13-16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3264,'EPSG','3264','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=-72 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST17-20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3265,'EPSG','3265','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=-48 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST21-24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3266,'EPSG','3266','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=-24 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST25-28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3267,'EPSG','3267','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=0 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST29-32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3268,'EPSG','3268','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=24 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST33-36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3269,'EPSG','3269','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=48 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST37-40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3270,'EPSG','3270','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=72 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST41-44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3271,'EPSG','3271','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=96 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST45-48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3272,'EPSG','3272','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=120 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST49-52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3273,'EPSG','3273','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=144 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST53-56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3274,'EPSG','3274','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=168 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW ST57-60',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3275,'EPSG','3275','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=-165 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SU01-05',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3276,'EPSG','3276','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=-135 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SU06-10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3277,'EPSG','3277','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=-105 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SU11-15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3278,'EPSG','3278','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=-75 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SU16-20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3279,'EPSG','3279','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=-45 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SU21-25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3280,'EPSG','3280','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=-15 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SU26-30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3281,'EPSG','3281','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=15 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SU31-35',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3282,'EPSG','3282','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=45 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SU36-40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3283,'EPSG','3283','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=75 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SU41-45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3284,'EPSG','3284','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=105 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SU46-50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3285,'EPSG','3285','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=135 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SU51-55',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3286,'EPSG','3286','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=165 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SU56-60',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3287,'EPSG','3287','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=-150 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SV01-10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3288,'EPSG','3288','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=-90 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SV11-20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3289,'EPSG','3289','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=-30 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SV21-30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3290,'EPSG','3290','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=30 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SV31-40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3291,'EPSG','3291','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=90 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SV41-50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3292,'EPSG','3292','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=150 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SV51-60',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3293,'EPSG','3293','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-80.23861111111111 +lon_0=0 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / SCAR IMW SW01-60',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3294,'EPSG','3294','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-78 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=162 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / USGS Transantarctic Mountains',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3296,'EPSG','3296','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0.072,-0.507,-0.245,-0.0183,0.0003,-0.007,-0.0093 +units=m +zone=5',NULL,'Guam 1963 / Yap Islands\12Unable to translate coordinate system EPSG:3295 into PROJ.4 format.\12\12RGPF / UTM zone 5S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3297,'EPSG','3297','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0.072,-0.507,-0.245,-0.0183,0.0003,-0.007,-0.0093 +units=m +zone=6',NULL,'RGPF / UTM zone 6S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3298,'EPSG','3298','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0.072,-0.507,-0.245,-0.0183,0.0003,-0.007,-0.0093 +units=m +zone=7',NULL,'RGPF / UTM zone 7S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3299,'EPSG','3299','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0.072,-0.507,-0.245,-0.0183,0.0003,-0.007,-0.0093 +units=m +zone=8',NULL,'RGPF / UTM zone 8S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3300,'EPSG','3300','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=57.51755393055556 +lat_1=59.33333333333334 +lat_2=58 +lon_0=24 +no_defs +proj=lcc +towgs84=0.055,-0.541,-0.185,0.0183,-0.0003,-0.007,-0.014 +units=m +x_0=500000 +y_0=6375000',NULL,'Estonian Coordinate System of 1992',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3300,'ESRI','3300','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=57.51755393055556 +lat_1=59.33333333333334 +lat_2=58 +lon_0=24 +no_defs +proj=lcc +towgs84=0.055,-0.541,-0.185,0.0183,-0.0003,-0.007,-0.014 +units=m +x_0=500000 +y_0=6375000 no_defs',NULL,'Estonian Coordinate System of 1992',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3301,'EPSG','3301','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=57.51755393055556 +lat_1=59.33333333333334 +lat_2=58 +lon_0=24 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=6375000',NULL,'Estonian Coordinate System of 1997',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3301,'ESRI','3301','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=57.51755393055556 +lat_1=59.33333333333334 +lat_2=58 +lon_0=24 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=6375000 no_defs',NULL,'Estonian Coordinate System of 1997',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3301,'NAD27','3301','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=47 +lat_1=48d44 +lat_2=47d26 +lon_0=-100d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3301: north dakota north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3301,'NAD83','3301','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=47 +lat_1=48d44 +lat_2=47d26 +lon_0=-100d30 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'3301: north dakota north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3302,'EPSG','3302','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=410.721,55.049,80.746,2.5779,2.3514,0.6664,17.3311 +units=m +zone=7',NULL,'IGN63 Hiva Oa / UTM zone 7S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3302,'NAD27','3302','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=45d40 +lat_1=47d29 +lat_2=46d11 +lon_0=-100d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3302: north dakota south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3302,'NAD83','3302','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=45d40 +lat_1=47d29 +lat_2=46d11 +lon_0=-100d30 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'3302: north dakota south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3303,'EPSG','3303','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=347.103,1078.125,2623.922,-33.8875,70.6773,-9.3943,186.074 +units=m +zone=7',NULL,'Fatu Iva 72 / UTM zone 7S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3304,'EPSG','3304','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=221.525,152.948,176.768,-2.3847,-1.3896,-0.877,11.4741 +units=m +zone=6',NULL,'Tahiti 79 / UTM zone 6S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3305,'EPSG','3305','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=215.525,149.593,176.229,-3.2624,-1.692,-1.1571,10.4773 +units=m +zone=6',NULL,'Moorea 87 / UTM zone 6S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3306,'EPSG','3306','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=217.037,86.959,23.956,0,0,0,0 +units=m +zone=5',NULL,'Maupiti 83 / UTM zone 5S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3307,'EPSG','3307','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,-0.15,0.68,0,0,0,0 +units=m +zone=39',NULL,'Nakhl-e Ghanem / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3308,'EPSG','3308','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=-33.25 +lat_1=-30.75 +lat_2=-35.75 +lon_0=147 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=9300000 +y_0=4500000',NULL,'GDA94 / NSW Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3309,'EPSG','3309','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=0 +lat_1=34 +lat_2=40.5 +lon_0=-120 +no_defs +proj=aea +units=m +x_0=0 +y_0=-4000000',NULL,'NAD27 / California Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3310,'EPSG','3310','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=0 +lat_1=34 +lat_2=40.5 +lon_0=-120 +no_defs +proj=aea +units=m +x_0=0 +y_0=-4000000',NULL,'NAD83 / California Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3311,'EPSG','3311','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=0 +lat_1=34 +lat_2=40.5 +lon_0=-120 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=-4000000',NULL,'NAD83(HARN) / California Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3312,'EPSG','3312','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-186,230,110,0,0,0,0 +units=m +zone=21',NULL,'CSG67 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3313,'EPSG','3313','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=21',NULL,'RGFG95 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3314,'EPSG','3314','proj4_data/epsg',NULL,'+ellps=clrk66 +lat_0=0 +lat_1=-6.5 +lat_2=-11.5 +lon_0=26 +no_defs +proj=lcc +towgs84=-103.746,-9.614,-255.95,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Katanga 1955 / Katanga Lambert (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3315,'EPSG','3315','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.9998 +lat_0=-9 +lon_0=26 +no_defs +proj=tmerc +towgs84=-103.746,-9.614,-255.95,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Katanga 1955 / Katanga TM (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3316,'EPSG','3316','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=22 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'Kasai 1953 / Congo TM zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3317,'EPSG','3317','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'Kasai 1953 / Congo TM zone 24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3318,'EPSG','3318','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'IGC 1962 / Congo TM zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3319,'EPSG','3319','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=14 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'IGC 1962 / Congo TM zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3320,'EPSG','3320','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=16 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'IGC 1962 / Congo TM zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3321,'EPSG','3321','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'IGC 1962 / Congo TM zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3322,'EPSG','3322','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=20 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'IGC 1962 / Congo TM zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3323,'EPSG','3323','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=22 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'IGC 1962 / Congo TM zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3324,'EPSG','3324','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'IGC 1962 / Congo TM zone 24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3325,'EPSG','3325','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=26 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'IGC 1962 / Congo TM zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3326,'EPSG','3326','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=28 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'IGC 1962 / Congo TM zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3327,'EPSG','3327','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'IGC 1962 / Congo TM zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3328,'EPSG','3328','proj4_data/epsg',NULL,'+ellps=krass +k=0.999714 +lat_0=52.16666666666666 +lon_0=19.16666666666667 +no_defs +proj=sterea +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=500000 +y_0=500000',NULL,'Pulkovo 1942(58) / GUGiK-80',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3329,'EPSG','3329','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=5500000 +y_0=0',NULL,'Pulkovo 1942(58) / 3-degree Gauss-Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3330,'EPSG','3330','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=6500000 +y_0=0',NULL,'Pulkovo 1942(58) / 3-degree Gauss-Kruger zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3331,'EPSG','3331','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=7500000 +y_0=0',NULL,'Pulkovo 1942(58) / 3-degree Gauss-Kruger zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3332,'EPSG','3332','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=8500000 +y_0=0',NULL,'Pulkovo 1942(58) / 3-degree Gauss-Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3333,'EPSG','3333','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=3500000 +y_0=0',NULL,'Pulkovo 1942(58) / Gauss-Kruger zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3334,'EPSG','3334','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=4500000 +y_0=0',NULL,'Pulkovo 1942(58) / Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3335,'EPSG','3335','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=5500000 +y_0=0',NULL,'Pulkovo 1942(58) / Gauss-Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3336,'EPSG','3336','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=145,-187,103,0,0,0,0 +units=m +zone=42',NULL,'IGN 1962 Kerguelen / UTM zone 42S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3337,'EPSG','3337','proj4_data/epsg',NULL,'+ellps=clrk80 +k_0=1 +lat_0=-20.19506944444445 +lat_1=-20.19506944444445 +lon_0=57.52182777777778 +no_defs +proj=lcc +towgs84=-770.1,158.4,-498.2,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'Le Pouce 1934 / Mauritius Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3338,'EPSG','3338','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=50 +lat_1=55 +lat_2=65 +lon_0=-154 +no_defs +proj=aea +units=m +x_0=0 +y_0=0',NULL,'NAD83 / Alaska Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3339,'EPSG','3339','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=-79.9,-158,-168.9,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'IGCB 1955 / Congo TM zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3340,'EPSG','3340','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=14 +no_defs +proj=tmerc +towgs84=-79.9,-158,-168.9,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'IGCB 1955 / Congo TM zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3341,'EPSG','3341','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999 +lat_0=0 +lon_0=16 +no_defs +proj=tmerc +towgs84=-79.9,-158,-168.9,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'IGCB 1955 / Congo TM zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3342,'EPSG','3342','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +south +towgs84=-79.9,-158,-168.9,0,0,0,0 +units=m +zone=33',NULL,'IGCB 1955 / UTM zone 33S',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_25() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3343,'EPSG','3343','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=28',NULL,'Mauritania 1999 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3344,'EPSG','3344','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=29',NULL,'Mauritania 1999 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3345,'EPSG','3345','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=30',NULL,'Mauritania 1999 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3346,'EPSG','3346','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9998 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'LKS94 / Lithuania TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3347,'EPSG','3347','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=63.390675 +lat_1=49 +lat_2=77 +lon_0=-91.86666666666666 +no_defs +proj=lcc +units=m +x_0=6200000 +y_0=3000000',NULL,'NAD83 / Statistics Canada Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3348,'EPSG','3348','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=63.390675 +lat_1=49 +lat_2=77 +lon_0=-91.86666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=6200000 +y_0=3000000',NULL,'NAD83(CSRS) / Statistics Canada Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3349,'EPSG','3349','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lon_0=-150 +no_defs +proj=merc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / PDC Mercator (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3350,'EPSG','3350','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0.1 +lon_0=21.95 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=250000 +y_0=0',NULL,'Pulkovo 1942 / CS63 zone C0',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3351,'EPSG','3351','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0.1 +lon_0=24.95 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=1250000 +y_0=0',NULL,'Pulkovo 1942 / CS63 zone C1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3352,'EPSG','3352','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0.1 +lon_0=27.95 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=2250000 +y_0=0',NULL,'Pulkovo 1942 / CS63 zone C2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3353,'EPSG','3353','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=32',NULL,'Mhast (onshore) / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3354,'EPSG','3354','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=32',NULL,'Mhast (offshore) / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3355,'EPSG','3355','proj4_data/epsg',NULL,'+ellps=helmert +k=1 +lat_0=30 +lon_0=31 +no_defs +proj=tmerc +towgs84=-146.21,112.63,4.05,0,0,0,0 +units=m +x_0=615000 +y_0=810000',NULL,'Egypt Gulf of Suez S-650 TL / Red Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3356,'EPSG','3356','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +towgs84=-179.483,-69.379,-27.584,-7.862,8.163,6.042,-13.925 +units=m +zone=17',NULL,'Grand Cayman 1959 / UTM zone 17N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3357,'EPSG','3357','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +towgs84=8.853,-52.644,180.304,-0.393,-2.323,2.96,-24.081 +units=m +zone=17',NULL,'Little Cayman 1961 / UTM zone 17N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3358,'EPSG','3358','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.75 +lat_1=36.16666666666666 +lat_2=34.33333333333334 +lon_0=-79 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=609601.22 +y_0=0',NULL,'NAD83(HARN) / North Carolina',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3359,'EPSG','3359','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.75 +lat_1=36.16666666666666 +lat_2=34.33333333333334 +lon_0=-79 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=609601.2192024385 +y_0=0',NULL,'NAD83(HARN) / North Carolina (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3360,'EPSG','3360','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=31.83333333333333 +lat_1=34.83333333333334 +lat_2=32.5 +lon_0=-81 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=609600 +y_0=0',NULL,'NAD83(HARN) / South Carolina',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3361,'EPSG','3361','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=31.83333333333333 +lat_1=34.83333333333334 +lat_2=32.5 +lon_0=-81 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=609600 +y_0=0',NULL,'NAD83(HARN) / South Carolina (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3362,'EPSG','3362','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.95 +lat_2=40.88333333333333 +lon_0=-77.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Pennsylvania North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3363,'EPSG','3363','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.95 +lat_2=40.88333333333333 +lon_0=-77.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Pennsylvania North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3364,'EPSG','3364','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.96666666666667 +lat_2=39.93333333333333 +lon_0=-77.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Pennsylvania South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3365,'EPSG','3365','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.96666666666667 +lat_2=39.93333333333333 +lon_0=-77.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Pennsylvania South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3366,'EPSG','3366','proj4_data/epsg',NULL,'+a=6378293.645208759 +b=6356617.987679838 +lat_0=22.31213333333334 +lon_0=114.1785555555556 +no_defs +proj=cass +units=m +x_0=40243.57775604237 +y_0=19069.93351512578',NULL,'Hong Kong 1963 Grid System (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3367,'EPSG','3367','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=28',NULL,'IGN Astro 1960 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3368,'EPSG','3368','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=29',NULL,'IGN Astro 1960 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3369,'EPSG','3369','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=30',NULL,'IGN Astro 1960 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3370,'EPSG','3370','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=59',NULL,'NAD27 / UTM zone 59N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3371,'EPSG','3371','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=60',NULL,'NAD27 / UTM zone 60N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3372,'EPSG','3372','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=59',NULL,'NAD83 / UTM zone 59N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3373,'EPSG','3373','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=60',NULL,'NAD83 / UTM zone 60N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3374,'EPSG','3374','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=29',NULL,'FD54 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3375,'EPSG','3375','proj4_data/epsg',NULL,'+alpha=323.0257964666666 +ellps=GRS80 +gamma=323.1301023611111 +k=0.99984 +lat_0=4 +lonc=102.25 +no_defs +no_uoff +proj=omerc +units=m +x_0=804671 +y_0=0',NULL,'GDM2000 / Peninsula RSO',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3376,'EPSG','3376','proj4_data/epsg',NULL,'+alpha=53.31580995 +ellps=GRS80 +gamma=53.13010236111111 +k=0.99984 +lat_0=4 +lonc=115 +no_defs +no_uoff +proj=omerc +units=m +x_0=0 +y_0=0',NULL,'GDM2000 / East Malaysia BRSO',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3377,'EPSG','3377','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=2.121679744444445 +lon_0=103.4279362361111 +no_defs +proj=cass +units=m +x_0=-14810.562 +y_0=8758.32',NULL,'GDM2000 / Johor Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3378,'EPSG','3378','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=2.682347636111111 +lon_0=101.9749050416667 +no_defs +proj=cass +units=m +x_0=3673.785 +y_0=-4240.573',NULL,'GDM2000 / Sembilan and Melaka Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3379,'EPSG','3379','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=3.769388088888889 +lon_0=102.3682989833333 +no_defs +proj=cass +units=m +x_0=-7368.228 +y_0=6485.858',NULL,'GDM2000 / Pahang Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3380,'EPSG','3380','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=3.68464905 +lon_0=101.3891079138889 +no_defs +proj=cass +units=m +x_0=-34836.161 +y_0=56464.049',NULL,'GDM2000 / Selangor Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3381,'EPSG','3381','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=4.9762852 +lon_0=103.070275625 +no_defs +proj=cass +units=m +x_0=19594.245 +y_0=3371.895',NULL,'GDM2000 / Terengganu Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3382,'EPSG','3382','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=5.421517541666667 +lon_0=100.3443769638889 +no_defs +proj=cass +units=m +x_0=-23.414 +y_0=62.283',NULL,'GDM2000 / Pinang Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3383,'EPSG','3383','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=5.964672713888889 +lon_0=100.6363711111111 +no_defs +proj=cass +units=m +x_0=0 +y_0=0',NULL,'GDM2000 / Kedah and Perlis Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3384,'EPSG','3384','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=4.859063022222222 +lon_0=100.8154105861111 +no_defs +proj=cass +units=m +x_0=-1.769 +y_0=133454.779',NULL,'GDM2000 / Perak Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3385,'EPSG','3385','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=5.972543658333334 +lon_0=102.2952416694444 +no_defs +proj=cass +units=m +x_0=13227.851 +y_0=8739.894',NULL,'GDM2000 / Kelantan Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3386,'EPSG','3386','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=-96.062,-82.428,-121.753,4.801,0.345,-1.376,1.496 +units=m +x_0=500000 +y_0=0',NULL,'KKJ / Finland zone 0',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3387,'EPSG','3387','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=-96.062,-82.428,-121.753,4.801,0.345,-1.376,1.496 +units=m +x_0=5500000 +y_0=0',NULL,'KKJ / Finland zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3388,'EPSG','3388','proj4_data/epsg',NULL,'+ellps=krass +lat_ts=42 +lon_0=51 +no_defs +proj=merc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=0 +y_0=0',NULL,'Pulkovo 1942 / Caspian Sea Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3389,'EPSG','3389','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=180 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=60500000 +y_0=0',NULL,'Pulkovo 1942 / 3-degree Gauss-Kruger zone 60',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3390,'EPSG','3390','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=180 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=60500000 +y_0=0',NULL,'Pulkovo 1995 / 3-degree Gauss-Kruger zone 60',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3391,'EPSG','3391','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=70.995,-335.916,262.898,0,0,0,0 +units=m +zone=37',NULL,'Karbala 1979 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3392,'EPSG','3392','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=70.995,-335.916,262.898,0,0,0,0 +units=m +zone=38',NULL,'Karbala 1979 / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3393,'EPSG','3393','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=70.995,-335.916,262.898,0,0,0,0 +units=m +zone=39',NULL,'Karbala 1979 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3394,'EPSG','3394','proj4_data/epsg',NULL,'+ellps=clrk80 +k_0=0.9987864078000001 +lat_0=32.5 +lat_1=32.5 +lon_0=45 +no_defs +proj=lcc +towgs84=-242.2,-144.9,370.3,0,0,0,0 +units=m +x_0=1500000 +y_0=1166200',NULL,'Nahrwan 1934 / Iraq zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3395,'EPSG','3395','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lon_0=0 +no_defs +proj=merc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / World Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3396,'EPSG','3396','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +x_0=3500000 +y_0=0',NULL,'PD/83 / 3-degree Gauss-Kruger zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3397,'EPSG','3397','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0',NULL,'PD/83 / 3-degree Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3398,'EPSG','3398','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0',NULL,'RD/83 / 3-degree Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3399,'EPSG','3399','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0',NULL,'RD/83 / 3-degree Gauss-Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3400,'EPSG','3400','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9992 +lat_0=0 +lon_0=-115 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Alberta 10-TM (Forest)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3401,'EPSG','3401','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9992 +lat_0=0 +lon_0=-115 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD83 / Alberta 10-TM (Resource)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3401,'NAD27','3401','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=39d40 +lat_1=41d42 +lat_2=40d26 +lon_0=-82d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3401: ohio north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3401,'NAD83','3401','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=39d40 +lat_1=41d42 +lat_2=40d26 +lon_0=-82d30 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'3401: ohio north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3402,'EPSG','3402','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9992 +lat_0=0 +lon_0=-115 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(CSRS) / Alberta 10-TM (Forest)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3402,'NAD27','3402','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=38 +lat_1=40d2 +lat_2=38d44 +lon_0=-82d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3402: ohio south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3402,'NAD83','3402','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=38 +lat_1=40d2 +lat_2=38d44 +lon_0=-82d30 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'3402: ohio south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3403,'EPSG','3403','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9992 +lat_0=0 +lon_0=-115 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(CSRS) / Alberta 10-TM (Resource)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3404,'EPSG','3404','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.75 +lat_1=36.16666666666666 +lat_2=34.33333333333334 +lon_0=-79 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD83(HARN) / North Carolina (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3405,'EPSG','3405','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=-191.90441429,-39.30318279,-111.45032835,0.00928836,-0.01975479,0.00427372,0.252906278 +units=m +zone=48',NULL,'VN-2000 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3406,'EPSG','3406','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=-191.90441429,-39.30318279,-111.45032835,0.00928836,-0.01975479,0.00427372,0.252906278 +units=m +zone=49',NULL,'VN-2000 / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3407,'EPSG','3407','proj4_data/epsg',NULL,'+a=6378293.645208759 +b=6356617.987679838 +lat_0=22.31213333333334 +lon_0=114.1785555555556 +no_defs +proj=cass +to_meter=0.3047972654 +x_0=40243.57775604237 +y_0=19069.93351512578',NULL,'Hong Kong 1963 Grid System',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3408,'EPSG','3408','proj4_data/epsg',NULL,'+a=6371228 +b=6371228 +lat_0=90 +lon_0=0 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'NSIDC EASE-Grid North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3409,'EPSG','3409','proj4_data/epsg',NULL,'+a=6371228 +b=6371228 +lat_0=-90 +lon_0=0 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'NSIDC EASE-Grid South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3410,'EPSG','3410','proj4_data/epsg',NULL,'+a=6371228 +b=6371228 +lat_ts=30 +lon_0=0 +no_defs +proj=cea +units=m +x_0=0 +y_0=0',NULL,'NSIDC EASE-Grid Global',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3411,'EPSG','3411','proj4_data/epsg',NULL,'+a=6378273 +b=6356889.449 +k=1 +lat_0=90 +lat_ts=70 +lon_0=-45 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'NSIDC Sea Ice Polar Stereographic North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3412,'EPSG','3412','proj4_data/epsg',NULL,'+a=6378273 +b=6356889.449 +k=1 +lat_0=-90 +lat_ts=-70 +lon_0=0 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'NSIDC Sea Ice Polar Stereographic South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3413,'EPSG','3413','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=90 +lat_ts=70 +lon_0=-45 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / NSIDC Sea Ice Polar Stereographic North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3414,'EPSG','3414','proj4_data/epsg',NULL,'+ellps=WGS84 +k=1 +lat_0=1.366666666666667 +lon_0=103.8333333333333 +no_defs +proj=tmerc +units=m +x_0=28001.642 +y_0=38744.572',NULL,'SVY21 / Singapore TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3415,'EPSG','3415','proj4_data/epsg',NULL,'+ellps=WGS72 +lat_0=21 +lat_1=18 +lat_2=24 +lon_0=114 +no_defs +proj=lcc +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +x_0=500000 +y_0=500000',NULL,'WGS 72BE / South China Sea Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3416,'EPSG','3416','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47.5 +lat_1=49 +lat_2=46 +lon_0=13.33333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=400000',NULL,'ETRS89 / Austria Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3417,'EPSG','3417','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=41.5 +lat_1=43.26666666666667 +lat_2=42.06666666666667 +lon_0=-93.5 +no_defs +proj=lcc +units=us-ft +x_0=1500000 +y_0=999999.9999898402',NULL,'NAD83 / Iowa North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3418,'EPSG','3418','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=40 +lat_1=41.78333333333333 +lat_2=40.61666666666667 +lon_0=-93.5 +no_defs +proj=lcc +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83 / Iowa South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3419,'EPSG','3419','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=38.33333333333334 +lat_1=39.78333333333333 +lat_2=38.71666666666667 +lon_0=-98 +no_defs +proj=lcc +units=us-ft +x_0=399999.99998984 +y_0=0',NULL,'NAD83 / Kansas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3420,'EPSG','3420','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.66666666666666 +lat_1=38.56666666666667 +lat_2=37.26666666666667 +lon_0=-98.5 +no_defs +proj=lcc +units=us-ft +x_0=399999.99998984 +y_0=399999.99998984',NULL,'NAD83 / Kansas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3421,'EPSG','3421','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=34.75 +lon_0=-115.5833333333333 +no_defs +proj=tmerc +units=us-ft +x_0=200000.00001016 +y_0=8000000.000010163',NULL,'NAD83 / Nevada East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3422,'EPSG','3422','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=34.75 +lon_0=-116.6666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=500000.00001016 +y_0=6000000',NULL,'NAD83 / Nevada Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3423,'EPSG','3423','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=34.75 +lon_0=-118.5833333333333 +no_defs +proj=tmerc +units=us-ft +x_0=800000.0000101599 +y_0=3999999.99998984',NULL,'NAD83 / Nevada West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3424,'EPSG','3424','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +units=us-ft +x_0=150000 +y_0=0',NULL,'NAD83 / New Jersey (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3425,'EPSG','3425','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.26666666666667 +lat_2=42.06666666666667 +lon_0=-93.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=1500000 +y_0=999999.9999898402',NULL,'NAD83(HARN) / Iowa North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3426,'EPSG','3426','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40 +lat_1=41.78333333333333 +lat_2=40.61666666666667 +lon_0=-93.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83(HARN) / Iowa South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3427,'EPSG','3427','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=39.78333333333333 +lat_2=38.71666666666667 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=399999.99998984 +y_0=0',NULL,'NAD83(HARN) / Kansas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3428,'EPSG','3428','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.56666666666667 +lat_2=37.26666666666667 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=399999.99998984 +y_0=399999.99998984',NULL,'NAD83(HARN) / Kansas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3429,'EPSG','3429','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-115.5833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.00001016 +y_0=8000000.000010163',NULL,'NAD83(HARN) / Nevada East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3430,'EPSG','3430','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-116.6666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=6000000',NULL,'NAD83(HARN) / Nevada Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3431,'EPSG','3431','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-118.5833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=800000.0000101599 +y_0=3999999.99998984',NULL,'NAD83(HARN) / Nevada West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3432,'EPSG','3432','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=150000 +y_0=0',NULL,'NAD83(HARN) / New Jersey (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3433,'EPSG','3433','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=34.33333333333334 +lat_1=36.23333333333333 +lat_2=34.93333333333333 +lon_0=-92 +no_defs +proj=lcc +units=us-ft +x_0=399999.99998984 +y_0=0',NULL,'NAD83 / Arkansas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3434,'EPSG','3434','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=32.66666666666666 +lat_1=34.76666666666667 +lat_2=33.3 +lon_0=-92 +no_defs +proj=lcc +units=us-ft +x_0=399999.99998984 +y_0=399999.99998984',NULL,'NAD83 / Arkansas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3435,'EPSG','3435','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999749999999999 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83 / Illinois East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3436,'EPSG','3436','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999941177 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=699999.9999898402 +y_0=0',NULL,'NAD83 / Illinois West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3437,'EPSG','3437','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=42.5 +lon_0=-71.66666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83 / New Hampshire (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3438,'EPSG','3438','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99999375 +lat_0=41.08333333333334 +lon_0=-71.5 +no_defs +proj=tmerc +units=us-ft +x_0=99999.99998983997 +y_0=0',NULL,'NAD83 / Rhode Island (ftUS)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_26() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3439,'EPSG','3439','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-180.624,-225.516,173.919,-0.81,-1.898,8.336,16.71006 +units=m +zone=39',NULL,'PSD93 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3439,'ESRI','3439','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=39 no_defs',NULL,'PSD93 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3440,'EPSG','3440','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-180.624,-225.516,173.919,-0.81,-1.898,8.336,16.71006 +units=m +zone=40',NULL,'PSD93 / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3440,'ESRI','3440','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=40 no_defs',NULL,'PSD93 / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3441,'EPSG','3441','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.23333333333333 +lat_2=34.93333333333333 +lon_0=-92 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=399999.99998984 +y_0=0',NULL,'NAD83(HARN) / Arkansas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3442,'EPSG','3442','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=32.66666666666666 +lat_1=34.76666666666667 +lat_2=33.3 +lon_0=-92 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=399999.99998984 +y_0=399999.99998984',NULL,'NAD83(HARN) / Arkansas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3443,'EPSG','3443','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999749999999999 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(HARN) / Illinois East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3444,'EPSG','3444','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=699999.9999898402 +y_0=0',NULL,'NAD83(HARN) / Illinois West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3445,'EPSG','3445','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.5 +lon_0=-71.66666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(HARN) / New Hampshire (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3446,'EPSG','3446','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999375 +lat_0=41.08333333333334 +lon_0=-71.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=99999.99998983997 +y_0=0',NULL,'NAD83(HARN) / Rhode Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3447,'EPSG','3447','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=50.797815 +lat_1=49.83333333333334 +lat_2=51.16666666666666 +lon_0=4.359215833333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150328 +y_0=166262',NULL,'ETRS89 / Belgian Lambert 2005',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3448,'EPSG','3448','proj4_data/epsg',NULL,'+ellps=WGS84 +k_0=1 +lat_0=18 +lat_1=18 +lon_0=-77 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=750000 +y_0=650000',NULL,'JAD2001 / Jamaica Metric Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3449,'EPSG','3449','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=17',NULL,'JAD2001 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3450,'EPSG','3450','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'JAD2001 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3451,'EPSG','3451','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=30.5 +lat_1=32.66666666666666 +lat_2=31.16666666666667 +lon_0=-92.5 +no_defs +proj=lcc +units=us-ft +x_0=999999.9999898402 +y_0=0',NULL,'NAD83 / Louisiana North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3452,'EPSG','3452','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=28.5 +lat_1=30.7 +lat_2=29.3 +lon_0=-91.33333333333333 +no_defs +proj=lcc +units=us-ft +x_0=999999.9999898402 +y_0=0',NULL,'NAD83 / Louisiana South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3453,'EPSG','3453','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=25.5 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-91.33333333333333 +no_defs +proj=lcc +units=us-ft +x_0=999999.9999898402 +y_0=0',NULL,'NAD83 / Louisiana Offshore (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3454,'EPSG','3454','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=42.33333333333334 +lat_1=44.4 +lat_2=42.83333333333334 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / South Dakota North (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3455,'EPSG','3455','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=42.33333333333334 +lat_1=44.4 +lat_2=42.83333333333334 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / South Dakota South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3456,'EPSG','3456','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=30.5 +lat_1=32.66666666666666 +lat_2=31.16666666666667 +lon_0=-92.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=999999.9999898402 +y_0=0',NULL,'NAD83(HARN) / Louisiana North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3457,'EPSG','3457','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=28.5 +lat_1=30.7 +lat_2=29.3 +lon_0=-91.33333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=999999.9999898402 +y_0=0',NULL,'NAD83(HARN) / Louisiana South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3458,'EPSG','3458','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.68333333333333 +lat_2=44.41666666666666 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / South Dakota North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3459,'EPSG','3459','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42.33333333333334 +lat_1=44.4 +lat_2=42.83333333333334 +lon_0=-100.3333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / South Dakota South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3460,'EPSG','3460','proj4_data/epsg',NULL,'+ellps=WGS72 +k=0.99985 +lat_0=-17 +lon_0=178.75 +no_defs +proj=tmerc +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +x_0=2000000 +y_0=4000000',NULL,'Fiji 1986 / Fiji Map Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3461,'EPSG','3461','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-83,37,124,0,0,0,0 +units=m +zone=28',NULL,'Dabola 1981 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3462,'EPSG','3462','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-83,37,124,0,0,0,0 +units=m +zone=29',NULL,'Dabola 1981 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3463,'EPSG','3463','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99998 +lat_0=43.5 +lon_0=-69.125 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Maine CS2000 Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3464,'EPSG','3464','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=43.5 +lon_0=-69.125 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(HARN) / Maine CS2000 Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3465,'EPSG','3465','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99996 +lat_0=30.5 +lon_0=-85.83333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(NSRS2007) / Alabama East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3466,'EPSG','3466','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=30 +lon_0=-87.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Alabama West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3467,'EPSG','3467','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=50 +lat_1=55 +lat_2=65 +lon_0=-154 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(NSRS2007) / Alaska Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3468,'EPSG','3468','proj4_data/epsg',NULL,'+alpha=323.1301023611111 +ellps=GRS80 +gamma=323.1301023611111 +k=0.9999 +lat_0=57 +lonc=-133.6666666666667 +no_defs +no_uoff +proj=omerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=5000000 +y_0=-5000000',NULL,'NAD83(NSRS2007) / Alaska zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3469,'EPSG','3469','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-142 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Alaska zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3470,'EPSG','3470','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-146 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Alaska zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3471,'EPSG','3471','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-150 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Alaska zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3472,'EPSG','3472','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-154 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Alaska zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3473,'EPSG','3473','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-158 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Alaska zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3474,'EPSG','3474','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-162 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Alaska zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3475,'EPSG','3475','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-166 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Alaska zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3476,'EPSG','3476','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-170 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Alaska zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3477,'EPSG','3477','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=51 +lat_1=53.83333333333334 +lat_2=51.83333333333334 +lon_0=-176 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=0',NULL,'NAD83(NSRS2007) / Alaska zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3478,'EPSG','3478','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=213360 +y_0=0',NULL,'NAD83(NSRS2007) / Arizona Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3479,'EPSG','3479','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=213360 +y_0=0',NULL,'NAD83(NSRS2007) / Arizona Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3480,'EPSG','3480','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=213360 +y_0=0',NULL,'NAD83(NSRS2007) / Arizona East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3481,'EPSG','3481','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=213360 +y_0=0',NULL,'NAD83(NSRS2007) / Arizona East (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3482,'EPSG','3482','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=213360 +y_0=0',NULL,'NAD83(NSRS2007) / Arizona West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3483,'EPSG','3483','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=213360 +y_0=0',NULL,'NAD83(NSRS2007) / Arizona West (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3484,'EPSG','3484','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.23333333333333 +lat_2=34.93333333333333 +lon_0=-92 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'NAD83(NSRS2007) / Arkansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3485,'EPSG','3485','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.23333333333333 +lat_2=34.93333333333333 +lon_0=-92 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=399999.99998984 +y_0=0',NULL,'NAD83(NSRS2007) / Arkansas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3486,'EPSG','3486','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=32.66666666666666 +lat_1=34.76666666666667 +lat_2=33.3 +lon_0=-92 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=400000',NULL,'NAD83(NSRS2007) / Arkansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3487,'EPSG','3487','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=32.66666666666666 +lat_1=34.76666666666667 +lat_2=33.3 +lon_0=-92 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=399999.99998984 +y_0=399999.99998984',NULL,'NAD83(NSRS2007) / Arkansas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3488,'EPSG','3488','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=0 +lat_1=34 +lat_2=40.5 +lon_0=-120 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=-4000000',NULL,'NAD83(NSRS2007) / California Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3489,'EPSG','3489','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(NSRS2007) / California zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3490,'EPSG','3490','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(NSRS2007) / California zone 1 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3491,'EPSG','3491','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(NSRS2007) / California zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3492,'EPSG','3492','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(NSRS2007) / California zone 2 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3493,'EPSG','3493','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(NSRS2007) / California zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3494,'EPSG','3494','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(NSRS2007) / California zone 3 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3495,'EPSG','3495','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(NSRS2007) / California zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3496,'EPSG','3496','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(NSRS2007) / California zone 4 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3497,'EPSG','3497','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(NSRS2007) / California zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3498,'EPSG','3498','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(NSRS2007) / California zone 5 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3499,'EPSG','3499','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(NSRS2007) / California zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3500,'EPSG','3500','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(NSRS2007) / California zone 6 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3501,'EPSG','3501','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=914401.8289 +y_0=304800.6096',NULL,'NAD83(NSRS2007) / Colorado Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3501,'NAD27','3501','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=35 +lat_1=36d46 +lat_2=35d34 +lon_0=-98 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3501: oklahoma north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3501,'NAD83','3501','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=35 +lat_1=36d46 +lat_2=35d34 +lon_0=-98 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'3501: oklahoma north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3502,'EPSG','3502','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=914401.8288036576 +y_0=304800.6096012192',NULL,'NAD83(NSRS2007) / Colorado Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3502,'NAD27','3502','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=33d20 +lat_1=35d14 +lat_2=33d56 +lon_0=-98 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3502: oklahoma south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3502,'NAD83','3502','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=33d20 +lat_1=35d14 +lat_2=33d56 +lon_0=-98 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'3502: oklahoma south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3503,'EPSG','3503','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=914401.8289 +y_0=304800.6096',NULL,'NAD83(NSRS2007) / Colorado North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3504,'EPSG','3504','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=914401.8288036576 +y_0=304800.6096012192',NULL,'NAD83(NSRS2007) / Colorado North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3505,'EPSG','3505','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=914401.8289 +y_0=304800.6096',NULL,'NAD83(NSRS2007) / Colorado South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3506,'EPSG','3506','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=914401.8288036576 +y_0=304800.6096012192',NULL,'NAD83(NSRS2007) / Colorado South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3507,'EPSG','3507','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800.6096 +y_0=152400.3048',NULL,'NAD83(NSRS2007) / Connecticut',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3508,'EPSG','3508','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=304800.6096012192 +y_0=152400.3048006096',NULL,'NAD83(NSRS2007) / Connecticut (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3509,'EPSG','3509','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(NSRS2007) / Delaware',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3510,'EPSG','3510','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(NSRS2007) / Delaware (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3511,'EPSG','3511','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(NSRS2007) / Florida East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3512,'EPSG','3512','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(NSRS2007) / Florida East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3513,'EPSG','3513','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=24 +lat_1=24 +lat_2=31.5 +lon_0=-84 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'NAD83(NSRS2007) / Florida GDL Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3514,'EPSG','3514','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Florida North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3515,'EPSG','3515','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Florida North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3516,'EPSG','3516','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(NSRS2007) / Florida West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3517,'EPSG','3517','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(NSRS2007) / Florida West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3518,'EPSG','3518','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(NSRS2007) / Georgia East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3519,'EPSG','3519','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(NSRS2007) / Georgia East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3520,'EPSG','3520','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=0',NULL,'NAD83(NSRS2007) / Georgia West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3521,'EPSG','3521','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=699999.9998983998 +y_0=0',NULL,'NAD83(NSRS2007) / Georgia West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3522,'EPSG','3522','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Idaho Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3523,'EPSG','3523','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(NSRS2007) / Idaho Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3524,'EPSG','3524','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(NSRS2007) / Idaho East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3525,'EPSG','3525','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(NSRS2007) / Idaho East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3526,'EPSG','3526','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=0',NULL,'NAD83(NSRS2007) / Idaho West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3527,'EPSG','3527','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=800000.0001016001 +y_0=0',NULL,'NAD83(NSRS2007) / Idaho West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3528,'EPSG','3528','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999749999999999 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(NSRS2007) / Illinois East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3529,'EPSG','3529','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999749999999999 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(NSRS2007) / Illinois East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3530,'EPSG','3530','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=0',NULL,'NAD83(NSRS2007) / Illinois West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3531,'EPSG','3531','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=699999.9999898402 +y_0=0',NULL,'NAD83(NSRS2007) / Illinois West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3532,'EPSG','3532','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=250000',NULL,'NAD83(NSRS2007) / Indiana East',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_27() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3533,'EPSG','3533','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=99999.99989839978 +y_0=249999.9998983998',NULL,'NAD83(NSRS2007) / Indiana East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3534,'EPSG','3534','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=900000 +y_0=250000',NULL,'NAD83(NSRS2007) / Indiana West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3535,'EPSG','3535','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=900000 +y_0=249999.9998983998',NULL,'NAD83(NSRS2007) / Indiana West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3536,'EPSG','3536','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.26666666666667 +lat_2=42.06666666666667 +lon_0=-93.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=1000000',NULL,'NAD83(NSRS2007) / Iowa North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3537,'EPSG','3537','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.26666666666667 +lat_2=42.06666666666667 +lon_0=-93.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=1500000 +y_0=999999.9999898402',NULL,'NAD83(NSRS2007) / Iowa North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3538,'EPSG','3538','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40 +lat_1=41.78333333333333 +lat_2=40.61666666666667 +lon_0=-93.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Iowa South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3539,'EPSG','3539','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40 +lat_1=41.78333333333333 +lat_2=40.61666666666667 +lon_0=-93.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83(NSRS2007) / Iowa South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3540,'EPSG','3540','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=39.78333333333333 +lat_2=38.71666666666667 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'NAD83(NSRS2007) / Kansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3541,'EPSG','3541','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=39.78333333333333 +lat_2=38.71666666666667 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=399999.99998984 +y_0=0',NULL,'NAD83(NSRS2007) / Kansas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3542,'EPSG','3542','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.56666666666667 +lat_2=37.26666666666667 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=400000',NULL,'NAD83(NSRS2007) / Kansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3543,'EPSG','3543','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.56666666666667 +lat_2=37.26666666666667 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=399999.99998984 +y_0=399999.99998984',NULL,'NAD83(NSRS2007) / Kansas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3544,'EPSG','3544','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Kentucky North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3545,'EPSG','3545','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(NSRS2007) / Kentucky North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3546,'EPSG','3546','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.08333333333334 +lat_2=38.66666666666666 +lon_0=-85.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=1000000',NULL,'NAD83(NSRS2007) / Kentucky Single Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3547,'EPSG','3547','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.08333333333334 +lat_2=38.66666666666666 +lon_0=-85.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=1500000 +y_0=999999.9998983998',NULL,'NAD83(NSRS2007) / Kentucky Single Zone (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3548,'EPSG','3548','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lon_0=-85.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=500000',NULL,'NAD83(NSRS2007) / Kentucky South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3549,'EPSG','3549','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lon_0=-85.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=500000.0001016001',NULL,'NAD83(NSRS2007) / Kentucky South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3550,'EPSG','3550','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=30.5 +lat_1=32.66666666666666 +lat_2=31.16666666666667 +lon_0=-92.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=0',NULL,'NAD83(NSRS2007) / Louisiana North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3551,'EPSG','3551','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=30.5 +lat_1=32.66666666666666 +lat_2=31.16666666666667 +lon_0=-92.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=999999.9999898402 +y_0=0',NULL,'NAD83(NSRS2007) / Louisiana North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3552,'EPSG','3552','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=28.5 +lat_1=30.7 +lat_2=29.3 +lon_0=-91.33333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=0',NULL,'NAD83(NSRS2007) / Louisiana South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3553,'EPSG','3553','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=28.5 +lat_1=30.7 +lat_2=29.3 +lon_0=-91.33333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=999999.9999898402 +y_0=0',NULL,'NAD83(NSRS2007) / Louisiana South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3554,'EPSG','3554','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=43.5 +lon_0=-69.125 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Maine CS2000 Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3555,'EPSG','3555','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=43.83333333333334 +lon_0=-67.875 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=0',NULL,'NAD83(NSRS2007) / Maine CS2000 East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3556,'EPSG','3556','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=42.83333333333334 +lon_0=-70.375 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(NSRS2007) / Maine CS2000 West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3557,'EPSG','3557','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(NSRS2007) / Maine East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3558,'EPSG','3558','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=900000 +y_0=0',NULL,'NAD83(NSRS2007) / Maine West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3559,'EPSG','3559','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.45 +lat_2=38.3 +lon_0=-77 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'NAD83(NSRS2007) / Maryland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3560,'EPSG','3560','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=us-ft +x_0=500000.00001016 +y_0=999999.9999898402',NULL,'NAD83 / Utah North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3561,'EPSG','3561','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.999966667 +lat_0=18.83333333333333 +lon_0=-155.5 +no_defs +proj=tmerc +towgs84=61,-285,-181,0,0,0,0 +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'Old Hawaiian / Hawaii zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3561,'ESRI','3561','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999967 +lat_0=18.83333333333333 +lon_0=-155.5 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'Old Hawaiian / Hawaii zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3562,'EPSG','3562','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.999966667 +lat_0=20.33333333333333 +lon_0=-156.6666666666667 +no_defs +proj=tmerc +towgs84=61,-285,-181,0,0,0,0 +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'Old Hawaiian / Hawaii zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3562,'ESRI','3562','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999967 +lat_0=20.33333333333333 +lon_0=-156.6666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'Old Hawaiian / Hawaii zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3563,'EPSG','3563','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.99999 +lat_0=21.16666666666667 +lon_0=-158 +no_defs +proj=tmerc +towgs84=61,-285,-181,0,0,0,0 +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'Old Hawaiian / Hawaii zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3563,'ESRI','3563','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999990 +lat_0=21.16666666666667 +lon_0=-158 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'Old Hawaiian / Hawaii zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3564,'EPSG','3564','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.99999 +lat_0=21.83333333333333 +lon_0=-159.5 +no_defs +proj=tmerc +towgs84=61,-285,-181,0,0,0,0 +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'Old Hawaiian / Hawaii zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3564,'ESRI','3564','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999990 +lat_0=21.83333333333333 +lon_0=-159.5 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'Old Hawaiian / Hawaii zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3565,'EPSG','3565','proj4_data/epsg',NULL,'+ellps=clrk66 +k=1 +lat_0=21.66666666666667 +lon_0=-160.1666666666667 +no_defs +proj=tmerc +towgs84=61,-285,-181,0,0,0,0 +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'Old Hawaiian / Hawaii zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3565,'ESRI','3565','proj4_data/esri',NULL,'+ellps=clrk66 +k=1.000000 +lat_0=21.66666666666667 +lon_0=-160.1666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'Old Hawaiian / Hawaii zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3566,'EPSG','3566','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=us-ft +x_0=500000.00001016 +y_0=2000000.00001016',NULL,'NAD83 / Utah Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3567,'EPSG','3567','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=us-ft +x_0=500000.00001016 +y_0=3000000',NULL,'NAD83 / Utah South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3568,'EPSG','3568','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=999999.9999898402',NULL,'NAD83(HARN) / Utah North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3569,'EPSG','3569','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=2000000.00001016',NULL,'NAD83(HARN) / Utah Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3570,'EPSG','3570','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=3000000',NULL,'NAD83(HARN) / Utah South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3571,'EPSG','3571','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=90 +lon_0=180 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / North Pole LAEA Bering Sea',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3572,'EPSG','3572','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=90 +lon_0=-150 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / North Pole LAEA Alaska',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3573,'EPSG','3573','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=90 +lon_0=-100 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / North Pole LAEA Canada',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3574,'EPSG','3574','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=90 +lon_0=-40 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / North Pole LAEA Atlantic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3575,'EPSG','3575','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=90 +lon_0=10 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / North Pole LAEA Europe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3576,'EPSG','3576','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=90 +lon_0=90 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / North Pole LAEA Russia',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3577,'EPSG','3577','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=0 +lat_1=-18 +lat_2=-36 +lon_0=132 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'GDA94 / Australian Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3578,'EPSG','3578','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=59 +lat_1=61.66666666666666 +lat_2=68 +lon_0=-132.5 +no_defs +proj=aea +units=m +x_0=500000 +y_0=500000',NULL,'NAD83 / Yukon Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3579,'EPSG','3579','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=59 +lat_1=61.66666666666666 +lat_2=68 +lon_0=-132.5 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=500000',NULL,'NAD83(CSRS) / Yukon Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3580,'EPSG','3580','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=0 +lat_1=62 +lat_2=70 +lon_0=-112 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'NAD83 / NWT Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3581,'EPSG','3581','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=0 +lat_1=62 +lat_2=70 +lon_0=-112 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(CSRS) / NWT Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3582,'EPSG','3582','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.45 +lat_2=38.3 +lon_0=-77 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=399999.9998983998 +y_0=0',NULL,'NAD83(NSRS2007) / Maryland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3583,'EPSG','3583','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lon_0=-70.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Massachusetts Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3584,'EPSG','3584','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lon_0=-70.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(NSRS2007) / Massachusetts Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3585,'EPSG','3585','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lon_0=-71.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=750000',NULL,'NAD83(NSRS2007) / Massachusetts Mainland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3586,'EPSG','3586','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lon_0=-71.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=750000',NULL,'NAD83(NSRS2007) / Massachusetts Mainland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3587,'EPSG','3587','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.31666666666667 +lat_1=45.7 +lat_2=44.18333333333333 +lon_0=-84.36666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=6000000 +y_0=0',NULL,'NAD83(NSRS2007) / Michigan Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3588,'EPSG','3588','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.31666666666667 +lat_1=45.7 +lat_2=44.18333333333333 +lon_0=-84.36666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=5999999.999976001 +y_0=0',NULL,'NAD83(NSRS2007) / Michigan Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3589,'EPSG','3589','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44.78333333333333 +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lon_0=-87 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=8000000 +y_0=0',NULL,'NAD83(NSRS2007) / Michigan North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3590,'EPSG','3590','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44.78333333333333 +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lon_0=-87 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=7999999.999968001 +y_0=0',NULL,'NAD83(NSRS2007) / Michigan North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3591,'EPSG','3591','proj4_data/epsg',NULL,'+alpha=337.25556 +ellps=GRS80 +gamma=337.25556 +k=0.9996 +lat_0=45.30916666666666 +lonc=-86 +no_defs +no_uoff +proj=omerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2546731.496 +y_0=-4354009.816',NULL,'NAD83(NSRS2007) / Michigan Oblique Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3592,'EPSG','3592','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.66666666666666 +lat_2=42.1 +lon_0=-84.36666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4000000 +y_0=0',NULL,'NAD83(NSRS2007) / Michigan South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3593,'EPSG','3593','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.66666666666666 +lat_2=42.1 +lon_0=-84.36666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=3999999.999984 +y_0=0',NULL,'NAD83(NSRS2007) / Michigan South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3594,'EPSG','3594','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=100000',NULL,'NAD83(NSRS2007) / Minnesota Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3595,'EPSG','3595','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=100000',NULL,'NAD83(NSRS2007) / Minnesota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3596,'EPSG','3596','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=100000',NULL,'NAD83(NSRS2007) / Minnesota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3597,'EPSG','3597','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=29.5 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(NSRS2007) / Mississippi East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3598,'EPSG','3598','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=29.5 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(NSRS2007) / Mississippi East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3599,'EPSG','3599','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=29.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=0',NULL,'NAD83(NSRS2007) / Mississippi West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3600,'EPSG','3600','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=29.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=699999.9998983998 +y_0=0',NULL,'NAD83(NSRS2007) / Mississippi West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3601,'EPSG','3601','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=35.83333333333334 +lon_0=-92.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Missouri Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3601,'NAD27','3601','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=43d40 +lat_1=46 +lat_2=44d20 +lon_0=-120d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3601: oregon north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3601,'NAD83','3601','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=43d40 +lat_1=46 +lat_2=44d20 +lon_0=-120d30 +proj=lcc +x_0=2500000 +y_0=0 no_defs',NULL,'3601: oregon north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3602,'EPSG','3602','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=35.83333333333334 +lon_0=-90.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=0',NULL,'NAD83(NSRS2007) / Missouri East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3602,'NAD27','3602','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=41d40 +lat_1=44 +lat_2=42d20 +lon_0=-120d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3602: oregon south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3602,'NAD83','3602','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=41d40 +lat_1=44 +lat_2=42d20 +lon_0=-120d30 +proj=lcc +x_0=1500000 +y_0=0 no_defs',NULL,'3602: oregon south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3603,'EPSG','3603','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=36.16666666666666 +lon_0=-94.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=850000 +y_0=0',NULL,'NAD83(NSRS2007) / Missouri West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3604,'EPSG','3604','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44.25 +lat_1=49 +lat_2=45 +lon_0=-109.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Montana',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3605,'EPSG','3605','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44.25 +lat_1=49 +lat_2=45 +lon_0=-109.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=599999.9999976 +y_0=0',NULL,'NAD83(NSRS2007) / Montana (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3606,'EPSG','3606','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Nebraska',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3607,'EPSG','3607','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-116.6666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=6000000',NULL,'NAD83(NSRS2007) / Nevada Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3608,'EPSG','3608','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-116.6666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=6000000',NULL,'NAD83(NSRS2007) / Nevada Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3609,'EPSG','3609','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-115.5833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=8000000',NULL,'NAD83(NSRS2007) / Nevada East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3610,'EPSG','3610','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-115.5833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.00001016 +y_0=8000000.000010163',NULL,'NAD83(NSRS2007) / Nevada East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3611,'EPSG','3611','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-118.5833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=4000000',NULL,'NAD83(NSRS2007) / Nevada West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3612,'EPSG','3612','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-118.5833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=800000.0000101599 +y_0=3999999.99998984',NULL,'NAD83(NSRS2007) / Nevada West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3613,'EPSG','3613','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.5 +lon_0=-71.66666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(NSRS2007) / New Hampshire',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3614,'EPSG','3614','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.5 +lon_0=-71.66666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(NSRS2007) / New Hampshire (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3615,'EPSG','3615','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'NAD83(NSRS2007) / New Jersey',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3616,'EPSG','3616','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=150000 +y_0=0',NULL,'NAD83(NSRS2007) / New Jersey (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3617,'EPSG','3617','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / New Mexico Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3618,'EPSG','3618','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(NSRS2007) / New Mexico Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3619,'EPSG','3619','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999909091 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=165000 +y_0=0',NULL,'NAD83(NSRS2007) / New Mexico East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3620,'EPSG','3620','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999909091 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=165000 +y_0=0',NULL,'NAD83(NSRS2007) / New Mexico East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3621,'EPSG','3621','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999916667 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=830000 +y_0=0',NULL,'NAD83(NSRS2007) / New Mexico West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3622,'EPSG','3622','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999916667 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=830000.0001016001 +y_0=0',NULL,'NAD83(NSRS2007) / New Mexico West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3623,'EPSG','3623','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=0',NULL,'NAD83(NSRS2007) / New York Central',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_28() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3624,'EPSG','3624','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=249999.9998983998 +y_0=0',NULL,'NAD83(NSRS2007) / New York Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3625,'EPSG','3625','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'NAD83(NSRS2007) / New York East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3626,'EPSG','3626','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=150000 +y_0=0',NULL,'NAD83(NSRS2007) / New York East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3627,'EPSG','3627','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(NSRS2007) / New York Long Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3628,'EPSG','3628','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(NSRS2007) / New York Long Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3629,'EPSG','3629','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=350000 +y_0=0',NULL,'NAD83(NSRS2007) / New York West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3630,'EPSG','3630','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=350000.0001016001 +y_0=0',NULL,'NAD83(NSRS2007) / New York West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3631,'EPSG','3631','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.75 +lat_1=36.16666666666666 +lat_2=34.33333333333334 +lon_0=-79 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=609601.22 +y_0=0',NULL,'NAD83(NSRS2007) / North Carolina',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3632,'EPSG','3632','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.75 +lat_1=36.16666666666666 +lat_2=34.33333333333334 +lon_0=-79 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD83(NSRS2007) / North Carolina (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3633,'EPSG','3633','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.43333333333333 +lon_0=-100.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / North Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3634,'EPSG','3634','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.43333333333333 +lon_0=-100.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=599999.9999976 +y_0=0',NULL,'NAD83(NSRS2007) / North Dakota North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3635,'EPSG','3635','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.66666666666666 +lat_1=47.48333333333333 +lat_2=46.18333333333333 +lon_0=-100.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / North Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3636,'EPSG','3636','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.66666666666666 +lat_1=47.48333333333333 +lat_2=46.18333333333333 +lon_0=-100.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=599999.9999976 +y_0=0',NULL,'NAD83(NSRS2007) / North Dakota South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3637,'EPSG','3637','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.66666666666666 +lat_1=41.7 +lat_2=40.43333333333333 +lon_0=-82.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Ohio North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3638,'EPSG','3638','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38 +lat_1=40.03333333333333 +lat_2=38.73333333333333 +lon_0=-82.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Ohio South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3639,'EPSG','3639','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=35 +lat_1=36.76666666666667 +lat_2=35.56666666666667 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Oklahoma North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3640,'EPSG','3640','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=35 +lat_1=36.76666666666667 +lat_2=35.56666666666667 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Oklahoma North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3641,'EPSG','3641','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.33333333333334 +lat_1=35.23333333333333 +lat_2=33.93333333333333 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Oklahoma South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3642,'EPSG','3642','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.33333333333334 +lat_1=35.23333333333333 +lat_2=33.93333333333333 +lon_0=-98 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Oklahoma South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3643,'EPSG','3643','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.75 +lat_1=43 +lat_2=45.5 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'NAD83(NSRS2007) / Oregon LCC (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3644,'EPSG','3644','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.75 +lat_1=43 +lat_2=45.5 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=399999.9999984 +y_0=0',NULL,'NAD83(NSRS2007) / Oregon GIC Lambert (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3645,'EPSG','3645','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=0',NULL,'NAD83(NSRS2007) / Oregon North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3646,'EPSG','3646','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=2500000.0001424 +y_0=0',NULL,'NAD83(NSRS2007) / Oregon North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3647,'EPSG','3647','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=0',NULL,'NAD83(NSRS2007) / Oregon South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3648,'EPSG','3648','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=1500000.0001464 +y_0=0',NULL,'NAD83(NSRS2007) / Oregon South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3649,'EPSG','3649','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.95 +lat_2=40.88333333333333 +lon_0=-77.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Pennsylvania North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3650,'EPSG','3650','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.95 +lat_2=40.88333333333333 +lon_0=-77.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Pennsylvania North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3651,'EPSG','3651','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.96666666666667 +lat_2=39.93333333333333 +lon_0=-77.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Pennsylvania South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3652,'EPSG','3652','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.96666666666667 +lat_2=39.93333333333333 +lon_0=-77.75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Pennsylvania South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3653,'EPSG','3653','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999375 +lat_0=41.08333333333334 +lon_0=-71.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=0',NULL,'NAD83(NSRS2007) / Rhode Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3654,'EPSG','3654','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999375 +lat_0=41.08333333333334 +lon_0=-71.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=99999.99998983997 +y_0=0',NULL,'NAD83(NSRS2007) / Rhode Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3655,'EPSG','3655','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=31.83333333333333 +lat_1=34.83333333333334 +lat_2=32.5 +lon_0=-81 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=609600 +y_0=0',NULL,'NAD83(NSRS2007) / South Carolina',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3656,'EPSG','3656','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=31.83333333333333 +lat_1=34.83333333333334 +lat_2=32.5 +lon_0=-81 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=609600 +y_0=0',NULL,'NAD83(NSRS2007) / South Carolina (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3657,'EPSG','3657','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.68333333333333 +lat_2=44.41666666666666 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / South Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3658,'EPSG','3658','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.68333333333333 +lat_2=44.41666666666666 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / South Dakota North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3659,'EPSG','3659','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42.33333333333334 +lat_1=44.4 +lat_2=42.83333333333334 +lon_0=-100.3333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / South Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3660,'EPSG','3660','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42.33333333333334 +lat_1=44.4 +lat_2=42.83333333333334 +lon_0=-100.3333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / South Dakota South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3661,'EPSG','3661','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.41666666666666 +lat_2=35.25 +lon_0=-86 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Tennessee',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3662,'EPSG','3662','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.41666666666666 +lat_2=35.25 +lon_0=-86 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Tennessee (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3663,'EPSG','3663','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=29.66666666666667 +lat_1=31.88333333333333 +lat_2=30.11666666666667 +lon_0=-100.3333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=700000 +y_0=3000000',NULL,'NAD83(NSRS2007) / Texas Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3664,'EPSG','3664','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=29.66666666666667 +lat_1=31.88333333333333 +lat_2=30.11666666666667 +lon_0=-100.3333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=699999.9998983998 +y_0=3000000',NULL,'NAD83(NSRS2007) / Texas Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3665,'EPSG','3665','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=18 +lat_1=27.5 +lat_2=35 +lon_0=-100 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=6000000',NULL,'NAD83(NSRS2007) / Texas Centric Albers Equal Area',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3666,'EPSG','3666','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=18 +lat_1=27.5 +lat_2=35 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=5000000',NULL,'NAD83(NSRS2007) / Texas Centric Lambert Conformal',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3667,'EPSG','3667','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34 +lat_1=36.18333333333333 +lat_2=34.65 +lon_0=-101.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1000000',NULL,'NAD83(NSRS2007) / Texas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3668,'EPSG','3668','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34 +lat_1=36.18333333333333 +lat_2=34.65 +lon_0=-101.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.0001016002 +y_0=999999.9998983998',NULL,'NAD83(NSRS2007) / Texas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3669,'EPSG','3669','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=31.66666666666667 +lat_1=33.96666666666667 +lat_2=32.13333333333333 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=2000000',NULL,'NAD83(NSRS2007) / Texas North Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3670,'EPSG','3670','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=31.66666666666667 +lat_1=33.96666666666667 +lat_2=32.13333333333333 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=2000000.0001016',NULL,'NAD83(NSRS2007) / Texas North Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3671,'EPSG','3671','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=5000000',NULL,'NAD83(NSRS2007) / Texas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3672,'EPSG','3672','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-98.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=300000.0000000001 +y_0=5000000.0001016',NULL,'NAD83(NSRS2007) / Texas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3673,'EPSG','3673','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=27.83333333333333 +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lon_0=-99 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=4000000',NULL,'NAD83(NSRS2007) / Texas South Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3674,'EPSG','3674','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=27.83333333333333 +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lon_0=-99 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=3999999.9998984',NULL,'NAD83(NSRS2007) / Texas South Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3675,'EPSG','3675','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=2000000',NULL,'NAD83(NSRS2007) / Utah Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3676,'EPSG','3676','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=500000.0001504 +y_0=1999999.999992',NULL,'NAD83(NSRS2007) / Utah Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3677,'EPSG','3677','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=2000000.00001016',NULL,'NAD83(NSRS2007) / Utah Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3678,'EPSG','3678','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=1000000',NULL,'NAD83(NSRS2007) / Utah North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3679,'EPSG','3679','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=500000.0001504 +y_0=999999.9999960001',NULL,'NAD83(NSRS2007) / Utah North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3680,'EPSG','3680','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=999999.9999898402',NULL,'NAD83(NSRS2007) / Utah North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3681,'EPSG','3681','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=3000000',NULL,'NAD83(NSRS2007) / Utah South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3682,'EPSG','3682','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=500000.0001504 +y_0=2999999.999988',NULL,'NAD83(NSRS2007) / Utah South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3683,'EPSG','3683','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=3000000',NULL,'NAD83(NSRS2007) / Utah South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3684,'EPSG','3684','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999964286 +lat_0=42.5 +lon_0=-72.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Vermont',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3685,'EPSG','3685','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.2 +lat_2=38.03333333333333 +lon_0=-78.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=2000000',NULL,'NAD83(NSRS2007) / Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3686,'EPSG','3686','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.2 +lat_2=38.03333333333333 +lon_0=-78.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=3500000.0001016 +y_0=2000000.0001016',NULL,'NAD83(NSRS2007) / Virginia North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3687,'EPSG','3687','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.96666666666667 +lat_2=36.76666666666667 +lon_0=-78.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=1000000',NULL,'NAD83(NSRS2007) / Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3688,'EPSG','3688','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.96666666666667 +lat_2=36.76666666666667 +lon_0=-78.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=3500000.0001016 +y_0=999999.9998983998',NULL,'NAD83(NSRS2007) / Virginia South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3689,'EPSG','3689','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.5 +lon_0=-120.8333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Washington North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3690,'EPSG','3690','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.5 +lon_0=-120.8333333333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(NSRS2007) / Washington North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3691,'EPSG','3691','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.33333333333334 +lat_1=47.33333333333334 +lat_2=45.83333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD83(NSRS2007) / Washington South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3692,'EPSG','3692','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.33333333333334 +lat_1=47.33333333333334 +lat_2=45.83333333333334 +lon_0=-120.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(NSRS2007) / Washington South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3693,'EPSG','3693','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / West Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3694,'EPSG','3694','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / West Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3695,'EPSG','3695','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Wisconsin Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3696,'EPSG','3696','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Wisconsin Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3697,'EPSG','3697','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.16666666666666 +lat_1=46.76666666666667 +lat_2=45.56666666666667 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Wisconsin North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3698,'EPSG','3698','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.16666666666666 +lat_1=46.76666666666667 +lat_2=45.56666666666667 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Wisconsin North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3699,'EPSG','3699','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42 +lat_1=44.06666666666667 +lat_2=42.73333333333333 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Wisconsin South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3700,'EPSG','3700','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42 +lat_1=44.06666666666667 +lat_2=42.73333333333333 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Wisconsin South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3701,'EPSG','3701','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=-90 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=520000 +y_0=-4480000',NULL,'NAD83(NSRS2007) / Wisconsin Transverse Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3701,'NAD27','3701','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=40d10 +lat_1=41d57 +lat_2=40d53 +lon_0=-77d45 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3701: pennsylvania north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3701,'NAD83','3701','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=40d10 +lat_1=41d57 +lat_2=40d53 +lon_0=-77d45 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'3701: pennsylvania north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3702,'EPSG','3702','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-105.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=0',NULL,'NAD83(NSRS2007) / Wyoming East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3702,'NAD27','3702','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=39d20 +lat_1=40d58 +lat_2=39d56 +lon_0=-77d45 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3702: pennsylvania south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3702,'NAD83','3702','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=39d20 +lat_1=40d58 +lat_2=39d56 +lon_0=-77d45 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'3702: pennsylvania south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3703,'EPSG','3703','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-107.3333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=100000',NULL,'NAD83(NSRS2007) / Wyoming East Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3704,'EPSG','3704','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-108.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Wyoming West Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3705,'EPSG','3705','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-110.0833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=100000',NULL,'NAD83(NSRS2007) / Wyoming West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3706,'EPSG','3706','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=59',NULL,'NAD83(NSRS2007) / UTM zone 59N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3707,'EPSG','3707','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=60',NULL,'NAD83(NSRS2007) / UTM zone 60N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3708,'EPSG','3708','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=1',NULL,'NAD83(NSRS2007) / UTM zone 1N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3709,'EPSG','3709','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=2',NULL,'NAD83(NSRS2007) / UTM zone 2N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3710,'EPSG','3710','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=3',NULL,'NAD83(NSRS2007) / UTM zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3711,'EPSG','3711','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=4',NULL,'NAD83(NSRS2007) / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3712,'EPSG','3712','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=5',NULL,'NAD83(NSRS2007) / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3713,'EPSG','3713','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=6',NULL,'NAD83(NSRS2007) / UTM zone 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3714,'EPSG','3714','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=7',NULL,'NAD83(NSRS2007) / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3715,'EPSG','3715','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=8',NULL,'NAD83(NSRS2007) / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3716,'EPSG','3716','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=9',NULL,'NAD83(NSRS2007) / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3717,'EPSG','3717','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=10',NULL,'NAD83(NSRS2007) / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3718,'EPSG','3718','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=11',NULL,'NAD83(NSRS2007) / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3719,'EPSG','3719','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=12',NULL,'NAD83(NSRS2007) / UTM zone 12N',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_29() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3720,'EPSG','3720','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=13',NULL,'NAD83(NSRS2007) / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3721,'EPSG','3721','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=14',NULL,'NAD83(NSRS2007) / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3722,'EPSG','3722','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=15',NULL,'NAD83(NSRS2007) / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3723,'EPSG','3723','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=16',NULL,'NAD83(NSRS2007) / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3724,'EPSG','3724','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=17',NULL,'NAD83(NSRS2007) / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3725,'EPSG','3725','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'NAD83(NSRS2007) / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3726,'EPSG','3726','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'NAD83(NSRS2007) / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3727,'EPSG','3727','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-21.11666666666667 +lon_0=55.53333333333333 +no_defs +proj=tmerc +towgs84=94,-948,-1262,0,0,0,0 +units=m +x_0=160000 +y_0=50000',NULL,'Reunion 1947 / TM Reunion',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3728,'EPSG','3728','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.66666666666666 +lat_1=41.7 +lat_2=40.43333333333333 +lon_0=-82.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Ohio North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3729,'EPSG','3729','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38 +lat_1=40.03333333333333 +lat_2=38.73333333333333 +lon_0=-82.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Ohio South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3730,'EPSG','3730','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-105.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.00001016 +y_0=0',NULL,'NAD83(NSRS2007) / Wyoming East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3731,'EPSG','3731','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-107.3333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=399999.99998984 +y_0=99999.99998983997',NULL,'NAD83(NSRS2007) / Wyoming East Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3732,'EPSG','3732','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-108.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / Wyoming West Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3733,'EPSG','3733','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-110.0833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83(NSRS2007) / Wyoming West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3734,'EPSG','3734','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=39.66666666666666 +lat_1=41.7 +lat_2=40.43333333333333 +lon_0=-82.5 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / Ohio North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3735,'EPSG','3735','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=38 +lat_1=40.03333333333333 +lat_2=38.73333333333333 +lon_0=-82.5 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / Ohio South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3736,'EPSG','3736','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999375 +lat_0=40.5 +lon_0=-105.1666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=200000.00001016 +y_0=0',NULL,'NAD83 / Wyoming East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3737,'EPSG','3737','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999375 +lat_0=40.5 +lon_0=-107.3333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=399999.99998984 +y_0=99999.99998983997',NULL,'NAD83 / Wyoming East Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3738,'EPSG','3738','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999375 +lat_0=40.5 +lon_0=-108.75 +no_defs +proj=tmerc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / Wyoming West Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3739,'EPSG','3739','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999375 +lat_0=40.5 +lon_0=-110.0833333333333 +no_defs +proj=tmerc +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83 / Wyoming West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3740,'EPSG','3740','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=10',NULL,'NAD83(HARN) / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3741,'EPSG','3741','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=11',NULL,'NAD83(HARN) / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3742,'EPSG','3742','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=12',NULL,'NAD83(HARN) / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3743,'EPSG','3743','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=13',NULL,'NAD83(HARN) / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3744,'EPSG','3744','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=14',NULL,'NAD83(HARN) / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3745,'EPSG','3745','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=15',NULL,'NAD83(HARN) / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3746,'EPSG','3746','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=16',NULL,'NAD83(HARN) / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3747,'EPSG','3747','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=17',NULL,'NAD83(HARN) / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3748,'EPSG','3748','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'NAD83(HARN) / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3749,'EPSG','3749','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'NAD83(HARN) / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3750,'EPSG','3750','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=4',NULL,'NAD83(HARN) / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3751,'EPSG','3751','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=5',NULL,'NAD83(HARN) / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3752,'EPSG','3752','proj4_data/epsg',NULL,'+datum=WGS84 +lat_ts=-41 +lon_0=100 +no_defs +proj=merc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / Mercator 41 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3753,'EPSG','3753','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.66666666666666 +lat_1=41.7 +lat_2=40.43333333333333 +lon_0=-82.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Ohio North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3754,'EPSG','3754','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38 +lat_1=40.03333333333333 +lat_2=38.73333333333333 +lon_0=-82.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Ohio South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3755,'EPSG','3755','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-105.1666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=200000.00001016 +y_0=0',NULL,'NAD83(HARN) / Wyoming East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3756,'EPSG','3756','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-107.3333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=399999.99998984 +y_0=99999.99998983997',NULL,'NAD83(HARN) / Wyoming East Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3757,'EPSG','3757','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-108.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / Wyoming West Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3758,'EPSG','3758','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-110.0833333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83(HARN) / Wyoming West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3759,'EPSG','3759','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99999 +lat_0=21.16666666666667 +lon_0=-158 +no_defs +proj=tmerc +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83 / Hawaii zone 3 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3760,'EPSG','3760','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999 +lat_0=21.16666666666667 +lon_0=-158 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83(HARN) / Hawaii zone 3 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3761,'EPSG','3761','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=22',NULL,'NAD83(CSRS) / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3762,'EPSG','3762','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-55 +lat_1=-54 +lat_2=-54.75 +lon_0=-37 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / South Georgia Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3763,'EPSG','3763','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=39.66825833333333 +lon_0=-8.133108333333334 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'ETRS89 / Portugal TM06',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3764,'EPSG','3764','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-44 +lon_0=-176.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'NZGD2000 / Chatham Island Circuit 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3765,'EPSG','3765','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=16.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'HTRS96 / Croatia TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3766,'EPSG','3766','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=0 +lat_1=45.91666666666666 +lat_2=43.08333333333334 +lon_0=16.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'HTRS96 / Croatia LCC',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3767,'EPSG','3767','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=33',NULL,'HTRS96 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3768,'EPSG','3768','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=34',NULL,'HTRS96 / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3769,'EPSG','3769','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +towgs84=-73,213,296,0,0,0,0 +units=m +zone=20',NULL,'Bermuda 1957 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3770,'EPSG','3770','proj4_data/epsg',NULL,'+ellps=WGS84 +k=1 +lat_0=32 +lon_0=-64.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=550000 +y_0=100000',NULL,'BDA2000 / Bermuda 2000 National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3771,'EPSG','3771','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=0 +lon_0=-111 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD27 / Alberta 3TM ref merid 111 W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3772,'EPSG','3772','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=0 +lon_0=-114 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD27 / Alberta 3TM ref merid 114 W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3773,'EPSG','3773','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=0 +lon_0=-117 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD27 / Alberta 3TM ref merid 117 W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3774,'EPSG','3774','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=0 +lon_0=-120 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD27 / Alberta 3TM ref merid 120 W (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3775,'EPSG','3775','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-111 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD83 / Alberta 3TM ref merid 111 W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3776,'EPSG','3776','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-114 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD83 / Alberta 3TM ref merid 114 W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3777,'EPSG','3777','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-117 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD83 / Alberta 3TM ref merid 117 W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3778,'EPSG','3778','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-120 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD83 / Alberta 3TM ref merid 120 W (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3779,'EPSG','3779','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(CSRS) / Alberta 3TM ref merid 111 W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3780,'EPSG','3780','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-114 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(CSRS) / Alberta 3TM ref merid 114 W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3781,'EPSG','3781','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-117 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(CSRS) / Alberta 3TM ref merid 117 W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3782,'EPSG','3782','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-120 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(CSRS) / Alberta 3TM ref merid 120 W (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3783,'EPSG','3783','proj4_data/epsg',NULL,'+ellps=WGS84 +k=1 +lat_0=-25.06855261111111 +lon_0=-130.1129671111111 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=14200 +y_0=15500',NULL,'Pitcairn 2006 / Pitcairn TM 2006',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3784,'EPSG','3784','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=185,165,42,0,0,0,0 +units=m +zone=9',NULL,'Pitcairn 1967 / UTM zone 9S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3785,'EPSG','3785','proj4_data/epsg',NULL,'+a=6378137 +b=6378137 +k=1.0 +lat_ts=0.0 +lon_0=0.0 +nadgrids=@null +no_defs +proj=merc +units=m +wktext +x_0=0.0 +y_0=0',NULL,'Popular Visualisation CRS / Mercator (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3786,'EPSG','3786','proj4_data/epsg',NULL,'+a=6371007 +b=6371007 +lat_0=0 +lat_ts=0 +lon_0=0 +no_defs +proj=eqc +units=m +x_0=0 +y_0=0',NULL,'World Equidistant Cylindrical (Sphere) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3787,'EPSG','3787','proj4_data/epsg',NULL,'+datum=hermannskogel +k=0.9999 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=-5000000',NULL,'MGI / Slovene National Grid (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3788,'EPSG','3788','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=166 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=10000000',NULL,'NZGD2000 / Auckland Islands TM 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3789,'EPSG','3789','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=169 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=10000000',NULL,'NZGD2000 / Campbell Island TM 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3790,'EPSG','3790','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=179 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=10000000',NULL,'NZGD2000 / Antipodes Islands TM 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3791,'EPSG','3791','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=-178 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=10000000',NULL,'NZGD2000 / Raoul Island TM 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3793,'EPSG','3793','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=-176.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=10000000',NULL,'NZGD2000 / Chatham Islands TM 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3794,'EPSG','3794','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=-5000000',NULL,'Slovenia 1996 / Slovene National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3795,'EPSG','3795','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=22.35 +lat_1=23 +lat_2=21.7 +lon_0=-81 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=280296.016',NULL,'NAD27 / Cuba Norte',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3796,'EPSG','3796','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=20.71666666666667 +lat_1=21.3 +lat_2=20.13333333333333 +lon_0=-76.83333333333333 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=229126.939',NULL,'NAD27 / Cuba Sur',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3797,'EPSG','3797','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=44 +lat_1=50 +lat_2=46 +lon_0=-70 +no_defs +proj=lcc +units=m +x_0=800000 +y_0=0',NULL,'NAD27 / MTQ Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3798,'EPSG','3798','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=44 +lat_1=50 +lat_2=46 +lon_0=-70 +no_defs +proj=lcc +units=m +x_0=800000 +y_0=0',NULL,'NAD83 / MTQ Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3799,'EPSG','3799','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44 +lat_1=50 +lat_2=46 +lon_0=-70 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=0',NULL,'NAD83(CSRS) / MTQ Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3800,'EPSG','3800','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=0 +lon_0=-120 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD27 / Alberta 3TM ref merid 120 W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3800,'NAD27','3800','proj4_data/nad27',NULL,'+datum=NAD27 +k=.99999375 +lat_0=41d5 +lon_0=-71d30 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'3800: rhode island ---: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3800,'NAD83','3800','proj4_data/nad83',NULL,'+datum=NAD83 +k=.99999375 +lat_0=41d5 +lon_0=-71d30 +proj=tmerc +x_0=100000 +y_0=0 no_defs',NULL,'3800: rhode island ---: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3801,'EPSG','3801','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-120 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD83 / Alberta 3TM ref merid 120 W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3802,'EPSG','3802','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-120 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(CSRS) / Alberta 3TM ref merid 120 W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3812,'EPSG','3812','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=50.797815 +lat_1=49.83333333333334 +lat_2=51.16666666666666 +lon_0=4.359215833333333 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=649328 +y_0=665262',NULL,'ETRS89 / Belgian Lambert 2008',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3814,'EPSG','3814','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9998335 +lat_0=32.5 +lon_0=-89.75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=1300000',NULL,'NAD83 / Mississippi TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3815,'EPSG','3815','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9998335 +lat_0=32.5 +lon_0=-89.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=1300000',NULL,'NAD83(HARN) / Mississippi TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3816,'EPSG','3816','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9998335 +lat_0=32.5 +lon_0=-89.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=1300000',NULL,'NAD83(NSRS2007) / Mississippi TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3819,'EPSG','3819','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=595.48,121.69,515.35,4.115,-2.9383,0.853,-3.408',NULL,'HD1909',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3821,'EPSG','3821','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=longlat',NULL,'TWD67',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3822,'EPSG','3822','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'TWD97',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3824,'EPSG','3824','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'TWD97',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3825,'EPSG','3825','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=119 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=0',NULL,'TWD97 / TM2 zone 119',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3826,'EPSG','3826','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=121 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=0',NULL,'TWD97 / TM2 zone 121',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3827,'EPSG','3827','proj4_data/epsg',NULL,'+ellps=aust_SA +k=0.9999 +lat_0=0 +lon_0=119 +no_defs +proj=tmerc +units=m +x_0=250000 +y_0=0',NULL,'TWD67 / TM2 zone 119',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3828,'EPSG','3828','proj4_data/epsg',NULL,'+ellps=aust_SA +k=0.9999 +lat_0=0 +lon_0=121 +no_defs +proj=tmerc +units=m +x_0=250000 +y_0=0',NULL,'TWD67 / TM2 zone 121',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3829,'EPSG','3829','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-637,-549,-203,0,0,0,0 +units=m +zone=51',NULL,'Hu Tzu Shan 1950 / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3832,'EPSG','3832','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lon_0=150 +no_defs +proj=merc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / PDC Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3833,'EPSG','3833','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=2500000 +y_0=0',NULL,'Pulkovo 1942(58) / Gauss-Kruger zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3834,'EPSG','3834','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=2500000 +y_0=0',NULL,'Pulkovo 1942(83) / Gauss-Kruger zone 2',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_30() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3835,'EPSG','3835','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=3500000 +y_0=0',NULL,'Pulkovo 1942(83) / Gauss-Kruger zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3836,'EPSG','3836','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=4500000 +y_0=0',NULL,'Pulkovo 1942(83) / Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3837,'EPSG','3837','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=3500000 +y_0=0',NULL,'Pulkovo 1942(58) / 3-degree Gauss-Kruger zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3838,'EPSG','3838','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=4500000 +y_0=0',NULL,'Pulkovo 1942(58) / 3-degree Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3839,'EPSG','3839','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=9500000 +y_0=0',NULL,'Pulkovo 1942(58) / 3-degree Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3840,'EPSG','3840','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=10500000 +y_0=0',NULL,'Pulkovo 1942(58) / 3-degree Gauss-Kruger zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3841,'EPSG','3841','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=6500000 +y_0=0',NULL,'Pulkovo 1942(83) / 3-degree Gauss-Kruger zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3842,'EPSG','3842','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=6500000 +y_0=0',NULL,'Pulkovo 1942(83) / 3-degree Gauss-Kruger zone 7 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3843,'EPSG','3843','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=6500000 +y_0=0',NULL,'Pulkovo 1942(83) / 3-degree Gauss-Kruger zone 8 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3844,'EPSG','3844','proj4_data/epsg',NULL,'+ellps=krass +k=0.99975 +lat_0=46 +lon_0=25 +no_defs +proj=sterea +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=500000 +y_0=500000',NULL,'Pulkovo 1942(58) / Stereo70',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3845,'EPSG','3845','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000006 +lat_0=0 +lon_0=11.30625 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500025.141 +y_0=-667.282',NULL,'SWEREF99 / RT90 7.5 gon V emulation',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3846,'EPSG','3846','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000058 +lat_0=0 +lon_0=13.55626666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500044.695 +y_0=-667.13',NULL,'SWEREF99 / RT90 5 gon V emulation',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3847,'EPSG','3847','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00000561024 +lat_0=0 +lon_0=15.80628452944445 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500064.274 +y_0=-667.711',NULL,'SWEREF99 / RT90 2.5 gon V emulation',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3848,'EPSG','3848','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000054 +lat_0=0 +lon_0=18.0563 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500083.521 +y_0=-668.8440000000001',NULL,'SWEREF99 / RT90 0 gon emulation',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3849,'EPSG','3849','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000052 +lat_0=0 +lon_0=20.30631666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500102.765 +y_0=-670.706',NULL,'SWEREF99 / RT90 2.5 gon O emulation',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3850,'EPSG','3850','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000049 +lat_0=0 +lon_0=22.55633333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500121.846 +y_0=-672.557',NULL,'SWEREF99 / RT90 5 gon O emulation',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3851,'EPSG','3851','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=-41 +lat_1=-37.5 +lat_2=-44.5 +lon_0=173 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3000000 +y_0=7000000',NULL,'NZGD2000 / NZCS2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3852,'EPSG','3852','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=-90 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=157 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'RSRGD2000 / DGLC2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3854,'EPSG','3854','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999506 +lat_0=0 +lon_0=18.05787 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100182.7406 +y_0=-6500620.1207',NULL,'County ST74',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3857,'EPSG','3857','proj4_data/epsg',NULL,'+a=6378137 +b=6378137 +k=1.0 +lat_ts=0.0 +lon_0=0.0 +nadgrids=@null +no_defs +proj=merc +units=m +wktext +x_0=0.0 +y_0=0',NULL,'WGS 84 / Pseudo-Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3873,'EPSG','3873','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=19 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=19500000 +y_0=0',NULL,'ETRS89 / GK19FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3874,'EPSG','3874','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=20 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=20500000 +y_0=0',NULL,'ETRS89 / GK20FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3875,'EPSG','3875','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=21500000 +y_0=0',NULL,'ETRS89 / GK21FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3876,'EPSG','3876','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=22 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=22500000 +y_0=0',NULL,'ETRS89 / GK22FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3877,'EPSG','3877','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=23 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=23500000 +y_0=0',NULL,'ETRS89 / GK23FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3878,'EPSG','3878','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=24500000 +y_0=0',NULL,'ETRS89 / GK24FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3879,'EPSG','3879','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=25500000 +y_0=0',NULL,'ETRS89 / GK25FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3880,'EPSG','3880','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=26 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=26500000 +y_0=0',NULL,'ETRS89 / GK26FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3881,'EPSG','3881','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=27500000 +y_0=0',NULL,'ETRS89 / GK27FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3882,'EPSG','3882','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=28 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=28500000 +y_0=0',NULL,'ETRS89 / GK28FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3883,'EPSG','3883','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=29 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=29500000 +y_0=0',NULL,'ETRS89 / GK29FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3884,'EPSG','3884','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=30500000 +y_0=0',NULL,'ETRS89 / GK30FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3885,'EPSG','3885','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=31 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=31500000 +y_0=0',NULL,'ETRS89 / GK31FIN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3887,'EPSG','3887','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'IGRS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3889,'EPSG','3889','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'IGRS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3890,'EPSG','3890','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=37',NULL,'IGRS / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3891,'EPSG','3891','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=38',NULL,'IGRS / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3892,'EPSG','3892','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=39',NULL,'IGRS / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3893,'EPSG','3893','proj4_data/epsg',NULL,'+ellps=intl +k=0.9994 +lat_0=29.02626833333333 +lon_0=46.5 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=800000 +y_0=0',NULL,'ED50 / Iraq National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3900,'NAD83','3900','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=31d50 +lat_1=34d50 +lat_2=32d30 +lon_0=-81 +proj=lcc +x_0=609600 +y_0=0 no_defs',NULL,'3900: south carolina: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3901,'EPSG','3901','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=-96.062,-82.428,-121.753,4.801,0.345,-1.376,1.496 +units=m +vunits=m +x_0=3500000 +y_0=0',NULL,'KKJ / Finland Uniform Coordinate System + N60 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3901,'NAD27','3901','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=33 +lat_1=34d58 +lat_2=33d46 +lon_0=-81 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3901: south carolina north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3902,'EPSG','3902','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=35',NULL,'ETRS89 / TM35FIN(N,E) + N60 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3902,'NAD27','3902','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=31d50 +lat_1=33d40 +lat_2=32d20 +lon_0=-81 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'3902: south carolina south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3903,'EPSG','3903','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=35',NULL,'ETRS89 / TM35FIN(N,E) + N2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3906,'EPSG','3906','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=682,-203,480,0,0,0,0',NULL,'MGI 1901',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3907,'EPSG','3907','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=5500000 +y_0=0',NULL,'MGI 1901 / Balkans zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3908,'EPSG','3908','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=6500000 +y_0=0',NULL,'MGI 1901 / Balkans zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3909,'EPSG','3909','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=7500000 +y_0=0',NULL,'MGI 1901 / Balkans zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3910,'EPSG','3910','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=8500000 +y_0=0',NULL,'MGI 1901 / Balkans zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3911,'EPSG','3911','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'MGI 1901 / Slovenia Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3912,'EPSG','3912','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=500000 +y_0=-5000000',NULL,'MGI 1901 / Slovene National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3920,'EPSG','3920','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +towgs84=11,72,-101,0,0,0,0 +units=m +zone=20',NULL,'Puerto Rico / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3920,'ESRI','3920','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=utm +units=m +zone=20 no_defs',NULL,'Puerto Rico / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3942,'EPSG','3942','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42 +lat_1=41.25 +lat_2=42.75 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1700000 +y_0=1200000',NULL,'RGF93 / CC42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3943,'EPSG','3943','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43 +lat_1=42.25 +lat_2=43.75 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1700000 +y_0=2200000',NULL,'RGF93 / CC43',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3944,'EPSG','3944','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44 +lat_1=43.25 +lat_2=44.75 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1700000 +y_0=3200000',NULL,'RGF93 / CC44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3945,'EPSG','3945','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45 +lat_1=44.25 +lat_2=45.75 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1700000 +y_0=4200000',NULL,'RGF93 / CC45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3946,'EPSG','3946','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=46 +lat_1=45.25 +lat_2=46.75 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1700000 +y_0=5200000',NULL,'RGF93 / CC46',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3947,'EPSG','3947','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=46.25 +lat_2=47.75 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1700000 +y_0=6200000',NULL,'RGF93 / CC47',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3948,'EPSG','3948','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=48 +lat_1=47.25 +lat_2=48.75 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1700000 +y_0=7200000',NULL,'RGF93 / CC48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3949,'EPSG','3949','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=49 +lat_1=48.25 +lat_2=49.75 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1700000 +y_0=8200000',NULL,'RGF93 / CC49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3950,'EPSG','3950','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=50 +lat_1=49.25 +lat_2=50.75 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1700000 +y_0=9200000',NULL,'RGF93 / CC50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3968,'EPSG','3968','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36 +lat_1=37 +lat_2=39.5 +lon_0=-79.5 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'NAD83 / Virginia Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3969,'EPSG','3969','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36 +lat_1=37 +lat_2=39.5 +lon_0=-79.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(HARN) / Virginia Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3970,'EPSG','3970','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36 +lat_1=37 +lat_2=39.5 +lon_0=-79.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(NSRS2007) / Virginia Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3973,'EPSG','3973','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=90 +lon_0=0 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / NSIDC EASE-Grid North (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3974,'EPSG','3974','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lon_0=0 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / NSIDC EASE-Grid South (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3975,'EPSG','3975','proj4_data/epsg',NULL,'+datum=WGS84 +lat_ts=30 +lon_0=0 +no_defs +proj=cea +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / NSIDC EASE-Grid Global (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3976,'EPSG','3976','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=-90 +lat_ts=-70 +lon_0=0 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / NSIDC Sea Ice Polar Stereographic South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3978,'EPSG','3978','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=49 +lat_1=49 +lat_2=77 +lon_0=-95 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'NAD83 / Canada Atlas Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3979,'EPSG','3979','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=49 +lat_1=49 +lat_2=77 +lon_0=-95 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(CSRS) / Canada Atlas Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3985,'EPSG','3985','proj4_data/epsg',NULL,'+ellps=clrk66 +lat_0=9 +lat_1=-6.5 +lat_2=-11.5 +lon_0=26 +no_defs +proj=lcc +towgs84=-103.746,-9.614,-255.95,0,0,0,0 +units=m +x_0=500000 +y_0=500000',NULL,'Katanga 1955 / Katanga Lambert (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3986,'EPSG','3986','proj4_data/epsg',NULL,'+ellps=clrk66 +k=1 +lat_0=-9 +lon_0=30 +no_defs +proj=tmerc +towgs84=-103.746,-9.614,-255.95,0,0,0,0 +units=m +x_0=200000 +y_0=500000',NULL,'Katanga 1955 / Katanga Gauss zone A',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3987,'EPSG','3987','proj4_data/epsg',NULL,'+ellps=clrk66 +k=1 +lat_0=-9 +lon_0=28 +no_defs +proj=tmerc +towgs84=-103.746,-9.614,-255.95,0,0,0,0 +units=m +x_0=200000 +y_0=500000',NULL,'Katanga 1955 / Katanga Gauss zone B',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3988,'EPSG','3988','proj4_data/epsg',NULL,'+ellps=clrk66 +k=1 +lat_0=-9 +lon_0=26 +no_defs +proj=tmerc +towgs84=-103.746,-9.614,-255.95,0,0,0,0 +units=m +x_0=200000 +y_0=500000',NULL,'Katanga 1955 / Katanga Gauss zone C',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3989,'EPSG','3989','proj4_data/epsg',NULL,'+ellps=clrk66 +k=1 +lat_0=-9 +lon_0=24 +no_defs +proj=tmerc +towgs84=-103.746,-9.614,-255.95,0,0,0,0 +units=m +x_0=200000 +y_0=500000',NULL,'Katanga 1955 / Katanga Gauss zone D',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3991,'EPSG','3991','proj4_data/epsg',NULL,'+ellps=clrk66 +lat_0=17.83333333333333 +lat_1=18.43333333333333 +lat_2=18.03333333333333 +lon_0=-66.43333333333334 +no_defs +proj=lcc +towgs84=11,72,-101,0,0,0,0 +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'Puerto Rico State Plane CS of 1927',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3991,'ESRI','3991','proj4_data/esri',NULL,'+ellps=clrk66 +lat_0=17.83333333333333 +lat_1=18.43333333333333 +lat_2=18.03333333333333 +lon_0=-66.43333333333334 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'Puerto Rico State Plane CS of 1927',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3992,'EPSG','3992','proj4_data/epsg',NULL,'+ellps=clrk66 +lat_0=17.83333333333333 +lat_1=18.43333333333333 +lat_2=18.03333333333333 +lon_0=-66.43333333333334 +no_defs +proj=lcc +towgs84=11,72,-101,0,0,0,0 +units=us-ft +x_0=152400.3048006096 +y_0=30480.06096012192',NULL,'Puerto Rico / St. Croix',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3992,'ESRI','3992','proj4_data/esri',NULL,'+ellps=clrk66 +lat_0=17.83333333333333 +lat_1=18.43333333333333 +lat_2=18.03333333333333 +lon_0=-66.43333333333334 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=30480.06096012192 no_defs',NULL,'Puerto Rico / St. Croix',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3994,'EPSG','3994','proj4_data/epsg',NULL,'+datum=WGS84 +lat_ts=-41 +lon_0=100 +no_defs +proj=merc +units=m +x_0=0 +y_0=0',NULL,'Guam 1963 / Guam SPCS\12Unable to translate coordinate system EPSG:3993 into PROJ.4 format.\12\12WGS 84 / Mercator 41',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3995,'EPSG','3995','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=90 +lat_ts=71 +lon_0=0 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / Arctic Polar Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3996,'EPSG','3996','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=90 +lat_ts=75 +lon_0=0 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / IBCAO Polar Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(3997,'EPSG','3997','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=0 +lon_0=55.33333333333334 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'WGS 84 / Dubai Local TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4000,'EPSG','4000','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'MOLDREF99',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4001,'EPSG','4001','proj4_data/epsg',NULL,'+ellps=airy +no_defs +proj=longlat',NULL,'Unknown datum based upon the Airy 1830 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4001,'ESRI','4001','proj4_data/esri',NULL,'+ellps=airy +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Airy 1830 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4001,'NAD27','4001','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=43d50 +lat_1=45d41 +lat_2=44d25 +lon_0=-100 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4001: south dakota north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4001,'NAD83','4001','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=43d50 +lat_1=45d41 +lat_2=44d25 +lon_0=-100 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'4001: south dakota north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4002,'EPSG','4002','proj4_data/epsg',NULL,'+ellps=mod_airy +no_defs +proj=longlat',NULL,'Unknown datum based upon the Airy Modified 1849 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4002,'ESRI','4002','proj4_data/esri',NULL,'+a=6377340.189 +b=6356034.447938534 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Airy Modified 1849 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4002,'NAD27','4002','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=42d20 +lat_1=44d24 +lat_2=42d50 +lon_0=-100d20 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4002: south dakota south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4002,'NAD83','4002','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=42d20 +lat_1=44d24 +lat_2=42d50 +lon_0=-100d20 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'4002: south dakota south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4003,'EPSG','4003','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=longlat',NULL,'Unknown datum based upon the Australian National Spheroid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4003,'ESRI','4003','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Australian National Spheroid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4004,'EPSG','4004','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat',NULL,'Unknown datum based upon the Bessel 1841 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4004,'ESRI','4004','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Bessel 1841 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4005,'EPSG','4005','proj4_data/epsg',NULL,'+a=6377492.018 +b=6356173.508712696 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Bessel Modified ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4005,'ESRI','4005','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Bessel Modified ellipsoid',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_31() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4006,'EPSG','4006','proj4_data/epsg',NULL,'+ellps=bess_nam +no_defs +proj=longlat',NULL,'Unknown datum based upon the Bessel Namibia ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4006,'ESRI','4006','proj4_data/esri',NULL,'+ellps=bess_nam +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Bessel Namibia ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4007,'EPSG','4007','proj4_data/epsg',NULL,'+a=6378293.645208759 +b=6356617.987679838 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Clarke 1858 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4007,'ESRI','4007','proj4_data/esri',NULL,'+a=6378293.63683822 +b=6356617.979337744 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Clarke 1858 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4008,'EPSG','4008','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Clarke 1866 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4008,'ESRI','4008','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Clarke 1866 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4009,'EPSG','4009','proj4_data/epsg',NULL,'+a=6378450.047548896 +b=6356826.621488444 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Clarke 1866 Michigan ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4009,'ESRI','4009','proj4_data/esri',NULL,'+a=6378450.047548896 +b=6356826.621488444 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Clarke 1866 Michigan ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4010,'EPSG','4010','proj4_data/epsg',NULL,'+a=6378300.789 +b=6356566.435 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Clarke 1880 (Benoit) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4010,'ESRI','4010','proj4_data/esri',NULL,'+a=6378300.789 +b=6356566.435 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Clarke 1880 (Benoit) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4011,'EPSG','4011','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Clarke 1880 (IGN) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4011,'ESRI','4011','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Clarke 1880 (IGN) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4012,'EPSG','4012','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Clarke 1880 (RGS) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4012,'ESRI','4012','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Clarke 1880 (RGS) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4013,'EPSG','4013','proj4_data/epsg',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Clarke 1880 (Arc) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4013,'ESRI','4013','proj4_data/esri',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Clarke 1880 (Arc) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4014,'EPSG','4014','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356514.996941779 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Clarke 1880 (SGA 1922) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4014,'ESRI','4014','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.996941779 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Clarke 1880 (SGA 1922) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4015,'EPSG','4015','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Everest 1830 (1937 Adjustment) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4015,'ESRI','4015','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Everest 1830 (1937 Adjustment) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4016,'EPSG','4016','proj4_data/epsg',NULL,'+ellps=evrstSS +no_defs +proj=longlat',NULL,'Unknown datum based upon the Everest 1830 (1967 Definition) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4016,'ESRI','4016','proj4_data/esri',NULL,'+ellps=evrstSS +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Everest 1830 (1967 Definition) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4018,'EPSG','4018','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Everest 1830 Modified ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4018,'ESRI','4018','proj4_data/esri',NULL,'+a=6377304.063 +b=6356103.038993155 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Everest 1830 Modified ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4019,'EPSG','4019','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'Unknown datum based upon the GRS 1980 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4019,'ESRI','4019','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the GRS 1980 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4020,'EPSG','4020','proj4_data/epsg',NULL,'+ellps=helmert +no_defs +proj=longlat',NULL,'Unknown datum based upon the Helmert 1906 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4020,'ESRI','4020','proj4_data/esri',NULL,'+ellps=helmert +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Helmert 1906 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4021,'EPSG','4021','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Indonesian National Spheroid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4021,'ESRI','4021','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Indonesian National Spheroid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4022,'EPSG','4022','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Unknown datum based upon the International 1924 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4022,'ESRI','4022','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the International 1924 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4023,'EPSG','4023','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'MOLDREF99',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4023,'ESRI','4023','proj4_data/esri',NULL,'+ellps=aust_SA +proj=longlat no_defs',NULL,'GCS International 1967',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4024,'EPSG','4024','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat',NULL,'Unknown datum based upon the Krassowsky 1940 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4024,'ESRI','4024','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Krassowsky 1940 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4025,'EPSG','4025','proj4_data/epsg',NULL,'+ellps=WGS66 +no_defs +proj=longlat',NULL,'Unknown datum based upon the NWL 9D ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4025,'ESRI','4025','proj4_data/esri',NULL,'+ellps=WGS66 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the NWL 9D ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4026,'EPSG','4026','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999400000000001 +lat_0=0 +lon_0=28.4 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=-5000000',NULL,'MOLDREF99 / Moldova TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4027,'EPSG','4027','proj4_data/epsg',NULL,'+a=6376523 +b=6355862.933255573 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Plessis 1817 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4027,'ESRI','4027','proj4_data/esri',NULL,'+a=6376523 +b=6355862.933255573 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Plessis 1817 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4028,'EPSG','4028','proj4_data/epsg',NULL,'+a=6378298.3 +b=6356657.142669561 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Struve 1860 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4028,'ESRI','4028','proj4_data/esri',NULL,'+a=6378298.3 +b=6356657.142669562 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Struve 1860 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4029,'EPSG','4029','proj4_data/epsg',NULL,'+a=6378300 +b=6356751.689189189 +no_defs +proj=longlat',NULL,'Unknown datum based upon the War Office ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4029,'ESRI','4029','proj4_data/esri',NULL,'+a=6378300 +b=6356751.689189189 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the War Office ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4030,'EPSG','4030','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat',NULL,'Unknown datum based upon the WGS 84 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4030,'ESRI','4030','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the WGS 84 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4031,'EPSG','4031','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat',NULL,'Unknown datum based upon the GEM 10C ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4031,'ESRI','4031','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the GEM 10C ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4032,'EPSG','4032','proj4_data/epsg',NULL,'+a=6378136.2 +b=6356751.516927429 +no_defs +proj=longlat',NULL,'Unknown datum based upon the OSU86F ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4032,'ESRI','4032','proj4_data/esri',NULL,'+a=6378136.2 +b=6356751.516927429 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the OSU86F ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4033,'EPSG','4033','proj4_data/epsg',NULL,'+a=6378136.3 +b=6356751.616592146 +no_defs +proj=longlat',NULL,'Unknown datum based upon the OSU91A ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4033,'ESRI','4033','proj4_data/esri',NULL,'+a=6378136.3 +b=6356751.616592146 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the OSU91A ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4034,'EPSG','4034','proj4_data/epsg',NULL,'+a=6378249.144808011 +b=6356514.966204134 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Clarke 1880 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4034,'ESRI','4034','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Clarke 1880 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4035,'EPSG','4035','proj4_data/epsg',NULL,'+a=6371000 +b=6371000 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Authalic Sphere',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4035,'ESRI','4035','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Authalic Sphere',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4036,'EPSG','4036','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=longlat',NULL,'Unknown datum based upon the GRS 1967 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4036,'ESRI','4036','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the GRS 1967 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4037,'EPSG','4037','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=35',NULL,'WGS 84 / TMzn35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4038,'EPSG','4038','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=36',NULL,'WGS 84 / TMzn36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4039,'EPSG','4039','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGRDC 2005',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4041,'EPSG','4041','proj4_data/epsg',NULL,'+a=6378135 +b=6356750.304921594 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Average Terrestrial System 1977 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4041,'ESRI','4041','proj4_data/esri',NULL,'+a=6378135 +b=6356750.304921594 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Average Terrestrial System 1977 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4042,'EPSG','4042','proj4_data/epsg',NULL,'+a=6377299.36559538 +b=6356098.359005156 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Everest (1830 Definition) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4042,'ESRI','4042','proj4_data/esri',NULL,'+a=6377299.36559538 +b=6356098.357204817 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Everest (1830 Definition) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4043,'EPSG','4043','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=longlat',NULL,'Unknown datum based upon the WGS 72 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4043,'ESRI','4043','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the WGS 72 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4044,'EPSG','4044','proj4_data/epsg',NULL,'+a=6377301.243 +b=6356100.230165384 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Everest 1830 (1962 Definition) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4044,'ESRI','4044','proj4_data/esri',NULL,'+a=6377301.243 +b=6356100.230165385 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Everest 1830 (1962 Definition) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4045,'EPSG','4045','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=longlat',NULL,'Unknown datum based upon the Everest 1830 (1975 Definition) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4045,'ESRI','4045','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=longlat no_defs',NULL,'Unknown datum based upon the Everest 1830 (1975 Definition) ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4046,'EPSG','4046','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RGRDC 2005',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4047,'EPSG','4047','proj4_data/epsg',NULL,'+a=6371007 +b=6371007 +no_defs +proj=longlat',NULL,'Unspecified datum based upon the GRS 1980 Authalic Sphere',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4047,'ESRI','4047','proj4_data/esri',NULL,'+a=6370997 +b=6370997 +no_defs +proj=longlat no_defs',NULL,'Unspecified based upon the GRS 1980 Authalic Sphere',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4048,'EPSG','4048','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'RGRDC 2005 / Congo TM zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4049,'EPSG','4049','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=14 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'RGRDC 2005 / Congo TM zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4050,'EPSG','4050','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=16 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'RGRDC 2005 / Congo TM zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4051,'EPSG','4051','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'RGRDC 2005 / Congo TM zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4052,'EPSG','4052','proj4_data/epsg',NULL,'+a=6370997 +b=6370997 +no_defs +proj=longlat',NULL,'Unspecified datum based upon the Clarke 1866 Authalic Sphere',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4053,'EPSG','4053','proj4_data/epsg',NULL,'+a=6371228 +b=6371228 +no_defs +proj=longlat',NULL,'Unspecified datum based upon the International 1924 Authalic Sphere',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4054,'EPSG','4054','proj4_data/epsg',NULL,'+a=6378273 +b=6356889.449 +no_defs +proj=longlat',NULL,'Unspecified datum based upon the Hughes 1980 ellipsoid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4055,'EPSG','4055','proj4_data/epsg',NULL,'+a=6378137 +b=6378137 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Popular Visualisation CRS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4056,'EPSG','4056','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=20 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'RGRDC 2005 / Congo TM zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4057,'EPSG','4057','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=22 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'RGRDC 2005 / Congo TM zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4058,'EPSG','4058','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'RGRDC 2005 / Congo TM zone 24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4059,'EPSG','4059','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=26 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'RGRDC 2005 / Congo TM zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4060,'EPSG','4060','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=28 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'RGRDC 2005 / Congo TM zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4061,'EPSG','4061','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=33',NULL,'RGRDC 2005 / UTM zone 33S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4062,'EPSG','4062','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=34',NULL,'RGRDC 2005 / UTM zone 34S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4063,'EPSG','4063','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=35',NULL,'RGRDC 2005 / UTM zone 35S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4071,'EPSG','4071','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-143.87,243.37,-33.52,0,0,0,0 +units=m +zone=23',NULL,'Chua / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4073,'EPSG','4073','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'SREF98',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4075,'EPSG','4075','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'SREF98',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4079,'EPSG','4079','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'REGCAN95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4081,'EPSG','4081','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'REGCAN95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4082,'EPSG','4082','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=27',NULL,'REGCAN95 / UTM zone 27N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4083,'EPSG','4083','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=28',NULL,'REGCAN95 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4087,'EPSG','4087','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=0 +lat_ts=0 +lon_0=0 +no_defs +proj=eqc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / World Equidistant Cylindrical',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4088,'EPSG','4088','proj4_data/epsg',NULL,'+a=6371007 +b=6371007 +lat_0=0 +lat_ts=0 +lon_0=0 +no_defs +proj=eqc +units=m +x_0=0 +y_0=0',NULL,'World Equidistant Cylindrical (Sphere)',''); +} +; + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_32() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4093,'EPSG','4093','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=-5000000',NULL,'ETRS89 / DKTM1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4094,'EPSG','4094','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=0 +lon_0=10 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=400000 +y_0=-5000000',NULL,'ETRS89 / DKTM2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4095,'EPSG','4095','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=0 +lon_0=11.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=-5000000',NULL,'ETRS89 / DKTM3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4096,'EPSG','4096','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000 +y_0=-5000000',NULL,'ETRS89 / DKTM4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4097,'EPSG','4097','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=200000 +y_0=-5000000',NULL,'ETRS89 / DKTM1 + DVR90 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4098,'EPSG','4098','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=0 +lon_0=10 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=400000 +y_0=-5000000',NULL,'ETRS89 / DKTM2 + DVR90 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4099,'EPSG','4099','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=0 +lon_0=11.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=600000 +y_0=-5000000',NULL,'ETRS89 / DKTM3 + DVR90 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4100,'EPSG','4100','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=800000 +y_0=-5000000',NULL,'ETRS89 / DKTM4 + DVR90 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4100,'NAD27','4100','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=34d40 +lat_1=36d25 +lat_2=35d15 +lon_0=-86 +proj=lcc +x_0=609601.2192024384 +y_0=30480.06096012192 no_defs',NULL,'4100: tennessee ---: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4100,'NAD83','4100','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=34d20 +lat_1=36d25 +lat_2=35d15 +lon_0=-86 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'4100: tennessee ---: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4120,'EPSG','4120','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat',NULL,'Greek',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4120,'ESRI','4120','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'Greek',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4121,'EPSG','4121','proj4_data/epsg',NULL,'+datum=GGRS87 +no_defs +proj=longlat',NULL,'GGRS87',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4121,'ESRI','4121','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=-199.87,74.79,246.62,0,0,0,0 no_defs',NULL,'GGRS87',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4122,'EPSG','4122','proj4_data/epsg',NULL,'+a=6378135 +b=6356750.304921594 +no_defs +proj=longlat',NULL,'ATS77',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4122,'ESRI','4122','proj4_data/esri',NULL,'+a=6378135 +b=6356750.304921594 +no_defs +proj=longlat no_defs',NULL,'ATS77',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4123,'EPSG','4123','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-96.062,-82.428,-121.753,4.801,0.345,-1.376,1.496',NULL,'KKJ',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4123,'ESRI','4123','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-90.7,-106.1,-119.2,4.09,0.218,-1.05,1.37 no_defs',NULL,'KKJ',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4124,'EPSG','4124','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=414.1,41.3,603.1,-0.855,2.141,-7.023,0',NULL,'RT90',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4124,'ESRI','4124','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'RT90',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4125,'EPSG','4125','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-404.78,685.68,45.47,0,0,0,0',NULL,'Samboja',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4125,'ESRI','4125','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-404.78,685.68,45.47,0,0,0,0 no_defs',NULL,'Samboja',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4126,'EPSG','4126','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'LKS94 (ETRS89)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4126,'ESRI','4126','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'LKS94 (ETRS89)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4127,'EPSG','4127','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=-80,-100,-228,0,0,0,0',NULL,'Tete',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4127,'ESRI','4127','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'Tete',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4128,'EPSG','4128','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat',NULL,'Madzansua',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4128,'ESRI','4128','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'Madzansua',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4129,'EPSG','4129','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=-132,-110,-335,0,0,0,0',NULL,'Observatario',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4129,'ESRI','4129','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'Observatario',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4130,'EPSG','4130','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Moznet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4130,'ESRI','4130','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,-0,-0,-0,0 no_defs',NULL,'Moznet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4131,'EPSG','4131','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=longlat +towgs84=198,881,317,0,0,0,0',NULL,'Indian 1960',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4131,'ESRI','4131','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=longlat no_defs',NULL,'Indian 1960',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4132,'EPSG','4132','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-241.54,-163.64,396.06,0,0,0,0',NULL,'FD58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4132,'ESRI','4132','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'FD58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4133,'EPSG','4133','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0.055,-0.541,-0.185,0.0183,-0.0003,-0.007,-0.014',NULL,'EST92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4133,'ESRI','4133','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0.055,-0.541,-0.185,0.0183,-0.0003,-0.007,-0.014 no_defs',NULL,'EST92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4134,'EPSG','4134','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-180.624,-225.516,173.919,-0.81,-1.898,8.336,16.71006',NULL,'PSD93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4134,'ESRI','4134','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'PDO Survey Datum 1993',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4135,'EPSG','4135','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=61,-285,-181,0,0,0,0',NULL,'Old Hawaiian',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4135,'ESRI','4135','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'Old Hawaiian',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4136,'EPSG','4136','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat',NULL,'St. Lawrence Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4136,'ESRI','4136','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'St. Lawrence Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4137,'EPSG','4137','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat',NULL,'St. Paul Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4137,'ESRI','4137','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'St. Paul Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4138,'EPSG','4138','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat',NULL,'St. George Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4138,'ESRI','4138','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'St. George Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4139,'EPSG','4139','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=11,72,-101,0,0,0,0',NULL,'Puerto Rico',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4139,'ESRI','4139','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'Puerto Rico',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4140,'EPSG','4140','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'NAD83(CSRS98)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4140,'ESRI','4140','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'NAD83(CSRS98)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4141,'EPSG','4141','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=-48,55,52,0,0,0,0',NULL,'Israel 1993',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4141,'ESRI','4141','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat no_defs',NULL,'Israel',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4142,'EPSG','4142','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-125,53,467,0,0,0,0',NULL,'Locodjo 1965',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4142,'ESRI','4142','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-125,53,467,0,0,0,0 no_defs',NULL,'Locodjo 1965',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4143,'EPSG','4143','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-124.76,53,466.79,0,0,0,0',NULL,'Abidjan 1987',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4143,'ESRI','4143','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-124.76,53,466.79,0,0,0,0 no_defs',NULL,'Abidjan 1987',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4144,'EPSG','4144','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=longlat +towgs84=214,804,268,0,0,0,0',NULL,'Kalianpur 1937',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4144,'ESRI','4144','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=longlat no_defs',NULL,'Kalianpur 1937',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4145,'EPSG','4145','proj4_data/epsg',NULL,'+a=6377301.243 +b=6356100.230165384 +no_defs +proj=longlat +towgs84=283,682,231,0,0,0,0',NULL,'Kalianpur 1962',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4145,'ESRI','4145','proj4_data/esri',NULL,'+a=6377301.243 +b=6356100.230165385 +no_defs +proj=longlat +towgs84=283,682,231,0,0,0,0 no_defs',NULL,'Kalianpur 1962',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4146,'EPSG','4146','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=longlat +towgs84=295,736,257,0,0,0,0',NULL,'Kalianpur 1975',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4146,'ESRI','4146','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=longlat +towgs84=295,736,257,0,0,0,0 no_defs',NULL,'Kalianpur 1975',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4147,'EPSG','4147','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=-17.51,-108.32,-62.39,0,0,0,0',NULL,'Hanoi 1972',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4147,'ESRI','4147','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=-17.51,-108.32,-62.39,0,0,0,0 no_defs',NULL,'Hanoi 1972',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4148,'EPSG','4148','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Hartebeesthoek94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4148,'ESRI','4148','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'Hartebeesthoek94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4149,'EPSG','4149','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=674.4,15.1,405.3,0,0,0,0',NULL,'CH1903',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4149,'ESRI','4149','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'CH1903',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4150,'EPSG','4150','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=674.374,15.056,405.346,0,0,0,0',NULL,'CH1903+',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4150,'ESRI','4150','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=674.374,15.056,405.346,0,0,0,0 no_defs',NULL,'CH1903+',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4151,'EPSG','4151','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'CHTRF95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4151,'ESRI','4151','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'CHTRF95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4152,'EPSG','4152','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'NAD83(HARN)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4152,'ESRI','4152','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'NAD83(HARN)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4153,'EPSG','4153','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-133.63,-157.5,-158.62,0,0,0,0',NULL,'Rassadiran',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4153,'ESRI','4153','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-133.63,-157.5,-158.62,0,0,0,0 no_defs',NULL,'Rassadiran',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4154,'EPSG','4154','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-117,-132,-164,0,0,0,0',NULL,'ED50(ED77)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4154,'ESRI','4154','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'ED50(ED77)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4155,'EPSG','4155','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-83,37,124,0,0,0,0',NULL,'Dabola 1981',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4155,'ESRI','4155','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-83,37,124,0,0,0,0 no_defs',NULL,'Dabola 1981',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4156,'EPSG','4156','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=589,76,480,0,0,0,0',NULL,'S-JTSK',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4156,'ESRI','4156','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'S-JTSK',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4157,'EPSG','4157','proj4_data/epsg',NULL,'+a=6378293.645208759 +b=6356617.987679838 +no_defs +proj=longlat',NULL,'Mount Dillon',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4157,'ESRI','4157','proj4_data/esri',NULL,'+a=6378293.63683822 +b=6356617.979337744 +no_defs +proj=longlat no_defs',NULL,'Mount Dillon',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4158,'EPSG','4158','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-0.465,372.095,171.736,0,0,0,0',NULL,'Naparima 1955',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4158,'ESRI','4158','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Naparima 1955',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4159,'EPSG','4159','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-115.8543,-99.0583,-152.4616,0,0,0,0',NULL,'ELD79',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4159,'ESRI','4159','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'ELD79',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4160,'EPSG','4160','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Chos Malal 1914',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4160,'ESRI','4160','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Chos Malal 1914',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4161,'EPSG','4161','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=27.5,14,186.4,0,0,0,0',NULL,'Pampa del Castillo',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4161,'ESRI','4161','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Pampa del Castillo',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4162,'EPSG','4162','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat',NULL,'Korean 1985',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4162,'ESRI','4162','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'Korean 1985',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4163,'EPSG','4163','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Yemen NGN96',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4163,'ESRI','4163','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'Yemen NGN96',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4164,'EPSG','4164','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=-76,-138,67,0,0,0,0',NULL,'South Yemen',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4164,'ESRI','4164','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=-76,-138,67,0,0,0,0 no_defs',NULL,'South Yemen',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_33() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4165,'EPSG','4165','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-173,253,27,0,0,0,0',NULL,'Bissau',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4165,'ESRI','4165','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-173,253,27,0,0,0,0 no_defs',NULL,'Bissau',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4166,'EPSG','4166','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Korean 1995',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4166,'ESRI','4166','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'Korean 1995',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4167,'EPSG','4167','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'NZGD2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4167,'ESRI','4167','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'NZGD2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4168,'EPSG','4168','proj4_data/epsg',NULL,'+a=6378300 +b=6356751.689189189 +no_defs +proj=longlat +towgs84=-199,32,322,0,0,0,0',NULL,'Accra',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4168,'ESRI','4168','proj4_data/esri',NULL,'+a=6378300 +b=6356751.689189189 +no_defs +proj=longlat +towgs84=-199,32,322,0,0,0,0 no_defs',NULL,'Accra',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4169,'EPSG','4169','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=-115,118,426,0,0,0,0',NULL,'American Samoa 1962',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4169,'ESRI','4169','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=-115,118,426,0,0,0,0 no_defs',NULL,'American Samoa 1962',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4170,'EPSG','4170','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'SIRGAS 1995',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4170,'ESRI','4170','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'SIRGAS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4171,'EPSG','4171','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RGF93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4171,'ESRI','4171','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'RGF93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4172,'EPSG','4172','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'POSGAR',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4172,'ESRI','4172','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'POSGAR',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4173,'EPSG','4173','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'IRENET95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4173,'ESRI','4173','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'IRENET95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4174,'EPSG','4174','proj4_data/epsg',NULL,'+a=6378300 +b=6356751.689189189 +no_defs +proj=longlat',NULL,'Sierra Leone 1924',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4174,'ESRI','4174','proj4_data/esri',NULL,'+a=6378300 +b=6356751.689189189 +no_defs +proj=longlat no_defs',NULL,'Sierra Leone 1924',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4175,'EPSG','4175','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-88,4,101,0,0,0,0',NULL,'Sierra Leone 1968',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4175,'ESRI','4175','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-88,4,101,0,0,0,0 no_defs',NULL,'Sierra Leone 1968',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4176,'EPSG','4176','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Australian Antarctic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4176,'ESRI','4176','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat no_defs',NULL,'Australian Antarctic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4178,'EPSG','4178','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=26,-121,-78,0,0,0,0',NULL,'Pulkovo 1942(83)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4178,'ESRI','4178','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=24,-123,-94,0.02,-0.25,-0.13,1.1 no_defs',NULL,'Pulkovo 1942(83)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4179,'EPSG','4179','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84',NULL,'Pulkovo 1942(58)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4179,'ESRI','4179','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 no_defs',NULL,'Pulkovo 1942(58)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4180,'EPSG','4180','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'EST97',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4180,'ESRI','4180','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'EST97',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4181,'EPSG','4181','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-189.6806,18.3463,-42.7695,-0.33746,-3.09264,2.53861,0.4598',NULL,'Luxembourg 1930',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4181,'ESRI','4181','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-193,13.7,-39.3,-0.41,-2.933,2.688,0.43 no_defs',NULL,'Luxembourg 1930',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4182,'EPSG','4182','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-425,-169,81,0,0,0,0',NULL,'Azores Occidental 1939',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4182,'ESRI','4182','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Azores Occidental 1939',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4183,'EPSG','4183','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-104,167,-38,0,0,0,0',NULL,'Azores Central 1948',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4183,'ESRI','4183','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Azores Central 1948',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4184,'EPSG','4184','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-203,141,53,0,0,0,0',NULL,'Azores Oriental 1940',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4184,'ESRI','4184','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Azores Oriental 1940',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4185,'EPSG','4185','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Madeira 1936',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4185,'ESRI','4185','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Madeira 1936',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4188,'EPSG','4188','proj4_data/epsg',NULL,'+ellps=airy +no_defs +proj=longlat +towgs84=482.5,-130.6,564.6,-1.042,-0.214,-0.631,8.15',NULL,'OSNI 1952',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4188,'ESRI','4188','proj4_data/esri',NULL,'+ellps=airy +no_defs +proj=longlat no_defs',NULL,'OSNI 1952',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4189,'EPSG','4189','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'REGVEN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4189,'ESRI','4189','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'REGVEN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4190,'EPSG','4190','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'POSGAR 98',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4190,'ESRI','4190','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'POSGAR 98',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4191,'EPSG','4191','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=-44.183,-0.58,-38.489,-2.3867,-2.7072,3.5196,-8.2703',NULL,'Albanian 1987',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4191,'ESRI','4191','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=longlat no_defs',NULL,'Albanian 1987',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4192,'EPSG','4192','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-206.1,-174.7,-87.7,0,0,0,0',NULL,'Douala 1948',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4192,'ESRI','4192','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Douala 1948',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4193,'EPSG','4193','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-70.9,-151.8,-41.4,0,0,0,0',NULL,'Manoca 1962',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4193,'ESRI','4193','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-70.9,-151.8,-41.4,0,0,0,0 no_defs',NULL,'Manoca 1962',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4194,'EPSG','4194','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=164,138,-189,0,0,0,0',NULL,'Qornoq 1927',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4194,'ESRI','4194','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Qornoq 1927',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4195,'EPSG','4195','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=105,326,-102.5,0,0,0.814,-0.6',NULL,'Scoresbysund 1952',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4195,'ESRI','4195','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=105,326,-102.5,0,0,0.814,-0.6 no_defs',NULL,'Scoresbysund 1952',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4196,'EPSG','4196','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-45,417,-3.5,0,0,0.814,-0.6',NULL,'Ammassalik 1958',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4196,'ESRI','4196','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-45,417,-3.5,0,0,0.814,-0.6 no_defs',NULL,'Ammassalik 1958',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4197,'EPSG','4197','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat',NULL,'Garoua',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4197,'ESRI','4197','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Garoua',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4198,'EPSG','4198','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat',NULL,'Kousseri',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4198,'ESRI','4198','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Kousseri',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4199,'EPSG','4199','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Egypt 1930',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4199,'ESRI','4199','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Egypt 1930',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4200,'EPSG','4200','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22',NULL,'Pulkovo 1995',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4200,'ESRI','4200','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=longlat no_defs',NULL,'Pulkovo 1995',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4201,'EPSG','4201','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-166,-15,204,0,0,0,0',NULL,'Adindan',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4201,'ESRI','4201','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Adindan',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4201,'NAD27','4201','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=34 +lat_1=36d11 +lat_2=34d39 +lon_0=-101d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4201: texas north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4201,'NAD83','4201','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=34 +lat_1=36d11 +lat_2=34d39 +lon_0=-101d30 +proj=lcc +x_0=200000 +y_0=1000000 no_defs',NULL,'4201: texas north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4202,'EPSG','4202','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=longlat +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29',NULL,'AGD66',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4202,'ESRI','4202','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=longlat no_defs',NULL,'AGD66',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4202,'NAD27','4202','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=31d40 +lat_1=33d58 +lat_2=32d8 +lon_0=-97d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4202: texas north central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4202,'NAD83','4202','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=31d40 +lat_1=33d58 +lat_2=32d8 +lon_0=-98d30 +proj=lcc +x_0=600000 +y_0=2000000 no_defs',NULL,'4202: texas north central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4203,'EPSG','4203','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=longlat +towgs84=-134,-48,149,0,0,0,0',NULL,'AGD84',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4203,'ESRI','4203','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=longlat no_defs',NULL,'AGD84',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4203,'NAD27','4203','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=29d40 +lat_1=31d53 +lat_2=30d7 +lon_0=-100d20 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4203: texas central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4203,'NAD83','4203','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=29d40 +lat_1=31d53 +lat_2=30d7 +lon_0=-100d20 +proj=lcc +x_0=700000 +y_0=3000000 no_defs',NULL,'4203: texas central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4204,'EPSG','4204','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-143,-236,7,0,0,0,0',NULL,'Ain el Abd',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4204,'ESRI','4204','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Ain el Abd',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4204,'NAD27','4204','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=27d50 +lat_1=30d17 +lat_2=28d23 +lon_0=-99 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4204: texas south central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4204,'NAD83','4204','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=27d50 +lat_1=30d17 +lat_2=28d23 +lon_0=-99 +proj=lcc +x_0=600000 +y_0=4000000 no_defs',NULL,'4204: texas south central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4205,'EPSG','4205','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=-43,-163,45,0,0,0,0',NULL,'Afgooye',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4205,'ESRI','4205','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=-43,-163,45,0,0,0,0 no_defs',NULL,'Afgooye',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4205,'NAD27','4205','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=25d40 +lat_1=27d50 +lat_2=26d10 +lon_0=-98d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4205: texas south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4205,'NAD83','4205','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=25d40 +lat_1=27d50 +lat_2=26d10 +lon_0=-98d30 +proj=lcc +x_0=300000 +y_0=5000000 no_defs',NULL,'4205: texas south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4206,'EPSG','4206','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat',NULL,'Agadez',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4206,'ESRI','4206','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'Agadez',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4207,'EPSG','4207','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-304.046,-60.576,103.64,0,0,0,0',NULL,'Lisbon',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4207,'ESRI','4207','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Lisbon',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4208,'EPSG','4208','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-151.99,287.04,-147.45,0,0,0,0',NULL,'Aratu',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4208,'ESRI','4208','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Aratu',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4209,'EPSG','4209','proj4_data/epsg',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=longlat +towgs84=-143,-90,-294,0,0,0,0',NULL,'Arc 1950',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4209,'ESRI','4209','proj4_data/esri',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=longlat no_defs',NULL,'Arc 1950',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4210,'EPSG','4210','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-160,-6,-302,0,0,0,0',NULL,'Arc 1960',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4210,'ESRI','4210','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Arc 1960',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4211,'EPSG','4211','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-377,681,-50,0,0,0,0',NULL,'Batavia',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4211,'ESRI','4211','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'Batavia',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4212,'EPSG','4212','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=31.95,300.99,419.19,0,0,0,0',NULL,'Barbados 1938',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4212,'ESRI','4212','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Barbados 1938',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_34() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4213,'EPSG','4213','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-106,-87,188,0,0,0,0',NULL,'Beduaram',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4213,'ESRI','4213','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'Beduaram',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4214,'EPSG','4214','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=15.8,-154.4,-82.3,0,0,0,0',NULL,'Beijing 1954',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4214,'ESRI','4214','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=longlat no_defs',NULL,'Beijing 1954',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4215,'EPSG','4215','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Belge 1950',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4215,'ESRI','4215','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Belge 1950',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4216,'EPSG','4216','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=-73,213,296,0,0,0,0',NULL,'Bermuda 1957',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4216,'ESRI','4216','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=-73,213,296,0,0,0,0 no_defs',NULL,'Bermuda 1957',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4217,'EPSG','4217','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 59N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4217,'ESRI','4217','proj4_data/esri',NULL,'+ellps=bessel +proj=longlat no_defs',NULL,'GCS Bern 1898',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4218,'EPSG','4218','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=307,304,-318,0,0,0,0',NULL,'Bogota 1975',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4218,'ESRI','4218','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Bogota 1975',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4219,'EPSG','4219','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-384,664,-48,0,0,0,0',NULL,'Bukit Rimpah',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4219,'ESRI','4219','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-384,664,-48,0,0,0,0 no_defs',NULL,'Bukit Rimpah',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4220,'EPSG','4220','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-50.9,-347.6,-231,0,0,0,0',NULL,'Camacupa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4220,'ESRI','4220','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Camacupa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4221,'EPSG','4221','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-148,136,90,0,0,0,0',NULL,'Campo Inchauspe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4221,'ESRI','4221','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Campo Inchauspe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4222,'EPSG','4222','proj4_data/epsg',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=longlat +towgs84=-136,-108,-292,0,0,0,0',NULL,'Cape',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4222,'ESRI','4222','proj4_data/esri',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=longlat no_defs',NULL,'Cape',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4223,'EPSG','4223','proj4_data/epsg',NULL,'+datum=carthage +no_defs +proj=longlat',NULL,'Carthage',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4223,'ESRI','4223','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'Carthage',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4224,'EPSG','4224','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-143.87,243.37,-33.52,0,0,0,0',NULL,'Chua',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4224,'ESRI','4224','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-134,229,-29,0,0,0,0 no_defs',NULL,'Chua',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4225,'EPSG','4225','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-205.57,168.77,-4.12,0,0,0,0',NULL,'Corrego Alegre 1970-72',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4225,'ESRI','4225','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-206,172,-6,0,0,0,0 no_defs',NULL,'Corrego Alegre',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4226,'EPSG','4226','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat',NULL,'Cote d\47Ivoire',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4226,'ESRI','4226','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'Cote d\47Ivoire',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4227,'EPSG','4227','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-190.421,8.532,238.69,0,0,0,0',NULL,'Deir ez Zor',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4227,'ESRI','4227','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'Deir ez Zor',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4228,'EPSG','4228','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat',NULL,'Douala',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4228,'ESRI','4228','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'Douala',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4229,'EPSG','4229','proj4_data/epsg',NULL,'+ellps=helmert +no_defs +proj=longlat +towgs84=-130,110,-13,0,0,0,0',NULL,'Egypt 1907',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4229,'ESRI','4229','proj4_data/esri',NULL,'+ellps=helmert +no_defs +proj=longlat no_defs',NULL,'Egypt 1907',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4230,'EPSG','4230','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-87,-98,-121,0,0,0,0',NULL,'ED50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4230,'ESRI','4230','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'ED50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4231,'EPSG','4231','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-83.11,-97.38,-117.22,0.005693,-0.044698,0.044285,0.1218',NULL,'ED87',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4231,'ESRI','4231','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-82.981,-99.719,-110.709,-0.5076,0.1503,0.3898,-0.3143 no_defs',NULL,'ED87',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4232,'EPSG','4232','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-333.102,-11.02,230.69,0,0,0.554,0.219',NULL,'Fahud',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4232,'ESRI','4232','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Fahud',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4233,'EPSG','4233','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-133,-321,50,0,0,0,0',NULL,'Gandajika 1970',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4233,'ESRI','4233','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Gandajika 1970',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4234,'EPSG','4234','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat',NULL,'Garoua',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4234,'ESRI','4234','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'Garoua',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4235,'EPSG','4235','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Guyane Francaise',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4235,'ESRI','4235','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Guyane Francaise',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4236,'EPSG','4236','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-637,-549,-203,0,0,0,0',NULL,'Hu Tzu Shan 1950',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4236,'ESRI','4236','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-637,-549,-203,0,0,0,0 no_defs',NULL,'Hu Tzu Shan',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4237,'EPSG','4237','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=longlat +towgs84=52.17,-71.82,-14.9,0,0,0,0',NULL,'HD72',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4237,'ESRI','4237','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=longlat no_defs',NULL,'HD72',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4238,'EPSG','4238','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=longlat +towgs84=-24,-15,5,0,0,0,0',NULL,'ID74',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4238,'ESRI','4238','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=longlat no_defs',NULL,'ID74',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4239,'EPSG','4239','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=longlat +towgs84=217,823,299,0,0,0,0',NULL,'Indian 1954',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4239,'ESRI','4239','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=longlat +towgs84=217,823,299,0,0,0,0 no_defs',NULL,'Indian 1954',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4240,'EPSG','4240','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=longlat +towgs84=210,814,289,0,0,0,0',NULL,'Indian 1975',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4240,'ESRI','4240','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=longlat no_defs',NULL,'Indian 1975',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4241,'EPSG','4241','proj4_data/epsg',NULL,'+a=6378249.144808011 +b=6356514.966204134 +no_defs +proj=longlat',NULL,'Jamaica 1875',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4241,'ESRI','4241','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Jamaica 1875',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4242,'EPSG','4242','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=70,207,389.5,0,0,0,0',NULL,'JAD69',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4242,'ESRI','4242','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'JAD69',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4243,'EPSG','4243','proj4_data/epsg',NULL,'+a=6377299.36559538 +b=6356098.359005156 +no_defs +proj=longlat',NULL,'Kalianpur 1880',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4243,'ESRI','4243','proj4_data/esri',NULL,'+a=6377299.36559538 +b=6356098.357204817 +no_defs +proj=longlat no_defs',NULL,'Kalianpur 1880',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4244,'EPSG','4244','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=longlat +towgs84=-97,787,86,0,0,0,0',NULL,'Kandawala',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4244,'ESRI','4244','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=longlat +towgs84=-97,787,86,0,0,0,0 no_defs',NULL,'Kandawala',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4245,'EPSG','4245','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +no_defs +proj=longlat +towgs84=-11,851,5,0,0,0,0',NULL,'Kertau 1968',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4245,'ESRI','4245','proj4_data/esri',NULL,'+a=6377304.063 +b=6356103.038993155 +no_defs +proj=longlat +towgs84=-11,851,5,0,0,0,0 no_defs',NULL,'Kertau',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4246,'EPSG','4246','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-294.7,-200.1,525.5,0,0,0,0',NULL,'KOC',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4246,'ESRI','4246','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'KOC',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4247,'EPSG','4247','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-273.5,110.6,-357.9,0,0,0,0',NULL,'La Canoa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4247,'ESRI','4247','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-273.5,110.6,-357.9,0,0,0,0 no_defs',NULL,'La Canoa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4248,'EPSG','4248','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-288,175,-376,0,0,0,0',NULL,'PSAD56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4248,'ESRI','4248','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'PSAD56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4249,'EPSG','4249','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Lake',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4249,'ESRI','4249','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Lake',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4250,'EPSG','4250','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-130,29,364,0,0,0,0',NULL,'Leigon',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4250,'ESRI','4250','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-130,29,364,0,0,0,0 no_defs',NULL,'Leigon',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4251,'EPSG','4251','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-90,40,88,0,0,0,0',NULL,'Liberia 1964',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4251,'ESRI','4251','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-90,40,88,0,0,0,0 no_defs',NULL,'Liberia 1964',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4252,'EPSG','4252','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat',NULL,'Lome',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4252,'ESRI','4252','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'Lome',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4253,'EPSG','4253','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=-133,-77,-51,0,0,0,0',NULL,'Luzon 1911',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4253,'ESRI','4253','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'Luzon 1911',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4254,'EPSG','4254','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=16,196,93,0,0,0,0',NULL,'Hito XVIII 1963',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4254,'ESRI','4254','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=18.38,192.45,96.82,0.056,-0.142,-0.2,-0.0013 no_defs',NULL,'Hito XVIII 1963',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4255,'EPSG','4255','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-333,-222,114,0,0,0,0',NULL,'Herat North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4255,'ESRI','4255','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-333,-222,114,0,0,0,0 no_defs',NULL,'Herat North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4256,'EPSG','4256','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=41,-220,-134,0,0,0,0',NULL,'Mahe 1971',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4256,'ESRI','4256','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=41,-220,-134,0,0,0,0 no_defs',NULL,'Mahe 1971',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4257,'EPSG','4257','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-587.8,519.75,145.76,0,0,0,0',NULL,'Makassar',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4257,'ESRI','4257','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-587.8,519.75,145.76,0,0,0,0 no_defs',NULL,'Makassar',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4258,'EPSG','4258','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'ETRS89',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4258,'ESRI','4258','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat no_defs',NULL,'ETRS89',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4259,'EPSG','4259','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-254.1,-5.36,-100.29,0,0,0,0',NULL,'Malongo 1987',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4259,'ESRI','4259','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Malongo 1987',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4260,'EPSG','4260','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-70.9,-151.8,-41.4,0,0,0,0',NULL,'Manoca',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4260,'ESRI','4260','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-70.9,-151.8,-41.4,0,0,0,0 no_defs',NULL,'Manoca',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4261,'EPSG','4261','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=31,146,47,0,0,0,0',NULL,'Merchich',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4261,'ESRI','4261','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=31,146,47,0,0,0,0 no_defs',NULL,'Merchich',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4262,'EPSG','4262','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=639,405,60,0,0,0,0',NULL,'Massawa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4262,'ESRI','4262','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=639,405,60,0,0,0,0 no_defs',NULL,'Massawa',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_35() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4263,'EPSG','4263','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-92,-93,122,0,0,0,0',NULL,'Minna',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4263,'ESRI','4263','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Minna',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4264,'EPSG','4264','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-252.95,-4.11,-96.38,0,0,0,0',NULL,'Mhast',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4264,'ESRI','4264','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-252.95,-4.11,-96.38,0,0,0,0 no_defs',NULL,'Mhast',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4265,'EPSG','4265','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-104.1,-49.1,-9.9,0.971,-2.917,0.714,-11.68',NULL,'Monte Mario',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4265,'ESRI','4265','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Monte Mario',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4266,'EPSG','4266','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-74,-130,42,0,0,0,0',NULL,'M\47poraloko',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4266,'ESRI','4266','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'M\47poraloko',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4267,'EPSG','4267','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=longlat',NULL,'NAD27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4267,'ESRI','4267','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'NAD27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4268,'EPSG','4268','proj4_data/epsg',NULL,'+a=6378450.047548896 +b=6356826.621488444 +no_defs +proj=longlat',NULL,'NAD27 Michigan',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4268,'ESRI','4268','proj4_data/esri',NULL,'+a=6378450.047548896 +b=6356826.621488444 +no_defs +proj=longlat no_defs',NULL,'NAD27 Michigan',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4269,'EPSG','4269','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=longlat',NULL,'NAD83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4269,'ESRI','4269','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=longlat no_defs',NULL,'NAD83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4270,'EPSG','4270','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-249,-156,381,0,0,0,0',NULL,'Nahrwan 1967',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4270,'ESRI','4270','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Nahrwan 1967',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4271,'EPSG','4271','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-10,375,165,0,0,0,0',NULL,'Naparima 1972',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4271,'ESRI','4271','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Naparima 1972',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4272,'EPSG','4272','proj4_data/epsg',NULL,'+datum=nzgd49 +no_defs +proj=longlat',NULL,'NZGD49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4272,'ESRI','4272','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'NZGD49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4273,'EPSG','4273','proj4_data/epsg',NULL,'+a=6377492.018 +b=6356173.508712696 +no_defs +proj=longlat +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21',NULL,'NGO 1948',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4273,'ESRI','4273','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +no_defs +proj=longlat +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 no_defs',NULL,'NGO 1948',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4274,'EPSG','4274','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-223.237,110.193,36.649,0,0,0,0',NULL,'Datum 73',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4274,'ESRI','4274','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Datum 73',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4275,'EPSG','4275','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-168,-60,320,0,0,0,0',NULL,'NTF',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4275,'ESRI','4275','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-168,-60,320,0,0,0,0 no_defs',NULL,'NTF',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4276,'EPSG','4276','proj4_data/epsg',NULL,'+ellps=WGS66 +no_defs +proj=longlat',NULL,'NSWC 9Z-2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4276,'ESRI','4276','proj4_data/esri',NULL,'+ellps=WGS66 +no_defs +proj=longlat no_defs',NULL,'NSWC 9Z-2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4277,'EPSG','4277','proj4_data/epsg',NULL,'+datum=OSGB36 +no_defs +proj=longlat',NULL,'OSGB 1936',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4277,'ESRI','4277','proj4_data/esri',NULL,'+ellps=airy +no_defs +proj=longlat no_defs',NULL,'OSGB 1936',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4278,'EPSG','4278','proj4_data/epsg',NULL,'+ellps=airy +no_defs +proj=longlat',NULL,'OSGB70',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4278,'ESRI','4278','proj4_data/esri',NULL,'+ellps=airy +no_defs +proj=longlat no_defs',NULL,'OSGB70',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4279,'EPSG','4279','proj4_data/epsg',NULL,'+ellps=airy +no_defs +proj=longlat',NULL,'OS(SN)80',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4279,'ESRI','4279','proj4_data/esri',NULL,'+ellps=airy +no_defs +proj=longlat no_defs',NULL,'OS(SN)80',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4280,'EPSG','4280','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat',NULL,'Padang',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4280,'ESRI','4280','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'Padang',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4281,'EPSG','4281','proj4_data/epsg',NULL,'+a=6378300.789 +b=6356566.435 +no_defs +proj=longlat +towgs84=-275.7224,94.7824,340.8944,-8.001,-4.42,-11.821,1',NULL,'Palestine 1923',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4281,'ESRI','4281','proj4_data/esri',NULL,'+a=6378300.789 +b=6356566.435 +no_defs +proj=longlat no_defs',NULL,'Palestine 1923',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4282,'EPSG','4282','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-148,51,-291,0,0,0,0',NULL,'Pointe Noire',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4282,'ESRI','4282','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'Pointe Noire',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4283,'EPSG','4283','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'GDA94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4283,'ESRI','4283','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'GDA94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4284,'EPSG','4284','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12',NULL,'Pulkovo 1942',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4284,'ESRI','4284','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=longlat no_defs',NULL,'Pulkovo 1942',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4285,'EPSG','4285','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-128.16,-282.42,21.93,0,0,0,0',NULL,'Qatar 1974',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4285,'ESRI','4285','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Qatar 1974',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4286,'EPSG','4286','proj4_data/epsg',NULL,'+ellps=helmert +no_defs +proj=longlat',NULL,'Qatar 1948',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4286,'ESRI','4286','proj4_data/esri',NULL,'+ellps=helmert +no_defs +proj=longlat no_defs',NULL,'Qatar 1948',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4287,'EPSG','4287','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=164,138,-189,0,0,0,0',NULL,'Qornoq',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4287,'ESRI','4287','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=164,138,-189,0,0,0,0 no_defs',NULL,'Qornoq',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4288,'EPSG','4288','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Loma Quintana',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4288,'ESRI','4288','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Loma Quintana',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4289,'EPSG','4289','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=565.4171,50.3319,465.5524,-0.398957,0.343988,-1.87740,4.0725',NULL,'Amersfoort',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4289,'ESRI','4289','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'Amersfoort',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4291,'EPSG','4291','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=longlat +towgs84=-57,1,-41,0,0,0,0',NULL,'SAD69',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4291,'ESRI','4291','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=longlat no_defs',NULL,'SAD69',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4292,'EPSG','4292','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-355,21,72,0,0,0,0',NULL,'Sapper Hill 1943',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4292,'ESRI','4292','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-355,21,72,0,0,0,0 no_defs',NULL,'Sapper Hill 1943',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4293,'EPSG','4293','proj4_data/epsg',NULL,'+ellps=bess_nam +no_defs +proj=longlat +towgs84=616,97,-251,0,0,0,0',NULL,'Schwarzeck',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4293,'ESRI','4293','proj4_data/esri',NULL,'+ellps=bess_nam +no_defs +proj=longlat no_defs',NULL,'Schwarzeck',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4294,'EPSG','4294','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-403,684,41,0,0,0,0',NULL,'Segora',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4294,'ESRI','4294','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'Segora',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4295,'EPSG','4295','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat',NULL,'Serindung',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4295,'ESRI','4295','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'Serindung',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4296,'EPSG','4296','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat',NULL,'Sudan',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4296,'ESRI','4296','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'Sudan',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4297,'EPSG','4297','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-189,-242,-91,0,0,0,0',NULL,'Tananarive',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4297,'ESRI','4297','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-189,-242,-91,0,0,0,0 no_defs',NULL,'Tananarive',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4298,'EPSG','4298','proj4_data/epsg',NULL,'+ellps=evrstSS +no_defs +proj=longlat +towgs84=-679,669,-48,0,0,0,0',NULL,'Timbalai 1948',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4298,'ESRI','4298','proj4_data/esri',NULL,'+ellps=evrstSS +no_defs +proj=longlat no_defs',NULL,'Timbalai 1948',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4299,'EPSG','4299','proj4_data/epsg',NULL,'+datum=ire65 +no_defs +proj=longlat',NULL,'TM65',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4299,'ESRI','4299','proj4_data/esri',NULL,'+a=6377340.189 +b=6356034.447938534 +no_defs +proj=longlat no_defs',NULL,'TM65',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4300,'EPSG','4300','proj4_data/epsg',NULL,'+ellps=mod_airy +no_defs +proj=longlat +towgs84=482.5,-130.6,564.6,-1.042,-0.214,-0.631,8.15',NULL,'TM75',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4300,'ESRI','4300','proj4_data/esri',NULL,'+a=6377340.189 +b=6356034.447938534 +no_defs +proj=longlat no_defs',NULL,'TM75',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4301,'EPSG','4301','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-146.414,507.337,680.507,0,0,0,0',NULL,'Tokyo',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4301,'ESRI','4301','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'Tokyo',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4301,'NAD27','4301','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=40d20 +lat_1=41d47 +lat_2=40d43 +lon_0=-111d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4301: utah north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4301,'NAD83','4301','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=40d20 +lat_1=41d47 +lat_2=40d43 +lon_0=-111d30 +proj=lcc +x_0=500000 +y_0=1000000 no_defs',NULL,'4301: utah north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4302,'EPSG','4302','proj4_data/epsg',NULL,'+a=6378293.645208759 +b=6356617.987679838 +no_defs +proj=longlat +towgs84=-61.702,284.488,472.052,0,0,0,0',NULL,'Trinidad 1903',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4302,'ESRI','4302','proj4_data/esri',NULL,'+a=6378293.63683822 +b=6356617.979337744 +no_defs +proj=longlat +towgs84=-61.702,284.488,472.052,0,0,0,0 no_defs',NULL,'Trinidad 1903',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4302,'NAD27','4302','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=38d20 +lat_1=40d39 +lat_2=39d1 +lon_0=-111d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4302: utah central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4302,'NAD83','4302','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=38d20 +lat_1=40d39 +lat_2=39d1 +lon_0=-111d30 +proj=lcc +x_0=500000 +y_0=2000000 no_defs',NULL,'4302: utah central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4303,'EPSG','4303','proj4_data/epsg',NULL,'+ellps=helmert +no_defs +proj=longlat',NULL,'TC(1948)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4303,'ESRI','4303','proj4_data/esri',NULL,'+ellps=helmert +no_defs +proj=longlat no_defs',NULL,'TC(1948)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4303,'NAD27','4303','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=36d40 +lat_1=38d21 +lat_2=37d13 +lon_0=-111d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4303: utah south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4303,'NAD83','4303','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=36d40 +lat_1=38d21 +lat_2=37d13 +lon_0=-111d30 +proj=lcc +x_0=500000 +y_0=3000000 no_defs',NULL,'4303: utah south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4304,'EPSG','4304','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-73,-247,227,0,0,0,0',NULL,'Voirol 1875',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4304,'ESRI','4304','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-73,-247,227,0,0,0,0 no_defs',NULL,'Voirol 1875',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4305,'ESRI','4305','proj4_data/esri',NULL,'+ellps=clrk80 +proj=longlat no_defs',NULL,'GCS Voirol Unifie 1960',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4306,'EPSG','4306','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat',NULL,'Bern 1938',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4306,'ESRI','4306','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'Bern 1938',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4307,'EPSG','4307','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-209.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547',NULL,'Nord Sahara 1959',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4307,'ESRI','4307','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Nord Sahara 1959',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4308,'EPSG','4308','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat',NULL,'RT38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4308,'ESRI','4308','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'RT38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4309,'EPSG','4309','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-155,171,37,0,0,0,0',NULL,'Yacare',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4309,'ESRI','4309','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-155,171,37,0,0,0,0 no_defs',NULL,'Yacare',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4310,'EPSG','4310','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-30,190,89,0,0,0,0',NULL,'Yoff',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4310,'ESRI','4310','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat no_defs',NULL,'Yoff',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4311,'EPSG','4311','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-265,120,-358,0,0,0,0',NULL,'Zanderij',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_36() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4311,'ESRI','4311','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-265,120,-358,0,0,0,0 no_defs',NULL,'Zanderij',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4312,'EPSG','4312','proj4_data/epsg',NULL,'+datum=hermannskogel +no_defs +proj=longlat',NULL,'MGI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4312,'ESRI','4312','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'MGI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4313,'EPSG','4313','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-106.8686,52.2978,-103.7239,0.3366,-0.457,1.8422,-1.2747',NULL,'Belge 1972',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4313,'ESRI','4313','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Belge 1972',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4314,'EPSG','4314','proj4_data/epsg',NULL,'+datum=potsdam +no_defs +proj=longlat',NULL,'DHDN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4314,'ESRI','4314','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat no_defs',NULL,'DHDN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4315,'EPSG','4315','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-23,259,-9,0,0,0,0',NULL,'Conakry 1905',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4315,'ESRI','4315','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat +towgs84=-23,259,-9,0,0,0,0 no_defs',NULL,'Conakry 1905',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4316,'EPSG','4316','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=103.25,-100.4,-307.19,0,0,0,0',NULL,'Dealul Piscului 1930',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4316,'ESRI','4316','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=103.25,-100.4,-307.19,0,0,0,0 no_defs',NULL,'Dealul Piscului 1933',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4317,'EPSG','4317','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=28,-121,-77,0,0,0,0',NULL,'Dealul Piscului 1970',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4317,'ESRI','4317','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=longlat no_defs',NULL,'Dealul Piscului 1970',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4318,'EPSG','4318','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=-3.2,-5.7,2.8,0,0,0,0',NULL,'NGN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4318,'ESRI','4318','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=longlat no_defs',NULL,'NGN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4319,'EPSG','4319','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=-20.8,11.3,2.4,0,0,0,0',NULL,'KUDAMS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4319,'ESRI','4319','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat no_defs',NULL,'KUDAMS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4322,'EPSG','4322','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=longlat +towgs84=0,0,4.5,0,0,0.554,0.2263',NULL,'WGS 72',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4322,'ESRI','4322','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=longlat no_defs',NULL,'WGS 72',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4324,'EPSG','4324','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=longlat +towgs84=0,0,1.9,0,0,0.814,-0.38',NULL,'WGS 72BE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4324,'ESRI','4324','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=longlat +towgs84=0,0,1.9,0,0,0.814,-0.38 no_defs',NULL,'WGS 72BE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4326,'EPSG','4326','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=longlat',NULL,'WGS 84',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4326,'ESRI','4326','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=longlat no_defs',NULL,'WGS 84',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4328,'EPSG','4328','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=geocent +units=m',NULL,'WGS 84 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4330,'EPSG','4330','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF88 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4331,'EPSG','4331','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF89 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4332,'EPSG','4332','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF90 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4333,'EPSG','4333','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF91 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4334,'EPSG','4334','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF92 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4335,'EPSG','4335','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF93 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4336,'EPSG','4336','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF94 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4337,'EPSG','4337','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF96 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4338,'EPSG','4338','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF97 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4340,'EPSG','4340','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'Australian Antarctic (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4342,'EPSG','4342','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'EST97 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4344,'EPSG','4344','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'CHTRF95 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4346,'EPSG','4346','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ETRS89 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4348,'EPSG','4348','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'GDA94 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4350,'EPSG','4350','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'Hartebeesthoek94 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4352,'EPSG','4352','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'IRENET95 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4354,'EPSG','4354','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'JGD2000 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4356,'EPSG','4356','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'LKS94 (ETRS89) (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4358,'EPSG','4358','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'Moznet (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4360,'EPSG','4360','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'NAD83(CSRS) (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4362,'EPSG','4362','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'NAD83(HARN) (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4364,'EPSG','4364','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'NZGD2000 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4366,'EPSG','4366','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'POSGAR 98 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4368,'EPSG','4368','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'REGVEN (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4370,'EPSG','4370','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGF93 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4372,'EPSG','4372','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGFG95 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4374,'EPSG','4374','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGR92 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4376,'EPSG','4376','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'SIRGAS (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4378,'EPSG','4378','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'SWEREF99 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4380,'EPSG','4380','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'Yemen NGN96 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4382,'EPSG','4382','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=geocent +units=m',NULL,'RGNC 1991 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4384,'EPSG','4384','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'RRAF 1991 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4385,'EPSG','4385','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF2000 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4387,'EPSG','4387','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ISN93 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4389,'EPSG','4389','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'LKS92 (geocentric)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4390,'EPSG','4390','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +lat_0=2.042583333333333 +lon_0=103.5627583333333 +no_defs +proj=cass +towgs84=-11,851,5,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Kertau 1968 / Johor Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4391,'EPSG','4391','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +lat_0=2.712283333333334 +lon_0=101.9411666666667 +no_defs +proj=cass +towgs84=-11,851,5,0,0,0,0 +units=m +x_0=-242.005 +y_0=-948.547',NULL,'Kertau 1968 / Sembilan and Melaka Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4392,'EPSG','4392','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +lat_0=3.710972222222222 +lon_0=102.4361777777778 +no_defs +proj=cass +towgs84=-11,851,5,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Kertau 1968 / Pahang Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4393,'EPSG','4393','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +lat_0=3.680344444444444 +lon_0=101.5082444444444 +no_defs +proj=cass +towgs84=-11,851,5,0,0,0,0 +units=m +x_0=-21759.438 +y_0=55960.906',NULL,'Kertau 1968 / Selangor Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4394,'EPSG','4394','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +lat_0=4.946141666666667 +lon_0=102.8952083333333 +no_defs +proj=cass +towgs84=-11,851,5,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Kertau 1968 / Terengganu Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4395,'EPSG','4395','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +lat_0=5.421325 +lon_0=100.3458694444444 +no_defs +proj=cass +towgs84=-11,851,5,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Kertau 1968 / Pinang Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4396,'EPSG','4396','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +lat_0=5.965147222222223 +lon_0=100.6375944444444 +no_defs +proj=cass +towgs84=-11,851,5,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Kertau 1968 / Kedah and Perlis Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4397,'EPSG','4397','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +lat_0=4.859380555555555 +lon_0=100.8167666666667 +no_defs +proj=cass +towgs84=-11,851,5,0,0,0,0 +units=m +x_0=0 +y_0=133453.669',NULL,'Kertau 1968 / Perak Revised Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4398,'EPSG','4398','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +lat_0=5.893922222222222 +lon_0=102.1772916666667 +no_defs +proj=cass +towgs84=-11,851,5,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Kertau 1968 / Kelantan Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4399,'EPSG','4399','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 59N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4400,'EPSG','4400','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 60N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4400,'NAD27','4400','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999642857142857 +lat_0=42d30 +lon_0=-72d30 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'4400: vermont ---: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4400,'NAD83','4400','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999642857142857 +lat_0=42d30 +lon_0=-72d30 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'4400: vermont ---: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4401,'EPSG','4401','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 1N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4402,'EPSG','4402','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 2N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4403,'EPSG','4403','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-165 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 3N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4404,'EPSG','4404','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-159 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 4N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4404,'ESRI','4404','proj4_data/esri',NULL,'+ellps=clrk80 +proj=longlat no_defs',NULL,'GCS Montserrat 1958',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4405,'EPSG','4405','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-153 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 5N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4406,'EPSG','4406','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-147 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 6N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4407,'EPSG','4407','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-141 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 7N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4408,'EPSG','4408','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-135 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 8N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4409,'EPSG','4409','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-129 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 9N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4410,'EPSG','4410','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-123 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 10N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4411,'EPSG','4411','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-117 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 11N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4412,'EPSG','4412','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-111 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 12N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4413,'EPSG','4413','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-105 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 13N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4414,'EPSG','4414','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=13.5 +lon_0=144.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=200000',NULL,'NAD83(HARN) / Guam Map Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4415,'EPSG','4415','proj4_data/epsg',NULL,'+ellps=clrk66 +lat_0=-9 +lat_1=-6.5 +lat_2=-11.5 +lon_0=26 +no_defs +proj=lcc +towgs84=-103.746,-9.614,-255.95,0,0,0,0 +units=m +x_0=500000 +y_0=500000',NULL,'Katanga 1955 / Katanga Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4417,'EPSG','4417','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=7500000 +y_0=0',NULL,'Pulkovo 1942(83) / 3-degree Gauss-Kruger zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4418,'EPSG','4418','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-75 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 18N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4419,'EPSG','4419','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-69 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 19N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4420,'EPSG','4420','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 60N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4421,'EPSG','4421','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 1N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4422,'EPSG','4422','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 2N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4423,'EPSG','4423','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-165 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 3N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4424,'EPSG','4424','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-159 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 4N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4425,'EPSG','4425','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-153 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 5N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4426,'EPSG','4426','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-147 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 6N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4427,'EPSG','4427','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-141 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 7N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4428,'EPSG','4428','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-135 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 8N (ftUS)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_37() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4429,'EPSG','4429','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-129 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 9N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4430,'EPSG','4430','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-123 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 10N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4431,'EPSG','4431','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-117 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 11N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4432,'EPSG','4432','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-111 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 12N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4433,'EPSG','4433','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-105 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 13N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4434,'EPSG','4434','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=8500000 +y_0=0',NULL,'Pulkovo 1942(83) / 3-degree Gauss-Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4437,'EPSG','4437','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=17.83333333333333 +lat_1=18.43333333333333 +lat_2=18.03333333333333 +lon_0=-66.43333333333334 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=200000',NULL,'NAD83(NSRS2007) / Puerto Rico and Virgin Is.',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4438,'EPSG','4438','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-75 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 18N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4439,'EPSG','4439','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-69 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 19N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4455,'EPSG','4455','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=39.33333333333334 +lat_1=40.96666666666667 +lat_2=39.93333333333333 +lon_0=-77.75 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Pennsylvania South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4456,'EPSG','4456','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=40.5 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=30480.06096012192',NULL,'NAD27 / New York Long Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4457,'EPSG','4457','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=43.83333333333334 +lat_1=45.68333333333333 +lat_2=44.41666666666666 +lon_0=-100 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / South Dakota North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4462,'EPSG','4462','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-27 +lat_1=-18 +lat_2=-36 +lon_0=132 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / Australian Centre for Remote Sensing Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4463,'EPSG','4463','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RGSPM06',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4465,'EPSG','4465','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGSPM06',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4467,'EPSG','4467','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=21',NULL,'RGSPM06 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4468,'EPSG','4468','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGM04',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4470,'EPSG','4470','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RGM04',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4471,'EPSG','4471','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=38',NULL,'RGM04 / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4473,'EPSG','4473','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=geocent +units=m',NULL,'Cadastre 1997',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4474,'EPSG','4474','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-382,-59,-262,0,0,0,0 +units=m +zone=38',NULL,'Cadastre 1997 / UTM zone 38S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4475,'EPSG','4475','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-381.788,-57.501,-256.673,0,0,0,0',NULL,'Cadastre 1997',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4479,'EPSG','4479','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'China Geodetic Coordinate System 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4481,'EPSG','4481','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'Mexico ITRF92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4483,'EPSG','4483','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Mexico ITRF92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4484,'EPSG','4484','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=11',NULL,'Mexico ITRF92 / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4485,'EPSG','4485','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=12',NULL,'Mexico ITRF92 / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4486,'EPSG','4486','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=13',NULL,'Mexico ITRF92 / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4487,'EPSG','4487','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=14',NULL,'Mexico ITRF92 / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4488,'EPSG','4488','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=15',NULL,'Mexico ITRF92 / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4489,'EPSG','4489','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=16',NULL,'Mexico ITRF92 / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4490,'EPSG','4490','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'China Geodetic Coordinate System 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4491,'EPSG','4491','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=13500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4492,'EPSG','4492','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=14500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4493,'EPSG','4493','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=15500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4494,'EPSG','4494','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=16500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4495,'EPSG','4495','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=17500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4496,'EPSG','4496','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=18500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4497,'EPSG','4497','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=19500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4498,'EPSG','4498','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=20500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4499,'EPSG','4499','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=21500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4500,'EPSG','4500','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=22500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4501,'EPSG','4501','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=23500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4501,'NAD27','4501','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=37d40 +lat_1=39d12 +lat_2=38d2 +lon_0=-78d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4501: virginia north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4501,'NAD83','4501','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=37d40 +lat_1=39d12 +lat_2=38d2 +lon_0=-78d30 +proj=lcc +x_0=3500000 +y_0=2000000 no_defs',NULL,'4501: virginia north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4502,'EPSG','4502','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4502,'NAD27','4502','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=36d20 +lat_1=37d58 +lat_2=36d46 +lon_0=-78d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4502: virginia south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4502,'NAD83','4502','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=36d20 +lat_1=37d58 +lat_2=36d46 +lon_0=-78d30 +proj=lcc +x_0=3500000 +y_0=1000000 no_defs',NULL,'4502: virginia south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4503,'EPSG','4503','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4504,'EPSG','4504','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4505,'EPSG','4505','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4506,'EPSG','4506','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4507,'EPSG','4507','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4508,'EPSG','4508','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4509,'EPSG','4509','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4510,'EPSG','4510','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4511,'EPSG','4511','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4512,'EPSG','4512','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4513,'EPSG','4513','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=25500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4514,'EPSG','4514','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=26500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4515,'EPSG','4515','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=27500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4516,'EPSG','4516','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=28500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4517,'EPSG','4517','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=29500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4518,'EPSG','4518','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=30500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4519,'EPSG','4519','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=31500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4520,'EPSG','4520','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=32500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4521,'EPSG','4521','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=33500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4522,'EPSG','4522','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=34500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4523,'EPSG','4523','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=35500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 35',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4524,'EPSG','4524','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=36500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4525,'EPSG','4525','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=37500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 37',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4526,'EPSG','4526','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=38500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4527,'EPSG','4527','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=39500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4528,'EPSG','4528','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=40500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4529,'EPSG','4529','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=41500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 41',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4530,'EPSG','4530','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=42500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4531,'EPSG','4531','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=43500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 43',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4532,'EPSG','4532','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=44500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4533,'EPSG','4533','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=45500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger zone 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4534,'EPSG','4534','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4535,'EPSG','4535','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 78E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4536,'EPSG','4536','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4537,'EPSG','4537','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 84E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4538,'EPSG','4538','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4539,'EPSG','4539','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 90E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4540,'EPSG','4540','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4541,'EPSG','4541','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 96E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4542,'EPSG','4542','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4543,'EPSG','4543','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 102E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4544,'EPSG','4544','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4545,'EPSG','4545','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 108E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4546,'EPSG','4546','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4547,'EPSG','4547','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 114E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4548,'EPSG','4548','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4549,'EPSG','4549','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 120E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4550,'EPSG','4550','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4551,'EPSG','4551','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 126E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4552,'EPSG','4552','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4553,'EPSG','4553','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 132E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4554,'EPSG','4554','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'CGCS2000 / 3-degree Gauss-Kruger CM 135E',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_38() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4555,'EPSG','4555','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat',NULL,'New Beijing',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4556,'EPSG','4556','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RRAF 1991',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4558,'EPSG','4558','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RRAF 1991',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4559,'EPSG','4559','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20',NULL,'RRAF 1991 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4568,'EPSG','4568','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=13500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4569,'EPSG','4569','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=14500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4570,'EPSG','4570','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=15500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4571,'EPSG','4571','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=16500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4572,'EPSG','4572','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=17500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4573,'EPSG','4573','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=18500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4574,'EPSG','4574','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=19500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4575,'EPSG','4575','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=20500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4576,'EPSG','4576','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=21500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4577,'EPSG','4577','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=22500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4578,'EPSG','4578','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=23500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4579,'EPSG','4579','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4580,'EPSG','4580','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4581,'EPSG','4581','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4582,'EPSG','4582','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4583,'EPSG','4583','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4584,'EPSG','4584','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4585,'EPSG','4585','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4586,'EPSG','4586','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4587,'EPSG','4587','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4588,'EPSG','4588','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4589,'EPSG','4589','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4600,'EPSG','4600','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat',NULL,'Anguilla 1957',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4600,'ESRI','4600','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'Anguilla 1957',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4601,'EPSG','4601','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-255,-15,71,0,0,0,0',NULL,'Antigua 1943',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4601,'ESRI','4601','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-255,-15,71,0,0,0,0 no_defs',NULL,'Antigua 1943',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4601,'NAD27','4601','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=47 +lat_1=48d44 +lat_2=47d30 +lon_0=-120d50 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4601: washington north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4601,'NAD83','4601','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=47 +lat_1=48d44 +lat_2=47d30 +lon_0=-120d50 +proj=lcc +x_0=500000 +y_0=0 no_defs',NULL,'4601: washington north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4602,'EPSG','4602','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=725,685,536,0,0,0,0',NULL,'Dominica 1945',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4602,'ESRI','4602','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=725,685,536,0,0,0,0 no_defs',NULL,'Dominica 1945',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4602,'NAD27','4602','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=45d20 +lat_1=47d20 +lat_2=45d50 +lon_0=-120d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4602: washington south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4602,'NAD83','4602','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=45d20 +lat_1=47d20 +lat_2=45d50 +lon_0=-120d30 +proj=lcc +x_0=500000 +y_0=0 no_defs',NULL,'4602: washington south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4603,'EPSG','4603','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=72,213.7,93,0,0,0,0',NULL,'Grenada 1953',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4603,'ESRI','4603','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=72,213.7,93,0,0,0,0 no_defs',NULL,'Grenada 1953',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4604,'EPSG','4604','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=174,359,365,0,0,0,0',NULL,'Montserrat 1958',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4604,'ESRI','4604','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=174,359,365,0,0,0,0 no_defs',NULL,'Montserrat 1958',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4605,'EPSG','4605','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=9,183,236,0,0,0,0',NULL,'St. Kitts 1955',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4605,'ESRI','4605','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=9,183,236,0,0,0,0 no_defs',NULL,'St. Kitts 1955',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4606,'EPSG','4606','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-149,128,296,0,0,0,0',NULL,'St. Lucia 1955',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4606,'ESRI','4606','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-149,128,296,0,0,0,0 no_defs',NULL,'St. Lucia 1955',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4607,'EPSG','4607','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=195.671,332.517,274.607,0,0,0,0',NULL,'St. Vincent 1945',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4607,'ESRI','4607','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=longlat no_defs',NULL,'St. Vincent 1945',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4608,'EPSG','4608','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat',NULL,'NAD27(76)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4608,'ESRI','4608','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'NAD27(76)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4609,'EPSG','4609','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat',NULL,'NAD27(CGQ77)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4609,'ESRI','4609','proj4_data/esri',NULL,'+ellps=clrk66 +no_defs +proj=longlat no_defs',NULL,'NAD27(CGQ77)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4610,'EPSG','4610','proj4_data/epsg',NULL,'+a=6378140 +b=6356755.288157528 +no_defs +proj=longlat',NULL,'Xian 1980',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4610,'ESRI','4610','proj4_data/esri',NULL,'+a=6378140 +b=6356755.288157528 +no_defs +proj=longlat no_defs',NULL,'Xian 1980',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4611,'EPSG','4611','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-162.619,-276.959,-161.764,0.067753,-2.243649,-1.158827,-1.094246',NULL,'Hong Kong 1980',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4611,'ESRI','4611','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-162.619,-276.959,-161.764,0.067753,-2.24365,-1.15883,-1.09425 no_defs',NULL,'Hong Kong 1980',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4612,'EPSG','4612','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'JGD2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4612,'ESRI','4612','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'JGD2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4613,'EPSG','4613','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-403,684,41,0,0,0,0',NULL,'Segara',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4613,'ESRI','4613','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-404.78,685.68,45.47,0,0,0,0 no_defs',NULL,'Segara',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4614,'EPSG','4614','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-119.4248,-303.65872,-11.00061,1.164298,0.174458,1.096259,3.657065',NULL,'QND95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4614,'ESRI','4614','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-119.425,-303.659,-11.0006,1.1643,0.174458,1.09626,3.65706 no_defs',NULL,'QND95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4615,'EPSG','4615','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-499,-249,314,0,0,0,0',NULL,'Porto Santo',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4615,'ESRI','4615','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Porto Santo',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4616,'EPSG','4616','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-289,-124,60,0,0,0,0',NULL,'Selvagem Grande',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4616,'ESRI','4616','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=longlat no_defs',NULL,'Selvagem Grande',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4617,'EPSG','4617','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'NAD83(CSRS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4617,'ESRI','4617','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 no_defs',NULL,'NAD83(CSRS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4618,'EPSG','4618','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=longlat +towgs84=-66.87,4.37,-38.52,0,0,0,0',NULL,'SAD69',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4619,'EPSG','4619','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'SWEREF99',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4620,'EPSG','4620','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-106,-129,165,0,0,0,0',NULL,'Point 58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4621,'EPSG','4621','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=137,248,-430,0,0,0,0',NULL,'Fort Marigot',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4622,'EPSG','4622','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-467,-16,-300,0,0,0,0',NULL,'Guadeloupe 1948',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4623,'EPSG','4623','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-186,230,110,0,0,0,0',NULL,'CSG67',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4624,'EPSG','4624','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RGFG95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4625,'EPSG','4625','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=186,482,151,0,0,0,0',NULL,'Martinique 1938',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4626,'EPSG','4626','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=94,-948,-1262,0,0,0,0',NULL,'Reunion 1947',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4627,'EPSG','4627','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RGR92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4628,'EPSG','4628','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=162,117,154,0,0,0,0',NULL,'Tahiti 52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4629,'EPSG','4629','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=72.438,345.918,79.486,1.6045,0.8823,0.5565,1.3746',NULL,'Tahaa 54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4630,'EPSG','4630','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=84,274,65,0,0,0,0',NULL,'IGN72 Nuku Hiva',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4631,'EPSG','4631','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=145,-187,103,0,0,0,0',NULL,'K0 1949',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4632,'EPSG','4632','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-382,-59,-262,0,0,0,0',NULL,'Combani 1950',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4633,'EPSG','4633','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=335.47,222.58,-230.94,0,0,0,0',NULL,'IGN56 Lifou',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4634,'EPSG','4634','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-13,-348,292,0,0,0,0',NULL,'IGN72 Grand Terre',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4635,'EPSG','4635','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-122.383,-188.696,103.344,3.5107,-4.9668,-5.7047,4.4798',NULL,'ST87 Ouvea',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4636,'EPSG','4636','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=365,194,166,0,0,0,0',NULL,'Petrels 1972',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4637,'EPSG','4637','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=325,154,172,0,0,0,0',NULL,'Perroud 1950',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4638,'EPSG','4638','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=30,430,368,0,0,0,0',NULL,'Saint Pierre et Miquelon 1950',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4639,'EPSG','4639','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=253,-132,-127,0,0,0,0',NULL,'MOP78',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4640,'EPSG','4640','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RRAF 1991',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4641,'EPSG','4641','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=287.58,177.78,-135.41,0,0,0,0',NULL,'IGN53 Mare',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4642,'EPSG','4642','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-13,-348,292,0,0,0,0',NULL,'ST84 Ile des Pins',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4643,'EPSG','4643','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-480.26,-438.32,-643.429,16.3119,20.1721,-4.0349,-111.7002',NULL,'ST71 Belep',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4644,'EPSG','4644','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-10.18,-350.43,291.37,0,0,0,0',NULL,'NEA74 Noumea',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4645,'EPSG','4645','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RGNC 1991',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4646,'EPSG','4646','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-963,510,-359,0,0,0,0',NULL,'Grand Comoros',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4647,'EPSG','4647','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=32500000 +y_0=0',NULL,'ETRS89 / UTM zone 32N (zE-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4652,'EPSG','4652','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=25500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4653,'EPSG','4653','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=26500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4654,'EPSG','4654','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=27500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4655,'EPSG','4655','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=28500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 28',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_39() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4656,'EPSG','4656','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=29500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4657,'EPSG','4657','proj4_data/epsg',NULL,'+a=6377019.27 +b=6355762.5391 +no_defs +proj=longlat +towgs84=-28,199,5,0,0,0,0',NULL,'Reykjavik 1900',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4658,'EPSG','4658','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-73,47,-83,0,0,0,0',NULL,'Hjorsey 1955',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4659,'EPSG','4659','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'ISN93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4660,'EPSG','4660','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=982.6087,552.753,-540.873,6.6816266,-31.6114924,-19.84816,16.805',NULL,'Helle 1954',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4661,'EPSG','4661','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'LKS92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4662,'EPSG','4662','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-11.64,-348.6,291.98,0,0,0,0',NULL,'IGN72 Grande Terre',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4663,'EPSG','4663','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-502.862,-247.438,312.724,0,0,0,0',NULL,'Porto Santo 1995',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4664,'EPSG','4664','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-204.619,140.176,55.226,0,0,0,0',NULL,'Azores Oriental 1995',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4665,'EPSG','4665','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-106.226,166.366,-37.893,0,0,0,0',NULL,'Azores Central 1995',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4666,'EPSG','4666','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=508.088,-191.042,565.223,0,0,0,0',NULL,'Lisbon 1890',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4667,'EPSG','4667','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'IKBD-92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4668,'EPSG','4668','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-86,-98,-119,0,0,0,0',NULL,'ED79',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4669,'EPSG','4669','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'LKS94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4670,'EPSG','4670','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'IGM95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4671,'EPSG','4671','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=longlat',NULL,'Voirol 1879',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4672,'EPSG','4672','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=175,-38,113,0,0,0,0',NULL,'Chatham Islands 1971',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4673,'EPSG','4673','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=174.05,-25.49,112.57,0,0,0.554,0.2263',NULL,'Chatham Islands 1979',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4674,'EPSG','4674','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'SIRGAS 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4675,'EPSG','4675','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=-100,-248,259,0,0,0,0',NULL,'Guam 1963',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4676,'EPSG','4676','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat',NULL,'Vientiane 1982',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4677,'EPSG','4677','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat',NULL,'Lao 1993',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4678,'EPSG','4678','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=44.585,-131.212,-39.544,0,0,0,0',NULL,'Lao 1997',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4679,'EPSG','4679','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-80.01,253.26,291.19,0,0,0,0',NULL,'Jouik 1961',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4680,'EPSG','4680','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=124.5,-63.5,-281,0,0,0,0',NULL,'Nouakchott 1965',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4681,'EPSG','4681','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat',NULL,'Mauritania 1999',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4682,'EPSG','4682','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=longlat +towgs84=283.7,735.9,261.1,0,0,0,0',NULL,'Gulshan 303',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4683,'EPSG','4683','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=-127.62,-67.24,-47.04,-3.068,4.903,1.578,-1.06',NULL,'PRS92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4684,'EPSG','4684','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-133,-321,50,0,0,0,0',NULL,'Gan 1970',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4685,'EPSG','4685','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Gandajika',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4686,'EPSG','4686','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'MAGNA-SIRGAS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4687,'EPSG','4687','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0.072,-0.507,-0.245,-0.0183,0.0003,-0.007,-0.0093',NULL,'RGPF',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4688,'EPSG','4688','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=347.103,1078.125,2623.922,-33.8875,70.6773,-9.3943,186.074',NULL,'Fatu Iva 72',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4689,'EPSG','4689','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=410.721,55.049,80.746,2.5779,2.3514,0.6664,17.3311',NULL,'IGN63 Hiva Oa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4690,'EPSG','4690','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=221.525,152.948,176.768,-2.3847,-1.3896,-0.877,11.4741',NULL,'Tahiti 79',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4691,'EPSG','4691','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=215.525,149.593,176.229,-3.2624,-1.692,-1.1571,10.4773',NULL,'Moorea 87',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4692,'EPSG','4692','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=217.037,86.959,23.956,0,0,0,0',NULL,'Maupiti 83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4693,'EPSG','4693','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,-0.15,0.68,0,0,0,0',NULL,'Nakhl-e Ghanem',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4694,'EPSG','4694','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'POSGAR 94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4695,'EPSG','4695','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=-103.746,-9.614,-255.95,0,0,0,0',NULL,'Katanga 1955',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4696,'EPSG','4696','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat',NULL,'Kasai 1953',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4697,'EPSG','4697','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat',NULL,'IGC 1962 6th Parallel South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4698,'EPSG','4698','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=145,-187,103,0,0,0,0',NULL,'IGN 1962 Kerguelen',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4699,'EPSG','4699','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-770.1,158.4,-498.2,0,0,0,0',NULL,'Le Pouce 1934',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4700,'EPSG','4700','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat',NULL,'IGN Astro 1960',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4701,'EPSG','4701','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-79.9,-158,-168.9,0,0,0,0',NULL,'IGCB 1955',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4701,'NAD27','4701','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=38d30 +lat_1=40d15 +lat_2=39 +lon_0=-79d30 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4701: west virginia north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4701,'NAD83','4701','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=38d30 +lat_1=40d15 +lat_2=39 +lon_0=-79d30 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'4701: west virginia north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4702,'EPSG','4702','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Mauritania 1999',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4702,'NAD27','4702','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=37 +lat_1=38d53 +lat_2=37d29 +lon_0=-81 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4702: west virginia south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4702,'NAD83','4702','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=37 +lat_1=38d53 +lat_2=37d29 +lon_0=-81 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'4702: west virginia south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4703,'EPSG','4703','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat',NULL,'Mhast 1951',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4704,'EPSG','4704','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Mhast (onshore)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4705,'EPSG','4705','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Mhast (offshore)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4706,'EPSG','4706','proj4_data/epsg',NULL,'+ellps=helmert +no_defs +proj=longlat +towgs84=-146.21,112.63,4.05,0,0,0,0',NULL,'Egypt Gulf of Suez S-650 TL',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4707,'EPSG','4707','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=114,-116,-333,0,0,0,0',NULL,'Tern Island 1961',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4708,'EPSG','4708','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=longlat +towgs84=-491,-22,435,0,0,0,0',NULL,'Cocos Islands 1965',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4709,'EPSG','4709','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=145,75,-272,0,0,0,0',NULL,'Iwo Jima 1945',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4710,'EPSG','4710','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-320,550,-494,0,0,0,0',NULL,'St. Helena 1971',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4711,'EPSG','4711','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=124,-234,-25,0,0,0,0',NULL,'Marcus Island 1952',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4712,'EPSG','4712','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-205,107,53,0,0,0,0',NULL,'Ascension Island 1958',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4713,'EPSG','4713','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-77,-128,142,0,0,0,0',NULL,'Ayabelle Lighthouse',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4714,'EPSG','4714','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-127,-769,472,0,0,0,0',NULL,'Bellevue',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4715,'EPSG','4715','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-104,-129,239,0,0,0,0',NULL,'Camp Area Astro',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4716,'EPSG','4716','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=298,-304,-375,0,0,0,0',NULL,'Phoenix Islands 1966',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4717,'EPSG','4717','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=-2,151,181,0,0,0,0',NULL,'Cape Canaveral',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4718,'EPSG','4718','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=230,-199,-752,0,0,0,0',NULL,'Solomon 1968',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4719,'EPSG','4719','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=211,147,111,0,0,0,0',NULL,'Easter Island 1967',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4720,'EPSG','4720','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=longlat +towgs84=0,0,4.5,0,0,0.554,0.2263',NULL,'Fiji 1986',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4721,'EPSG','4721','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=265.025,384.929,-194.046,0,0,0,0',NULL,'Fiji 1956',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4722,'EPSG','4722','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-794,119,-298,0,0,0,0',NULL,'South Georgia 1968',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4723,'EPSG','4723','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=-179.483,-69.379,-27.584,-7.862,8.163,6.042,-13.925',NULL,'GCGD59',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4724,'EPSG','4724','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=208,-435,-229,0,0,0,0',NULL,'Diego Garcia 1969',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4725,'EPSG','4725','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=189,-79,-202,0,0,0,0',NULL,'Johnston Island 1961',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4726,'EPSG','4726','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=8.853,-52.644,180.304,-0.393,-2.323,2.96,-24.081',NULL,'SIGD61',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4727,'EPSG','4727','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=403,-81,277,0,0,0,0',NULL,'Midway 1961',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4728,'EPSG','4728','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-307,-92,127,0,0,0,0',NULL,'Pico de las Nieves 1984',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4729,'EPSG','4729','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=185,165,42,0,0,0,0',NULL,'Pitcairn 1967',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4730,'EPSG','4730','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=170,42,84,0,0,0,0',NULL,'Santo 1965',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4731,'EPSG','4731','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=51,391,-36,0,0,0,0',NULL,'Viti Levu 1916',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4732,'EPSG','4732','proj4_data/epsg',NULL,'+a=6378270 +b=6356794.343434343 +no_defs +proj=longlat +towgs84=102,52,-38,0,0,0,0',NULL,'Marshall Islands 1960',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4733,'EPSG','4733','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=276,-57,149,0,0,0,0',NULL,'Wake Island 1952',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4734,'EPSG','4734','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-632,438,-609,0,0,0,0',NULL,'Tristan 1968',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4735,'EPSG','4735','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=647,1777,-1124,0,0,0,0',NULL,'Kusaie 1951',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4736,'EPSG','4736','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=260,12,-147,0,0,0,0',NULL,'Deception Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4737,'EPSG','4737','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Korea 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4738,'EPSG','4738','proj4_data/epsg',NULL,'+a=6378293.645208759 +b=6356617.987679838 +no_defs +proj=longlat',NULL,'Hong Kong 1963',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4739,'EPSG','4739','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-156,-271,-189,0,0,0,0',NULL,'Hong Kong 1963(67)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4740,'EPSG','4740','proj4_data/epsg',NULL,'+a=6378136 +b=6356751.361745712 +no_defs +proj=longlat +towgs84=0,0,1.5,0,0,0.076,0',NULL,'PZ-90',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4741,'EPSG','4741','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'FD54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4742,'EPSG','4742','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'GDM2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4743,'EPSG','4743','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=70.995,-335.916,262.898,0,0,0,0',NULL,'Karbala 1979',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4744,'EPSG','4744','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-242.2,-144.9,370.3,0,0,0,0',NULL,'Nahrwan 1934',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4745,'EPSG','4745','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat',NULL,'RD/83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4746,'EPSG','4746','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat',NULL,'PD/83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4747,'EPSG','4747','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'GR96',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4748,'EPSG','4748','proj4_data/epsg',NULL,'+a=6378306.3696 +b=6356571.996 +no_defs +proj=longlat +towgs84=51,391,-36,0,0,0,0',NULL,'Vanua Levu 1915',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4749,'EPSG','4749','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RGNC91-93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4750,'EPSG','4750','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=-56.263,16.136,-22.856,0,0,0,0',NULL,'ST87 Ouvea',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4751,'EPSG','4751','proj4_data/epsg',NULL,'+a=6377295.664 +b=6356094.667915204 +no_defs +proj=longlat',NULL,'Kertau (RSO)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_40() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4752,'EPSG','4752','proj4_data/epsg',NULL,'+a=6378306.3696 +b=6356571.996 +no_defs +proj=longlat +towgs84=98,390,-22,0,0,0,0',NULL,'Viti Levu 1912',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4753,'EPSG','4753','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'fk89',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4754,'EPSG','4754','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-208.4058,-109.8777,-2.5764,0,0,0,0',NULL,'LGD2006',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4755,'EPSG','4755','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'DGN95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4756,'EPSG','4756','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=-191.90441429,-39.30318279,-111.45032835,0.00928836,-0.01975479,0.00427372,0.252906278',NULL,'VN-2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4757,'EPSG','4757','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat',NULL,'SVY21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4758,'EPSG','4758','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'JAD2001',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4759,'EPSG','4759','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'NAD83(NSRS2007)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4760,'EPSG','4760','proj4_data/epsg',NULL,'+ellps=WGS66 +no_defs +proj=longlat',NULL,'WGS 66',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4761,'EPSG','4761','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'HTRS96',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4762,'EPSG','4762','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'BDA2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4763,'EPSG','4763','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Pitcairn 2006',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4764,'EPSG','4764','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RSRGD2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4765,'EPSG','4765','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Slovenia 1996',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4766,'EPSG','4766','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=30500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4767,'EPSG','4767','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=31500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4768,'EPSG','4768','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=32500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4769,'EPSG','4769','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=33500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4770,'EPSG','4770','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=34500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4771,'EPSG','4771','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=35500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 35',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4772,'EPSG','4772','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=36500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4773,'EPSG','4773','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=37500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 37',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4774,'EPSG','4774','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=38500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4775,'EPSG','4775','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=39500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4776,'EPSG','4776','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=40500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4777,'EPSG','4777','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=41500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 41',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4778,'EPSG','4778','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=42500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4779,'EPSG','4779','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=43500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 43',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4780,'EPSG','4780','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=44500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 44',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4781,'EPSG','4781','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=45500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger zone 45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4782,'EPSG','4782','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4783,'EPSG','4783','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=78 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 78E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4784,'EPSG','4784','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4785,'EPSG','4785','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=84 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 84E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4786,'EPSG','4786','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4787,'EPSG','4787','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 90E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4788,'EPSG','4788','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4789,'EPSG','4789','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=96 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 96E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4790,'EPSG','4790','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4791,'EPSG','4791','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 102E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4792,'EPSG','4792','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4793,'EPSG','4793','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 108E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4794,'EPSG','4794','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4795,'EPSG','4795','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=114 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 114E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4796,'EPSG','4796','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4797,'EPSG','4797','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=120 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 120E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4798,'EPSG','4798','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4799,'EPSG','4799','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=126 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 126E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4800,'EPSG','4800','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4801,'EPSG','4801','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +pm=bern +proj=longlat +towgs84=674.4,15.1,405.3,0,0,0,0',NULL,'Bern 1898 (Bern)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4801,'ESRI','4801','proj4_data/esri',NULL,'+ellps=bessel +no_defs +pm=bern +proj=longlat no_defs',NULL,'Bern 1898 (Bern)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4801,'NAD27','4801','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=45d10 +lat_1=46d46 +lat_2=45d34 +lon_0=-90 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4801: wisconsin north: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4801,'NAD83','4801','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=45d10 +lat_1=46d46 +lat_2=45d34 +lon_0=-90 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'4801: wisconsin north: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4802,'EPSG','4802','proj4_data/epsg',NULL,'+ellps=intl +no_defs +pm=bogota +proj=longlat +towgs84=307,304,-318,0,0,0,0',NULL,'Bogota 1975 (Bogota)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4802,'ESRI','4802','proj4_data/esri',NULL,'+ellps=intl +no_defs +pm=bogota +proj=longlat no_defs',NULL,'Bogota 1975 (Bogota)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4802,'NAD27','4802','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=43d50 +lat_1=45d30 +lat_2=44d15 +lon_0=-90 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4802: wisconsin central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4802,'NAD83','4802','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=43d50 +lat_1=45d30 +lat_2=44d15 +lon_0=-90 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'4802: wisconsin central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4803,'EPSG','4803','proj4_data/epsg',NULL,'+ellps=intl +no_defs +pm=lisbon +proj=longlat +towgs84=-304.046,-60.576,103.64,0,0,0,0',NULL,'Lisbon (Lisbon)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4803,'ESRI','4803','proj4_data/esri',NULL,'+ellps=intl +no_defs +pm=lisbon +proj=longlat no_defs',NULL,'Lisbon (Lisbon)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4803,'NAD27','4803','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=42 +lat_1=44d4 +lat_2=42d44 +lon_0=-90 +proj=lcc +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'4803: wisconsin south: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4803,'NAD83','4803','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=42 +lat_1=44d4 +lat_2=42d44 +lon_0=-90 +proj=lcc +x_0=600000 +y_0=0 no_defs',NULL,'4803: wisconsin south: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4804,'EPSG','4804','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +pm=jakarta +proj=longlat +towgs84=-587.8,519.75,145.76,0,0,0,0',NULL,'Makassar (Jakarta)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4804,'ESRI','4804','proj4_data/esri',NULL,'+ellps=bessel +no_defs +pm=jakarta +proj=longlat +towgs84=-587.8,519.75,145.76,0,0,0,0 no_defs',NULL,'Makassar (Jakarta)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4805,'EPSG','4805','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +pm=ferro +proj=longlat +towgs84=682,-203,480,0,0,0,0',NULL,'MGI (Ferro)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4805,'ESRI','4805','proj4_data/esri',NULL,'+ellps=bessel +no_defs +pm=ferro +proj=longlat no_defs',NULL,'MGI (Ferro)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4806,'EPSG','4806','proj4_data/epsg',NULL,'+ellps=intl +no_defs +pm=rome +proj=longlat +towgs84=-104.1,-49.1,-9.9,0.971,-2.917,0.714,-11.68',NULL,'Monte Mario (Rome)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4806,'ESRI','4806','proj4_data/esri',NULL,'+ellps=intl +no_defs +pm=rome +proj=longlat no_defs',NULL,'Monte Mario (Rome)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4807,'EPSG','4807','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +pm=paris +proj=longlat +towgs84=-168,-60,320,0,0,0,0',NULL,'NTF (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4807,'ESRI','4807','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +pm=paris +proj=longlat +towgs84=-168,-60,320,0,0,0,0 no_defs',NULL,'NTF (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4808,'EPSG','4808','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +pm=jakarta +proj=longlat',NULL,'Padang (Jakarta)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4808,'ESRI','4808','proj4_data/esri',NULL,'+ellps=bessel +no_defs +pm=jakarta +proj=longlat no_defs',NULL,'Padang (Jakarta)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4809,'EPSG','4809','proj4_data/epsg',NULL,'+ellps=intl +no_defs +pm=brussels +proj=longlat',NULL,'Belge 1950 (Brussels)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4809,'ESRI','4809','proj4_data/esri',NULL,'+ellps=intl +no_defs +pm=brussels +proj=longlat no_defs',NULL,'Belge 1950 (Brussels)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4810,'EPSG','4810','proj4_data/epsg',NULL,'+ellps=intl +no_defs +pm=paris +proj=longlat +towgs84=-189,-242,-91,0,0,0,0',NULL,'Tananarive (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4810,'ESRI','4810','proj4_data/esri',NULL,'+ellps=intl +no_defs +pm=paris +proj=longlat +towgs84=-189,-242,-91,0,0,0,0 no_defs',NULL,'Tananarive (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4811,'EPSG','4811','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +pm=paris +proj=longlat +towgs84=-73,-247,227,0,0,0,0',NULL,'Voirol 1875 (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4811,'ESRI','4811','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +pm=paris +proj=longlat +towgs84=-73,-247,227,0,0,0,0 no_defs',NULL,'Voirol 1875 (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4812,'EPSG','4812','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=132 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 132E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4812,'ESRI','4812','proj4_data/esri',NULL,'+ellps=clrk80 +pm=2.337229166666667 +proj=longlat no_defs',NULL,'GCS Voirol Unifie 1960 Paris',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4813,'EPSG','4813','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +pm=jakarta +proj=longlat +towgs84=-377,681,-50,0,0,0,0',NULL,'Batavia (Jakarta)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4813,'ESRI','4813','proj4_data/esri',NULL,'+ellps=bessel +no_defs +pm=jakarta +proj=longlat no_defs',NULL,'Batavia (Jakarta)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4814,'EPSG','4814','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +pm=stockholm +proj=longlat',NULL,'RT38 (Stockholm)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4814,'ESRI','4814','proj4_data/esri',NULL,'+ellps=bessel +no_defs +pm=stockholm +proj=longlat no_defs',NULL,'RT38 (Stockholm)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4815,'EPSG','4815','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +pm=athens +proj=longlat',NULL,'Greek (Athens)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4815,'ESRI','4815','proj4_data/esri',NULL,'+ellps=bessel +no_defs +pm=athens +proj=longlat no_defs',NULL,'Greek (Athens)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4816,'EPSG','4816','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +pm=paris +proj=longlat +towgs84=-263,6,431,0,0,0,0',NULL,'Carthage (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4816,'ESRI','4816','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +pm=paris +proj=longlat no_defs',NULL,'Carthage (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4817,'EPSG','4817','proj4_data/epsg',NULL,'+a=6377492.018 +b=6356173.508712696 +no_defs +pm=oslo +proj=longlat +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21',NULL,'NGO 1948 (Oslo)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4817,'ESRI','4817','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +no_defs +pm=oslo +proj=longlat +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 no_defs',NULL,'NGO 1948 (Oslo)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4818,'EPSG','4818','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +pm=ferro +proj=longlat +towgs84=589,76,480,0,0,0,0',NULL,'S-JTSK (Ferro)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4818,'ESRI','4818','proj4_data/esri',NULL,'+ellps=bessel +no_defs +pm=ferro +proj=longlat no_defs',NULL,'S-JTSK (Ferro)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4819,'EPSG','4819','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +pm=paris +proj=longlat +towgs84=-209.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547',NULL,'Nord Sahara 1959 (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4819,'ESRI','4819','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +pm=paris +proj=longlat no_defs',NULL,'Nord Sahara 1959 (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4820,'EPSG','4820','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +pm=jakarta +proj=longlat +towgs84=-403,684,41,0,0,0,0',NULL,'Segara (Jakarta)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4820,'ESRI','4820','proj4_data/esri',NULL,'+ellps=bessel +no_defs +pm=jakarta +proj=longlat no_defs',NULL,'Segara (Jakarta)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4821,'EPSG','4821','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +pm=paris +proj=longlat',NULL,'Voirol 1879 (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4822,'EPSG','4822','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'New Beijing / 3-degree Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4823,'EPSG','4823','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Sao Tome',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4824,'EPSG','4824','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Principe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4826,'EPSG','4826','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=15.83333333333333 +lat_1=15 +lat_2=16.66666666666667 +lon_0=-24 +no_defs +proj=lcc +units=m +x_0=161587.83 +y_0=128511.202',NULL,'WGS 84 / Cape Verde National',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_41() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4839,'EPSG','4839','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=51 +lat_1=48.66666666666666 +lat_2=53.66666666666666 +lon_0=10.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'ETRS89 / LCC Germany (N-E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4855,'EPSG','4855','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=5.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 5 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4856,'EPSG','4856','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=6.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 6 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4857,'EPSG','4857','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=7.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 7 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4858,'EPSG','4858','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=8.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 8 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4859,'EPSG','4859','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=9.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 9 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4860,'EPSG','4860','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=10.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 10 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4861,'EPSG','4861','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=11.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 11 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4862,'EPSG','4862','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=12.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 12 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4863,'EPSG','4863','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=13.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 13 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4864,'EPSG','4864','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=14.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 14 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4865,'EPSG','4865','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=15.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 15 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4866,'EPSG','4866','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=16.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 16 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4867,'EPSG','4867','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=17.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 17 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4868,'EPSG','4868','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=18.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 18 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4869,'EPSG','4869','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=19.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 19 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4870,'EPSG','4870','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=20.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 20 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4871,'EPSG','4871','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=21.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 21 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4872,'EPSG','4872','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=22.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 22 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4873,'EPSG','4873','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=23.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 23 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4874,'EPSG','4874','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=24.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 24 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4875,'EPSG','4875','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=25.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 25 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4876,'EPSG','4876','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=26.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 26 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4877,'EPSG','4877','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=27.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 27 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4878,'EPSG','4878','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=28.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 28 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4879,'EPSG','4879','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=29.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 29 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4880,'EPSG','4880','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=30.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 30 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4882,'EPSG','4882','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'Slovenia 1996',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4884,'EPSG','4884','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RSRGD2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4886,'EPSG','4886','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'BDA2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4888,'EPSG','4888','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'HTRS96',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4890,'EPSG','4890','proj4_data/epsg',NULL,'+ellps=WGS66 +no_defs +proj=geocent +units=m',NULL,'WGS 66',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4892,'EPSG','4892','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'NAD83(NSRS2007)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4894,'EPSG','4894','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'JAD2001',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4896,'EPSG','4896','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF2005',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4897,'EPSG','4897','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'DGN95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4899,'EPSG','4899','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=geocent +units=m',NULL,'LGD2006',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4901,'EPSG','4901','proj4_data/epsg',NULL,'+a=6376523 +b=6355862.933255573 +no_defs +pm=2.337208333333333 +proj=longlat',NULL,'ATF (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4901,'ESRI','4901','proj4_data/esri',NULL,'+a=6376523 +b=6355862.933255573 +no_defs +pm=paris +proj=longlat no_defs',NULL,'ATF (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4901,'NAD27','4901','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999411764705882 +lat_0=40d40 +lon_0=-105d10 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'4901: wyoming east: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4901,'NAD83','4901','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999375 +lat_0=40d30 +lon_0=-105d10 +proj=tmerc +x_0=200000 +y_0=0 no_defs',NULL,'4901: wyoming east: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4902,'EPSG','4902','proj4_data/epsg',NULL,'+a=6376523 +b=6355862.933255573 +no_defs +pm=paris +proj=longlat',NULL,'NDG (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4902,'ESRI','4902','proj4_data/esri',NULL,'+a=6376523 +b=6355862.933255573 +no_defs +pm=paris +proj=longlat no_defs',NULL,'NDG (Paris)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4902,'NAD27','4902','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999411764705882 +lat_0=40d40 +lon_0=-107d20 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'4902: wyoming east central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4902,'NAD83','4902','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999375 +lat_0=40d30 +lon_0=-107d20 +proj=tmerc +x_0=400000 +y_0=100000 no_defs',NULL,'4902: wyoming east central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4903,'EPSG','4903','proj4_data/epsg',NULL,'+a=6378298.3 +b=6356657.142669561 +no_defs +pm=madrid +proj=longlat',NULL,'Madrid 1870 (Madrid)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4903,'ESRI','4903','proj4_data/esri',NULL,'+a=6378298.3 +b=6356657.142669562 +no_defs +pm=madrid +proj=longlat no_defs',NULL,'Madrid 1870 (Madrid)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4903,'NAD27','4903','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999411764705882 +lat_0=40d40 +lon_0=-108d45 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'4903: wyoming west central: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4903,'NAD83','4903','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999375 +lat_0=40d30 +lon_0=-108d45 +proj=tmerc +x_0=600000 +y_0=0 no_defs',NULL,'4903: wyoming west central: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4904,'EPSG','4904','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +pm=lisbon +proj=longlat +towgs84=508.088,-191.042,565.223,0,0,0,0',NULL,'Lisbon 1890 (Lisbon)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4904,'ESRI','4904','proj4_data/esri',NULL,'+ellps=bessel +no_defs +pm=lisbon +proj=longlat no_defs',NULL,'Lisbon 1890 (Lisbon)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4904,'NAD27','4904','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999411764705882 +lat_0=40d40 +lon_0=-110d5 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'4904: wyoming west: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4904,'NAD83','4904','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999375 +lat_0=40d30 +lon_0=-110d5 +proj=tmerc +x_0=800000 +y_0=100000 no_defs',NULL,'4904: wyoming west: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4906,'EPSG','4906','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGNC91-93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4908,'EPSG','4908','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'GR96',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4910,'EPSG','4910','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF88',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4911,'EPSG','4911','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF89',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4912,'EPSG','4912','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF90',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4913,'EPSG','4913','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF91',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4914,'EPSG','4914','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4915,'EPSG','4915','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4916,'EPSG','4916','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4917,'EPSG','4917','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF96',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4918,'EPSG','4918','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF97',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4919,'EPSG','4919','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4920,'EPSG','4920','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'GDM2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4922,'EPSG','4922','proj4_data/epsg',NULL,'+a=6378136 +b=6356751.361745712 +no_defs +proj=geocent +units=m',NULL,'PZ-90',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4924,'EPSG','4924','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'Mauritania 1999',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4926,'EPSG','4926','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'Korea 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4928,'EPSG','4928','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'POSGAR 94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4930,'EPSG','4930','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'Australian Antarctic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4932,'EPSG','4932','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'CHTRF95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4934,'EPSG','4934','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'EST97',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4936,'EPSG','4936','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ETRS89',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4938,'EPSG','4938','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'GDA94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4940,'EPSG','4940','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'Hartebeesthoek94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4942,'EPSG','4942','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'IRENET95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4944,'EPSG','4944','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ISN93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4946,'EPSG','4946','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'JGD2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4948,'EPSG','4948','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'LKS92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4950,'EPSG','4950','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'LKS94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4952,'EPSG','4952','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'Moznet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4954,'EPSG','4954','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'NAD83(CSRS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4956,'EPSG','4956','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'NAD83(HARN)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4958,'EPSG','4958','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'NZGD2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4960,'EPSG','4960','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'POSGAR 98',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4962,'EPSG','4962','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'REGVEN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4964,'EPSG','4964','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGF93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4966,'EPSG','4966','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGFG95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4968,'EPSG','4968','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=geocent +units=m',NULL,'RGNC 1991',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4970,'EPSG','4970','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGR92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4972,'EPSG','4972','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'RRAF 1991',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4974,'EPSG','4974','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'SIRGAS 1995',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4976,'EPSG','4976','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'SWEREF99',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4978,'EPSG','4978','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=geocent +units=m',NULL,'WGS 84',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4980,'EPSG','4980','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'Yemen NGN96',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4982,'EPSG','4982','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'IGM95',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4984,'EPSG','4984','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=geocent +units=m',NULL,'WGS 72',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4986,'EPSG','4986','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=geocent +units=m',NULL,'WGS 72BE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4988,'EPSG','4988','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'SIRGAS 2000',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_42() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4990,'EPSG','4990','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=geocent +units=m',NULL,'Lao 1993',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4992,'EPSG','4992','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=geocent +units=m',NULL,'Lao 1997',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4994,'EPSG','4994','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=geocent +units=m',NULL,'PRS92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4996,'EPSG','4996','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'MAGNA-SIRGAS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(4998,'EPSG','4998','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGPF',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5001,'NAD27','5001','proj4_data/nad27',NULL,'+alpha=-36d52\4711.6315 +datum=NAD27 +k=.9999 +lat_0=57 +lonc=-133d40 +proj=omerc +x_0=818585.5672270928 +y_0=575219.2451072642 no_defs',NULL,'5001: alaska zone no. 1: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5001,'NAD83','5001','proj4_data/nad83',NULL,'+alpha=-36d52\4711.6315 +datum=NAD83 +k=.9999 +lat_0=57 +lonc=-133d40 +proj=omerc +x_0=818676.7344011233 +y_0=575097.6888751927 no_defs',NULL,'5001: alaska zone no. 1: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5002,'NAD27','5002','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=54 +lon_0=-142 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'5002: alaska zone no. 2: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5002,'NAD83','5002','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=54 +lon_0=-142 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5002: alaska zone no. 2: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5003,'NAD27','5003','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=54 +lon_0=-146 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'5003: alaska zone no. 3: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5003,'NAD83','5003','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=54 +lon_0=-146 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5003: alaska zone no. 3: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5004,'NAD27','5004','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=54 +lon_0=-150 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'5004: alaska zone no. 4: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5004,'NAD83','5004','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=54 +lon_0=-150 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5004: alaska zone no. 4: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5005,'NAD27','5005','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=54 +lon_0=-154 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'5005: alaska zone no. 5: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5005,'NAD83','5005','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=54 +lon_0=-154 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5005: alaska zone no. 5: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5006,'NAD27','5006','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=54 +lon_0=-158 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'5006: alaska zone no. 6: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5006,'NAD83','5006','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=54 +lon_0=-158 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5006: alaska zone no. 6: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5007,'NAD27','5007','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=54 +lon_0=-162 +proj=tmerc +x_0=213360.4267208534 +y_0=0 no_defs',NULL,'5007: alaska zone no. 7: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5007,'NAD83','5007','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=54 +lon_0=-162 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5007: alaska zone no. 7: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5008,'NAD27','5008','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=54 +lon_0=-166 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'5008: alaska zone no. 8: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5008,'NAD83','5008','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=54 +lon_0=-166 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5008: alaska zone no. 8: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5009,'NAD27','5009','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999 +lat_0=54 +lon_0=-170 +proj=tmerc +x_0=182880.3657607315 +y_0=0 no_defs',NULL,'5009: alaska zone no. 9: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5009,'NAD83','5009','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999 +lat_0=54 +lon_0=-170 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5009: alaska zone no. 9: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5010,'NAD27','5010','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=51 +lat_1=53d50 +lat_2=51d50 +lon_0=-176 +proj=lcc +x_0=914401.8288036576 +y_0=0 no_defs',NULL,'5010: alaska zone no. 10: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5010,'NAD83','5010','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=51 +lat_1=53d50 +lat_2=51d50 +lon_0=-176 +proj=lcc +x_0=1000000 +y_0=0 no_defs',NULL,'5010: alaska zone no. 10: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5011,'EPSG','5011','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'PTRA08',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5013,'EPSG','5013','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'PTRA08',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5014,'EPSG','5014','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=25',NULL,'PTRA08 / UTM zone 25N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5015,'EPSG','5015','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=26',NULL,'PTRA08 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5016,'EPSG','5016','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=28',NULL,'PTRA08 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5018,'EPSG','5018','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=39.66666666666666 +lon_0=-8.131906111111112 +no_defs +proj=tmerc +towgs84=-304.046,-60.576,103.64,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Lisbon 1890 / Portugal Bonne New\12Unable to translate coordinate system EPSG:5017 into PROJ.4 format.\12\12Lisbon / Portuguese Grid New',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5041,'EPSG','5041','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.994 +lat_0=90 +lat_ts=90 +lon_0=0 +no_defs +proj=stere +units=m +x_0=2000000 +y_0=2000000',NULL,'WGS 84 / UPS North (E,N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5042,'EPSG','5042','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.994 +lat_0=-90 +lat_ts=-90 +lon_0=0 +no_defs +proj=stere +units=m +x_0=2000000 +y_0=2000000',NULL,'WGS 84 / UPS South (E,N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5048,'EPSG','5048','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=35',NULL,'ETRS89 / TM35FIN(N,E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5069,'EPSG','5069','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=23 +lat_1=29.5 +lat_2=45.5 +lon_0=-96 +no_defs +proj=aea +units=m +x_0=0 +y_0=0',NULL,'NAD27 / Conus Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5070,'EPSG','5070','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=23 +lat_1=29.5 +lat_2=45.5 +lon_0=-96 +no_defs +proj=aea +units=m +x_0=0 +y_0=0',NULL,'NAD83 / Conus Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5071,'EPSG','5071','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=23 +lat_1=29.5 +lat_2=45.5 +lon_0=-96 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(HARN) / Conus Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5072,'EPSG','5072','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=23 +lat_1=29.5 +lat_2=45.5 +lon_0=-96 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(NSRS2007) / Conus Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5101,'NAD27','5101','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999666666666667 +lat_0=18d50 +lon_0=-155d30 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'5101: hawaii 1: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5101,'NAD83','5101','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999666666666667 +lat_0=18d50 +lon_0=-155d30 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5101: hawaii 1: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5102,'NAD27','5102','proj4_data/nad27',NULL,'+datum=NAD27 +k=.9999666666666667 +lat_0=20d20 +lon_0=-156d40 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'5102: hawaii 2: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5102,'NAD83','5102','proj4_data/nad83',NULL,'+datum=NAD83 +k=.9999666666666667 +lat_0=20d20 +lon_0=-156d40 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5102: hawaii 2: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5103,'NAD27','5103','proj4_data/nad27',NULL,'+datum=NAD27 +k=.99999 +lat_0=21d10 +lon_0=-158 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'5103: hawaii 3: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5103,'NAD83','5103','proj4_data/nad83',NULL,'+datum=NAD83 +k=.99999 +lat_0=21d10 +lon_0=-158 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5103: hawaii 3: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5104,'NAD27','5104','proj4_data/nad27',NULL,'+datum=NAD27 +k=.99999 +lat_0=21d50 +lon_0=-159d30 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'5104: hawaii 4: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5104,'NAD83','5104','proj4_data/nad83',NULL,'+datum=NAD83 +k=.99999 +lat_0=21d50 +lon_0=-159d30 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5104: hawaii 4: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5105,'EPSG','5105','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=5.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5105,'NAD27','5105','proj4_data/nad27',NULL,'+datum=NAD27 +k=1 +lat_0=21d40 +lon_0=-160d10 +proj=tmerc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'5105: hawaii 5: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5105,'NAD83','5105','proj4_data/nad83',NULL,'+datum=NAD83 +k=1 +lat_0=21d40 +lon_0=-160d10 +proj=tmerc +x_0=500000 +y_0=0 no_defs',NULL,'5105: hawaii 5: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5106,'EPSG','5106','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=6.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5107,'EPSG','5107','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=7.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5108,'EPSG','5108','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=8.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5109,'EPSG','5109','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=9.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5110,'EPSG','5110','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=10.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5111,'EPSG','5111','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=11.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5112,'EPSG','5112','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=12.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5113,'EPSG','5113','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=13.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5114,'EPSG','5114','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=14.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5115,'EPSG','5115','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=15.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5116,'EPSG','5116','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=16.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5117,'EPSG','5117','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=17.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5118,'EPSG','5118','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=18.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5119,'EPSG','5119','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=19.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5120,'EPSG','5120','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=20.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5121,'EPSG','5121','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=21.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5122,'EPSG','5122','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=22.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5123,'EPSG','5123','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=23.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5124,'EPSG','5124','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=24.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5125,'EPSG','5125','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=25.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5126,'EPSG','5126','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=26.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5127,'EPSG','5127','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=27.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5128,'EPSG','5128','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=28.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5129,'EPSG','5129','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=29.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5130,'EPSG','5130','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=30.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5132,'EPSG','5132','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat',NULL,'Tokyo 1892',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5167,'EPSG','5167','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=131 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000',NULL,'Korean 1985 / East Sea Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5168,'EPSG','5168','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=127 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=550000',NULL,'Korean 1985 / Central Belt Jeju',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5169,'EPSG','5169','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=125 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000',NULL,'Tokyo 1892 / Korea West Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5170,'EPSG','5170','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=127 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000',NULL,'Tokyo 1892 / Korea Central Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5171,'EPSG','5171','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000',NULL,'Tokyo 1892 / Korea East Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5172,'EPSG','5172','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=131 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000',NULL,'Tokyo 1892 / Korea East Sea Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5173,'EPSG','5173','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=125.0028902777778 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000',NULL,'Korean 1985 / Modified West Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5174,'EPSG','5174','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=127.0028902777778 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000',NULL,'Korean 1985 / Modified Central Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5175,'EPSG','5175','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=127.0028902777778 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=550000',NULL,'Korean 1985 / Modified Central Belt Jeju',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5176,'EPSG','5176','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=129.0028902777778 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000',NULL,'Korean 1985 / Modified East Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5177,'EPSG','5177','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=38 +lon_0=131.0028902777778 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=500000',NULL,'Korean 1985 / Modified East Sea Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5178,'EPSG','5178','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9996 +lat_0=38 +lon_0=127.5 +no_defs +proj=tmerc +units=m +x_0=1000000 +y_0=2000000',NULL,'Korean 1985 / Unified CS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5179,'EPSG','5179','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=38 +lon_0=127.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=2000000',NULL,'Korea 2000 / Unified CS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5180,'EPSG','5180','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=38 +lon_0=125 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=500000',NULL,'Korea 2000 / West Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5181,'EPSG','5181','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=38 +lon_0=127 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=500000',NULL,'Korea 2000 / Central Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5182,'EPSG','5182','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=38 +lon_0=127 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=550000',NULL,'Korea 2000 / Central Belt Jeju',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5183,'EPSG','5183','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=38 +lon_0=129 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=500000',NULL,'Korea 2000 / East Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5184,'EPSG','5184','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=38 +lon_0=131 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=500000',NULL,'Korea 2000 / East Sea Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5185,'EPSG','5185','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=38 +lon_0=125 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=600000',NULL,'Korea 2000 / West Belt 2010',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5186,'EPSG','5186','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=38 +lon_0=127 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=600000',NULL,'Korea 2000 / Central Belt 2010',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5187,'EPSG','5187','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=38 +lon_0=129 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=600000',NULL,'Korea 2000 / East Belt 2010',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5188,'EPSG','5188','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=38 +lon_0=131 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=600000',NULL,'Korea 2000 / East Sea Belt 2010',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5200,'NAD83','5200','proj4_data/nad83',NULL,'+datum=NAD83 +lat_0=17d50 +lat_1=18d26 +lat_2=18d2 +lon_0=-66d26 +proj=lcc +x_0=200000 +y_0=200000 no_defs',NULL,'5200: puerto rico and virgin islands: nad83',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5201,'NAD27','5201','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=17d50 +lat_1=18d26 +lat_2=18d2 +lon_0=-66d26 +proj=lcc +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'5201: puerto rico and virgin islands: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5202,'NAD27','5202','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=17d50 +lat_1=18d26 +lat_2=18d2 +lon_0=-66d26 +proj=lcc +x_0=152400.3048006096 +y_0=30480.06096012192 no_defs',NULL,'5202: virgin islands st. croix: nad27',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_43() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5221,'EPSG','5221','proj4_data/epsg',NULL,'+alpha=30.28813972222222 +ellps=bessel +k=0.9999 +lat_0=49.5 +lon_0=42.5 +no_defs +pm=ferro +proj=krovak +towgs84=589,76,480,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'S-JTSK (Ferro) / Krovak East North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5223,'EPSG','5223','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.9996 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=500000',NULL,'WGS 84 / Gabon TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5228,'EPSG','5228','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=572.213,85.334,461.94,4.9732,1.529,5.2484,3.5378',NULL,'S-JTSK/05',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5229,'EPSG','5229','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +pm=ferro +proj=longlat +towgs84=572.213,85.334,461.94,4.9732,1.529,5.2484,3.5378',NULL,'S-JTSK/05 (Ferro)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5233,'EPSG','5233','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=longlat +towgs84=-0.293,766.95,87.713,0.195704,1.695068,3.473016,-0.039338',NULL,'SLD99',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5234,'EPSG','5234','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +k=0.9999238418 +lat_0=7.000480277777778 +lon_0=80.77171111111112 +no_defs +proj=tmerc +towgs84=-97,787,86,0,0,0,0 +units=m +x_0=200000 +y_0=200000',NULL,'S-JTSK/05 (Ferro) / Modified Krovak\12Unable to translate coordinate system EPSG:5224 into PROJ.4 format.\12\12S-JTSK/05 (Ferro) / Modified Krovak East North\12Unable to translate coordinate system EPSG:5225 into PROJ.4 format.\12\12Kandawala / Sri Lanka Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5235,'EPSG','5235','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +k=0.9999238418 +lat_0=7.000471527777778 +lon_0=80.77171308333334 +no_defs +proj=tmerc +towgs84=-0.293,766.95,87.713,0.195704,1.695068,3.473016,-0.039338 +units=m +x_0=500000 +y_0=500000',NULL,'SLD99 / Sri Lanka Grid 1999',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5243,'EPSG','5243','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=51 +lat_1=48.66666666666666 +lat_2=53.66666666666666 +lon_0=10.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'ETRS89 / LCC Germany (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5244,'EPSG','5244','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'GDBD2009',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5246,'EPSG','5246','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'GDBD2009',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5247,'EPSG','5247','proj4_data/epsg',NULL,'+alpha=53.31580995 +ellps=GRS80 +gamma=53.13010236111111 +k=0.99984 +lat_0=4 +lonc=115 +no_defs +no_uoff +proj=omerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'GDBD2009 / Brunei BRSO',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5250,'EPSG','5250','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'TUREF',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5252,'EPSG','5252','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'TUREF',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5253,'EPSG','5253','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'TUREF / TM27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5254,'EPSG','5254','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'TUREF / TM30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5255,'EPSG','5255','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'TUREF / TM33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5256,'EPSG','5256','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'TUREF / TM36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5257,'EPSG','5257','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'TUREF / TM39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5258,'EPSG','5258','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'TUREF / TM42',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5259,'EPSG','5259','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'TUREF / TM45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5262,'EPSG','5262','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'DRUKREF 03',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5264,'EPSG','5264','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'DRUKREF 03',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5266,'EPSG','5266','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=90 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=0',NULL,'DRUKREF 03 / Bhutan National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5269,'EPSG','5269','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=9500000 +y_0=0',NULL,'TUREF / 3-degree Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5270,'EPSG','5270','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=10500000 +y_0=0',NULL,'TUREF / 3-degree Gauss-Kruger zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5271,'EPSG','5271','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=11500000 +y_0=0',NULL,'TUREF / 3-degree Gauss-Kruger zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5272,'EPSG','5272','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=12500000 +y_0=0',NULL,'TUREF / 3-degree Gauss-Kruger zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5273,'EPSG','5273','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=13500000 +y_0=0',NULL,'TUREF / 3-degree Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5274,'EPSG','5274','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=42 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=14500000 +y_0=0',NULL,'TUREF / 3-degree Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5275,'EPSG','5275','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=15500000 +y_0=0',NULL,'TUREF / 3-degree Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5292,'EPSG','5292','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=90.73333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Bumthang TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5293,'EPSG','5293','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=89.55 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Chhukha TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5294,'EPSG','5294','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=89.84999999999999 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Dagana TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5295,'EPSG','5295','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=90.03333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Gasa TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5296,'EPSG','5296','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=90.15000000000001 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Ha TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5297,'EPSG','5297','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=91.13333333333334 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Lhuentse TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5298,'EPSG','5298','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=91.23333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Mongar TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5299,'EPSG','5299','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=89.34999999999999 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Paro TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5300,'EPSG','5300','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=91.34999999999999 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Pemagatshel TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5300,'NAD27','5300','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=-14d16 +lat_1=-14d16 +lat_2=-14d16 +lon_0=-170 +proj=lcc +x_0=152400.3048006096 +y_0=95169.31165862332 no_defs',NULL,'5300: american samoa: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5301,'EPSG','5301','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=89.84999999999999 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Punakha TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5302,'EPSG','5302','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=91.56666666666666 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Samdrup Jongkhar TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5303,'EPSG','5303','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=89.06666666666666 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Samtse TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5304,'EPSG','5304','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=90.26666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Sarpang TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5305,'EPSG','5305','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=89.55 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Thimphu TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5306,'EPSG','5306','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=91.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Trashigang TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5307,'EPSG','5307','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=90.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Trongsa TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5308,'EPSG','5308','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=90.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Tsirang TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5309,'EPSG','5309','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=90.11666666666666 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Wangdue Phodrang TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5310,'EPSG','5310','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=91.56666666666666 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Yangtse TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5311,'EPSG','5311','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=90.86666666666666 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=250000 +y_0=-2500000',NULL,'DRUKREF 03 / Zhemgang TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5316,'EPSG','5316','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999997 +lat_0=0 +lon_0=-7 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=-6000000',NULL,'ETRS89 / Faroe TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5318,'EPSG','5318','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999997 +lat_0=0 +lon_0=-7 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=200000 +y_0=-6000000',NULL,'ETRS89 / Faroe TM + FVR09 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5320,'EPSG','5320','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=0 +lat_1=44.5 +lat_2=54.5 +lon_0=-84 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=0',NULL,'NAD83 / Teranet Ontario Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5321,'EPSG','5321','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=0 +lat_1=44.5 +lat_2=54.5 +lon_0=-84 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=0',NULL,'NAD83(CSRS) / Teranet Ontario Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5322,'EPSG','5322','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ISN2004',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5324,'EPSG','5324','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'ISN2004',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5325,'EPSG','5325','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=65 +lat_1=64.25 +lat_2=65.75 +lon_0=-19 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1700000 +y_0=300000',NULL,'ISN2004 / Lambert 2004',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5329,'EPSG','5329','proj4_data/epsg',NULL,'+ellps=bessel +k=0.997 +lon_0=3.192280555555556 +no_defs +pm=jakarta +proj=merc +towgs84=-403,684,41,0,0,0,0 +units=m +x_0=3900000 +y_0=900000',NULL,'Segara (Jakarta) / NEIEZ',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5330,'EPSG','5330','proj4_data/epsg',NULL,'+ellps=bessel +k=0.997 +lon_0=3.192280555555556 +no_defs +pm=jakarta +proj=merc +towgs84=-377,681,-50,0,0,0,0 +units=m +x_0=3900000 +y_0=900000',NULL,'Batavia (Jakarta) / NEIEZ',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5331,'EPSG','5331','proj4_data/epsg',NULL,'+ellps=bessel +k=0.997 +lon_0=3.192280555555556 +no_defs +pm=jakarta +proj=merc +towgs84=-587.8,519.75,145.76,0,0,0,0 +units=m +x_0=3900000 +y_0=900000',NULL,'Makassar (Jakarta) / NEIEZ',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5332,'EPSG','5332','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ITRF2008',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5337,'EPSG','5337','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-151.99,287.04,-147.45,0,0,0,0 +units=m +zone=25',NULL,'Aratu / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5340,'EPSG','5340','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'POSGAR 2007',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5341,'EPSG','5341','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'POSGAR 2007',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5343,'EPSG','5343','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-72 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=0',NULL,'POSGAR 2007 / Argentina 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5344,'EPSG','5344','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-69 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=0',NULL,'POSGAR 2007 / Argentina 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5345,'EPSG','5345','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-66 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=0',NULL,'POSGAR 2007 / Argentina 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5346,'EPSG','5346','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-63 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4500000 +y_0=0',NULL,'POSGAR 2007 / Argentina 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5347,'EPSG','5347','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-60 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=5500000 +y_0=0',NULL,'POSGAR 2007 / Argentina 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5348,'EPSG','5348','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-57 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=6500000 +y_0=0',NULL,'POSGAR 2007 / Argentina 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5349,'EPSG','5349','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-54 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=7500000 +y_0=0',NULL,'POSGAR 2007 / Argentina 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5352,'EPSG','5352','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'MARGEN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5354,'EPSG','5354','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'MARGEN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5355,'EPSG','5355','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=20',NULL,'MARGEN / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5356,'EPSG','5356','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'MARGEN / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5357,'EPSG','5357','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=21',NULL,'MARGEN / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5358,'EPSG','5358','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'SIRGAS-Chile',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5360,'EPSG','5360','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'SIRGAS-Chile',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5361,'EPSG','5361','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'SIRGAS-Chile / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5362,'EPSG','5362','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'SIRGAS-Chile / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5363,'EPSG','5363','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'CR05',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5365,'EPSG','5365','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'CR05',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5367,'EPSG','5367','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=-84 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'CR05 / CRTM05',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5368,'EPSG','5368','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'MACARIO SOLIS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5369,'EPSG','5369','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'Peru96',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5371,'EPSG','5371','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'MACARIO SOLIS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5373,'EPSG','5373','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Peru96',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5379,'EPSG','5379','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'SIRGAS-ROU98',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5381,'EPSG','5381','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'SIRGAS-ROU98',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5382,'EPSG','5382','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=21',NULL,'SIRGAS-ROU98 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5383,'EPSG','5383','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=22',NULL,'SIRGAS-ROU98 / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5387,'EPSG','5387','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'Peru96 / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5388,'EPSG','5388','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=17',NULL,'Peru96 / UTM zone 17S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5389,'EPSG','5389','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'Peru96 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5391,'EPSG','5391','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'SIRGAS_ES2007.8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5393,'EPSG','5393','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'SIRGAS_ES2007.8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5396,'EPSG','5396','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=26',NULL,'SIRGAS 2000 / UTM zone 26S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5400,'NAD27','5400','proj4_data/nad27',NULL,'+datum=NAD27 +lat_0=13d28\4720.87887 +lon_0=144d44\4755.50254 +proj=poly +x_0=50000 +y_0=50000 no_defs',NULL,'5400: guam island: nad27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5451,'EPSG','5451','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat +towgs84=205,96,-98,0,0,0,0',NULL,'Ocotepeque 1935',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_44() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5456,'EPSG','5456','proj4_data/epsg',NULL,'+ellps=clrk66 +k_0=0.99995696 +lat_0=10.46666666666667 +lat_1=10.46666666666667 +lon_0=-84.33333333333333 +no_defs +proj=lcc +towgs84=205,96,-98,0,0,0,0 +units=m +x_0=500000 +y_0=271820.522',NULL,'Ocotepeque 1935 / Costa Rica Norte',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5457,'EPSG','5457','proj4_data/epsg',NULL,'+ellps=clrk66 +k_0=0.99995696 +lat_0=9 +lat_1=9 +lon_0=-83.66666666666667 +no_defs +proj=lcc +towgs84=205,96,-98,0,0,0,0 +units=m +x_0=500000 +y_0=327987.436',NULL,'Ocotepeque 1935 / Costa Rica Sur',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5458,'EPSG','5458','proj4_data/epsg',NULL,'+datum=NAD27 +k_0=0.99992226 +lat_0=16.81666666666667 +lat_1=16.81666666666667 +lon_0=-90.33333333333333 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=292209.579',NULL,'Ocotepeque 1935 / Guatemala Norte (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5459,'EPSG','5459','proj4_data/epsg',NULL,'+ellps=clrk66 +k_0=0.99989906 +lat_0=14.9 +lat_1=14.9 +lon_0=-90.33333333333333 +no_defs +proj=lcc +towgs84=205,96,-98,0,0,0,0 +units=m +x_0=500000 +y_0=325992.681',NULL,'Ocotepeque 1935 / Guatemala Sur',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5460,'EPSG','5460','proj4_data/epsg',NULL,'+ellps=clrk66 +k_0=0.99996704 +lat_0=13.78333333333333 +lat_1=13.78333333333333 +lon_0=-89 +no_defs +proj=lcc +towgs84=205,96,-98,0,0,0,0 +units=m +x_0=500000 +y_0=295809.184',NULL,'Ocotepeque 1935 / El Salvador Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5461,'EPSG','5461','proj4_data/epsg',NULL,'+ellps=clrk66 +k_0=0.99990314 +lat_0=13.86666666666667 +lat_1=13.86666666666667 +lon_0=-85.5 +no_defs +proj=lcc +towgs84=205,96,-98,0,0,0,0 +units=m +x_0=500000 +y_0=359891.816',NULL,'Ocotepeque 1935 / Nicaragua Norte',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5462,'EPSG','5462','proj4_data/epsg',NULL,'+ellps=clrk66 +k_0=0.9999222800000001 +lat_0=11.73333333333333 +lat_1=11.73333333333333 +lon_0=-85.5 +no_defs +proj=lcc +towgs84=205,96,-98,0,0,0,0 +units=m +x_0=500000 +y_0=288876.327',NULL,'Ocotepeque 1935 / Nicaragua Sur',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5463,'EPSG','5463','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=17',NULL,'SAD69 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5464,'EPSG','5464','proj4_data/epsg',NULL,'+a=6378293.645208759 +b=6356617.987679838 +no_defs +proj=longlat',NULL,'Sibun Gorge 1922',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5466,'EPSG','5466','proj4_data/epsg',NULL,'+a=6378293.645208759 +b=6356617.987679838 +k=1 +lat_0=17.06124194444444 +lon_0=-88.6318575 +no_defs +proj=tmerc +units=m +x_0=66220.02833082761 +y_0=135779.5099885299',NULL,'Sibun Gorge 1922 / Colony Grid (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5467,'EPSG','5467','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=longlat',NULL,'Panama-Colon 1911',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5469,'EPSG','5469','proj4_data/epsg',NULL,'+ellps=clrk66 +k_0=0.99989909 +lat_0=8.416666666666666 +lat_1=8.416666666666666 +lon_0=-80 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=294865.303',NULL,'Panama-Colon 1911 / Panama Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5472,'EPSG','5472','proj4_data/epsg',NULL,'+ellps=clrk66 +lat_0=8.25 +lon_0=-81 +no_defs +proj=poly +to_meter=0.9143917962 +x_0=914391.7962 +y_0=999404.7217154861',NULL,'Panama-Colon 1911 / Panama Polyconic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5479,'EPSG','5479','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=-78 +lat_1=-76.66666666666667 +lat_2=-79.33333333333333 +lon_0=163 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=7000000 +y_0=5000000',NULL,'RSRGD2000 / MSLC2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5480,'EPSG','5480','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=-74.5 +lat_1=-73.66666666666667 +lat_2=-75.33333333333333 +lon_0=165 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=5000000 +y_0=3000000',NULL,'RSRGD2000 / BCLC2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5481,'EPSG','5481','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=-71.5 +lat_1=-70.66666666666667 +lat_2=-72.33333333333333 +lon_0=166 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3000000 +y_0=1000000',NULL,'RSRGD2000 / PCLC2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5482,'EPSG','5482','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.994 +lat_0=-90 +lat_ts=-90 +lon_0=180 +no_defs +proj=stere +towgs84=0,0,0,0,0,0,0 +units=m +x_0=5000000 +y_0=1000000',NULL,'RSRGD2000 / RSPS2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5487,'EPSG','5487','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGAF09',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5489,'EPSG','5489','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RGAF09',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5490,'EPSG','5490','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20',NULL,'RGAF09 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5498,'EPSG','5498','proj4_data/epsg',NULL,'+datum=NAD83 +geoidgrids=g2012a_conus.gtx,g2012a_alaska.gtx,g2012a_guam.gtx,g2012a_hawaii.gtx,g2012a_puertorico.gtx,g2012a_samoa.gtx +no_defs +proj=longlat +vunits=m',NULL,'NAD83 + NAVD88 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5499,'EPSG','5499','proj4_data/epsg',NULL,'+ellps=GRS80 +geoidgrids=g2012a_conus.gtx,g2012a_alaska.gtx,g2012a_guam.gtx,g2012a_hawaii.gtx,g2012a_puertorico.gtx,g2012a_samoa.gtx +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 +vunits=m',NULL,'NAD83(HARN) + NAVD88 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5500,'EPSG','5500','proj4_data/epsg',NULL,'+ellps=GRS80 +geoidgrids=g2012a_conus.gtx,g2012a_alaska.gtx,g2012a_guam.gtx,g2012a_hawaii.gtx,g2012a_puertorico.gtx,g2012a_samoa.gtx +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 +vunits=m',NULL,'NAD83(NSRS2007) + NAVD88 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5513,'EPSG','5513','proj4_data/epsg',NULL,'+alpha=30.28813972222222 +ellps=bessel +k=0.9999 +lat_0=49.5 +lon_0=24.83333333333333 +no_defs +proj=krovak +towgs84=589,76,480,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'S-JTSK / Krovak',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5514,'EPSG','5514','proj4_data/epsg',NULL,'+alpha=30.28813972222222 +ellps=bessel +k=0.9999 +lat_0=49.5 +lon_0=24.83333333333333 +no_defs +proj=krovak +towgs84=589,76,480,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'S-JTSK / Krovak East North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5518,'EPSG','5518','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-44 +lon_0=-176.5 +no_defs +proj=tmerc +towgs84=175,-38,113,0,0,0,0 +units=m +x_0=350000 +y_0=650000',NULL,'S-JTSK/05 / Modified Krovak\12Unable to translate coordinate system EPSG:5515 into PROJ.4 format.\12\12S-JTSK/05 / Modified Krovak East North\12Unable to translate coordinate system EPSG:5516 into PROJ.4 format.\12\12CI1971 / Chatham Islands Map Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5519,'EPSG','5519','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-44 +lon_0=-176.5 +no_defs +proj=tmerc +towgs84=174.05,-25.49,112.57,0,0,0.554,0.2263 +units=m +x_0=350000 +y_0=650000',NULL,'CI1979 / Chatham Islands Map Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5520,'EPSG','5520','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=3 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0',NULL,'DHDN / 3-degree Gauss-Kruger zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5523,'EPSG','5523','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.9996 +lat_0=0 +lon_0=11.5 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=5500000',NULL,'WGS 84 / Gabon TM 2011',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5524,'EPSG','5524','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat',NULL,'Corrego Alegre 1961',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5527,'EPSG','5527','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=longlat +towgs84=-67.35,3.88,-38.22,0,0,0,0',NULL,'SAD69(96)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5530,'EPSG','5530','proj4_data/epsg',NULL,'+ellps=aust_SA +lat_0=0 +lon_0=-54 +no_defs +proj=poly +towgs84=-67.35,3.88,-38.22,0,0,0,0 +units=m +x_0=5000000 +y_0=10000000',NULL,'SAD69(96) / Brazil Polyconic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5531,'EPSG','5531','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-67.35,3.88,-38.22,0,0,0,0 +units=m +zone=21',NULL,'SAD69(96) / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5532,'EPSG','5532','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=22',NULL,'SAD69(96) / UTM zone 22S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5533,'EPSG','5533','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-67.35,3.88,-38.22,0,0,0,0 +units=m +zone=23',NULL,'SAD69(96) / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5534,'EPSG','5534','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-67.35,3.88,-38.22,0,0,0,0 +units=m +zone=24',NULL,'SAD69(96) / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5535,'EPSG','5535','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-67.35,3.88,-38.22,0,0,0,0 +units=m +zone=25',NULL,'SAD69(96) / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5536,'EPSG','5536','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=21',NULL,'Corrego Alegre 1961 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5537,'EPSG','5537','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=22',NULL,'Corrego Alegre 1961 / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5538,'EPSG','5538','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=23',NULL,'Corrego Alegre 1961 / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5539,'EPSG','5539','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=24',NULL,'Corrego Alegre 1961 / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5544,'EPSG','5544','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'PNG94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5546,'EPSG','5546','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'PNG94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5550,'EPSG','5550','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=54',NULL,'PNG94 / PNGMG94 zone 54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5551,'EPSG','5551','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=55',NULL,'PNG94 / PNGMG94 zone 55',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5552,'EPSG','5552','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=56',NULL,'PNG94 / PNGMG94 zone 56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5554,'EPSG','5554','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=31',NULL,'ETRS89 / UTM zone 31N + DHHN92 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5555,'EPSG','5555','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=32',NULL,'ETRS89 / UTM zone 32N + DHHN92 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5556,'EPSG','5556','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=33',NULL,'ETRS89 / UTM zone 33N + DHHN92 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5558,'EPSG','5558','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=geocent +units=m',NULL,'UCS-2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5559,'EPSG','5559','proj4_data/epsg',NULL,'+ellps=clrk66 +k_0=0.99992226 +lat_0=16.81666666666667 +lat_1=16.81666666666667 +lon_0=-90.33333333333333 +no_defs +proj=lcc +towgs84=205,96,-98,0,0,0,0 +units=m +x_0=500000 +y_0=292209.579',NULL,'Ocotepeque 1935 / Guatemala Norte',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5561,'EPSG','5561','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=longlat +towgs84=25,-141,-78.5,0,0.35,0.736,0',NULL,'UCS-2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5562,'EPSG','5562','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=4500000 +y_0=0',NULL,'UCS-2000 / Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5563,'EPSG','5563','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=5500000 +y_0=0',NULL,'UCS-2000 / Gauss-Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5564,'EPSG','5564','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=6500000 +y_0=0',NULL,'UCS-2000 / Gauss-Kruger zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5565,'EPSG','5565','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=7500000 +y_0=0',NULL,'UCS-2000 / Gauss-Kruger zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5566,'EPSG','5566','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=500000 +y_0=0',NULL,'UCS-2000 / Gauss-Kruger CM 21E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5567,'EPSG','5567','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=500000 +y_0=0',NULL,'UCS-2000 / Gauss-Kruger CM 27E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5568,'EPSG','5568','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=500000 +y_0=0',NULL,'UCS-2000 / Gauss-Kruger CM 33E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5569,'EPSG','5569','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=500000 +y_0=0',NULL,'UCS-2000 / Gauss-Kruger CM 39E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5570,'EPSG','5570','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=7500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger zone 7 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5571,'EPSG','5571','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=8500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger zone 8 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5572,'EPSG','5572','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=9500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger zone 9 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5573,'EPSG','5573','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=10500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger zone 10 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5574,'EPSG','5574','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=11500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger zone 11 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5575,'EPSG','5575','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=12500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger zone 12 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5576,'EPSG','5576','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=13500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger zone 13 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5577,'EPSG','5577','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger CM 21E (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5578,'EPSG','5578','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger CM 24E (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5579,'EPSG','5579','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger CM 27E (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5580,'EPSG','5580','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger CM 30E (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5581,'EPSG','5581','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger CM 33E (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5582,'EPSG','5582','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger CM 36E (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5583,'EPSG','5583','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=500000 +y_0=0',NULL,'UCS-2000 / 3-degree Gauss-Kruger CM 39E (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5588,'EPSG','5588','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999912 +lat_0=46.5 +lon_0=-66.5 +no_defs +proj=sterea +units=ft +x_0=304800 +y_0=304800',NULL,'NAD27 / New Brunswick Stereographic (NAD27)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5589,'EPSG','5589','proj4_data/epsg',NULL,'+a=6378293.645208759 +b=6356617.987679838 +k=1 +lat_0=17.06124194444444 +lon_0=-88.6318575 +no_defs +proj=tmerc +to_meter=0.3047972654 +x_0=66220.02833082761 +y_0=135779.5099885299',NULL,'Sibun Gorge 1922 / Colony Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5591,'EPSG','5591','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'FEH2010',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5593,'EPSG','5593','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'FEH2010',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5596,'EPSG','5596','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=11.33333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1000000 +y_0=0',NULL,'FEH2010 / Fehmarnbelt TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5598,'EPSG','5598','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=11.33333333333333 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=1000000 +y_0=0',NULL,'FEH2010 / Fehmarnbelt TM + FCSVR10 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5623,'EPSG','5623','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999942857 +lat_0=41.5 +lon_0=-83.66666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Michigan East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5624,'EPSG','5624','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999909091 +lat_0=41.5 +lon_0=-85.75 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Michigan Old Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5625,'EPSG','5625','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999909091 +lat_0=41.5 +lon_0=-88.75 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Michigan West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5627,'EPSG','5627','proj4_data/epsg',NULL,'+ellps=intl +k=0.9996 +lat_0=0 +lon_0=6 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ED50 / TM 6 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5628,'EPSG','5628','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 +vunits=m',NULL,'SWEREF99 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5629,'EPSG','5629','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=38',NULL,'Moznet / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5631,'EPSG','5631','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=2500000 +y_0=0',NULL,'Pulkovo 1942(58) / Gauss-Kruger zone 2 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5632,'EPSG','5632','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=52 +lat_1=35 +lat_2=65 +lon_0=10 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4000000 +y_0=2800000',NULL,'PTRA08 / LCC Europe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5633,'EPSG','5633','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=52 +lon_0=10 +no_defs +proj=laea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4321000 +y_0=3210000',NULL,'PTRA08 / LAEA Europe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5634,'EPSG','5634','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=52 +lat_1=35 +lat_2=65 +lon_0=10 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4000000 +y_0=2800000',NULL,'REGCAN95 / LCC Europe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5635,'EPSG','5635','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=52 +lon_0=10 +no_defs +proj=laea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4321000 +y_0=3210000',NULL,'REGCAN95 / LAEA Europe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5636,'EPSG','5636','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=52 +lon_0=10 +no_defs +proj=laea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4321000 +y_0=3210000',NULL,'TUREF / LAEA Europe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5637,'EPSG','5637','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=52 +lat_1=35 +lat_2=65 +lon_0=10 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4000000 +y_0=2800000',NULL,'TUREF / LCC Europe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5638,'EPSG','5638','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=52 +lon_0=10 +no_defs +proj=laea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4321000 +y_0=3210000',NULL,'ISN2004 / LAEA Europe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5639,'EPSG','5639','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=52 +lat_1=35 +lat_2=65 +lon_0=10 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4000000 +y_0=2800000',NULL,'ISN2004 / LCC Europe',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5641,'EPSG','5641','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_ts=-2 +lon_0=-43 +no_defs +proj=merc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=5000000 +y_0=10000000',NULL,'SIRGAS 2000 / Brazil Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5643,'EPSG','5643','proj4_data/epsg',NULL,'+ellps=intl +lat_0=48 +lat_1=52.66666666666666 +lat_2=54.33333333333334 +lon_0=10 +no_defs +proj=lcc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=815000 +y_0=0',NULL,'ED50 / SPBA LCC',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5644,'EPSG','5644','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=39',NULL,'RGR92 / UTM zone 39S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5646,'EPSG','5646','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999964286 +lat_0=42.5 +lon_0=-72.5 +no_defs +proj=tmerc +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83 / Vermont (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5649,'EPSG','5649','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=3 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=31500000 +y_0=0',NULL,'ETRS89 / UTM zone 31N (zE-N)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_45() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5650,'EPSG','5650','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=33500000 +y_0=0',NULL,'ETRS89 / UTM zone 33N (zE-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5651,'EPSG','5651','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=3 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=31500000 +y_0=0',NULL,'ETRS89 / UTM zone 31N (N-zE)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5652,'EPSG','5652','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=32500000 +y_0=0',NULL,'ETRS89 / UTM zone 32N (N-zE)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5653,'EPSG','5653','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=33500000 +y_0=0',NULL,'ETRS89 / UTM zone 33N (N-zE)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5654,'EPSG','5654','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999964286 +lat_0=42.5 +lon_0=-72.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83(HARN) / Vermont (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5655,'EPSG','5655','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999964286 +lat_0=42.5 +lon_0=-72.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83(NSRS2007) / Vermont (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5659,'EPSG','5659','proj4_data/epsg',NULL,'+ellps=intl +k=0.9996 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=-104.1,-49.1,-9.9,0.971,-2.917,0.714,-11.68 +units=m +x_0=500053 +y_0=-3999820',NULL,'Monte Mario / TM Emilia-Romagna',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5663,'EPSG','5663','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=3500000 +y_0=0',NULL,'Pulkovo 1942(58) / Gauss-Kruger zone 3 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5664,'EPSG','5664','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=2500000 +y_0=0',NULL,'Pulkovo 1942(83) / Gauss-Kruger zone 2 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5665,'EPSG','5665','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=3500000 +y_0=0',NULL,'Pulkovo 1942(83) / Gauss-Kruger zone 3 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5666,'EPSG','5666','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +x_0=3500000 +y_0=0',NULL,'PD/83 / 3-degree Gauss-Kruger zone 3 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5667,'EPSG','5667','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0',NULL,'PD/83 / 3-degree Gauss-Kruger zone 4 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5668,'EPSG','5668','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0',NULL,'RD/83 / 3-degree Gauss-Kruger zone 4 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5669,'EPSG','5669','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0',NULL,'RD/83 / 3-degree Gauss-Kruger zone 5 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5670,'EPSG','5670','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=3500000 +y_0=0',NULL,'Pulkovo 1942(58) / 3-degree Gauss-Kruger zone 3 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5671,'EPSG','5671','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=4500000 +y_0=0',NULL,'Pulkovo 1942(58) / 3-degree Gauss-Kruger zone 4 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5672,'EPSG','5672','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=33.4,-146.6,-76.3,-0.359,-0.053,0.844,-0.84 +units=m +x_0=5500000 +y_0=0',NULL,'Pulkovo 1942(58) / 3-degree Gauss-Kruger zone 5 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5673,'EPSG','5673','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=3500000 +y_0=0',NULL,'Pulkovo 1942(83) / 3-degree Gauss-Kruger zone 3 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5674,'EPSG','5674','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=4500000 +y_0=0',NULL,'Pulkovo 1942(83) / 3-degree Gauss-Kruger zone 4 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5675,'EPSG','5675','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=26,-121,-78,0,0,0,0 +units=m +x_0=5500000 +y_0=0',NULL,'Pulkovo 1942(83) / 3-degree Gauss-Kruger zone 5 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5676,'EPSG','5676','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=6 +no_defs +proj=tmerc +units=m +x_0=2500000 +y_0=0',NULL,'DHDN / 3-degree Gauss-Kruger zone 2 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5677,'EPSG','5677','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +x_0=3500000 +y_0=0',NULL,'DHDN / 3-degree Gauss-Kruger zone 3 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5678,'EPSG','5678','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0',NULL,'DHDN / 3-degree Gauss-Kruger zone 4 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5679,'EPSG','5679','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0',NULL,'DHDN / 3-degree Gauss-Kruger zone 5 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5680,'EPSG','5680','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=3 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0',NULL,'DHDN / 3-degree Gauss-Kruger zone 1 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5681,'EPSG','5681','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat',NULL,'DB_REF',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5682,'EPSG','5682','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=6 +no_defs +proj=tmerc +units=m +x_0=2500000 +y_0=0',NULL,'DB_REF / 3-degree Gauss-Kruger zone 2 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5683,'EPSG','5683','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +x_0=3500000 +y_0=0',NULL,'DB_REF / 3-degree Gauss-Kruger zone 3 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5684,'EPSG','5684','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0',NULL,'DB_REF / 3-degree Gauss-Kruger zone 4 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5685,'EPSG','5685','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0',NULL,'DB_REF / 3-degree Gauss-Kruger zone 5 (E-N)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5698,'EPSG','5698','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=49 +lat_2=44 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=700000 +y_0=6600000',NULL,'RGF93 / Lambert-93 + NGF-IGN69 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5699,'EPSG','5699','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=49 +lat_2=44 +lon_0=3 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=700000 +y_0=6600000',NULL,'RGF93 / Lambert-93 + NGF-IGN78 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5700,'EPSG','5700','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=1',NULL,'NZGD2000 / UTM zone 1S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5707,'EPSG','5707','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877341 +lat_0=49.50000000000001 +lat_1=49.50000000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +vunits=m +x_0=600000 +y_0=1200000',NULL,'NTF (Paris) / Lambert zone I + NGF-IGN69 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5708,'EPSG','5708','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99994471 +lat_0=42.16500000000001 +lat_1=42.16500000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +vunits=m +x_0=234.358 +y_0=4185861.369',NULL,'NTF (Paris) / Lambert zone IV + NGF-IGN78 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5825,'EPSG','5825','proj4_data/epsg',NULL,'+ellps=aust_SA +k=1.000086 +lat_0=-35.31773627777778 +lon_0=149.0092948305555 +no_defs +proj=tmerc +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +x_0=200000 +y_0=600000',NULL,'EPSG topocentric example A\12Unable to translate coordinate system EPSG:5819 into PROJ.4 format.\12\12EPSG topocentric example B\12Unable to translate coordinate system EPSG:5820 into PROJ.4 format.\12\12EPSG vertical perspective example\12Unable to translate coordinate system EPSG:5821 into PROJ.4 format.\12\12AGD66 / ACT Standard Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5828,'EPSG','5828','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=geocent +units=m',NULL,'DB_REF',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5832,'EPSG','5832','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=6 +no_defs +proj=tmerc +units=m +vunits=m +x_0=2500000 +y_0=0',NULL,'DB_REF / 3-degree Gauss-Kruger zone 2 (E-N) + DHHN92 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5833,'EPSG','5833','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +vunits=m +x_0=3500000 +y_0=0',NULL,'DB_REF / 3-degree Gauss-Kruger zone 3 (E-N) + DHHN92 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5834,'EPSG','5834','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +vunits=m +x_0=4500000 +y_0=0',NULL,'DB_REF / 3-degree Gauss-Kruger zone 4 (E-N) + DHHN92 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5835,'EPSG','5835','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +vunits=m +x_0=5500000 +y_0=0',NULL,'DB_REF / 3-degree Gauss-Kruger zone 5 (E-N) + DHHN92 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5836,'EPSG','5836','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=37',NULL,'Yemen NGN96 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5837,'EPSG','5837','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=40',NULL,'Yemen NGN96 / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5839,'EPSG','5839','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=17',NULL,'Peru96 / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5842,'EPSG','5842','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.9996 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'WGS 84 / TM 12 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5844,'EPSG','5844','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'RGRDC 2005 / Congo TM zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5845,'EPSG','5845','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=33',NULL,'SWEREF99 TM + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5846,'EPSG','5846','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=150000 +y_0=0',NULL,'SWEREF99 12 00 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5847,'EPSG','5847','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=13.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=150000 +y_0=0',NULL,'SWEREF99 13 30 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5848,'EPSG','5848','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=150000 +y_0=0',NULL,'SWEREF99 15 00 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5849,'EPSG','5849','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=16.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=150000 +y_0=0',NULL,'SWEREF99 16 30 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5850,'EPSG','5850','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=150000 +y_0=0',NULL,'SWEREF99 18 00 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5851,'EPSG','5851','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=14.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=150000 +y_0=0',NULL,'SWEREF99 14 15 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5852,'EPSG','5852','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=15.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=150000 +y_0=0',NULL,'SWEREF99 15 45 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5853,'EPSG','5853','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=17.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=150000 +y_0=0',NULL,'SWEREF99 17 15 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5854,'EPSG','5854','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=18.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=150000 +y_0=0',NULL,'SWEREF99 18 45 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5855,'EPSG','5855','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=20.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=150000 +y_0=0',NULL,'SWEREF99 20 15 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5856,'EPSG','5856','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=21.75 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=150000 +y_0=0',NULL,'SWEREF99 21 45 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5857,'EPSG','5857','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=23.25 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=150000 +y_0=0',NULL,'SWEREF99 23 15 + RH2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5858,'EPSG','5858','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-67.35,3.88,-38.22,0,0,0,0 +units=m +zone=22',NULL,'SAD69(96) / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5875,'EPSG','5875','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-67.35,3.88,-38.22,0,0,0,0 +units=m +zone=18',NULL,'SAD69(96) / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5876,'EPSG','5876','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-67.35,3.88,-38.22,0,0,0,0 +units=m +zone=19',NULL,'SAD69(96) / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5877,'EPSG','5877','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-67.35,3.88,-38.22,0,0,0,0 +units=m +zone=20',NULL,'SAD69(96) / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5879,'EPSG','5879','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-381.788,-57.501,-256.673,0,0,0,0 +units=m +zone=38',NULL,'Cadastre 1997 / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5880,'EPSG','5880','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=0 +lon_0=-54 +no_defs +proj=poly +towgs84=0,0,0,0,0,0,0 +units=m +x_0=5000000 +y_0=10000000',NULL,'SIRGAS 2000 / Brazil Polyconic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5884,'EPSG','5884','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'TGD2005',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5886,'EPSG','5886','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'TGD2005',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5887,'EPSG','5887','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=5000000',NULL,'TGD2005 / Tonga Map Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5890,'EPSG','5890','proj4_data/epsg',NULL,'+a=6378273 +b=6356889.449 +k=1 +lat_0=90 +lat_ts=70 +lon_0=90 +no_defs +proj=stere +units=m +x_0=0 +y_0=0',NULL,'JAXA Snow Depth Polar Stereographic North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5921,'EPSG','5921','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=81.31722600000001 +lat_1=85 +lat_2=77 +lon_0=-111 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone A1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5922,'EPSG','5922','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=81.31722600000001 +lat_1=85 +lat_2=77 +lon_0=-39 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone A2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5923,'EPSG','5923','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=81.31722600000001 +lat_1=85 +lat_2=77 +lon_0=33 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone A3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5924,'EPSG','5924','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=81.31722600000001 +lat_1=85 +lat_2=77 +lon_0=105 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone A4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5925,'EPSG','5925','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=81.31722600000001 +lat_1=85 +lat_2=77 +lon_0=177 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone A5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5926,'EPSG','5926','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=73.15574086111111 +lat_1=77 +lat_2=69 +lon_0=-111 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone B1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5927,'EPSG','5927','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=73.15574086111111 +lat_1=77 +lat_2=69 +lon_0=-39 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone B2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5928,'EPSG','5928','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=73.15574086111111 +lat_1=77 +lat_2=69 +lon_0=33 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone B3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5929,'EPSG','5929','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=73.15574086111111 +lat_1=77 +lat_2=69 +lon_0=105 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone B4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5930,'EPSG','5930','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=73.15574086111111 +lat_1=77 +lat_2=69 +lon_0=177 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone B5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5931,'EPSG','5931','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=65.10127088888888 +lat_1=69 +lat_2=61 +lon_0=-111 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone C1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5932,'EPSG','5932','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=65.10127088888888 +lat_1=69 +lat_2=61 +lon_0=-39 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone C2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5933,'EPSG','5933','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=65.10127088888888 +lat_1=69 +lat_2=61 +lon_0=33 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone C3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5934,'EPSG','5934','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=65.10127088888888 +lat_1=69 +lat_2=61 +lon_0=105 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone C4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5935,'EPSG','5935','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=65.10127088888888 +lat_1=69 +lat_2=61 +lon_0=177 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / EPSG Arctic Regional zone C5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5936,'EPSG','5936','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.994 +lat_0=90 +lat_ts=90 +lon_0=-150 +no_defs +proj=stere +units=m +x_0=2000000 +y_0=2000000',NULL,'WGS 84 / EPSG Alaska Polar Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5937,'EPSG','5937','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.994 +lat_0=90 +lat_ts=90 +lon_0=-100 +no_defs +proj=stere +units=m +x_0=2000000 +y_0=2000000',NULL,'WGS 84 / EPSG Canada Polar Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5938,'EPSG','5938','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.994 +lat_0=90 +lat_ts=90 +lon_0=-33 +no_defs +proj=stere +units=m +x_0=2000000 +y_0=2000000',NULL,'WGS 84 / EPSG Greenland Polar Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5939,'EPSG','5939','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.994 +lat_0=90 +lat_ts=90 +lon_0=18 +no_defs +proj=stere +units=m +x_0=2000000 +y_0=2000000',NULL,'WGS 84 / EPSG Norway Polar Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5940,'EPSG','5940','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.994 +lat_0=90 +lat_ts=90 +lon_0=105 +no_defs +proj=stere +units=m +x_0=2000000 +y_0=2000000',NULL,'WGS 84 / EPSG Russia Polar Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5942,'EPSG','5942','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 +vunits=m',NULL,'ETRS89 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5945,'EPSG','5945','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=5.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 5 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5946,'EPSG','5946','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=6.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 6 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5947,'EPSG','5947','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=7.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 7 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5948,'EPSG','5948','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=8.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 8 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5949,'EPSG','5949','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=9.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 9 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5950,'EPSG','5950','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=10.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 10 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5951,'EPSG','5951','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=11.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 11 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5952,'EPSG','5952','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=12.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 12 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5953,'EPSG','5953','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=13.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 13 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5954,'EPSG','5954','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=14.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 14 + NN2000 height',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_46() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5955,'EPSG','5955','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=15.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 15 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5956,'EPSG','5956','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=16.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 16 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5957,'EPSG','5957','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=17.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 17 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5958,'EPSG','5958','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=18.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 18 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5959,'EPSG','5959','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=19.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 19 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5960,'EPSG','5960','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=20.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 20 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5961,'EPSG','5961','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=21.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 21 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5962,'EPSG','5962','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=22.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 22 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5963,'EPSG','5963','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=23.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 23 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5964,'EPSG','5964','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=24.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 24 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5965,'EPSG','5965','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=25.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 25 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5966,'EPSG','5966','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=26.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 26 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5967,'EPSG','5967','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=27.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 27 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5968,'EPSG','5968','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=28.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 28 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5969,'EPSG','5969','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=29.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 29 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5970,'EPSG','5970','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=30.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 30 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5971,'EPSG','5971','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=31',NULL,'ETRS89 / UTM zone 31 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5972,'EPSG','5972','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=32',NULL,'ETRS89 / UTM zone 32 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5973,'EPSG','5973','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=33',NULL,'ETRS89 / UTM zone 33 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5974,'EPSG','5974','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=34',NULL,'ETRS89 / UTM zone 34 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5975,'EPSG','5975','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=35',NULL,'ETRS89 / UTM zone 35 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(5976,'EPSG','5976','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=36',NULL,'ETRS89 / UTM zone 36 + NN2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6050,'EPSG','6050','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=85.43711833333333 +lat_1=87 +lat_2=83.66666666666667 +lon_0=-30 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=25500000 +y_0=1500000',NULL,'GR96 / EPSG Arctic zone 1-25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6051,'EPSG','6051','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=82.05842488888888 +lat_1=83.66666666666667 +lat_2=80.33333333333333 +lon_0=-52 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=18500000 +y_0=2500000',NULL,'GR96 / EPSG Arctic zone 2-18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6052,'EPSG','6052','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=82.05842488888888 +lat_1=83.66666666666667 +lat_2=80.33333333333333 +lon_0=-12 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=20500000 +y_0=2500000',NULL,'GR96 / EPSG Arctic zone 2-20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6053,'EPSG','6053','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=-69 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=29500000 +y_0=3500000',NULL,'GR96 / EPSG Arctic zone 3-29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6054,'EPSG','6054','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=-39 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=31500000 +y_0=3500000',NULL,'GR96 / EPSG Arctic zone 3-31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6055,'EPSG','6055','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=-10 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=33500000 +y_0=3500000',NULL,'GR96 / EPSG Arctic zone 3-33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6056,'EPSG','6056','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=-64 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=20500000 +y_0=4500000',NULL,'GR96 / EPSG Arctic zone 4-20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6057,'EPSG','6057','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=-39 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=22500000 +y_0=4500000',NULL,'GR96 / EPSG Arctic zone 4-22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6058,'EPSG','6058','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=-14 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=24500000 +y_0=4500000',NULL,'GR96 / EPSG Arctic zone 4-24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6059,'EPSG','6059','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=-62 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=41500000 +y_0=5500000',NULL,'GR96 / EPSG Arctic zone 5-41',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6060,'EPSG','6060','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=-42 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=43500000 +y_0=5500000',NULL,'GR96 / EPSG Arctic zone 5-43',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6061,'EPSG','6061','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=-22 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=45500000 +y_0=5500000',NULL,'GR96 / EPSG Arctic zone 5-45',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6062,'EPSG','6062','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=68.68747555555557 +lat_1=70.33333333333333 +lat_2=67 +lon_0=-56 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=26500000 +y_0=6500000',NULL,'GR96 / EPSG Arctic zone 6-26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6063,'EPSG','6063','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=68.68747555555557 +lat_1=70.33333333333333 +lat_2=67 +lon_0=-38 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=28500000 +y_0=6500000',NULL,'GR96 / EPSG Arctic zone 6-28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6064,'EPSG','6064','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=68.68747555555557 +lat_1=70.33333333333333 +lat_2=67 +lon_0=-20 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=30500000 +y_0=6500000',NULL,'GR96 / EPSG Arctic zone 6-30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6065,'EPSG','6065','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=65.35103930555555 +lat_1=67 +lat_2=63.66666666666666 +lon_0=-51 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=11500000 +y_0=7500000',NULL,'GR96 / EPSG Arctic zone 7-11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6066,'EPSG','6066','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=65.35103930555555 +lat_1=67 +lat_2=63.66666666666666 +lon_0=-34 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=13500000 +y_0=7500000',NULL,'GR96 / EPSG Arctic zone 7-13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6067,'EPSG','6067','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=62.01530688888889 +lat_1=63.66666666666666 +lat_2=60.33333333333334 +lon_0=-52 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=20500000 +y_0=8500000',NULL,'GR96 / EPSG Arctic zone 8-20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6068,'EPSG','6068','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=62.01530688888889 +lat_1=63.66666666666666 +lat_2=60.33333333333334 +lon_0=-37 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=22500000 +y_0=8500000',NULL,'GR96 / EPSG Arctic zone 8-22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6069,'EPSG','6069','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=82.05842488888888 +lat_1=83.66666666666667 +lat_2=80.33333333333333 +lon_0=16 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=22500000 +y_0=2500000',NULL,'ETRS89 / EPSG Arctic zone 2-22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6070,'EPSG','6070','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=21 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=11500000 +y_0=3500000',NULL,'ETRS89 / EPSG Arctic zone 3-11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6071,'EPSG','6071','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=10 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=26500000 +y_0=4500000',NULL,'ETRS89 / EPSG Arctic zone 4-26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6072,'EPSG','6072','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=34 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=28500000 +y_0=4500000',NULL,'ETRS89 / EPSG Arctic zone 4-28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6073,'EPSG','6073','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=14 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=11500000 +y_0=5500000',NULL,'ETRS89 / EPSG Arctic zone 5-11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6074,'EPSG','6074','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=34 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=13500000 +y_0=5500000',NULL,'ETRS89 / EPSG Arctic zone 5-13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6075,'EPSG','6075','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=82.05842488888888 +lat_1=83.66666666666667 +lat_2=80.33333333333333 +lon_0=53 +no_defs +proj=lcc +units=m +x_0=24500000 +y_0=2500000',NULL,'WGS 84 / EPSG Arctic zone 2-24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6076,'EPSG','6076','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=82.05842488888888 +lat_1=83.66666666666667 +lat_2=80.33333333333333 +lon_0=93 +no_defs +proj=lcc +units=m +x_0=26500000 +y_0=2500000',NULL,'WGS 84 / EPSG Arctic zone 2-26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6077,'EPSG','6077','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=52 +no_defs +proj=lcc +units=m +x_0=13500000 +y_0=3500000',NULL,'WGS 84 / EPSG Arctic zone 3-13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6078,'EPSG','6078','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=83 +no_defs +proj=lcc +units=m +x_0=15500000 +y_0=3500000',NULL,'WGS 84 / EPSG Arctic zone 3-15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6079,'EPSG','6079','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=114 +no_defs +proj=lcc +units=m +x_0=17500000 +y_0=3500000',NULL,'WGS 84 / EPSG Arctic zone 3-17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6080,'EPSG','6080','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=145 +no_defs +proj=lcc +units=m +x_0=19500000 +y_0=3500000',NULL,'WGS 84 / EPSG Arctic zone 3-19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6081,'EPSG','6081','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=58 +no_defs +proj=lcc +units=m +x_0=30500000 +y_0=4500000',NULL,'WGS 84 / EPSG Arctic zone 4-30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6082,'EPSG','6082','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=82 +no_defs +proj=lcc +units=m +x_0=32500000 +y_0=4500000',NULL,'WGS 84 / EPSG Arctic zone 4-32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6083,'EPSG','6083','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=106 +no_defs +proj=lcc +units=m +x_0=34500000 +y_0=4500000',NULL,'WGS 84 / EPSG Arctic zone 4-34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6084,'EPSG','6084','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=130 +no_defs +proj=lcc +units=m +x_0=36500000 +y_0=4500000',NULL,'WGS 84 / EPSG Arctic zone 4-36',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6085,'EPSG','6085','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=154 +no_defs +proj=lcc +units=m +x_0=38500000 +y_0=4500000',NULL,'WGS 84 / EPSG Arctic zone 4-38',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6086,'EPSG','6086','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=179 +no_defs +proj=lcc +units=m +x_0=40500000 +y_0=4500000',NULL,'WGS 84 / EPSG Arctic zone 4-40',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6087,'EPSG','6087','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=54 +no_defs +proj=lcc +units=m +x_0=15500000 +y_0=5500000',NULL,'WGS 84 / EPSG Arctic zone 5-15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6088,'EPSG','6088','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=74 +no_defs +proj=lcc +units=m +x_0=17500000 +y_0=5500000',NULL,'WGS 84 / EPSG Arctic zone 5-17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6089,'EPSG','6089','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=95 +no_defs +proj=lcc +units=m +x_0=19500000 +y_0=5500000',NULL,'WGS 84 / EPSG Arctic zone 5-19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6090,'EPSG','6090','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=116 +no_defs +proj=lcc +units=m +x_0=21500000 +y_0=5500000',NULL,'WGS 84 / EPSG Arctic zone 5-21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6091,'EPSG','6091','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=137 +no_defs +proj=lcc +units=m +x_0=23500000 +y_0=5500000',NULL,'WGS 84 / EPSG Arctic zone 5-23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6092,'EPSG','6092','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=158 +no_defs +proj=lcc +units=m +x_0=25500000 +y_0=5500000',NULL,'WGS 84 / EPSG Arctic zone 5-25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6093,'EPSG','6093','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=179 +no_defs +proj=lcc +units=m +x_0=27500000 +y_0=5500000',NULL,'WGS 84 / EPSG Arctic zone 5-27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6094,'EPSG','6094','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=-163 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=29500000 +y_0=5500000',NULL,'NAD83(NSRS2007) / EPSG Arctic zone 5-29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6095,'EPSG','6095','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=-147 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=31500000 +y_0=5500000',NULL,'NAD83(NSRS2007) / EPSG Arctic zone 5-31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6096,'EPSG','6096','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=68.68747555555557 +lat_1=70.33333333333333 +lat_2=67 +lon_0=-165 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=14500000 +y_0=6500000',NULL,'NAD83(NSRS2007) / EPSG Arctic zone 6-14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6097,'EPSG','6097','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=68.68747555555557 +lat_1=70.33333333333333 +lat_2=67 +lon_0=-147 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=16500000 +y_0=6500000',NULL,'NAD83(NSRS2007) / EPSG Arctic zone 6-16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6098,'EPSG','6098','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=85.43711833333333 +lat_1=87 +lat_2=83.66666666666667 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=23500000 +y_0=1500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 1-23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6099,'EPSG','6099','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=82.05842488888888 +lat_1=83.66666666666667 +lat_2=80.33333333333333 +lon_0=-115 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=14500000 +y_0=2500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 2-14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6100,'EPSG','6100','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=82.05842488888888 +lat_1=83.66666666666667 +lat_2=80.33333333333333 +lon_0=-75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=16500000 +y_0=2500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 2-16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6101,'EPSG','6101','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=-129 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=25500000 +y_0=3500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 3-25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6102,'EPSG','6102','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=-99 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=27500000 +y_0=3500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 3-27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6103,'EPSG','6103','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=-69 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=29500000 +y_0=3500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 3-29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6104,'EPSG','6104','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=-129 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=14500000 +y_0=4500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 4-14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6105,'EPSG','6105','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=-104 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=16500000 +y_0=4500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 4-16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6106,'EPSG','6106','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=-79 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=18500000 +y_0=4500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 4-18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6107,'EPSG','6107','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=-131 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=33500000 +y_0=5500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 5-33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6108,'EPSG','6108','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=-111 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=35500000 +y_0=5500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 5-35',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6109,'EPSG','6109','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=-91 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=37500000 +y_0=5500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 5-37',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6110,'EPSG','6110','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=-71 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=39500000 +y_0=5500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 5-39',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6111,'EPSG','6111','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=68.68747555555557 +lat_1=70.33333333333333 +lat_2=67 +lon_0=-132 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=18500000 +y_0=6500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 6-18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6112,'EPSG','6112','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=68.68747555555557 +lat_1=70.33333333333333 +lat_2=67 +lon_0=-113 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=20500000 +y_0=6500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 6-20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6113,'EPSG','6113','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=68.68747555555557 +lat_1=70.33333333333333 +lat_2=67 +lon_0=-94 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=22500000 +y_0=6500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 6-22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6114,'EPSG','6114','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=68.68747555555557 +lat_1=70.33333333333333 +lat_2=67 +lon_0=-75 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=24500000 +y_0=6500000',NULL,'NAD83(CSRS) / EPSG Arctic zone 6-24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6115,'EPSG','6115','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=85.43711833333333 +lat_1=87 +lat_2=83.66666666666667 +lon_0=30 +no_defs +proj=lcc +units=m +x_0=27500000 +y_0=1500000',NULL,'WGS 84 / EPSG Arctic zone 1-27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6116,'EPSG','6116','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=85.43711833333333 +lat_1=87 +lat_2=83.66666666666667 +lon_0=90 +no_defs +proj=lcc +units=m +x_0=29500000 +y_0=1500000',NULL,'WGS 84 / EPSG Arctic zone 1-29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6117,'EPSG','6117','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=85.43711833333333 +lat_1=87 +lat_2=83.66666666666667 +lon_0=150 +no_defs +proj=lcc +units=m +x_0=31500000 +y_0=1500000',NULL,'WGS 84 / EPSG Arctic zone 1-31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6118,'EPSG','6118','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=85.43711833333333 +lat_1=87 +lat_2=83.66666666666667 +lon_0=-150 +no_defs +proj=lcc +units=m +x_0=21500000 +y_0=1500000',NULL,'WGS 84 / EPSG Arctic zone 1-21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6119,'EPSG','6119','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=82.05842488888888 +lat_1=83.66666666666667 +lat_2=80.33333333333333 +lon_0=133 +no_defs +proj=lcc +units=m +x_0=28500000 +y_0=2500000',NULL,'WGS 84 / EPSG Arctic zone 2-28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6120,'EPSG','6120','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=82.05842488888888 +lat_1=83.66666666666667 +lat_2=80.33333333333333 +lon_0=166 +no_defs +proj=lcc +units=m +x_0=10500000 +y_0=2500000',NULL,'WGS 84 / EPSG Arctic zone 2-10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6121,'EPSG','6121','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=82.05842488888888 +lat_1=83.66666666666667 +lat_2=80.33333333333333 +lon_0=-154 +no_defs +proj=lcc +units=m +x_0=12500000 +y_0=2500000',NULL,'WGS 84 / EPSG Arctic zone 2-12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6122,'EPSG','6122','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=176 +no_defs +proj=lcc +units=m +x_0=21500000 +y_0=3500000',NULL,'WGS 84 / EPSG Arctic zone 3-21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6123,'EPSG','6123','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=78.70733752777778 +lat_1=80.33333333333333 +lat_2=77 +lon_0=-153 +no_defs +proj=lcc +units=m +x_0=23500000 +y_0=3500000',NULL,'WGS 84 / EPSG Arctic zone 3-23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6124,'EPSG','6124','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=75.36440330555556 +lat_1=77 +lat_2=73.66666666666667 +lon_0=-155 +no_defs +proj=lcc +units=m +x_0=12500000 +y_0=4500000',NULL,'WGS 84 / EPSG Arctic zone 4-12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6125,'EPSG','6125','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=-5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=47500000 +y_0=5500000',NULL,'ETRS89 / EPSG Arctic zone 5-47',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6128,'EPSG','6128','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +towgs84=-179.483,-69.379,-27.584,-7.862,8.163,6.042,-13.925 +units=ft +zone=17',NULL,'Grand Cayman National Grid 1959',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6129,'EPSG','6129','proj4_data/epsg',NULL,'+ellps=clrk66 +no_defs +proj=utm +towgs84=8.853,-52.644,180.304,-0.393,-2.323,2.96,-24.081 +units=ft +zone=17',NULL,'Sister Islands National Grid 1961',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_47() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6133,'EPSG','6133','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'CIGD11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6135,'EPSG','6135','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'CIGD11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6141,'EPSG','6141','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=19.33333333333333 +lat_1=19.33333333333333 +lat_2=19.7 +lon_0=80.56666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=899160 +y_0=579120',NULL,'Cayman Islands National Grid 2011 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6144,'EPSG','6144','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 +vunits=m',NULL,'ETRS89 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6145,'EPSG','6145','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=5.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 5 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6146,'EPSG','6146','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=6.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 6 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6147,'EPSG','6147','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=7.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 7 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6148,'EPSG','6148','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=8.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 8 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6149,'EPSG','6149','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=9.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 9 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6150,'EPSG','6150','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=10.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 10 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6151,'EPSG','6151','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=11.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 11 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6152,'EPSG','6152','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=12.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 12 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6153,'EPSG','6153','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=13.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 13 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6154,'EPSG','6154','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=14.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 14 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6155,'EPSG','6155','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=15.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 15 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6156,'EPSG','6156','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=16.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 16 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6157,'EPSG','6157','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=17.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 17 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6158,'EPSG','6158','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=18.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 18 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6159,'EPSG','6159','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=19.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 19 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6160,'EPSG','6160','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=20.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 20 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6161,'EPSG','6161','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=21.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 21 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6162,'EPSG','6162','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=22.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 22 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6163,'EPSG','6163','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=23.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 23 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6164,'EPSG','6164','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=24.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 24 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6165,'EPSG','6165','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=25.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 25 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6166,'EPSG','6166','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=26.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 26 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6167,'EPSG','6167','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=27.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 27 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6168,'EPSG','6168','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=28.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 28 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6169,'EPSG','6169','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=29.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 29 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6170,'EPSG','6170','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=58 +lon_0=30.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=100000 +y_0=1000000',NULL,'ETRS89 / NTM zone 30 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6171,'EPSG','6171','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=31',NULL,'ETRS89 / UTM zone 31 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6172,'EPSG','6172','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=32',NULL,'ETRS89 / UTM zone 32 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6173,'EPSG','6173','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=33',NULL,'ETRS89 / UTM zone 33 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6174,'EPSG','6174','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=34',NULL,'ETRS89 / UTM zone 34 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6175,'EPSG','6175','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=35',NULL,'ETRS89 / UTM zone 35 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6176,'EPSG','6176','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=36',NULL,'ETRS89 / UTM zone 36 + NN54 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6190,'EPSG','6190','proj4_data/epsg',NULL,'+ellps=intl +lat_0=90 +lat_1=51.16666723333333 +lat_2=49.8333339 +lon_0=4.367486666666666 +no_defs +proj=lcc +towgs84=-106.8686,52.2978,-103.7239,0.3366,-0.457,1.8422,-1.2747 +units=m +vunits=m +x_0=150000.013 +y_0=5400088.438',NULL,'Belge 1972 / Belgian Lambert 72 + Ostend height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6204,'EPSG','6204','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'NAD27 / Michigan North (deprecated)\12Unable to translate coordinate system EPSG:6200 into PROJ.4 format.\12\12NAD27 / Michigan Central\12Unable to translate coordinate system EPSG:6201 into PROJ.4 format.\12\12NAD27 / Michigan South\12Unable to translate coordinate system EPSG:6202 into PROJ.4 format.\12\12Macedonia State Coordinate System',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6207,'EPSG','6207','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=longlat +towgs84=293.17,726.18,245.36,0,0,0,0',NULL,'Nepal 1981',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6210,'EPSG','6210','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=23',NULL,'SIRGAS 2000 / UTM zone 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6211,'EPSG','6211','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=24',NULL,'SIRGAS 2000 / UTM zone 24N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6307,'EPSG','6307','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=17.83333333333333 +lat_1=18.43333333333333 +lat_2=18.03333333333333 +lon_0=-66.43333333333334 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=200000',NULL,'MAGNA-SIRGAS / Arauca urban grid\12Unable to translate coordinate system EPSG:6244 into PROJ.4 format.\12\12MAGNA-SIRGAS / Armenia urban grid\12Unable to translate coordinate system EPSG:6245 into PROJ.4 format.\12\12MAGNA-SIRGAS / Barranquilla urban grid\12Unable to translate coordinate system EPSG:6246 into PROJ.4 format.\12\12MAGNA-SIRGAS / Bogota urban grid\12Unable to translate coordinate system EPSG:6247 into PROJ.4 format.\12\12MAGNA-SIRGAS / Bucaramanga urban grid\12Unable to translate coordinate system EPSG:6248 into PROJ.4 format.\12\12MAGNA-SIRGAS / Cali urban grid\12Unable to translate coordinate system EPSG:6249 into PROJ.4 format.\12\12MAGNA-SIRGAS / Cartagena urban grid\12Unable to translate coordinate system EPSG:6250 into PROJ.4 format.\12\12MAGNA-SIRGAS / Cucuta urban grid\12Unable to translate coordinate system EPSG:6251 into PROJ.4 format.\12\12MAGNA-SIRGAS / Florencia urban grid\12Unable to translate coordinate system EPSG:6252 into PROJ.4 format.\12\12MAGNA-SIRGAS / Ibague urban grid\12Unable to translate coordinate system EPSG:6253 into PROJ.4 format.\12\12MAGNA-SIRGAS / Inirida urban grid\12Unable to translate coordinate system EPSG:6254 into PROJ.4 format.\12\12MAGNA-SIRGAS / Leticia urban grid\12Unable to translate coordinate system EPSG:6255 into PROJ.4 format.\12\12MAGNA-SIRGAS / Manizales urban grid\12Unable to translate coordinate system EPSG:6256 into PROJ.4 format.\12\12MAGNA-SIRGAS / Medellin urban grid\12Unable to translate coordinate system EPSG:6257 into PROJ.4 format.\12\12MAGNA-SIRGAS / Mitu urban grid\12Unable to translate coordinate system EPSG:6258 into PROJ.4 format.\12\12MAGNA-SIRGAS / Mocoa urban grid\12Unable to translate coordinate system EPSG:6259 into PROJ.4 format.\12\12MAGNA-SIRGAS / Monteria urban grid\12Unable to translate coordinate system EPSG:6260 into PROJ.4 format.\12\12MAGNA-SIRGAS / Neiva urban grid\12Unable to translate coordinate system EPSG:6261 into PROJ.4 format.\12\12MAGNA-SIRGAS / Pasto urban grid\12Unable to translate coordinate system EPSG:6262 into PROJ.4 format.\12\12MAGNA-SIRGAS / Pereira urban grid\12Unable to translate coordinate system EPSG:6263 into PROJ.4 format.\12\12MAGNA-SIRGAS / Popayan urban grid\12Unable to translate coordinate system EPSG:6264 into PROJ.4 format.\12\12MAGNA-SIRGAS / Puerto Carreno urban grid\12Unable to translate coordinate system EPSG:6265 into PROJ.4 format.\12\12MAGNA-SIRGAS / Quibdo urban grid\12Unable to translate coordinate system EPSG:6266 into PROJ.4 format.\12\12MAGNA-SIRGAS / Riohacha urban grid\12Unable to translate coordinate system EPSG:6267 into PROJ.4 format.\12\12MAGNA-SIRGAS / San Andres urban grid\12Unable to translate coordinate system EPSG:6268 into PROJ.4 format.\12\12MAGNA-SIRGAS / San Jose del Guaviare urban grid\12Unable to translate coordinate system EPSG:6269 into PROJ.4 format.\12\12MAGNA-SIRGAS / Santa Marta urban grid\12Unable to translate coordinate system EPSG:6270 into PROJ.4 format.\12\12MAGNA-SIRGAS / Sucre urban grid\12Unable to translate coordinate system EPSG:6271 into PROJ.4 format.\12\12MAGNA-SIRGAS / Tunja urban grid\12Unable to translate coordinate system EPSG:6272 into PROJ.4 format.\12\12MAGNA-SIRGAS / Valledupar urban grid\12Unable to translate coordinate system EPSG:6273 into PROJ.4 format.\12\12MAGNA-SIRGAS / Villavicencio urban grid\12Unable to translate coordinate system EPSG:6274 into PROJ.4 format.\12\12MAGNA-SIRGAS / Yopal urban grid\12Unable to translate coordinate system EPSG:6275 into PROJ.4 format.\12\12NAD83(CORS96) / Puerto Rico and Virgin Is.',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6309,'EPSG','6309','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'CGRS93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6311,'EPSG','6311','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +towgs84=8.846,-4.394,-1.122,-0.00237,-0.146528,0.130428,0.783926',NULL,'CGRS93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6312,'EPSG','6312','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.99995 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=8.846,-4.394,-1.122,-0.00237,-0.146528,0.130428,0.783926 +units=m +x_0=200000 +y_0=-3500000',NULL,'CGRS93 / Cyprus Local Transverse Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6316,'EPSG','6316','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=7500000 +y_0=0',NULL,'Macedonia State Coordinate System zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6317,'EPSG','6317','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'NAD83(2011)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6318,'EPSG','6318','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'NAD83(2011)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6320,'EPSG','6320','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'NAD83(PA11)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6322,'EPSG','6322','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'NAD83(PA11)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6323,'EPSG','6323','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'NAD83(MA11)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6325,'EPSG','6325','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'NAD83(MA11)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6328,'EPSG','6328','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=59',NULL,'NAD83(2011) / UTM zone 59N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6329,'EPSG','6329','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=60',NULL,'NAD83(2011) / UTM zone 60N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6330,'EPSG','6330','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=1',NULL,'NAD83(2011) / UTM zone 1N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6331,'EPSG','6331','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=2',NULL,'NAD83(2011) / UTM zone 2N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6332,'EPSG','6332','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=3',NULL,'NAD83(2011) / UTM zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6333,'EPSG','6333','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=4',NULL,'NAD83(2011) / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6334,'EPSG','6334','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=5',NULL,'NAD83(2011) / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6335,'EPSG','6335','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=6',NULL,'NAD83(2011) / UTM zone 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6336,'EPSG','6336','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=7',NULL,'NAD83(2011) / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6337,'EPSG','6337','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=8',NULL,'NAD83(2011) / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6338,'EPSG','6338','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=9',NULL,'NAD83(2011) / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6339,'EPSG','6339','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=10',NULL,'NAD83(2011) / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6340,'EPSG','6340','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=11',NULL,'NAD83(2011) / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6341,'EPSG','6341','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=12',NULL,'NAD83(2011) / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6342,'EPSG','6342','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=13',NULL,'NAD83(2011) / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6343,'EPSG','6343','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=14',NULL,'NAD83(2011) / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6344,'EPSG','6344','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=15',NULL,'NAD83(2011) / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6345,'EPSG','6345','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=16',NULL,'NAD83(2011) / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6346,'EPSG','6346','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=17',NULL,'NAD83(2011) / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6347,'EPSG','6347','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=18',NULL,'NAD83(2011) / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6348,'EPSG','6348','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=19',NULL,'NAD83(2011) / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6349,'EPSG','6349','proj4_data/epsg',NULL,'+ellps=GRS80 +geoidgrids=g2012a_conus.gtx,g2012a_alaska.gtx,g2012a_guam.gtx,g2012a_hawaii.gtx,g2012a_puertorico.gtx,g2012a_samoa.gtx +no_defs +proj=longlat +vunits=m',NULL,'NAD83(2011) + NAVD88 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6350,'EPSG','6350','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=23 +lat_1=29.5 +lat_2=45.5 +lon_0=-96 +no_defs +proj=aea +units=m +x_0=0 +y_0=0',NULL,'NAD83(2011) / Conus Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6351,'EPSG','6351','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=-163 +no_defs +proj=lcc +units=m +x_0=29500000 +y_0=5500000',NULL,'NAD83(2011) / EPSG Arctic zone 5-29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6352,'EPSG','6352','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=72.02500919444445 +lat_1=73.66666666666667 +lat_2=70.33333333333333 +lon_0=-147 +no_defs +proj=lcc +units=m +x_0=31500000 +y_0=5500000',NULL,'NAD83(2011) / EPSG Arctic zone 5-31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6353,'EPSG','6353','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=68.68747555555557 +lat_1=70.33333333333333 +lat_2=67 +lon_0=-165 +no_defs +proj=lcc +units=m +x_0=14500000 +y_0=6500000',NULL,'NAD83(2011) / EPSG Arctic zone 6-14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6354,'EPSG','6354','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=68.68747555555557 +lat_1=70.33333333333333 +lat_2=67 +lon_0=-147 +no_defs +proj=lcc +units=m +x_0=16500000 +y_0=6500000',NULL,'NAD83(2011) / EPSG Arctic zone 6-16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6355,'EPSG','6355','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99996 +lat_0=30.5 +lon_0=-85.83333333333333 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83(2011) / Alabama East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6356,'EPSG','6356','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=30 +lon_0=-87.5 +no_defs +proj=tmerc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Alabama West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6362,'EPSG','6362','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=12 +lat_1=17.5 +lat_2=29.5 +lon_0=-102 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=0',NULL,'Mexico ITRF92 / LCC',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6363,'EPSG','6363','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'Mexico ITRF2008',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6365,'EPSG','6365','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'Mexico ITRF2008',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6366,'EPSG','6366','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=11',NULL,'Mexico ITRF2008 / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6367,'EPSG','6367','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=12',NULL,'Mexico ITRF2008 / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6368,'EPSG','6368','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=13',NULL,'Mexico ITRF2008 / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6369,'EPSG','6369','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=14',NULL,'Mexico ITRF2008 / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6370,'EPSG','6370','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=15',NULL,'Mexico ITRF2008 / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6371,'EPSG','6371','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=16',NULL,'Mexico ITRF2008 / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6372,'EPSG','6372','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=12 +lat_1=17.5 +lat_2=29.5 +lon_0=-102 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=0',NULL,'Mexico ITRF2008 / LCC',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6381,'EPSG','6381','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=300000 +y_0=0',NULL,'UCS-2000 / Ukraine TM zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6382,'EPSG','6382','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=300000 +y_0=0',NULL,'UCS-2000 / Ukraine TM zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6383,'EPSG','6383','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=300000 +y_0=0',NULL,'UCS-2000 / Ukraine TM zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6384,'EPSG','6384','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=30 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=300000 +y_0=0',NULL,'UCS-2000 / Ukraine TM zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6385,'EPSG','6385','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=300000 +y_0=0',NULL,'UCS-2000 / Ukraine TM zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6386,'EPSG','6386','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=300000 +y_0=0',NULL,'UCS-2000 / Ukraine TM zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6387,'EPSG','6387','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=25,-141,-78.5,0,0.35,0.736,0 +units=m +x_0=300000 +y_0=0',NULL,'UCS-2000 / Ukraine TM zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6391,'EPSG','6391','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=19.33333333333333 +lat_1=19.33333333333333 +lat_2=19.7 +lon_0=-80.56666666666666 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=ft +x_0=899160 +y_0=579120',NULL,'Cayman Islands National Grid 2011',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6393,'EPSG','6393','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=50 +lat_1=55 +lat_2=65 +lon_0=-154 +no_defs +proj=aea +units=m +x_0=0 +y_0=0',NULL,'NAD83(2011) / Alaska Albers',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_48() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6394,'EPSG','6394','proj4_data/epsg',NULL,'+alpha=323.1301023611111 +ellps=GRS80 +gamma=323.1301023611111 +k=0.9999 +lat_0=57 +lonc=-133.6666666666667 +no_defs +no_uoff +proj=omerc +units=m +x_0=5000000 +y_0=-5000000',NULL,'NAD83(2011) / Alaska zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6395,'EPSG','6395','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-142 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Alaska zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6396,'EPSG','6396','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-146 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Alaska zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6397,'EPSG','6397','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-150 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Alaska zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6398,'EPSG','6398','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-154 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Alaska zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6399,'EPSG','6399','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-158 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Alaska zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6400,'EPSG','6400','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-162 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Alaska zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6401,'EPSG','6401','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-166 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Alaska zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6402,'EPSG','6402','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=54 +lon_0=-170 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Alaska zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6403,'EPSG','6403','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=51 +lat_1=53.83333333333334 +lat_2=51.83333333333334 +lon_0=-176 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=0',NULL,'NAD83(2011) / Alaska zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6404,'EPSG','6404','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +units=m +x_0=213360 +y_0=0',NULL,'NAD83(2011) / Arizona Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6405,'EPSG','6405','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +units=ft +x_0=213360 +y_0=0',NULL,'NAD83(2011) / Arizona Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6406,'EPSG','6406','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +units=m +x_0=213360 +y_0=0',NULL,'NAD83(2011) / Arizona East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6407,'EPSG','6407','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +units=ft +x_0=213360 +y_0=0',NULL,'NAD83(2011) / Arizona East (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6408,'EPSG','6408','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +units=m +x_0=213360 +y_0=0',NULL,'NAD83(2011) / Arizona West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6409,'EPSG','6409','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +units=ft +x_0=213360 +y_0=0',NULL,'NAD83(2011) / Arizona West (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6410,'EPSG','6410','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.23333333333333 +lat_2=34.93333333333333 +lon_0=-92 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0',NULL,'NAD83(2011) / Arkansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6411,'EPSG','6411','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.23333333333333 +lat_2=34.93333333333333 +lon_0=-92 +no_defs +proj=lcc +units=us-ft +x_0=399999.99998984 +y_0=0',NULL,'NAD83(2011) / Arkansas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6412,'EPSG','6412','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=32.66666666666666 +lat_1=34.76666666666667 +lat_2=33.3 +lon_0=-92 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=400000',NULL,'NAD83(2011) / Arkansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6413,'EPSG','6413','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=32.66666666666666 +lat_1=34.76666666666667 +lat_2=33.3 +lon_0=-92 +no_defs +proj=lcc +units=us-ft +x_0=399999.99998984 +y_0=399999.99998984',NULL,'NAD83(2011) / Arkansas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6414,'EPSG','6414','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=0 +lat_1=34 +lat_2=40.5 +lon_0=-120 +no_defs +proj=aea +units=m +x_0=0 +y_0=-4000000',NULL,'NAD83(2011) / California Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6415,'EPSG','6415','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(2011) / California zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6416,'EPSG','6416','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(2011) / California zone 1 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6417,'EPSG','6417','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(2011) / California zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6418,'EPSG','6418','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(2011) / California zone 2 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6419,'EPSG','6419','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(2011) / California zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6420,'EPSG','6420','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(2011) / California zone 3 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6421,'EPSG','6421','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(2011) / California zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6422,'EPSG','6422','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(2011) / California zone 4 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6423,'EPSG','6423','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(2011) / California zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6424,'EPSG','6424','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(2011) / California zone 5 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6425,'EPSG','6425','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83(2011) / California zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6426,'EPSG','6426','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +units=us-ft +x_0=2000000.0001016 +y_0=500000.0001016001',NULL,'NAD83(2011) / California zone 6 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6427,'EPSG','6427','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +units=m +x_0=914401.8289 +y_0=304800.6096',NULL,'NAD83(2011) / Colorado Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6428,'EPSG','6428','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +units=us-ft +x_0=914401.8288036576 +y_0=304800.6096012192',NULL,'NAD83(2011) / Colorado Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6429,'EPSG','6429','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lon_0=-105.5 +no_defs +proj=lcc +units=m +x_0=914401.8289 +y_0=304800.6096',NULL,'NAD83(2011) / Colorado North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6430,'EPSG','6430','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lon_0=-105.5 +no_defs +proj=lcc +units=us-ft +x_0=914401.8288036576 +y_0=304800.6096012192',NULL,'NAD83(2011) / Colorado North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6431,'EPSG','6431','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +units=m +x_0=914401.8289 +y_0=304800.6096',NULL,'NAD83(2011) / Colorado South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6432,'EPSG','6432','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +units=us-ft +x_0=914401.8288036576 +y_0=304800.6096012192',NULL,'NAD83(2011) / Colorado South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6433,'EPSG','6433','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +units=m +x_0=304800.6096 +y_0=152400.3048',NULL,'NAD83(2011) / Connecticut',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6434,'EPSG','6434','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +units=us-ft +x_0=304800.6096012192 +y_0=152400.3048006096',NULL,'NAD83(2011) / Connecticut (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6435,'EPSG','6435','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83(2011) / Delaware',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6436,'EPSG','6436','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(2011) / Delaware (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6437,'EPSG','6437','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83(2011) / Florida East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6438,'EPSG','6438','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(2011) / Florida East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6439,'EPSG','6439','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=24 +lat_1=24 +lat_2=31.5 +lon_0=-84 +no_defs +proj=aea +units=m +x_0=400000 +y_0=0',NULL,'NAD83(2011) / Florida GDL Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6440,'EPSG','6440','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Florida North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6441,'EPSG','6441','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Florida North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6442,'EPSG','6442','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83(2011) / Florida West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6443,'EPSG','6443','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(2011) / Florida West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6444,'EPSG','6444','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83(2011) / Georgia East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6445,'EPSG','6445','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(2011) / Georgia East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6446,'EPSG','6446','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=0',NULL,'NAD83(2011) / Georgia West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6447,'EPSG','6447','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=699999.9998983998 +y_0=0',NULL,'NAD83(2011) / Georgia West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6448,'EPSG','6448','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Idaho Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6449,'EPSG','6449','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(2011) / Idaho Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6450,'EPSG','6450','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83(2011) / Idaho East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6451,'EPSG','6451','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=200000.0001016002 +y_0=0',NULL,'NAD83(2011) / Idaho East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6452,'EPSG','6452','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +units=m +x_0=800000 +y_0=0',NULL,'NAD83(2011) / Idaho West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6453,'EPSG','6453','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +units=us-ft +x_0=800000.0001016001 +y_0=0',NULL,'NAD83(2011) / Idaho West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6454,'EPSG','6454','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999749999999999 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0',NULL,'NAD83(2011) / Illinois East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6455,'EPSG','6455','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999749999999999 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(2011) / Illinois East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6456,'EPSG','6456','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=0',NULL,'NAD83(2011) / Illinois West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6457,'EPSG','6457','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=699999.9999898402 +y_0=0',NULL,'NAD83(2011) / Illinois West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6458,'EPSG','6458','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +units=m +x_0=100000 +y_0=250000',NULL,'NAD83(2011) / Indiana East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6459,'EPSG','6459','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=99999.99989839978 +y_0=249999.9998983998',NULL,'NAD83(2011) / Indiana East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6460,'EPSG','6460','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +units=m +x_0=900000 +y_0=250000',NULL,'NAD83(2011) / Indiana West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6461,'EPSG','6461','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=900000 +y_0=249999.9998983998',NULL,'NAD83(2011) / Indiana West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6462,'EPSG','6462','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.26666666666667 +lat_2=42.06666666666667 +lon_0=-93.5 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=1000000',NULL,'NAD83(2011) / Iowa North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6463,'EPSG','6463','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.26666666666667 +lat_2=42.06666666666667 +lon_0=-93.5 +no_defs +proj=lcc +units=us-ft +x_0=1500000 +y_0=999999.9999898402',NULL,'NAD83(2011) / Iowa North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6464,'EPSG','6464','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40 +lat_1=41.78333333333333 +lat_2=40.61666666666667 +lon_0=-93.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Iowa South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6465,'EPSG','6465','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40 +lat_1=41.78333333333333 +lat_2=40.61666666666667 +lon_0=-93.5 +no_defs +proj=lcc +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83(2011) / Iowa South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6466,'EPSG','6466','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=39.78333333333333 +lat_2=38.71666666666667 +lon_0=-98 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0',NULL,'NAD83(2011) / Kansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6467,'EPSG','6467','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=39.78333333333333 +lat_2=38.71666666666667 +lon_0=-98 +no_defs +proj=lcc +units=us-ft +x_0=399999.99998984 +y_0=0',NULL,'NAD83(2011) / Kansas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6468,'EPSG','6468','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.56666666666667 +lat_2=37.26666666666667 +lon_0=-98.5 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=400000',NULL,'NAD83(2011) / Kansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6469,'EPSG','6469','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.56666666666667 +lat_2=37.26666666666667 +lon_0=-98.5 +no_defs +proj=lcc +units=us-ft +x_0=399999.99998984 +y_0=399999.99998984',NULL,'NAD83(2011) / Kansas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6470,'EPSG','6470','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Kentucky North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6471,'EPSG','6471','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(2011) / Kentucky North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6472,'EPSG','6472','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.08333333333334 +lat_2=38.66666666666666 +lon_0=-85.75 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=1000000',NULL,'NAD83(2011) / Kentucky Single Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6473,'EPSG','6473','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.08333333333334 +lat_2=38.66666666666666 +lon_0=-85.75 +no_defs +proj=lcc +units=us-ft +x_0=1500000 +y_0=999999.9998983998',NULL,'NAD83(2011) / Kentucky Single Zone (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6474,'EPSG','6474','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lon_0=-85.75 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=500000',NULL,'NAD83(2011) / Kentucky South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6475,'EPSG','6475','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lon_0=-85.75 +no_defs +proj=lcc +units=us-ft +x_0=500000.0001016001 +y_0=500000.0001016001',NULL,'NAD83(2011) / Kentucky South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6476,'EPSG','6476','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=30.5 +lat_1=32.66666666666666 +lat_2=31.16666666666667 +lon_0=-92.5 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=0',NULL,'NAD83(2011) / Louisiana North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6477,'EPSG','6477','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=30.5 +lat_1=32.66666666666666 +lat_2=31.16666666666667 +lon_0=-92.5 +no_defs +proj=lcc +units=us-ft +x_0=999999.9999898402 +y_0=0',NULL,'NAD83(2011) / Louisiana North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6478,'EPSG','6478','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=28.5 +lat_1=30.7 +lat_2=29.3 +lon_0=-91.33333333333333 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=0',NULL,'NAD83(2011) / Louisiana South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6479,'EPSG','6479','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=28.5 +lat_1=30.7 +lat_2=29.3 +lon_0=-91.33333333333333 +no_defs +proj=lcc +units=us-ft +x_0=999999.9999898402 +y_0=0',NULL,'NAD83(2011) / Louisiana South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6480,'EPSG','6480','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=43.5 +lon_0=-69.125 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Maine CS2000 Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6481,'EPSG','6481','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=43.83333333333334 +lon_0=-67.875 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=0',NULL,'NAD83(2011) / Maine CS2000 East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6482,'EPSG','6482','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99998 +lat_0=42.83333333333334 +lon_0=-70.375 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0',NULL,'NAD83(2011) / Maine CS2000 West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6483,'EPSG','6483','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0',NULL,'NAD83(2011) / Maine East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6484,'EPSG','6484','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(2011) / Maine East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6485,'EPSG','6485','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +units=m +x_0=900000 +y_0=0',NULL,'NAD83(2011) / Maine West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6486,'EPSG','6486','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=900000 +y_0=0',NULL,'NAD83(2011) / Maine West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6487,'EPSG','6487','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.45 +lat_2=38.3 +lon_0=-77 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0',NULL,'NAD83(2011) / Maryland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6488,'EPSG','6488','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.45 +lat_2=38.3 +lon_0=-77 +no_defs +proj=lcc +units=us-ft +x_0=399999.9998983998 +y_0=0',NULL,'NAD83(2011) / Maryland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6489,'EPSG','6489','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lon_0=-70.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Massachusetts Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6490,'EPSG','6490','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lon_0=-70.5 +no_defs +proj=lcc +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(2011) / Massachusetts Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6491,'EPSG','6491','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lon_0=-71.5 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=750000',NULL,'NAD83(2011) / Massachusetts Mainland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6492,'EPSG','6492','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lon_0=-71.5 +no_defs +proj=lcc +units=us-ft +x_0=200000.0001016002 +y_0=750000',NULL,'NAD83(2011) / Massachusetts Mainland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6493,'EPSG','6493','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.31666666666667 +lat_1=45.7 +lat_2=44.18333333333333 +lon_0=-84.36666666666666 +no_defs +proj=lcc +units=m +x_0=6000000 +y_0=0',NULL,'NAD83(2011) / Michigan Central',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_49() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6494,'EPSG','6494','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.31666666666667 +lat_1=45.7 +lat_2=44.18333333333333 +lon_0=-84.36666666666666 +no_defs +proj=lcc +units=ft +x_0=5999999.999976001 +y_0=0',NULL,'NAD83(2011) / Michigan Central (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6495,'EPSG','6495','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44.78333333333333 +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lon_0=-87 +no_defs +proj=lcc +units=m +x_0=8000000 +y_0=0',NULL,'NAD83(2011) / Michigan North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6496,'EPSG','6496','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44.78333333333333 +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lon_0=-87 +no_defs +proj=lcc +units=ft +x_0=7999999.999968001 +y_0=0',NULL,'NAD83(2011) / Michigan North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6497,'EPSG','6497','proj4_data/epsg',NULL,'+alpha=337.25556 +ellps=GRS80 +gamma=337.25556 +k=0.9996 +lat_0=45.30916666666666 +lonc=-86 +no_defs +no_uoff +proj=omerc +units=m +x_0=2546731.496 +y_0=-4354009.816',NULL,'NAD83(2011) / Michigan Oblique Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6498,'EPSG','6498','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.66666666666666 +lat_2=42.1 +lon_0=-84.36666666666666 +no_defs +proj=lcc +units=m +x_0=4000000 +y_0=0',NULL,'NAD83(2011) / Michigan South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6499,'EPSG','6499','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=43.66666666666666 +lat_2=42.1 +lon_0=-84.36666666666666 +no_defs +proj=lcc +units=ft +x_0=3999999.999984 +y_0=0',NULL,'NAD83(2011) / Michigan South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6500,'EPSG','6500','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +units=m +x_0=800000 +y_0=100000',NULL,'NAD83(2011) / Minnesota Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6501,'EPSG','6501','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83(2011) / Minnesota Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6502,'EPSG','6502','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +units=m +x_0=800000 +y_0=100000',NULL,'NAD83(2011) / Minnesota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6503,'EPSG','6503','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83(2011) / Minnesota North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6504,'EPSG','6504','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +units=m +x_0=800000 +y_0=100000',NULL,'NAD83(2011) / Minnesota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6505,'EPSG','6505','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83(2011) / Minnesota South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6506,'EPSG','6506','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=29.5 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0',NULL,'NAD83(2011) / Mississippi East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6507,'EPSG','6507','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=29.5 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(2011) / Mississippi East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6508,'EPSG','6508','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9998335 +lat_0=32.5 +lon_0=-89.75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=1300000',NULL,'NAD83(2011) / Mississippi TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6509,'EPSG','6509','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=29.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=0',NULL,'NAD83(2011) / Mississippi West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6510,'EPSG','6510','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=29.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=699999.9998983998 +y_0=0',NULL,'NAD83(2011) / Mississippi West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6511,'EPSG','6511','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=35.83333333333334 +lon_0=-92.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Missouri Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6512,'EPSG','6512','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999933333 +lat_0=35.83333333333334 +lon_0=-90.5 +no_defs +proj=tmerc +units=m +x_0=250000 +y_0=0',NULL,'NAD83(2011) / Missouri East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6513,'EPSG','6513','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999941177 +lat_0=36.16666666666666 +lon_0=-94.5 +no_defs +proj=tmerc +units=m +x_0=850000 +y_0=0',NULL,'NAD83(2011) / Missouri West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6514,'EPSG','6514','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44.25 +lat_1=49 +lat_2=45 +lon_0=-109.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Montana',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6515,'EPSG','6515','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44.25 +lat_1=49 +lat_2=45 +lon_0=-109.5 +no_defs +proj=lcc +units=ft +x_0=599999.9999976 +y_0=0',NULL,'NAD83(2011) / Montana (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6516,'EPSG','6516','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Nebraska',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6517,'EPSG','6517','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83(2011) / Nebraska (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6518,'EPSG','6518','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-116.6666666666667 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=6000000',NULL,'NAD83(2011) / Nevada Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6519,'EPSG','6519','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-116.6666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=500000.00001016 +y_0=6000000',NULL,'NAD83(2011) / Nevada Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6520,'EPSG','6520','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-115.5833333333333 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=8000000',NULL,'NAD83(2011) / Nevada East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6521,'EPSG','6521','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-115.5833333333333 +no_defs +proj=tmerc +units=us-ft +x_0=200000.00001016 +y_0=8000000.000010163',NULL,'NAD83(2011) / Nevada East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6522,'EPSG','6522','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-118.5833333333333 +no_defs +proj=tmerc +units=m +x_0=800000 +y_0=4000000',NULL,'NAD83(2011) / Nevada West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6523,'EPSG','6523','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=34.75 +lon_0=-118.5833333333333 +no_defs +proj=tmerc +units=us-ft +x_0=800000.0000101599 +y_0=3999999.99998984',NULL,'NAD83(2011) / Nevada West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6524,'EPSG','6524','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.5 +lon_0=-71.66666666666667 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0',NULL,'NAD83(2011) / New Hampshire',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6525,'EPSG','6525','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.5 +lon_0=-71.66666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(2011) / New Hampshire (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6526,'EPSG','6526','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +units=m +x_0=150000 +y_0=0',NULL,'NAD83(2011) / New Jersey',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6527,'EPSG','6527','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +units=us-ft +x_0=150000 +y_0=0',NULL,'NAD83(2011) / New Jersey (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6528,'EPSG','6528','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / New Mexico Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6529,'EPSG','6529','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(2011) / New Mexico Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6530,'EPSG','6530','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999909091 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +units=m +x_0=165000 +y_0=0',NULL,'NAD83(2011) / New Mexico East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6531,'EPSG','6531','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999909091 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=165000 +y_0=0',NULL,'NAD83(2011) / New Mexico East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6532,'EPSG','6532','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999916667 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +units=m +x_0=830000 +y_0=0',NULL,'NAD83(2011) / New Mexico West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6533,'EPSG','6533','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999916667 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=830000.0001016001 +y_0=0',NULL,'NAD83(2011) / New Mexico West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6534,'EPSG','6534','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +units=m +x_0=250000 +y_0=0',NULL,'NAD83(2011) / New York Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6535,'EPSG','6535','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=249999.9998983998 +y_0=0',NULL,'NAD83(2011) / New York Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6536,'EPSG','6536','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +units=m +x_0=150000 +y_0=0',NULL,'NAD83(2011) / New York East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6537,'EPSG','6537','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +units=us-ft +x_0=150000 +y_0=0',NULL,'NAD83(2011) / New York East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6538,'EPSG','6538','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +units=m +x_0=300000 +y_0=0',NULL,'NAD83(2011) / New York Long Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6539,'EPSG','6539','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(2011) / New York Long Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6540,'EPSG','6540','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +units=m +x_0=350000 +y_0=0',NULL,'NAD83(2011) / New York West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6541,'EPSG','6541','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=350000.0001016001 +y_0=0',NULL,'NAD83(2011) / New York West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6542,'EPSG','6542','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.75 +lat_1=36.16666666666666 +lat_2=34.33333333333334 +lon_0=-79 +no_defs +proj=lcc +units=m +x_0=609601.22 +y_0=0',NULL,'NAD83(2011) / North Carolina',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6543,'EPSG','6543','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.75 +lat_1=36.16666666666666 +lat_2=34.33333333333334 +lon_0=-79 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD83(2011) / North Carolina (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6544,'EPSG','6544','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.43333333333333 +lon_0=-100.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / North Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6545,'EPSG','6545','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.43333333333333 +lon_0=-100.5 +no_defs +proj=lcc +units=ft +x_0=599999.9999976 +y_0=0',NULL,'NAD83(2011) / North Dakota North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6546,'EPSG','6546','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.66666666666666 +lat_1=47.48333333333333 +lat_2=46.18333333333333 +lon_0=-100.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / North Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6547,'EPSG','6547','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.66666666666666 +lat_1=47.48333333333333 +lat_2=46.18333333333333 +lon_0=-100.5 +no_defs +proj=lcc +units=ft +x_0=599999.9999976 +y_0=0',NULL,'NAD83(2011) / North Dakota South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6548,'EPSG','6548','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.66666666666666 +lat_1=41.7 +lat_2=40.43333333333333 +lon_0=-82.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Ohio North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6549,'EPSG','6549','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.66666666666666 +lat_1=41.7 +lat_2=40.43333333333333 +lon_0=-82.5 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Ohio North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6550,'EPSG','6550','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38 +lat_1=40.03333333333333 +lat_2=38.73333333333333 +lon_0=-82.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Ohio South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6551,'EPSG','6551','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38 +lat_1=40.03333333333333 +lat_2=38.73333333333333 +lon_0=-82.5 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Ohio South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6552,'EPSG','6552','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=35 +lat_1=36.76666666666667 +lat_2=35.56666666666667 +lon_0=-98 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Oklahoma North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6553,'EPSG','6553','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=35 +lat_1=36.76666666666667 +lat_2=35.56666666666667 +lon_0=-98 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Oklahoma North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6554,'EPSG','6554','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.33333333333334 +lat_1=35.23333333333333 +lat_2=33.93333333333333 +lon_0=-98 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Oklahoma South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6555,'EPSG','6555','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=33.33333333333334 +lat_1=35.23333333333333 +lat_2=33.93333333333333 +lon_0=-98 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Oklahoma South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6556,'EPSG','6556','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.75 +lat_1=43 +lat_2=45.5 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0',NULL,'NAD83(2011) / Oregon LCC (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6557,'EPSG','6557','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.75 +lat_1=43 +lat_2=45.5 +lon_0=-120.5 +no_defs +proj=lcc +units=ft +x_0=399999.9999984 +y_0=0',NULL,'NAD83(2011) / Oregon GIC Lambert (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6558,'EPSG','6558','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=2500000 +y_0=0',NULL,'NAD83(2011) / Oregon North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6559,'EPSG','6559','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=ft +x_0=2500000.0001424 +y_0=0',NULL,'NAD83(2011) / Oregon North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6560,'EPSG','6560','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=0',NULL,'NAD83(2011) / Oregon South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6561,'EPSG','6561','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=ft +x_0=1500000.0001464 +y_0=0',NULL,'NAD83(2011) / Oregon South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6562,'EPSG','6562','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.95 +lat_2=40.88333333333333 +lon_0=-77.75 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Pennsylvania North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6563,'EPSG','6563','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.95 +lat_2=40.88333333333333 +lon_0=-77.75 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Pennsylvania North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6564,'EPSG','6564','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.96666666666667 +lat_2=39.93333333333333 +lon_0=-77.75 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Pennsylvania South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6565,'EPSG','6565','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.96666666666667 +lat_2=39.93333333333333 +lon_0=-77.75 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Pennsylvania South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6566,'EPSG','6566','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=17.83333333333333 +lat_1=18.43333333333333 +lat_2=18.03333333333333 +lon_0=-66.43333333333334 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=200000',NULL,'NAD83(2011) / Puerto Rico and Virgin Is.',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6567,'EPSG','6567','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999375 +lat_0=41.08333333333334 +lon_0=-71.5 +no_defs +proj=tmerc +units=m +x_0=100000 +y_0=0',NULL,'NAD83(2011) / Rhode Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6568,'EPSG','6568','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999375 +lat_0=41.08333333333334 +lon_0=-71.5 +no_defs +proj=tmerc +units=us-ft +x_0=99999.99998983997 +y_0=0',NULL,'NAD83(2011) / Rhode Island (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6569,'EPSG','6569','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=31.83333333333333 +lat_1=34.83333333333334 +lat_2=32.5 +lon_0=-81 +no_defs +proj=lcc +units=m +x_0=609600 +y_0=0',NULL,'NAD83(2011) / South Carolina',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6570,'EPSG','6570','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=31.83333333333333 +lat_1=34.83333333333334 +lat_2=32.5 +lon_0=-81 +no_defs +proj=lcc +units=ft +x_0=609600 +y_0=0',NULL,'NAD83(2011) / South Carolina (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6571,'EPSG','6571','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.68333333333333 +lat_2=44.41666666666666 +lon_0=-100 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / South Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6572,'EPSG','6572','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.68333333333333 +lat_2=44.41666666666666 +lon_0=-100 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / South Dakota North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6573,'EPSG','6573','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42.33333333333334 +lat_1=44.4 +lat_2=42.83333333333334 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / South Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6574,'EPSG','6574','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42.33333333333334 +lat_1=44.4 +lat_2=42.83333333333334 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / South Dakota South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6575,'EPSG','6575','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.41666666666666 +lat_2=35.25 +lon_0=-86 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Tennessee',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6576,'EPSG','6576','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.41666666666666 +lat_2=35.25 +lon_0=-86 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Tennessee (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6577,'EPSG','6577','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=29.66666666666667 +lat_1=31.88333333333333 +lat_2=30.11666666666667 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=m +x_0=700000 +y_0=3000000',NULL,'NAD83(2011) / Texas Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6578,'EPSG','6578','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=29.66666666666667 +lat_1=31.88333333333333 +lat_2=30.11666666666667 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=us-ft +x_0=699999.9998983998 +y_0=3000000',NULL,'NAD83(2011) / Texas Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6579,'EPSG','6579','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=18 +lat_1=27.5 +lat_2=35 +lon_0=-100 +no_defs +proj=aea +units=m +x_0=1500000 +y_0=6000000',NULL,'NAD83(2011) / Texas Centric Albers Equal Area',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6580,'EPSG','6580','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=18 +lat_1=27.5 +lat_2=35 +lon_0=-100 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=5000000',NULL,'NAD83(2011) / Texas Centric Lambert Conformal',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6581,'EPSG','6581','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34 +lat_1=36.18333333333333 +lat_2=34.65 +lon_0=-101.5 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=1000000',NULL,'NAD83(2011) / Texas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6582,'EPSG','6582','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=34 +lat_1=36.18333333333333 +lat_2=34.65 +lon_0=-101.5 +no_defs +proj=lcc +units=us-ft +x_0=200000.0001016002 +y_0=999999.9998983998',NULL,'NAD83(2011) / Texas North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6583,'EPSG','6583','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=31.66666666666667 +lat_1=33.96666666666667 +lat_2=32.13333333333333 +lon_0=-98.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=2000000',NULL,'NAD83(2011) / Texas North Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6584,'EPSG','6584','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=31.66666666666667 +lat_1=33.96666666666667 +lat_2=32.13333333333333 +lon_0=-98.5 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=2000000.0001016',NULL,'NAD83(2011) / Texas North Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6585,'EPSG','6585','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-98.5 +no_defs +proj=lcc +units=m +x_0=300000 +y_0=5000000',NULL,'NAD83(2011) / Texas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6586,'EPSG','6586','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-98.5 +no_defs +proj=lcc +units=us-ft +x_0=300000.0000000001 +y_0=5000000.0001016',NULL,'NAD83(2011) / Texas South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6587,'EPSG','6587','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=27.83333333333333 +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lon_0=-99 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=4000000',NULL,'NAD83(2011) / Texas South Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6588,'EPSG','6588','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=27.83333333333333 +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lon_0=-99 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=3999999.9998984',NULL,'NAD83(2011) / Texas South Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6589,'EPSG','6589','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999964286 +lat_0=42.5 +lon_0=-72.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Vermont',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6590,'EPSG','6590','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999964286 +lat_0=42.5 +lon_0=-72.5 +no_defs +proj=tmerc +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83(2011) / Vermont (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6591,'EPSG','6591','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36 +lat_1=37 +lat_2=39.5 +lon_0=-79.5 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'NAD83(2011) / Virginia Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6592,'EPSG','6592','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.2 +lat_2=38.03333333333333 +lon_0=-78.5 +no_defs +proj=lcc +units=m +x_0=3500000 +y_0=2000000',NULL,'NAD83(2011) / Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6593,'EPSG','6593','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.2 +lat_2=38.03333333333333 +lon_0=-78.5 +no_defs +proj=lcc +units=us-ft +x_0=3500000.0001016 +y_0=2000000.0001016',NULL,'NAD83(2011) / Virginia North (ftUS)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_50() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6594,'EPSG','6594','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.96666666666667 +lat_2=36.76666666666667 +lon_0=-78.5 +no_defs +proj=lcc +units=m +x_0=3500000 +y_0=1000000',NULL,'NAD83(2011) / Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6595,'EPSG','6595','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.96666666666667 +lat_2=36.76666666666667 +lon_0=-78.5 +no_defs +proj=lcc +units=us-ft +x_0=3500000.0001016 +y_0=999999.9998983998',NULL,'NAD83(2011) / Virginia South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6596,'EPSG','6596','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.5 +lon_0=-120.8333333333333 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Washington North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6597,'EPSG','6597','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.5 +lon_0=-120.8333333333333 +no_defs +proj=lcc +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(2011) / Washington North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6598,'EPSG','6598','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.33333333333334 +lat_1=47.33333333333334 +lat_2=45.83333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(2011) / Washington South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6599,'EPSG','6599','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.33333333333334 +lat_1=47.33333333333334 +lat_2=45.83333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=us-ft +x_0=500000.0001016001 +y_0=0',NULL,'NAD83(2011) / Washington South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6600,'EPSG','6600','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / West Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6601,'EPSG','6601','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / West Virginia North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6602,'EPSG','6602','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / West Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6603,'EPSG','6603','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / West Virginia South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6604,'EPSG','6604','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Wisconsin Central (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6605,'EPSG','6605','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Wisconsin Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6606,'EPSG','6606','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.16666666666666 +lat_1=46.76666666666667 +lat_2=45.56666666666667 +lon_0=-90 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Wisconsin North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6607,'EPSG','6607','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45.16666666666666 +lat_1=46.76666666666667 +lat_2=45.56666666666667 +lon_0=-90 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Wisconsin North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6608,'EPSG','6608','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42 +lat_1=44.06666666666667 +lat_2=42.73333333333333 +lon_0=-90 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Wisconsin South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6609,'EPSG','6609','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=42 +lat_1=44.06666666666667 +lat_2=42.73333333333333 +lon_0=-90 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Wisconsin South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6610,'EPSG','6610','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=-90 +no_defs +proj=tmerc +units=m +x_0=520000 +y_0=-4480000',NULL,'NAD83(2011) / Wisconsin Transverse Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6611,'EPSG','6611','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-105.1666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83(2011) / Wyoming East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6612,'EPSG','6612','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-105.1666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=200000.00001016 +y_0=0',NULL,'NAD83(2011) / Wyoming East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6613,'EPSG','6613','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-107.3333333333333 +no_defs +proj=tmerc +units=m +x_0=400000 +y_0=100000',NULL,'NAD83(2011) / Wyoming East Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6614,'EPSG','6614','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-107.3333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=399999.99998984 +y_0=99999.99998983997',NULL,'NAD83(2011) / Wyoming East Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6615,'EPSG','6615','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-110.0833333333333 +no_defs +proj=tmerc +units=m +x_0=800000 +y_0=100000',NULL,'NAD83(2011) / Wyoming West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6616,'EPSG','6616','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-110.0833333333333 +no_defs +proj=tmerc +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83(2011) / Wyoming West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6617,'EPSG','6617','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-108.75 +no_defs +proj=tmerc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Wyoming West Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6618,'EPSG','6618','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999375 +lat_0=40.5 +lon_0=-108.75 +no_defs +proj=tmerc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Wyoming West Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6619,'EPSG','6619','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=2000000',NULL,'NAD83(2011) / Utah Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6620,'EPSG','6620','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=1000000',NULL,'NAD83(2011) / Utah North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6621,'EPSG','6621','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=3000000',NULL,'NAD83(2011) / Utah South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6622,'EPSG','6622','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44 +lat_1=60 +lat_2=46 +lon_0=-68.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(CSRS) / Quebec Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6623,'EPSG','6623','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=44 +lat_1=60 +lat_2=46 +lon_0=-68.5 +no_defs +proj=aea +units=m +x_0=0 +y_0=0',NULL,'NAD83 / Quebec Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6624,'EPSG','6624','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=44 +lat_1=60 +lat_2=46 +lon_0=-68.5 +no_defs +proj=aea +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'NAD83(CSRS) / Quebec Albers',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6625,'EPSG','6625','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=us-ft +x_0=500000.00001016 +y_0=2000000.00001016',NULL,'NAD83(2011) / Utah Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6626,'EPSG','6626','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=us-ft +x_0=500000.00001016 +y_0=999999.9999898402',NULL,'NAD83(2011) / Utah North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6627,'EPSG','6627','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=us-ft +x_0=500000.00001016 +y_0=3000000',NULL,'NAD83(2011) / Utah South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6628,'EPSG','6628','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=18.83333333333333 +lon_0=-155.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(PA11) / Hawaii zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6629,'EPSG','6629','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=20.33333333333333 +lon_0=-156.6666666666667 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(PA11) / Hawaii zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6630,'EPSG','6630','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999 +lat_0=21.16666666666667 +lon_0=-158 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(PA11) / Hawaii zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6631,'EPSG','6631','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999 +lat_0=21.83333333333333 +lon_0=-159.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(PA11) / Hawaii zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6632,'EPSG','6632','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=21.66666666666667 +lon_0=-160.1666666666667 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83(PA11) / Hawaii zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6633,'EPSG','6633','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999 +lat_0=21.16666666666667 +lon_0=-158 +no_defs +proj=tmerc +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83(PA11) / Hawaii zone 3 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6634,'EPSG','6634','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=4',NULL,'NAD83(PA11) / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6635,'EPSG','6635','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=5',NULL,'NAD83(PA11) / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6636,'EPSG','6636','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +units=m +zone=2',NULL,'NAD83(PA11) / UTM zone 2S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6637,'EPSG','6637','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=13.5 +lon_0=144.75 +no_defs +proj=tmerc +units=m +x_0=100000 +y_0=200000',NULL,'NAD83(MA11) / Guam Map Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6646,'EPSG','6646','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9994 +lat_0=29.02626833333333 +lon_0=46.5 +no_defs +proj=tmerc +towgs84=70.995,-335.916,262.898,0,0,0,0 +units=m +x_0=800000 +y_0=0',NULL,'Karbala 1979 / Iraq National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6649,'EPSG','6649','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 +vunits=m',NULL,'NAD83(CSRS) + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6650,'EPSG','6650','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=7',NULL,'NAD83(CSRS) / UTM zone 7N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6651,'EPSG','6651','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=8',NULL,'NAD83(CSRS) / UTM zone 8N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6652,'EPSG','6652','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=9',NULL,'NAD83(CSRS) / UTM zone 9N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6653,'EPSG','6653','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=10',NULL,'NAD83(CSRS) / UTM zone 10N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6654,'EPSG','6654','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=11',NULL,'NAD83(CSRS) / UTM zone 11N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6655,'EPSG','6655','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=12',NULL,'NAD83(CSRS) / UTM zone 12N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6656,'EPSG','6656','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=13',NULL,'NAD83(CSRS) / UTM zone 13N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6657,'EPSG','6657','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=14',NULL,'NAD83(CSRS) / UTM zone 14N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6658,'EPSG','6658','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=15',NULL,'NAD83(CSRS) / UTM zone 15N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6659,'EPSG','6659','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=16',NULL,'NAD83(CSRS) / UTM zone 16N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6660,'EPSG','6660','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=17',NULL,'NAD83(CSRS) / UTM zone 17N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6661,'EPSG','6661','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=18',NULL,'NAD83(CSRS) / UTM zone 18N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6662,'EPSG','6662','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=19',NULL,'NAD83(CSRS) / UTM zone 19N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6663,'EPSG','6663','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=20',NULL,'NAD83(CSRS) / UTM zone 20N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6664,'EPSG','6664','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=21',NULL,'NAD83(CSRS) / UTM zone 21N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6665,'EPSG','6665','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=22',NULL,'NAD83(CSRS) / UTM zone 22N + CGVD2013 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6666,'EPSG','6666','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'JGD2011',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6668,'EPSG','6668','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'JGD2011',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6669,'EPSG','6669','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=33 +lon_0=129.5 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6670,'EPSG','6670','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=33 +lon_0=131 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6671,'EPSG','6671','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=36 +lon_0=132.1666666666667 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6672,'EPSG','6672','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=33 +lon_0=133.5 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6673,'EPSG','6673','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=36 +lon_0=134.3333333333333 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6674,'EPSG','6674','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=36 +lon_0=136 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS VI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6675,'EPSG','6675','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=36 +lon_0=137.1666666666667 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS VII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6676,'EPSG','6676','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=36 +lon_0=138.5 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS VIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6677,'EPSG','6677','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=36 +lon_0=139.8333333333333 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS IX',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6678,'EPSG','6678','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=40 +lon_0=140.8333333333333 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS X',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6679,'EPSG','6679','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=44 +lon_0=140.25 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS XI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6680,'EPSG','6680','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=44 +lon_0=142.25 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS XII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6681,'EPSG','6681','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=44 +lon_0=144.25 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS XIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6682,'EPSG','6682','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=26 +lon_0=142 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS XIV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6683,'EPSG','6683','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=26 +lon_0=127.5 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS XV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6684,'EPSG','6684','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=26 +lon_0=124 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS XVI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6685,'EPSG','6685','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=26 +lon_0=131 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS XVII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6686,'EPSG','6686','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=20 +lon_0=136 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS XVIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6687,'EPSG','6687','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=26 +lon_0=154 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'JGD2011 / Japan Plane Rectangular CS XIX',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6688,'EPSG','6688','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=51',NULL,'JGD2011 / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6689,'EPSG','6689','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=52',NULL,'JGD2011 / UTM zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6690,'EPSG','6690','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=53',NULL,'JGD2011 / UTM zone 53N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6691,'EPSG','6691','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=54',NULL,'JGD2011 / UTM zone 54N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6692,'EPSG','6692','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=55',NULL,'JGD2011 / UTM zone 55N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6696,'EPSG','6696','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 +vunits=m',NULL,'JGD2000 + JGD2000 (vertical) height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6697,'EPSG','6697','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +vunits=m',NULL,'JGD2011 + JGD2011 (vertical) height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6700,'EPSG','6700','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-146.414,507.337,680.507,0,0,0,0 +vunits=m',NULL,'Tokyo + JSLD72 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6703,'EPSG','6703','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.9996 +lat_0=0 +lon_0=-60 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'WGS 84 / TM 60 SW',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6704,'EPSG','6704','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RDN2008',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6706,'EPSG','6706','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'RDN2008',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6707,'EPSG','6707','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=32',NULL,'RDN2008 / TM32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6708,'EPSG','6708','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=33',NULL,'RDN2008 / TM33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6709,'EPSG','6709','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=34',NULL,'RDN2008 / TM34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6720,'EPSG','6720','proj4_data/epsg',NULL,'+datum=WGS84 +k=1.000024 +lat_0=0 +lon_0=105.625 +no_defs +proj=tmerc +units=m +x_0=50000 +y_0=1300000',NULL,'WGS 84 / CIG92',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6721,'EPSG','6721','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00002514 +lat_0=0 +lon_0=105.625 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=50000 +y_0=1300000',NULL,'GDA94 / CIG94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6722,'EPSG','6722','proj4_data/epsg',NULL,'+datum=WGS84 +k=1 +lat_0=0 +lon_0=96.875 +no_defs +proj=tmerc +units=m +x_0=50000 +y_0=1400000',NULL,'WGS 84 / CKIG92',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_51() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6723,'EPSG','6723','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99999387 +lat_0=0 +lon_0=96.875 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=50000 +y_0=1500000',NULL,'GDA94 / CKIG94',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6732,'EPSG','6732','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=41',NULL,'GDA94 / MGA zone 41 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6733,'EPSG','6733','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=42',NULL,'GDA94 / MGA zone 42 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6734,'EPSG','6734','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=43',NULL,'GDA94 / MGA zone 43 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6735,'EPSG','6735','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=44',NULL,'GDA94 / MGA zone 44 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6736,'EPSG','6736','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=46',NULL,'GDA94 / MGA zone 46',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6737,'EPSG','6737','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=47',NULL,'GDA94 / MGA zone 47',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6738,'EPSG','6738','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=59',NULL,'GDA94 / MGA zone 59',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6781,'EPSG','6781','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'NAD83(CORS96)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6783,'EPSG','6783','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'NAD83(CORS96)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6784,'EPSG','6784','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00016 +lat_0=44.5 +lon_0=-117.8333333333333 +no_defs +proj=tmerc +units=m +x_0=40000 +y_0=0',NULL,'NAD83(CORS96) / Oregon Baker zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6785,'EPSG','6785','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00016 +lat_0=44.5 +lon_0=-117.8333333333333 +no_defs +proj=tmerc +units=ft +x_0=39999.99999984 +y_0=0',NULL,'NAD83(CORS96) / Oregon Baker zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6786,'EPSG','6786','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00016 +lat_0=44.5 +lon_0=-117.8333333333333 +no_defs +proj=tmerc +units=m +x_0=40000 +y_0=0',NULL,'NAD83(2011) / Oregon Baker zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6787,'EPSG','6787','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00016 +lat_0=44.5 +lon_0=-117.8333333333333 +no_defs +proj=tmerc +units=ft +x_0=39999.99999984 +y_0=0',NULL,'NAD83(2011) / Oregon Baker zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6788,'EPSG','6788','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0002 +lat_0=41.75 +lon_0=-121.75 +no_defs +proj=tmerc +units=m +x_0=80000 +y_0=0',NULL,'NAD83(CORS96) / Oregon Bend-Klamath Falls zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6789,'EPSG','6789','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0002 +lat_0=41.75 +lon_0=-121.75 +no_defs +proj=tmerc +units=ft +x_0=79999.99999968 +y_0=0',NULL,'NAD83(CORS96) / Oregon Bend-Klamath Falls zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6790,'EPSG','6790','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0002 +lat_0=41.75 +lon_0=-121.75 +no_defs +proj=tmerc +units=m +x_0=80000 +y_0=0',NULL,'NAD83(2011) / Oregon Bend-Klamath Falls zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6791,'EPSG','6791','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0002 +lat_0=41.75 +lon_0=-121.75 +no_defs +proj=tmerc +units=ft +x_0=79999.99999968 +y_0=0',NULL,'NAD83(2011) / Oregon Bend-Klamath Falls zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6792,'EPSG','6792','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00012 +lat_0=44.66666666666666 +lat_1=44.66666666666666 +lon_0=-121.25 +no_defs +proj=lcc +units=m +x_0=80000 +y_0=130000',NULL,'NAD83(CORS96) / Oregon Bend-Redmond-Prineville zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6793,'EPSG','6793','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00012 +lat_0=44.66666666666666 +lat_1=44.66666666666666 +lon_0=-121.25 +no_defs +proj=lcc +units=ft +x_0=79999.99999968 +y_0=130000.00001472',NULL,'NAD83(CORS96) / Oregon Bend-Redmond-Prineville zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6794,'EPSG','6794','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00012 +lat_0=44.66666666666666 +lat_1=44.66666666666666 +lon_0=-121.25 +no_defs +proj=lcc +units=m +x_0=80000 +y_0=130000',NULL,'NAD83(2011) / Oregon Bend-Redmond-Prineville zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6795,'EPSG','6795','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00012 +lat_0=44.66666666666666 +lat_1=44.66666666666666 +lon_0=-121.25 +no_defs +proj=lcc +units=ft +x_0=79999.99999968 +y_0=130000.00001472',NULL,'NAD83(2011) / Oregon Bend-Redmond-Prineville zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6796,'EPSG','6796','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0002 +lat_0=43.66666666666666 +lat_1=43.66666666666666 +lon_0=-119.75 +no_defs +proj=lcc +units=m +x_0=120000 +y_0=60000',NULL,'NAD83(CORS96) / Oregon Bend-Burns zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6797,'EPSG','6797','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0002 +lat_0=43.66666666666666 +lat_1=43.66666666666666 +lon_0=-119.75 +no_defs +proj=lcc +units=ft +x_0=119999.99999952 +y_0=59999.99999976',NULL,'NAD83(CORS96) / Oregon Bend-Burns zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6798,'EPSG','6798','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0002 +lat_0=43.66666666666666 +lat_1=43.66666666666666 +lon_0=-119.75 +no_defs +proj=lcc +units=m +x_0=120000 +y_0=60000',NULL,'NAD83(2011) / Oregon Bend-Burns zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6799,'EPSG','6799','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0002 +lat_0=43.66666666666666 +lat_1=43.66666666666666 +lon_0=-119.75 +no_defs +proj=lcc +units=ft +x_0=119999.99999952 +y_0=59999.99999976',NULL,'NAD83(2011) / Oregon Bend-Burns zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6800,'EPSG','6800','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00007 +lat_0=42.5 +lon_0=-123.3333333333333 +no_defs +proj=tmerc +units=m +x_0=40000 +y_0=0',NULL,'NAD83(CORS96) / Oregon Canyonville-Grants Pass zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6801,'EPSG','6801','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00007 +lat_0=42.5 +lon_0=-123.3333333333333 +no_defs +proj=tmerc +units=ft +x_0=39999.99999984 +y_0=0',NULL,'NAD83(CORS96) / Oregon Canyonville-Grants Pass zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6802,'EPSG','6802','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00007 +lat_0=42.5 +lon_0=-123.3333333333333 +no_defs +proj=tmerc +units=m +x_0=40000 +y_0=0',NULL,'NAD83(2011) / Oregon Canyonville-Grants Pass zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6803,'EPSG','6803','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00007 +lat_0=42.5 +lon_0=-123.3333333333333 +no_defs +proj=tmerc +units=ft +x_0=39999.99999984 +y_0=0',NULL,'NAD83(2011) / Oregon Canyonville-Grants Pass zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6804,'EPSG','6804','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000008 +lat_0=45.66666666666666 +lat_1=45.66666666666666 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=150000 +y_0=30000',NULL,'NAD83(CORS96) / Oregon Columbia River East zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6805,'EPSG','6805','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000008 +lat_0=45.66666666666666 +lat_1=45.66666666666666 +lon_0=-120.5 +no_defs +proj=lcc +units=ft +x_0=150000.00001464 +y_0=30000.00001512',NULL,'NAD83(CORS96) / Oregon Columbia River East zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6806,'EPSG','6806','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000008 +lat_0=45.66666666666666 +lat_1=45.66666666666666 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=150000 +y_0=30000',NULL,'NAD83(2011) / Oregon Columbia River East zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6807,'EPSG','6807','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000008 +lat_0=45.66666666666666 +lat_1=45.66666666666666 +lon_0=-120.5 +no_defs +proj=lcc +units=ft +x_0=150000.00001464 +y_0=30000.00001512',NULL,'NAD83(2011) / Oregon Columbia River East zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6808,'EPSG','6808','proj4_data/epsg',NULL,'+alpha=295 +ellps=GRS80 +gamma=295 +k=1 +lat_0=45.91666666666666 +lonc=-123 +no_defs +no_uoff +proj=omerc +units=m +x_0=7000000 +y_0=-3000000',NULL,'NAD83(CORS96) / Oregon Columbia River West zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6809,'EPSG','6809','proj4_data/epsg',NULL,'+alpha=295 +ellps=GRS80 +gamma=295 +k=1 +lat_0=45.91666666666666 +lonc=-123 +no_defs +no_uoff +proj=omerc +units=ft +x_0=7000000.00000248 +y_0=-2999999.999988',NULL,'NAD83(CORS96) / Oregon Columbia River West zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6810,'EPSG','6810','proj4_data/epsg',NULL,'+alpha=295 +ellps=GRS80 +gamma=295 +k=1 +lat_0=45.91666666666666 +lonc=-123 +no_defs +no_uoff +proj=omerc +units=m +x_0=7000000 +y_0=-3000000',NULL,'NAD83(2011) / Oregon Columbia River West zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6811,'EPSG','6811','proj4_data/epsg',NULL,'+alpha=295 +ellps=GRS80 +gamma=295 +k=1 +lat_0=45.91666666666666 +lonc=-123 +no_defs +no_uoff +proj=omerc +units=ft +x_0=7000000.00000248 +y_0=-2999999.999988',NULL,'NAD83(2011) / Oregon Columbia River West zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6812,'EPSG','6812','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000023 +lat_0=42.83333333333334 +lon_0=-123.3333333333333 +no_defs +proj=tmerc +units=m +x_0=50000 +y_0=0',NULL,'NAD83(CORS96) / Oregon Cottage Grove-Canyonville zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6813,'EPSG','6813','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000023 +lat_0=42.83333333333334 +lon_0=-123.3333333333333 +no_defs +proj=tmerc +units=ft +x_0=50000.00001504 +y_0=0',NULL,'NAD83(CORS96) / Oregon Cottage Grove-Canyonville zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6814,'EPSG','6814','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000023 +lat_0=42.83333333333334 +lon_0=-123.3333333333333 +no_defs +proj=tmerc +units=m +x_0=50000 +y_0=0',NULL,'NAD83(2011) / Oregon Cottage Grove-Canyonville zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6815,'EPSG','6815','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000023 +lat_0=42.83333333333334 +lon_0=-123.3333333333333 +no_defs +proj=tmerc +units=ft +x_0=50000.00001504 +y_0=0',NULL,'NAD83(2011) / Oregon Cottage Grove-Canyonville zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6816,'EPSG','6816','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00011 +lat_0=44.5 +lon_0=-121 +no_defs +proj=tmerc +units=m +x_0=80000 +y_0=0',NULL,'NAD83(CORS96) / Oregon Dufur-Madras zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6817,'EPSG','6817','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00011 +lat_0=44.5 +lon_0=-121 +no_defs +proj=tmerc +units=ft +x_0=79999.99999968 +y_0=0',NULL,'NAD83(CORS96) / Oregon Dufur-Madras zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6818,'EPSG','6818','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00011 +lat_0=44.5 +lon_0=-121 +no_defs +proj=tmerc +units=m +x_0=80000 +y_0=0',NULL,'NAD83(2011) / Oregon Dufur-Madras zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6819,'EPSG','6819','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00011 +lat_0=44.5 +lon_0=-121 +no_defs +proj=tmerc +units=ft +x_0=79999.99999968 +y_0=0',NULL,'NAD83(2011) / Oregon Dufur-Madras zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6820,'EPSG','6820','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000015 +lat_0=43.75 +lon_0=-123.1666666666667 +no_defs +proj=tmerc +units=m +x_0=50000 +y_0=0',NULL,'NAD83(CORS96) / Oregon Eugene zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6821,'EPSG','6821','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000015 +lat_0=43.75 +lon_0=-123.1666666666667 +no_defs +proj=tmerc +units=ft +x_0=50000.00001504 +y_0=0',NULL,'NAD83(CORS96) / Oregon Eugene zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6822,'EPSG','6822','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000015 +lat_0=43.75 +lon_0=-123.1666666666667 +no_defs +proj=tmerc +units=m +x_0=50000 +y_0=0',NULL,'NAD83(2011) / Oregon Eugene zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6823,'EPSG','6823','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000015 +lat_0=43.75 +lon_0=-123.1666666666667 +no_defs +proj=tmerc +units=ft +x_0=50000.00001504 +y_0=0',NULL,'NAD83(2011) / Oregon Eugene zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6824,'EPSG','6824','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000043 +lat_0=41.75 +lon_0=-123.3333333333333 +no_defs +proj=tmerc +units=m +x_0=50000 +y_0=0',NULL,'NAD83(CORS96) / Oregon Grants Pass-Ashland zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6825,'EPSG','6825','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000043 +lat_0=41.75 +lon_0=-123.3333333333333 +no_defs +proj=tmerc +units=ft +x_0=50000.00001504 +y_0=0',NULL,'NAD83(CORS96) / Oregon Grants Pass-Ashland zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6826,'EPSG','6826','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000043 +lat_0=41.75 +lon_0=-123.3333333333333 +no_defs +proj=tmerc +units=m +x_0=50000 +y_0=0',NULL,'NAD83(2011) / Oregon Grants Pass-Ashland zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6827,'EPSG','6827','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000043 +lat_0=41.75 +lon_0=-123.3333333333333 +no_defs +proj=tmerc +units=ft +x_0=50000.00001504 +y_0=0',NULL,'NAD83(2011) / Oregon Grants Pass-Ashland zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6828,'EPSG','6828','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00005 +lat_0=45 +lon_0=-122.3333333333333 +no_defs +proj=tmerc +units=m +x_0=10000 +y_0=0',NULL,'NAD83(CORS96) / Oregon Gresham-Warm Springs zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6829,'EPSG','6829','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00005 +lat_0=45 +lon_0=-122.3333333333333 +no_defs +proj=tmerc +units=ft +x_0=10000.0000152 +y_0=0',NULL,'NAD83(CORS96) / Oregon Gresham-Warm Springs zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6830,'EPSG','6830','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00005 +lat_0=45 +lon_0=-122.3333333333333 +no_defs +proj=tmerc +units=m +x_0=10000 +y_0=0',NULL,'NAD83(2011) / Oregon Gresham-Warm Springs zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6831,'EPSG','6831','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00005 +lat_0=45 +lon_0=-122.3333333333333 +no_defs +proj=tmerc +units=ft +x_0=10000.0000152 +y_0=0',NULL,'NAD83(2011) / Oregon Gresham-Warm Springs zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6832,'EPSG','6832','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00013 +lat_0=45 +lon_0=-118 +no_defs +proj=tmerc +units=m +x_0=40000 +y_0=0',NULL,'NAD83(CORS96) / Oregon La Grande zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6833,'EPSG','6833','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00013 +lat_0=45 +lon_0=-118 +no_defs +proj=tmerc +units=ft +x_0=39999.99999984 +y_0=0',NULL,'NAD83(CORS96) / Oregon La Grande zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6834,'EPSG','6834','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00013 +lat_0=45 +lon_0=-118 +no_defs +proj=tmerc +units=m +x_0=40000 +y_0=0',NULL,'NAD83(2011) / Oregon La Grande zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6835,'EPSG','6835','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00013 +lat_0=45 +lon_0=-118 +no_defs +proj=tmerc +units=ft +x_0=39999.99999984 +y_0=0',NULL,'NAD83(2011) / Oregon La Grande zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6836,'EPSG','6836','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0001 +lat_0=43.25 +lon_0=-117 +no_defs +proj=tmerc +units=m +x_0=80000 +y_0=0',NULL,'NAD83(CORS96) / Oregon Ontario zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6837,'EPSG','6837','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0001 +lat_0=43.25 +lon_0=-117 +no_defs +proj=tmerc +units=ft +x_0=79999.99999968 +y_0=0',NULL,'NAD83(CORS96) / Oregon Ontario zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6838,'EPSG','6838','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0001 +lat_0=43.25 +lon_0=-117 +no_defs +proj=tmerc +units=m +x_0=80000 +y_0=0',NULL,'NAD83(2011) / Oregon Ontario zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6839,'EPSG','6839','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0001 +lat_0=43.25 +lon_0=-117 +no_defs +proj=tmerc +units=ft +x_0=79999.99999968 +y_0=0',NULL,'NAD83(2011) / Oregon Ontario zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6840,'EPSG','6840','proj4_data/epsg',NULL,'+alpha=5 +ellps=GRS80 +gamma=5 +k=1 +lat_0=44.75 +lonc=-124.05 +no_defs +no_uoff +proj=omerc +units=m +x_0=-300000 +y_0=-4600000',NULL,'NAD83(CORS96) / Oregon Coast zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6841,'EPSG','6841','proj4_data/epsg',NULL,'+alpha=5 +ellps=GRS80 +gamma=5 +k=1 +lat_0=44.75 +lonc=-124.05 +no_defs +no_uoff +proj=omerc +units=ft +x_0=-299999.9999988 +y_0=-4600000.00001208',NULL,'NAD83(CORS96) / Oregon Coast zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6842,'EPSG','6842','proj4_data/epsg',NULL,'+alpha=5 +ellps=GRS80 +gamma=5 +k=1 +lat_0=44.75 +lonc=-124.05 +no_defs +no_uoff +proj=omerc +units=m +x_0=-300000 +y_0=-4600000',NULL,'NAD83(2011) / Oregon Coast zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6843,'EPSG','6843','proj4_data/epsg',NULL,'+alpha=5 +ellps=GRS80 +gamma=5 +k=1 +lat_0=44.75 +lonc=-124.05 +no_defs +no_uoff +proj=omerc +units=ft +x_0=-299999.9999988 +y_0=-4600000.00001208',NULL,'NAD83(2011) / Oregon Coast zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6844,'EPSG','6844','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000045 +lat_0=45.25 +lon_0=-119.1666666666667 +no_defs +proj=tmerc +units=m +x_0=60000 +y_0=0',NULL,'NAD83(CORS96) / Oregon Pendleton zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6845,'EPSG','6845','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000045 +lat_0=45.25 +lon_0=-119.1666666666667 +no_defs +proj=tmerc +units=ft +x_0=59999.99999976 +y_0=0',NULL,'NAD83(CORS96) / Oregon Pendleton zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6846,'EPSG','6846','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000045 +lat_0=45.25 +lon_0=-119.1666666666667 +no_defs +proj=tmerc +units=m +x_0=60000 +y_0=0',NULL,'NAD83(2011) / Oregon Pendleton zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6847,'EPSG','6847','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000045 +lat_0=45.25 +lon_0=-119.1666666666667 +no_defs +proj=tmerc +units=ft +x_0=59999.99999976 +y_0=0',NULL,'NAD83(2011) / Oregon Pendleton zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6848,'EPSG','6848','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000175 +lat_0=45.08333333333334 +lon_0=-118.3333333333333 +no_defs +proj=tmerc +units=m +x_0=30000 +y_0=0',NULL,'NAD83(CORS96) / Oregon Pendleton-La Grande zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6849,'EPSG','6849','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000175 +lat_0=45.08333333333334 +lon_0=-118.3333333333333 +no_defs +proj=tmerc +units=ft +x_0=30000.00001512 +y_0=0',NULL,'NAD83(CORS96) / Oregon Pendleton-La Grande zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6850,'EPSG','6850','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000175 +lat_0=45.08333333333334 +lon_0=-118.3333333333333 +no_defs +proj=tmerc +units=m +x_0=30000 +y_0=0',NULL,'NAD83(2011) / Oregon Pendleton-La Grande zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6851,'EPSG','6851','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000175 +lat_0=45.08333333333334 +lon_0=-118.3333333333333 +no_defs +proj=tmerc +units=ft +x_0=30000.00001512 +y_0=0',NULL,'NAD83(2011) / Oregon Pendleton-La Grande zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6852,'EPSG','6852','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000002 +lat_0=45.5 +lat_1=45.5 +lon_0=-122.75 +no_defs +proj=lcc +units=m +x_0=100000 +y_0=50000',NULL,'NAD83(CORS96) / Oregon Portland zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6853,'EPSG','6853','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000002 +lat_0=45.5 +lat_1=45.5 +lon_0=-122.75 +no_defs +proj=lcc +units=ft +x_0=99999.99999960001 +y_0=50000.00001504',NULL,'NAD83(CORS96) / Oregon Portland zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6854,'EPSG','6854','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000002 +lat_0=45.5 +lat_1=45.5 +lon_0=-122.75 +no_defs +proj=lcc +units=m +x_0=100000 +y_0=50000',NULL,'NAD83(2011) / Oregon Portland zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6855,'EPSG','6855','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000002 +lat_0=45.5 +lat_1=45.5 +lon_0=-122.75 +no_defs +proj=lcc +units=ft +x_0=99999.99999960001 +y_0=50000.00001504',NULL,'NAD83(2011) / Oregon Portland zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6856,'EPSG','6856','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00001 +lat_0=44.33333333333334 +lon_0=-123.0833333333333 +no_defs +proj=tmerc +units=m +x_0=50000 +y_0=0',NULL,'NAD83(CORS96) / Oregon Salem zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6857,'EPSG','6857','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00001 +lat_0=44.33333333333334 +lon_0=-123.0833333333333 +no_defs +proj=tmerc +units=ft +x_0=50000.00001504 +y_0=0',NULL,'NAD83(CORS96) / Oregon Salem zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6858,'EPSG','6858','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00001 +lat_0=44.33333333333334 +lon_0=-123.0833333333333 +no_defs +proj=tmerc +units=m +x_0=50000 +y_0=0',NULL,'NAD83(2011) / Oregon Salem zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6859,'EPSG','6859','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00001 +lat_0=44.33333333333334 +lon_0=-123.0833333333333 +no_defs +proj=tmerc +units=ft +x_0=50000.00001504 +y_0=0',NULL,'NAD83(2011) / Oregon Salem zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6860,'EPSG','6860','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000155 +lat_0=44.08333333333334 +lon_0=-122.5 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD83(CORS96) / Oregon Santiam Pass zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6861,'EPSG','6861','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000155 +lat_0=44.08333333333334 +lon_0=-122.5 +no_defs +proj=tmerc +units=ft +x_0=0 +y_0=0',NULL,'NAD83(CORS96) / Oregon Santiam Pass zone (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6862,'EPSG','6862','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000155 +lat_0=44.08333333333334 +lon_0=-122.5 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0',NULL,'NAD83(2011) / Oregon Santiam Pass zone (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6863,'EPSG','6863','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000155 +lat_0=44.08333333333334 +lon_0=-122.5 +no_defs +proj=tmerc +units=ft +x_0=0 +y_0=0',NULL,'NAD83(2011) / Oregon Santiam Pass (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6867,'EPSG','6867','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.75 +lat_1=43 +lat_2=45.5 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0',NULL,'NAD83(CORS96) / Oregon LCC (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6868,'EPSG','6868','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.75 +lat_1=43 +lat_2=45.5 +lon_0=-120.5 +no_defs +proj=lcc +units=ft +x_0=399999.9999984 +y_0=0',NULL,'NAD83(CORS96) / Oregon GIC Lambert (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6870,'EPSG','6870','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=20 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / Albania TM 2010',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6871,'EPSG','6871','proj4_data/epsg',NULL,'+datum=WGS84 +geoidgrids=egm08_25.gtx +k=1 +lon_0=0 +no_defs +proj=merc +units=m +vunits=m +x_0=0 +y_0=0',NULL,'WGS 84 / Pseudo-Mercator + EGM2008 geoid height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6875,'EPSG','6875','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9985000000000001 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=7000000 +y_0=0',NULL,'RDN2008 / Italy zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6876,'EPSG','6876','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3000000 +y_0=0',NULL,'RDN2008 / Zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6879,'EPSG','6879','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83(2011) / Wisconsin Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6880,'EPSG','6880','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83(2011) / Nebraska (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6881,'EPSG','6881','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-24,-203,268,0,0,0,0',NULL,'Aden 1925',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6882,'EPSG','6882','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-183,-15,273,0,0,0,0',NULL,'Bekaa Valley 1920',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_52() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6883,'EPSG','6883','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=longlat +towgs84=-235,-110,393,0,0,0,0',NULL,'Bioko',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6884,'EPSG','6884','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=2500000 +y_0=0',NULL,'NAD83(CORS96) / Oregon North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6885,'EPSG','6885','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=ft +x_0=2500000.0001424 +y_0=0',NULL,'NAD83(CORS96) / Oregon North (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6886,'EPSG','6886','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=0',NULL,'NAD83(CORS96) / Oregon South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6887,'EPSG','6887','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=ft +x_0=1500000.0001464 +y_0=0',NULL,'NAD83(CORS96) / Oregon South (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6892,'EPSG','6892','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-43.685,-179.785,-267.721,0,0,0,0',NULL,'South East Island 1943',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6893,'EPSG','6893','proj4_data/epsg',NULL,'+datum=WGS84 +geoidgrids=egm08_25.gtx +k=1 +lon_0=0 +no_defs +proj=merc +units=m +vunits=m +x_0=0 +y_0=0',NULL,'WGS 84 / World Mercator + EGM2008 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6894,'EPSG','6894','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-63,176,185,0,0,0,0',NULL,'Gambia',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6915,'EPSG','6915','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-43.685,-179.785,-267.721,0,0,0,0 +units=m +zone=40',NULL,'South East Island 1943 / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6917,'EPSG','6917','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat +vunits=m',NULL,'SVY21 + SHD height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6922,'EPSG','6922','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36 +lat_1=39.5 +lat_2=37.5 +lon_0=-98.25 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0',NULL,'NAD83 / Kansas LCC',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6923,'EPSG','6923','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36 +lat_1=39.5 +lat_2=37.5 +lon_0=-98.25 +no_defs +proj=lcc +units=us-ft +x_0=399999.99998984 +y_0=0',NULL,'NAD83 / Kansas LCC (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6924,'EPSG','6924','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36 +lat_1=39.5 +lat_2=37.5 +lon_0=-98.25 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0',NULL,'NAD83(2011) / Kansas LCC',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6925,'EPSG','6925','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=36 +lat_1=39.5 +lat_2=37.5 +lon_0=-98.25 +no_defs +proj=lcc +units=us-ft +x_0=399999.99998984 +y_0=0',NULL,'NAD83(2011) / Kansas LCC (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6927,'EPSG','6927','proj4_data/epsg',NULL,'+ellps=WGS84 +k=1 +lat_0=1.366666666666667 +lon_0=103.8333333333333 +no_defs +proj=tmerc +units=m +vunits=m +x_0=28001.642 +y_0=38744.572',NULL,'SVY21 / Singapore TM + SHD height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6931,'EPSG','6931','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=90 +lon_0=0 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / NSIDC EASE-Grid 2.0 North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6932,'EPSG','6932','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=-90 +lon_0=0 +no_defs +proj=laea +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / NSIDC EASE-Grid 2.0 South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6933,'EPSG','6933','proj4_data/epsg',NULL,'+datum=WGS84 +lat_ts=30 +lon_0=0 +no_defs +proj=cea +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / NSIDC EASE-Grid 2.0 Global',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6934,'EPSG','6934','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'IGS08',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6956,'EPSG','6956','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=102 +no_defs +proj=tmerc +towgs84=-191.90441429,-39.30318279,-111.45032835,0.00928836,-0.01975479,0.00427372,0.252906278 +units=m +x_0=0 +y_0=500000',NULL,'VN-2000 / TM-3 zone 481',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6957,'EPSG','6957','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=-191.90441429,-39.30318279,-111.45032835,0.00928836,-0.01975479,0.00427372,0.252906278 +units=m +x_0=0 +y_0=500000',NULL,'VN-2000 / TM-3 zone 482',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6958,'EPSG','6958','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=108 +no_defs +proj=tmerc +towgs84=-191.90441429,-39.30318279,-111.45032835,0.00928836,-0.01975479,0.00427372,0.252906278 +units=m +x_0=0 +y_0=500000',NULL,'VN-2000 / TM-3 zone 491',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6959,'EPSG','6959','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=107.75 +no_defs +proj=tmerc +towgs84=-191.90441429,-39.30318279,-111.45032835,0.00928836,-0.01975479,0.00427372,0.252906278 +units=m +x_0=0 +y_0=500000',NULL,'VN-2000 / TM-3 Da Nang zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6962,'EPSG','6962','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=39 +lat_2=43 +lon_0=20 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'ETRS89 / Albania LCC 2010',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6978,'EPSG','6978','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'IGD05',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6980,'EPSG','6980','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'IGD05',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6981,'EPSG','6981','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'IG05 Intermediate CRS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6983,'EPSG','6983','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'IG05 Intermediate CRS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6984,'EPSG','6984','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000067 +lat_0=31.73439361111111 +lon_0=35.20451694444445 +no_defs +proj=tmerc +units=m +x_0=219529.584 +y_0=626907.39',NULL,'NAD27 / Michigan North\12Unable to translate coordinate system EPSG:6966 into PROJ.4 format.\12\12Israeli Grid 05',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6985,'EPSG','6985','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'IGD05/12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6987,'EPSG','6987','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'IGD05/12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6988,'EPSG','6988','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'IG05/12 Intermediate CRS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6990,'EPSG','6990','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'IG05/12 Intermediate CRS',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6991,'EPSG','6991','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000067 +lat_0=31.73439361111111 +lon_0=35.20451694444445 +no_defs +proj=tmerc +units=m +x_0=219529.584 +y_0=626907.39',NULL,'Israeli Grid 05/12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6996,'EPSG','6996','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000007 +lat_0=37.75 +lon_0=-122.45 +no_defs +proj=tmerc +units=m +x_0=48000 +y_0=24000',NULL,'NAD83(2011) / San Francisco CS13 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(6997,'EPSG','6997','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000007 +lat_0=37.75 +lon_0=-122.45 +no_defs +proj=tmerc +units=us-ft +x_0=48000 +y_0=24000',NULL,'NAD83(2011) / San Francisco CS13 (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7005,'EPSG','7005','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-242.2,-144.9,370.3,0,0,0,0 +units=m +zone=37',NULL,'Nahrwan 1934 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7006,'EPSG','7006','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-242.2,-144.9,370.3,0,0,0,0 +units=m +zone=38',NULL,'Nahrwan 1934 / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7007,'EPSG','7007','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-242.2,-144.9,370.3,0,0,0,0 +units=m +zone=39',NULL,'Nahrwan 1934 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7035,'EPSG','7035','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'RGSPM06 (lon-lat)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7037,'EPSG','7037','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'RGR92 (lon-lat)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7039,'EPSG','7039','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'RGM04 (lon-lat)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7041,'EPSG','7041','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'RGFG95 (lon-lat)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7057,'EPSG','7057','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000052 +lat_0=43.2 +lat_1=43.2 +lon_0=-95.25 +no_defs +proj=lcc +units=us-ft +x_0=3505207.010414021 +y_0=2926085.852171705',NULL,'NAD83(2011) / IaRCS zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7058,'EPSG','7058','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000043 +lat_0=43.16666666666666 +lat_1=43.16666666666666 +lon_0=-92.75 +no_defs +proj=lcc +units=us-ft +x_0=3810007.62001524 +y_0=2987045.974091948',NULL,'NAD83(2011) / IaRCS zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7059,'EPSG','7059','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000035 +lat_0=40.25 +lon_0=-91.2 +no_defs +proj=tmerc +units=us-ft +x_0=4114808.229616459 +y_0=2529845.05969012',NULL,'NAD83(2011) / IaRCS zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7060,'EPSG','7060','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000045 +lat_0=42.53333333333333 +lat_1=42.53333333333333 +lon_0=-94.83333333333333 +no_defs +proj=lcc +units=us-ft +x_0=4419608.839217679 +y_0=2621285.242570485',NULL,'NAD83(2011) / IaRCS zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7061,'EPSG','7061','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000032 +lat_0=42.65 +lat_1=42.65 +lon_0=-92.25 +no_defs +proj=lcc +units=us-ft +x_0=4724409.448818898 +y_0=2712725.425450851',NULL,'NAD83(2011) / IaRCS zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7062,'EPSG','7062','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000039 +lat_0=40.25 +lon_0=-95.73333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=5029210.058420117 +y_0=2011684.023368047',NULL,'NAD83(2011) / IaRCS zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7063,'EPSG','7063','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000045 +lat_0=40.25 +lon_0=-94.63333333333334 +no_defs +proj=tmerc +units=us-ft +x_0=5334010.668021336 +y_0=2072644.145288291',NULL,'NAD83(2011) / IaRCS zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7064,'EPSG','7064','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000033 +lat_0=40.25 +lon_0=-93.71666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=5638811.277622555 +y_0=2133604.267208535',NULL,'NAD83(2011) / IaRCS zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7065,'EPSG','7065','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000027 +lat_0=40.25 +lon_0=-92.81666666666666 +no_defs +proj=tmerc +units=us-ft +x_0=5943611.887223775 +y_0=2194564.389128779',NULL,'NAD83(2011) / IaRCS zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7066,'EPSG','7066','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00002 +lat_0=41.83333333333334 +lat_1=41.83333333333334 +lon_0=-91.66666666666667 +no_defs +proj=lcc +units=us-ft +x_0=6248412.496824994 +y_0=2438404.876809754',NULL,'NAD83(2011) / IaRCS zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7067,'EPSG','7067','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000027 +lat_0=40.25 +lon_0=-90.53333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=6553213.106426213 +y_0=2316484.632969266',NULL,'NAD83(2011) / IaRCS zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7068,'EPSG','7068','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000037 +lat_0=40.91666666666666 +lat_1=40.91666666666666 +lon_0=-93.75 +no_defs +proj=lcc +units=us-ft +x_0=6858013.716027432 +y_0=1889763.779527559',NULL,'NAD83(2011) / IaRCS zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7069,'EPSG','7069','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00002 +lat_0=40.25 +lon_0=-91.91666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=7162814.325628651 +y_0=1950723.901447803',NULL,'NAD83(2011) / IaRCS zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7070,'EPSG','7070','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000018 +lat_0=40.25 +lon_0=-91.25 +no_defs +proj=tmerc +units=us-ft +x_0=7467614.93522987 +y_0=1889763.779527559',NULL,'NAD83(2011) / IaRCS zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7071,'EPSG','7071','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'RGTAAF07',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7073,'EPSG','7073','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'RGTAAF07',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7074,'EPSG','7074','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +units=m +zone=37',NULL,'RGTAAF07 / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7075,'EPSG','7075','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +units=m +zone=38',NULL,'RGTAAF07 / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7076,'EPSG','7076','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +units=m +zone=39',NULL,'RGTAAF07 / UTM zone 39S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7077,'EPSG','7077','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +units=m +zone=40',NULL,'RGTAAF07 / UTM zone 40S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7078,'EPSG','7078','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +units=m +zone=41',NULL,'RGTAAF07 / UTM zone 41S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7079,'EPSG','7079','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +units=m +zone=42',NULL,'RGTAAF07 / UTM zone 42S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7080,'EPSG','7080','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +units=m +zone=43',NULL,'RGTAAF07 / UTM zone 43S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7081,'EPSG','7081','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +units=m +zone=44',NULL,'RGTAAF07 / UTM zone 44S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7084,'EPSG','7084','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'RGF93 (lon-lat)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7086,'EPSG','7086','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'RGAF09 (lon-lat)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7088,'EPSG','7088','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'RGTAAF07 (lon-lat)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7109,'EPSG','7109','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00016 +lat_0=48.5 +lon_0=-112.5 +no_defs +proj=tmerc +units=m +x_0=150000 +y_0=0',NULL,'RGTAAF07 / Terre Adelie Polar Stereographic\12Unable to translate coordinate system EPSG:7082 into PROJ.4 format.\12\12NAD83(2011) / RMTCRS St Mary (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7110,'EPSG','7110','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00019 +lat_0=48 +lon_0=-112.5 +no_defs +proj=tmerc +units=m +x_0=100000 +y_0=0',NULL,'NAD83(2011) / RMTCRS Blackfeet (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7111,'EPSG','7111','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000145 +lat_0=48.5 +lat_1=48.5 +lon_0=-111 +no_defs +proj=lcc +units=m +x_0=150000 +y_0=200000',NULL,'NAD83(2011) / RMTCRS Milk River (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7112,'EPSG','7112','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00012 +lat_0=48.5 +lat_1=48.5 +lon_0=-108.5 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=150000',NULL,'NAD83(2011) / RMTCRS Fort Belknap (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7113,'EPSG','7113','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00012 +lat_0=48.33333333333334 +lat_1=48.33333333333334 +lon_0=-105.5 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=100000',NULL,'NAD83(2011) / RMTCRS Fort Peck Assiniboine (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7114,'EPSG','7114','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00009 +lat_0=48.33333333333334 +lat_1=48.33333333333334 +lon_0=-105.5 +no_defs +proj=lcc +units=m +x_0=100000 +y_0=50000',NULL,'NAD83(2011) / RMTCRS Fort Peck Sioux (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7115,'EPSG','7115','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000148 +lat_0=44.75 +lon_0=-107.75 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83(2011) / RMTCRS Crow (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7116,'EPSG','7116','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000185 +lat_0=46.25 +lat_1=46.25 +lon_0=-111.25 +no_defs +proj=lcc +units=m +x_0=100000 +y_0=100000',NULL,'NAD83(2011) / RMTCRS Bobcat (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7117,'EPSG','7117','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0001515 +lat_0=45.78333333333333 +lat_1=45.78333333333333 +lon_0=-108.4166666666667 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=50000',NULL,'NAD83(2011) / RMTCRS Billings (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7118,'EPSG','7118','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00024 +lat_0=42.66666666666666 +lon_0=-108.3333333333333 +no_defs +proj=tmerc +units=m +x_0=100000 +y_0=0',NULL,'NAD83(2011) / RMTCRS Wind River (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7119,'EPSG','7119','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00016 +lat_0=48.5 +lon_0=-112.5 +no_defs +proj=tmerc +units=ft +x_0=150000.00001464 +y_0=0',NULL,'NAD83(2011) / RMTCRS St Mary (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7120,'EPSG','7120','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00019 +lat_0=48 +lon_0=-112.5 +no_defs +proj=tmerc +units=ft +x_0=99999.99999960001 +y_0=0',NULL,'NAD83(2011) / RMTCRS Blackfeet (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7121,'EPSG','7121','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000145 +lat_0=48.5 +lat_1=48.5 +lon_0=-111 +no_defs +proj=lcc +units=ft +x_0=150000.00001464 +y_0=199999.9999992',NULL,'NAD83(2011) / RMTCRS Milk River (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7122,'EPSG','7122','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00012 +lat_0=48.5 +lat_1=48.5 +lon_0=-108.5 +no_defs +proj=lcc +units=ft +x_0=199999.9999992 +y_0=150000.00001464',NULL,'NAD83(2011) / RMTCRS Fort Belknap (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7123,'EPSG','7123','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00012 +lat_0=48.33333333333334 +lat_1=48.33333333333334 +lon_0=-105.5 +no_defs +proj=lcc +units=ft +x_0=199999.9999992 +y_0=99999.99999960001',NULL,'NAD83(2011) / RMTCRS Fort Peck Assiniboine (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7124,'EPSG','7124','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00009 +lat_0=48.33333333333334 +lat_1=48.33333333333334 +lon_0=-105.5 +no_defs +proj=lcc +units=ft +x_0=99999.99999960001 +y_0=49999.99971024',NULL,'NAD83(2011) / RMTCRS Fort Peck Sioux (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7125,'EPSG','7125','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000148 +lat_0=44.75 +lon_0=-107.75 +no_defs +proj=tmerc +units=ft +x_0=199999.9999992 +y_0=0',NULL,'NAD83(2011) / RMTCRS Crow (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7126,'EPSG','7126','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000185 +lat_0=46.25 +lat_1=46.25 +lon_0=-111.25 +no_defs +proj=lcc +units=ft +x_0=99999.99999960001 +y_0=99999.99999960001',NULL,'NAD83(2011) / RMTCRS Bobcat (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7127,'EPSG','7127','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0001515 +lat_0=45.78333333333333 +lat_1=45.78333333333333 +lon_0=-108.4166666666667 +no_defs +proj=lcc +units=ft +x_0=199999.9999992 +y_0=50000.00001504',NULL,'NAD83(2011) / RMTCRS Billings (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7128,'EPSG','7128','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00024 +lat_0=42.66666666666666 +lon_0=-108.3333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=99999.99998983997 +y_0=0',NULL,'NAD83(2011) / RMTCRS Wind River (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7131,'EPSG','7131','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000007 +lat_0=37.75 +lon_0=-122.45 +no_defs +proj=tmerc +units=m +x_0=48000 +y_0=24000',NULL,'NAD83(2011) / San Francisco CS13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7132,'EPSG','7132','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000007 +lat_0=37.75 +lon_0=-122.45 +no_defs +proj=tmerc +units=us-ft +x_0=48000 +y_0=24000',NULL,'NAD83(2011) / San Francisco CS13 (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7133,'EPSG','7133','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'RGTAAF07 (lon-lat)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7134,'EPSG','7134','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'IGD05',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7136,'EPSG','7136','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat',NULL,'IGD05',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7137,'EPSG','7137','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=geocent +units=m',NULL,'IGD05/12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7139,'EPSG','7139','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=longlat',NULL,'IGD05/12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7142,'EPSG','7142','proj4_data/epsg',NULL,'+a=6378300.789 +b=6356566.435 +k=1 +lat_0=31.73409694444445 +lon_0=35.21208055555556 +no_defs +proj=tmerc +towgs84=-275.7224,94.7824,340.8944,-8.001,-4.42,-11.821,1 +units=m +x_0=170251.555 +y_0=126867.909',NULL,'Palestine 1923 / Palestine Grid modified',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7257,'EPSG','7257','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000034 +lat_0=40.55 +lon_0=-84.95 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Adams (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7258,'EPSG','7258','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000034 +lat_0=40.55 +lon_0=-84.95 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Adams (ftUS)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_53() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7259,'EPSG','7259','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000031 +lat_0=40.9 +lon_0=-85.05 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Allen (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7260,'EPSG','7260','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000031 +lat_0=40.9 +lon_0=-85.05 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Allen (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7261,'EPSG','7261','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000026 +lat_0=39 +lon_0=-85.84999999999999 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Bartholomew (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7262,'EPSG','7262','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000026 +lat_0=39 +lon_0=-85.84999999999999 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Bartholomew (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7263,'EPSG','7263','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000029 +lat_0=40.45 +lon_0=-87.3 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Benton (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7264,'EPSG','7264','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000029 +lat_0=40.45 +lon_0=-87.3 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Benton (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7265,'EPSG','7265','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000038 +lat_0=40.05 +lon_0=-85.40000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Blackford-Delaware (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7266,'EPSG','7266','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000038 +lat_0=40.05 +lon_0=-85.40000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Blackford-Delaware (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7267,'EPSG','7267','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000036 +lat_0=39.6 +lon_0=-86.5 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Boone-Hendricks (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7268,'EPSG','7268','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000036 +lat_0=39.6 +lon_0=-86.5 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Boone-Hendricks (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7269,'EPSG','7269','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00003 +lat_0=39 +lon_0=-86.3 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Brown (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7270,'EPSG','7270','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00003 +lat_0=39 +lon_0=-86.3 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Brown (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7271,'EPSG','7271','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000026 +lat_0=40.4 +lon_0=-86.65000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Carroll (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7272,'EPSG','7272','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000026 +lat_0=40.4 +lon_0=-86.65000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Carroll (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7273,'EPSG','7273','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000028 +lat_0=40.55 +lon_0=-86.40000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Cass (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7274,'EPSG','7274','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000028 +lat_0=40.55 +lon_0=-86.40000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Cass (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7275,'EPSG','7275','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000021 +lat_0=38.15 +lon_0=-85.59999999999999 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Clark-Floyd-Scott (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7276,'EPSG','7276','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000021 +lat_0=38.15 +lon_0=-85.59999999999999 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Clark-Floyd-Scott (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7277,'EPSG','7277','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000024 +lat_0=39.15 +lon_0=-87.15000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Clay (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7278,'EPSG','7278','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000024 +lat_0=39.15 +lon_0=-87.15000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Clay (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7279,'EPSG','7279','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000032 +lat_0=40.15 +lon_0=-86.59999999999999 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Clinton (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7280,'EPSG','7280','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000032 +lat_0=40.15 +lon_0=-86.59999999999999 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Clinton (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7281,'EPSG','7281','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000025 +lat_0=38.1 +lon_0=-86.5 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Crawford-Lawrence-Orange (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7282,'EPSG','7282','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000025 +lat_0=38.1 +lon_0=-86.5 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Crawford-Lawrence-Orange (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7283,'EPSG','7283','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000018 +lat_0=38.45 +lon_0=-87.09999999999999 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Daviess-Greene (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7284,'EPSG','7284','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000018 +lat_0=38.45 +lon_0=-87.09999999999999 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Daviess-Greene (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7285,'EPSG','7285','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000029 +lat_0=38.65 +lon_0=-84.90000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Dearborn-Ohio-Switzerland (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7286,'EPSG','7286','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000029 +lat_0=38.65 +lon_0=-84.90000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Dearborn-Ohio-Switzerland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7287,'EPSG','7287','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000036 +lat_0=39.1 +lon_0=-85.65000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Decatur-Rush (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7288,'EPSG','7288','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000036 +lat_0=39.1 +lon_0=-85.65000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Decatur-Rush (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7289,'EPSG','7289','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000036 +lat_0=41.25 +lon_0=-84.95 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS DeKalb (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7290,'EPSG','7290','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000036 +lat_0=41.25 +lon_0=-84.95 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS DeKalb (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7291,'EPSG','7291','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00002 +lat_0=38.2 +lon_0=-86.95 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Dubois-Martin (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7292,'EPSG','7292','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00002 +lat_0=38.2 +lon_0=-86.95 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Dubois-Martin (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7293,'EPSG','7293','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000033 +lat_0=40.65 +lon_0=-85.84999999999999 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Elkhart-Kosciusko-Wabash (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7294,'EPSG','7294','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000033 +lat_0=40.65 +lon_0=-85.84999999999999 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Elkhart-Kosciusko-Wabash (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7295,'EPSG','7295','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000038 +lat_0=39.25 +lon_0=-85.05 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Fayette-Franklin-Union (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7296,'EPSG','7296','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000038 +lat_0=39.25 +lon_0=-85.05 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Fayette-Franklin-Union (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7297,'EPSG','7297','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000025 +lat_0=39.95 +lon_0=-87.3 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Fountain-Warren (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7298,'EPSG','7298','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000025 +lat_0=39.95 +lon_0=-87.3 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Fountain-Warren (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7299,'EPSG','7299','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000031 +lat_0=40.9 +lon_0=-86.3 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Fulton-Marshall-St. Joseph (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7300,'EPSG','7300','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000031 +lat_0=40.9 +lon_0=-86.3 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Fulton-Marshall-St. Joseph (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7301,'EPSG','7301','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000013 +lat_0=38.15 +lon_0=-87.65000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Gibson (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7302,'EPSG','7302','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000013 +lat_0=38.15 +lon_0=-87.65000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Gibson (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7303,'EPSG','7303','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000034 +lat_0=40.35 +lon_0=-85.7 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Grant (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7304,'EPSG','7304','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000034 +lat_0=40.35 +lon_0=-85.7 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Grant (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7305,'EPSG','7305','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000034 +lat_0=39.9 +lon_0=-86 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Hamilton-Tipton (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7306,'EPSG','7306','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000034 +lat_0=39.9 +lon_0=-86 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Hamilton-Tipton (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7307,'EPSG','7307','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000036 +lat_0=39.65 +lon_0=-85.8 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Hancock-Madison (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7308,'EPSG','7308','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000036 +lat_0=39.65 +lon_0=-85.8 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Hancock-Madison (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7309,'EPSG','7309','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000027 +lat_0=37.95 +lon_0=-86.15000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Harrison-Washington (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7310,'EPSG','7310','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000027 +lat_0=37.95 +lon_0=-86.15000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Harrison-Washington (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7311,'EPSG','7311','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000043 +lat_0=39.75 +lon_0=-85.45 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Henry (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7312,'EPSG','7312','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000043 +lat_0=39.75 +lon_0=-85.45 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Henry (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7313,'EPSG','7313','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000031 +lat_0=40.35 +lon_0=-86.15000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Howard-Miami (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7314,'EPSG','7314','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000031 +lat_0=40.35 +lon_0=-86.15000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Howard-Miami (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7315,'EPSG','7315','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000034 +lat_0=40.65 +lon_0=-85.5 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Huntington-Whitley (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7316,'EPSG','7316','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000034 +lat_0=40.65 +lon_0=-85.5 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Huntington-Whitley (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7317,'EPSG','7317','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000022 +lat_0=38.7 +lon_0=-85.95 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Jackson (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7318,'EPSG','7318','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000022 +lat_0=38.7 +lon_0=-85.95 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Jackson (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7319,'EPSG','7319','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000027 +lat_0=40.7 +lon_0=-87.09999999999999 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Jasper-Porter (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7320,'EPSG','7320','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000027 +lat_0=40.7 +lon_0=-87.09999999999999 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Jasper-Porter (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7321,'EPSG','7321','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000038 +lat_0=40.3 +lon_0=-85 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Jay (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7322,'EPSG','7322','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000038 +lat_0=40.3 +lon_0=-85 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Jay (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7323,'EPSG','7323','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000028 +lat_0=38.55 +lon_0=-85.34999999999999 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Jefferson (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7324,'EPSG','7324','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000028 +lat_0=38.55 +lon_0=-85.34999999999999 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Jefferson (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7325,'EPSG','7325','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000025 +lat_0=38.8 +lon_0=-85.8 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Jennings (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7326,'EPSG','7326','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000025 +lat_0=38.8 +lon_0=-85.8 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Jennings (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7327,'EPSG','7327','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000031 +lat_0=39.3 +lon_0=-86.15000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Johnson-Marion (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7328,'EPSG','7328','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000031 +lat_0=39.3 +lon_0=-86.15000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Johnson-Marion (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7329,'EPSG','7329','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000015 +lat_0=38.4 +lon_0=-87.45 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Knox (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7330,'EPSG','7330','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000015 +lat_0=38.4 +lon_0=-87.45 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Knox (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7331,'EPSG','7331','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000037 +lat_0=41.25 +lon_0=-85.45 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS LaGrange-Noble (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7332,'EPSG','7332','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000037 +lat_0=41.25 +lon_0=-85.45 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS LaGrange-Noble (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7333,'EPSG','7333','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000026 +lat_0=40.7 +lon_0=-87.40000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Lake-Newton (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7334,'EPSG','7334','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000026 +lat_0=40.7 +lon_0=-87.40000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Lake-Newton (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7335,'EPSG','7335','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000027 +lat_0=40.9 +lon_0=-86.75 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS LaPorte-Pulaski-Starke (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7336,'EPSG','7336','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000027 +lat_0=40.9 +lon_0=-86.75 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS LaPorte-Pulaski-Starke (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7337,'EPSG','7337','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000028 +lat_0=38.95 +lon_0=-86.5 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Monroe-Morgan (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7338,'EPSG','7338','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000028 +lat_0=38.95 +lon_0=-86.5 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Monroe-Morgan (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7339,'EPSG','7339','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000031 +lat_0=39.45 +lon_0=-86.95 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Montgomery-Putnam (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7340,'EPSG','7340','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000031 +lat_0=39.45 +lon_0=-86.95 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Montgomery-Putnam (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7341,'EPSG','7341','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000026 +lat_0=39.15 +lon_0=-86.90000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Owen (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7342,'EPSG','7342','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000026 +lat_0=39.15 +lon_0=-86.90000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Owen (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7343,'EPSG','7343','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000022 +lat_0=39.6 +lon_0=-87.34999999999999 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Parke-Vermillion (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7344,'EPSG','7344','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000022 +lat_0=39.6 +lon_0=-87.34999999999999 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Parke-Vermillion (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7345,'EPSG','7345','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00002 +lat_0=37.8 +lon_0=-86.7 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Perry (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7346,'EPSG','7346','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00002 +lat_0=37.8 +lon_0=-86.7 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Perry (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7347,'EPSG','7347','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000015 +lat_0=37.85 +lon_0=-87.3 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Pike-Warrick (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7348,'EPSG','7348','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000015 +lat_0=37.85 +lon_0=-87.3 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Pike-Warrick (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7349,'EPSG','7349','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000013 +lat_0=37.75 +lon_0=-87.95 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Posey (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7350,'EPSG','7350','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000013 +lat_0=37.75 +lon_0=-87.95 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Posey (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7351,'EPSG','7351','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000044 +lat_0=39.7 +lon_0=-85.05 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Randolph-Wayne (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7352,'EPSG','7352','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000044 +lat_0=39.7 +lon_0=-85.05 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Randolph-Wayne (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7353,'EPSG','7353','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000038 +lat_0=38.9 +lon_0=-85.3 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Ripley (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7354,'EPSG','7354','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000038 +lat_0=38.9 +lon_0=-85.3 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Ripley (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7355,'EPSG','7355','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00003 +lat_0=39.3 +lon_0=-85.90000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Shelby (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7356,'EPSG','7356','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00003 +lat_0=39.3 +lon_0=-85.90000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Shelby (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7357,'EPSG','7357','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000014 +lat_0=37.75 +lon_0=-87.05 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Spencer (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7358,'EPSG','7358','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000014 +lat_0=37.75 +lon_0=-87.05 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Spencer (ftUS)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_54() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7359,'EPSG','7359','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000041 +lat_0=41.5 +lon_0=-85 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Steuben (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7360,'EPSG','7360','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000041 +lat_0=41.5 +lon_0=-85 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Steuben (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7361,'EPSG','7361','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000017 +lat_0=38.9 +lon_0=-87.5 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Sullivan (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7362,'EPSG','7362','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000017 +lat_0=38.9 +lon_0=-87.5 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Sullivan (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7363,'EPSG','7363','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000026 +lat_0=40.2 +lon_0=-86.90000000000001 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Tippecanoe-White (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7364,'EPSG','7364','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000026 +lat_0=40.2 +lon_0=-86.90000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Tippecanoe-White (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7365,'EPSG','7365','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000015 +lat_0=37.8 +lon_0=-87.55 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Vanderburgh (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7366,'EPSG','7366','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000015 +lat_0=37.8 +lon_0=-87.55 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Vanderburgh (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7367,'EPSG','7367','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00002 +lat_0=39.25 +lon_0=-87.45 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Vigo (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7368,'EPSG','7368','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00002 +lat_0=39.25 +lon_0=-87.45 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Vigo (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7369,'EPSG','7369','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000034 +lat_0=40.55 +lon_0=-85.25 +no_defs +proj=tmerc +units=m +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Wells (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7370,'EPSG','7370','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000034 +lat_0=40.55 +lon_0=-85.25 +no_defs +proj=tmerc +units=us-ft +x_0=240000 +y_0=36000',NULL,'NAD83(2011) / InGCS Wells (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7371,'EPSG','7371','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'ONGD14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7373,'EPSG','7373','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0',NULL,'ONGD14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7374,'EPSG','7374','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=39',NULL,'ONGD14 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7375,'EPSG','7375','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=40',NULL,'ONGD14 / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7376,'EPSG','7376','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=41',NULL,'ONGD14 / UTM zone 41N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7400,'EPSG','7400','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +pm=paris +proj=longlat +towgs84=-168,-60,320,0,0,0,0 +vunits=m',NULL,'NTF (Paris) + NGF IGN69 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7401,'EPSG','7401','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +vunits=m +x_0=600000 +y_0=2200000',NULL,'NTF (Paris) / France II + NGF Lallemand',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7402,'EPSG','7402','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +vunits=m +x_0=600000 +y_0=2200000',NULL,'NTF (Paris) / France II + NGF IGN69',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7403,'EPSG','7403','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877499 +lat_0=44.10000000000001 +lat_1=44.10000000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +vunits=m +x_0=600000 +y_0=3200000',NULL,'NTF (Paris) / France III + NGF IGN69',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7404,'EPSG','7404','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=414.1,41.3,603.1,-0.855,2.141,-7.023,0 +vunits=m',NULL,'RT90 + RH70 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7405,'EPSG','7405','proj4_data/epsg',NULL,'+datum=OSGB36 +k=0.9996012717 +lat_0=49 +lon_0=-2 +no_defs +proj=tmerc +units=m +vunits=m +x_0=400000 +y_0=-100000',NULL,'OSGB 1936 / British National Grid + ODN height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7406,'EPSG','7406','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=longlat +vunits=us-ft',NULL,'NAD27 + NGVD29 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7407,'EPSG','7407','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=34 +lat_1=34.65 +lat_2=36.18333333333333 +lon_0=-101.5 +no_defs +proj=lcc +units=us-ft +vunits=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Texas North + NGVD29 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7408,'EPSG','7408','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=565.4171,50.3319,465.5524,-0.398957,0.343988,-1.87740,4.0725 +vunits=m',NULL,'RD/NAP',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7409,'EPSG','7409','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 +vunits=m',NULL,'ETRS89 + EVRF2000 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7410,'EPSG','7410','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=longlat +towgs84=-180.624,-225.516,173.919,-0.81,-1.898,8.336,16.71006 +vunits=m',NULL,'PSHD93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7411,'EPSG','7411','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +vunits=m +x_0=600000 +y_0=2200000',NULL,'NTF (Paris) / Lambert zone II + NGF Lallemand height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7412,'EPSG','7412','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +vunits=m +x_0=600000 +y_0=2200000',NULL,'NTF (Paris) / Lambert zone II + NGF IGN69',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7413,'EPSG','7413','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877499 +lat_0=44.10000000000001 +lat_1=44.10000000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +vunits=m +x_0=600000 +y_0=3200000',NULL,'NTF (Paris) / Lambert zone III + NGF IGN69',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7414,'EPSG','7414','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=longlat +towgs84=-146.414,507.337,680.507,0,0,0,0 +vunits=m',NULL,'Tokyo + JSLD69 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7415,'EPSG','7415','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999079 +lat_0=52.15616055555555 +lon_0=5.38763888888889 +no_defs +proj=sterea +towgs84=565.4171,50.3319,465.5524,-0.398957,0.343988,-1.87740,4.0725 +units=m +vunits=m +x_0=155000 +y_0=463000',NULL,'Amersfoort / RD New + NAP height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7416,'EPSG','7416','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=32',NULL,'ETRS89 / UTM zone 32N + DVR90 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7417,'EPSG','7417','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +zone=33',NULL,'ETRS89 / UTM zone 33N + DVR90 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7418,'EPSG','7418','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=0 +lon_0=9.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=200000 +y_0=0',NULL,'ETRS89 / Kp2000 Jutland + DVR90 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7419,'EPSG','7419','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.99995 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=500000 +y_0=0',NULL,'ETRS89 / Kp2000 Zealand + DVR90 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7420,'EPSG','7420','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +vunits=m +x_0=900000 +y_0=0',NULL,'ETRS89 / Kp2000 Bornholm + DVR90 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7421,'EPSG','7421','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +vunits=m +x_0=600000 +y_0=2200000',NULL,'NTF (Paris) / Lambert zone II + NGF-IGN69 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7422,'EPSG','7422','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877499 +lat_0=44.10000000000001 +lat_1=44.10000000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +vunits=m +x_0=600000 +y_0=3200000',NULL,'NTF (Paris) / Lambert zone III + NGF-IGN69 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7423,'EPSG','7423','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat +towgs84=0,0,0,0,0,0,0 +vunits=m',NULL,'ETRS89 + EVRF2007 height',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7528,'EPSG','7528','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000365285 +lat_0=43.36666666666667 +lon_0=-90 +no_defs +proj=tmerc +units=m +x_0=147218.6942 +y_0=0.0037',NULL,'NAD83(2011) / WISCRS Adams and Juneau (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7529,'EPSG','7529','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000495683 +lat_0=45.70611111111111 +lon_0=-90.62222222222222 +no_defs +proj=tmerc +units=m +x_0=172821.9461 +y_0=0.0017',NULL,'NAD83(2011) / WISCRS Ashland (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7530,'EPSG','7530','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000486665 +lat_0=45.13333333333333 +lon_0=-91.84999999999999 +no_defs +proj=tmerc +units=m +x_0=93150 +y_0=0.0029',NULL,'NAD83(2011) / WISCRS Barron (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7531,'EPSG','7531','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000331195 +lat_0=46.66964837722222 +lat_1=46.66964837722222 +lon_0=-91.15277777777779 +no_defs +proj=lcc +units=m +x_0=228600.4575 +y_0=148551.4837',NULL,'NAD83(2011) / WISCRS Bayfield (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7532,'EPSG','7532','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00002 +lat_0=43 +lon_0=-88 +no_defs +proj=tmerc +units=m +x_0=31600 +y_0=4600',NULL,'NAD83(2011) / WISCRS Brown (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7533,'EPSG','7533','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000382778 +lat_0=43.48138888888889 +lon_0=-91.79722222222222 +no_defs +proj=tmerc +units=m +x_0=175260.3502 +y_0=0.0048',NULL,'NAD83(2011) / WISCRS Buffalo (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7534,'EPSG','7534','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000383841 +lat_0=45.89871486583333 +lat_1=45.89871486583333 +lon_0=-92.45777777777778 +no_defs +proj=lcc +units=m +x_0=64008.1276 +y_0=59445.9043',NULL,'NAD83(2011) / WISCRS Burnett (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7535,'EPSG','7535','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000286569 +lat_0=42.71944444444445 +lon_0=-88.5 +no_defs +proj=tmerc +units=m +x_0=244754.8893 +y_0=0.0049',NULL,'NAD83(2011) / WISCRS Calumet, Fond du Lac, Outagamie and Winnebago (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7536,'EPSG','7536','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000391127 +lat_0=44.97785689861112 +lat_1=44.97785689861112 +lon_0=-91.29444444444444 +no_defs +proj=lcc +units=m +x_0=60045.72 +y_0=44091.4346',NULL,'NAD83(2011) / WISCRS Chippewa (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7537,'EPSG','7537','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000463003 +lat_0=43.6 +lon_0=-90.70833333333334 +no_defs +proj=tmerc +units=m +x_0=199949.1989 +y_0=0.0086',NULL,'NAD83(2011) / WISCRS Clark (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7538,'EPSG','7538','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00003498 +lat_0=43.46254664583333 +lat_1=43.46254664583333 +lon_0=-89.39444444444445 +no_defs +proj=lcc +units=m +x_0=169164.3381 +y_0=111569.6134',NULL,'NAD83(2011) / WISCRS Columbia (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7539,'EPSG','7539','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000349151 +lat_0=43.200055605 +lat_1=43.200055605 +lon_0=-90.9388888888889 +no_defs +proj=lcc +units=m +x_0=113690.6274 +y_0=53703.1201',NULL,'NAD83(2011) / WISCRS Crawford (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7540,'EPSG','7540','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000384786 +lat_0=43.0695160375 +lat_1=43.0695160375 +lon_0=-89.42222222222223 +no_defs +proj=lcc +units=m +x_0=247193.2944 +y_0=146591.9896',NULL,'NAD83(2011) / WISCRS Dane (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7541,'EPSG','7541','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000346418 +lat_0=41.47222222222222 +lon_0=-88.77500000000001 +no_defs +proj=tmerc +units=m +x_0=263347.7263 +y_0=0.0076',NULL,'NAD83(2011) / WISCRS Dodge and Jefferson (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7542,'EPSG','7542','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000187521 +lat_0=44.4 +lon_0=-87.27222222222223 +no_defs +proj=tmerc +units=m +x_0=158801.1176 +y_0=0.0023',NULL,'NAD83(2011) / WISCRS Door (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7543,'EPSG','7543','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000385418 +lat_0=45.88333333333333 +lon_0=-91.91666666666667 +no_defs +proj=tmerc +units=m +x_0=59131.3183 +y_0=0.0041',NULL,'NAD83(2011) / WISCRS Douglas (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7544,'EPSG','7544','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000410324 +lat_0=44.40833333333333 +lon_0=-91.89444444444445 +no_defs +proj=tmerc +units=m +x_0=51816.104 +y_0=0.003',NULL,'NAD83(2011) / WISCRS Dunn (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7545,'EPSG','7545','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000035079 +lat_0=44.87228112638889 +lat_1=44.87228112638889 +lon_0=-91.28888888888889 +no_defs +proj=lcc +units=m +x_0=120091.4402 +y_0=91687.92389999999',NULL,'NAD83(2011) / WISCRS Eau Claire (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7546,'EPSG','7546','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000552095 +lat_0=45.43888888888888 +lon_0=-88.14166666666668 +no_defs +proj=tmerc +units=m +x_0=133502.6683 +y_0=0.0063',NULL,'NAD83(2011) / WISCRS Florence (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7547,'EPSG','7547','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000673004 +lat_0=44.00555555555555 +lon_0=-88.63333333333334 +no_defs +proj=tmerc +units=m +x_0=275844.5533 +y_0=0.0157',NULL,'NAD83(2011) / WISCRS Forest (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7548,'EPSG','7548','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000349452 +lat_0=41.41111111111111 +lon_0=-90.8 +no_defs +proj=tmerc +units=m +x_0=242316.4841 +y_0=0.01',NULL,'NAD83(2011) / WISCRS Grant (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7549,'EPSG','7549','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000390487 +lat_0=42.63756227694444 +lat_1=42.63756227694444 +lon_0=-89.83888888888889 +no_defs +proj=lcc +units=m +x_0=170078.7403 +y_0=45830.2947',NULL,'NAD83(2011) / WISCRS Green and Lafayette (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7550,'EPSG','7550','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000344057 +lat_0=43.80700011777778 +lat_1=43.80700011777778 +lon_0=-89.24166666666667 +no_defs +proj=lcc +units=m +x_0=150876.3018 +y_0=79170.7795',NULL,'NAD83(2011) / WISCRS Green Lake and Marquette (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7551,'EPSG','7551','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000394961 +lat_0=42.53888888888888 +lon_0=-90.16111111111111 +no_defs +proj=tmerc +units=m +x_0=113081.0261 +y_0=0.0045',NULL,'NAD83(2011) / WISCRS Iowa (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7552,'EPSG','7552','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000677153 +lat_0=45.43333333333333 +lon_0=-90.25555555555556 +no_defs +proj=tmerc +units=m +x_0=220980.4419 +y_0=0.008500000000000001',NULL,'NAD83(2011) / WISCRS Iron (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7553,'EPSG','7553','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000353 +lat_0=44.25333512777778 +lon_0=-90.84429651944444 +no_defs +proj=tmerc +units=m +x_0=27000 +y_0=25000',NULL,'NAD83(2011) / WISCRS Jackson (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7554,'EPSG','7554','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000260649 +lat_0=42.21666666666667 +lon_0=-87.89444444444445 +no_defs +proj=tmerc +units=m +x_0=185928.3728 +y_0=0.0009',NULL,'NAD83(2011) / WISCRS Kenosha, Milwaukee, Ozaukee and Racine (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7555,'EPSG','7555','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000233704 +lat_0=43.26666666666667 +lon_0=-87.55 +no_defs +proj=tmerc +units=m +x_0=79857.7614 +y_0=0.0012',NULL,'NAD83(2011) / WISCRS Kewaunee, Manitowoc and Sheboygan (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7556,'EPSG','7556','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000319985 +lat_0=43.45111111111111 +lon_0=-91.31666666666666 +no_defs +proj=tmerc +units=m +x_0=130454.6598 +y_0=0.0033',NULL,'NAD83(2011) / WISCRS La Crosse (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7557,'EPSG','7557','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000627024 +lat_0=45.15423710527778 +lat_1=45.15423710527778 +lon_0=-89.03333333333333 +no_defs +proj=lcc +units=m +x_0=198425.197 +y_0=105279.7829',NULL,'NAD83(2011) / WISCRS Langlade (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7558,'EPSG','7558','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000599003 +lat_0=44.84444444444445 +lon_0=-89.73333333333333 +no_defs +proj=tmerc +units=m +x_0=116129.0323 +y_0=0.0058',NULL,'NAD83(2011) / WISCRS Lincoln (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7559,'EPSG','7559','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000053289 +lat_0=44.90090442361111 +lat_1=44.90090442361111 +lon_0=-89.77 +no_defs +proj=lcc +units=m +x_0=74676.1493 +y_0=55049.2669',NULL,'NAD83(2011) / WISCRS Marathon (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7560,'EPSG','7560','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000234982 +lat_0=44.69166666666666 +lon_0=-87.71111111111111 +no_defs +proj=tmerc +units=m +x_0=238658.8794 +y_0=0.0032',NULL,'NAD83(2011) / WISCRS Marinette (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7561,'EPSG','7561','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000362499 +lat_0=44.71666666666667 +lon_0=-88.41666666666667 +no_defs +proj=tmerc +units=m +x_0=105461.0121 +y_0=0.0029',NULL,'NAD83(2011) / WISCRS Menominee (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7562,'EPSG','7562','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000434122 +lat_0=44.00007392861111 +lat_1=44.00007392861111 +lon_0=-90.64166666666668 +no_defs +proj=lcc +units=m +x_0=204521.209 +y_0=121923.9861',NULL,'NAD83(2011) / WISCRS Monroe (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7563,'EPSG','7563','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000236869 +lat_0=44.39722222222222 +lon_0=-87.90833333333335 +no_defs +proj=tmerc +units=m +x_0=182880.3676 +y_0=0.0033',NULL,'NAD83(2011) / WISCRS Oconto (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7564,'EPSG','7564','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000686968 +lat_0=45.70422377027778 +lat_1=45.70422377027778 +lon_0=-89.54444444444444 +no_defs +proj=lcc +units=m +x_0=70104.1401 +y_0=57588.0346',NULL,'NAD83(2011) / WISCRS Oneida (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7565,'EPSG','7565','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000362977 +lat_0=44.63614887194444 +lat_1=44.63614887194444 +lon_0=-92.22777777777777 +no_defs +proj=lcc +units=m +x_0=167640.3354 +y_0=86033.0876',NULL,'NAD83(2011) / WISCRS Pepin and Pierce (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7566,'EPSG','7566','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000433849 +lat_0=44.66111111111111 +lon_0=-92.63333333333334 +no_defs +proj=tmerc +units=m +x_0=141732.2823 +y_0=0.0059',NULL,'NAD83(2011) / WISCRS Polk (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7567,'EPSG','7567','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000039936 +lat_0=44.41682397527777 +lat_1=44.41682397527777 +lon_0=-89.5 +no_defs +proj=lcc +units=m +x_0=56388.1128 +y_0=50022.1874',NULL,'NAD83(2011) / WISCRS Portage (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7568,'EPSG','7568','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000649554 +lat_0=44.55555555555555 +lon_0=-90.48888888888889 +no_defs +proj=tmerc +units=m +x_0=227990.8546 +y_0=0.0109',NULL,'NAD83(2011) / WISCRS Price (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7569,'EPSG','7569','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000375653 +lat_0=43.3223129275 +lat_1=43.3223129275 +lon_0=-90.43055555555556 +no_defs +proj=lcc +units=m +x_0=202387.6048 +y_0=134255.4253',NULL,'NAD83(2011) / WISCRS Richland (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7570,'EPSG','7570','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000337311 +lat_0=41.94444444444444 +lon_0=-89.07222222222222 +no_defs +proj=tmerc +units=m +x_0=146304.2926 +y_0=0.0068',NULL,'NAD83(2011) / WISCRS Rock (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7571,'EPSG','7571','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000495976 +lat_0=43.91944444444444 +lon_0=-91.06666666666666 +no_defs +proj=tmerc +units=m +x_0=250546.1013 +y_0=0.0234',NULL,'NAD83(2011) / WISCRS Rusk (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7572,'EPSG','7572','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000373868 +lat_0=42.81944444444445 +lon_0=-89.90000000000001 +no_defs +proj=tmerc +units=m +x_0=185623.5716 +y_0=0.0051',NULL,'NAD83(2011) / WISCRS Sauk (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7573,'EPSG','7573','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000573461 +lat_0=45.90009913138888 +lat_1=45.90009913138888 +lon_0=-91.11666666666666 +no_defs +proj=lcc +units=m +x_0=216713.2336 +y_0=120734.1631',NULL,'NAD83(2011) / WISCRS Sawyer (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7574,'EPSG','7574','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000032144 +lat_0=44.03611111111111 +lon_0=-88.60555555555555 +no_defs +proj=tmerc +units=m +x_0=262433.3253 +y_0=0.009599999999999999',NULL,'NAD83(2011) / WISCRS Shawano (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7575,'EPSG','7575','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000381803 +lat_0=44.03611111111111 +lon_0=-92.63333333333334 +no_defs +proj=tmerc +units=m +x_0=165506.7302 +y_0=0.0103',NULL,'NAD83(2011) / WISCRS St. Croix (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7576,'EPSG','7576','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000597566 +lat_0=45.17782208583333 +lat_1=45.17782208583333 +lon_0=-90.48333333333333 +no_defs +proj=lcc +units=m +x_0=187147.5744 +y_0=107746.7522',NULL,'NAD83(2011) / WISCRS Taylor (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7577,'EPSG','7577','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000361538 +lat_0=43.16111111111111 +lon_0=-91.36666666666666 +no_defs +proj=tmerc +units=m +x_0=256946.9138 +y_0=0.0041',NULL,'NAD83(2011) / WISCRS Trempealeau (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7578,'EPSG','7578','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000408158 +lat_0=43.57503293972223 +lat_1=43.57503293972223 +lon_0=-90.78333333333333 +no_defs +proj=lcc +units=m +x_0=222504.4451 +y_0=47532.0602',NULL,'NAD83(2011) / WISCRS Vernon (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7579,'EPSG','7579','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000730142 +lat_0=46.07784409055556 +lat_1=46.07784409055556 +lon_0=-89.48888888888889 +no_defs +proj=lcc +units=m +x_0=134417.0689 +y_0=50337.1092',NULL,'NAD83(2011) / WISCRS Vilas (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7580,'EPSG','7580','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000367192 +lat_0=42.66946209694444 +lat_1=42.66946209694444 +lon_0=-88.54166666666667 +no_defs +proj=lcc +units=m +x_0=232562.8651 +y_0=111088.2224',NULL,'NAD83(2011) / WISCRS Walworth (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7581,'EPSG','7581','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000475376 +lat_0=45.96121983333334 +lat_1=45.96121983333334 +lon_0=-91.78333333333333 +no_defs +proj=lcc +units=m +x_0=234086.8682 +y_0=188358.6058',NULL,'NAD83(2011) / WISCRS Washburn (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7582,'EPSG','7582','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00003738 +lat_0=42.91805555555555 +lon_0=-88.06388888888888 +no_defs +proj=tmerc +units=m +x_0=120091.4415 +y_0=0.003',NULL,'NAD83(2011) / WISCRS Washington (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7583,'EPSG','7583','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000346179 +lat_0=42.56944444444445 +lon_0=-88.22499999999999 +no_defs +proj=tmerc +units=m +x_0=208788.418 +y_0=0.0034',NULL,'NAD83(2011) / WISCRS Waukesha (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7584,'EPSG','7584','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000333645 +lat_0=43.42027777777778 +lon_0=-88.81666666666666 +no_defs +proj=tmerc +units=m +x_0=185013.9709 +y_0=0.007',NULL,'NAD83(2011) / WISCRS Waupaca (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7585,'EPSG','7585','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000392096 +lat_0=44.11394404583334 +lat_1=44.11394404583334 +lon_0=-89.24166666666667 +no_defs +proj=lcc +units=m +x_0=120091.4402 +y_0=45069.7587',NULL,'NAD83(2011) / WISCRS Waushara (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7586,'EPSG','7586','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000421209 +lat_0=44.36259546944444 +lat_1=44.36259546944444 +lon_0=-90 +no_defs +proj=lcc +units=m +x_0=208483.6173 +y_0=134589.754',NULL,'NAD83(2011) / WISCRS Wood (m)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_55() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7587,'EPSG','7587','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000365285 +lat_0=43.36666666666667 +lon_0=-90 +no_defs +proj=tmerc +units=us-ft +x_0=147218.6941325883 +y_0=0.00365760731521463',NULL,'NAD83(2011) / WISCRS Adams and Juneau (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7588,'EPSG','7588','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000495683 +lat_0=45.70611111111111 +lon_0=-90.62222222222222 +no_defs +proj=tmerc +units=us-ft +x_0=172821.945948692 +y_0=0.001828803657607315',NULL,'NAD83(2011) / WISCRS Ashland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7589,'EPSG','7589','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000486665 +lat_0=45.13333333333333 +lon_0=-91.84999999999999 +no_defs +proj=tmerc +units=us-ft +x_0=93150 +y_0=0.003048006096012192',NULL,'NAD83(2011) / WISCRS Barron (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7590,'EPSG','7590','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000331195 +lat_0=46.66964837722222 +lat_1=46.66964837722222 +lon_0=-91.15277777777779 +no_defs +proj=lcc +units=us-ft +x_0=228600.4575057151 +y_0=148551.4835661671',NULL,'NAD83(2011) / WISCRS Bayfield (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7591,'EPSG','7591','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00002 +lat_0=43 +lon_0=-88 +no_defs +proj=tmerc +units=us-ft +x_0=31599.99989839979 +y_0=4599.999898399797',NULL,'NAD83(2011) / WISCRS Brown (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7592,'EPSG','7592','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000382778 +lat_0=43.48138888888889 +lon_0=-91.79722222222222 +no_defs +proj=tmerc +units=us-ft +x_0=175260.3502159004 +y_0=0.004876809753619507',NULL,'NAD83(2011) / WISCRS Buffalo (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7593,'EPSG','7593','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000383841 +lat_0=45.89871486583333 +lat_1=45.89871486583333 +lon_0=-92.45777777777778 +no_defs +proj=lcc +units=us-ft +x_0=64008.12771145543 +y_0=59445.90419100838',NULL,'NAD83(2011) / WISCRS Burnett (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7594,'EPSG','7594','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000286569 +lat_0=42.71944444444445 +lon_0=-88.5 +no_defs +proj=tmerc +units=us-ft +x_0=244754.8892049784 +y_0=0.004876809753619507',NULL,'NAD83(2011) / WISCRS Calumet, Fond du Lac, Outagamie and Winnebago (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7595,'EPSG','7595','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000391127 +lat_0=44.97785689861112 +lat_1=44.97785689861112 +lon_0=-91.29444444444444 +no_defs +proj=lcc +units=us-ft +x_0=60045.72009144018 +y_0=44091.43449326898',NULL,'NAD83(2011) / WISCRS Chippewa (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7596,'EPSG','7596','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000463003 +lat_0=43.6 +lon_0=-90.70833333333334 +no_defs +proj=tmerc +units=us-ft +x_0=199949.198983998 +y_0=0.008534417068834137',NULL,'NAD83(2011) / WISCRS Clark (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7597,'EPSG','7597','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.00003498 +lat_0=43.46254664583333 +lat_1=43.46254664583333 +lon_0=-89.39444444444445 +no_defs +proj=lcc +units=us-ft +x_0=169164.338023876 +y_0=111569.613512827',NULL,'NAD83(2011) / WISCRS Columbia (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7598,'EPSG','7598','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000349151 +lat_0=43.200055605 +lat_1=43.200055605 +lon_0=-90.9388888888889 +no_defs +proj=lcc +units=us-ft +x_0=113690.6273812548 +y_0=53703.12024384048',NULL,'NAD83(2011) / WISCRS Crawford (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7599,'EPSG','7599','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000384786 +lat_0=43.0695160375 +lat_1=43.0695160375 +lon_0=-89.42222222222223 +no_defs +proj=lcc +units=us-ft +x_0=247193.2943865888 +y_0=146591.9896367793',NULL,'NAD83(2011) / WISCRS Dane (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7600,'EPSG','7600','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000346418 +lat_0=41.47222222222222 +lon_0=-88.77500000000001 +no_defs +proj=tmerc +units=us-ft +x_0=263347.7263906528 +y_0=0.00762001524003048',NULL,'NAD83(2011) / WISCRS Dodge and Jefferson (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7601,'EPSG','7601','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000187521 +lat_0=44.4 +lon_0=-87.27222222222223 +no_defs +proj=tmerc +units=us-ft +x_0=158801.1176022352 +y_0=0.002438404876809754',NULL,'NAD83(2011) / WISCRS Door (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7602,'EPSG','7602','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000385418 +lat_0=45.88333333333333 +lon_0=-91.91666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=59131.31826263652 +y_0=0.003962407924815849',NULL,'NAD83(2011) / WISCRS Douglas (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7603,'EPSG','7603','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000410324 +lat_0=44.40833333333333 +lon_0=-91.89444444444445 +no_defs +proj=tmerc +units=us-ft +x_0=51816.10393700787 +y_0=0.003048006096012192',NULL,'NAD83(2011) / WISCRS Dunn (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7604,'EPSG','7604','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000035079 +lat_0=44.87228112638889 +lat_1=44.87228112638889 +lon_0=-91.28888888888889 +no_defs +proj=lcc +units=us-ft +x_0=120091.4401828804 +y_0=91687.92390144781',NULL,'NAD83(2011) / WISCRS Eau Claire (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7605,'EPSG','7605','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000552095 +lat_0=45.43888888888888 +lon_0=-88.14166666666668 +no_defs +proj=tmerc +units=us-ft +x_0=133502.6682245364 +y_0=0.006400812801625603',NULL,'NAD83(2011) / WISCRS Florence (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7606,'EPSG','7606','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000673004 +lat_0=44.00555555555555 +lon_0=-88.63333333333334 +no_defs +proj=tmerc +units=us-ft +x_0=275844.5532131065 +y_0=0.0158496316992634',NULL,'NAD83(2011) / WISCRS Forest (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7607,'EPSG','7607','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000349452 +lat_0=41.41111111111111 +lon_0=-90.8 +no_defs +proj=tmerc +units=us-ft +x_0=242316.484023368 +y_0=0.01005842011684023',NULL,'NAD83(2011) / WISCRS Grant (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7608,'EPSG','7608','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000390487 +lat_0=42.63756227694444 +lat_1=42.63756227694444 +lon_0=-89.83888888888889 +no_defs +proj=lcc +units=us-ft +x_0=170078.7401574803 +y_0=45830.29484378968',NULL,'NAD83(2011) / WISCRS Green and Lafayette (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7609,'EPSG','7609','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000344057 +lat_0=43.80700011777778 +lat_1=43.80700011777778 +lon_0=-89.24166666666667 +no_defs +proj=lcc +units=us-ft +x_0=150876.3017526035 +y_0=79170.77937515875',NULL,'NAD83(2011) / WISCRS Green Lake and Marquette (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7610,'EPSG','7610','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000394961 +lat_0=42.53888888888888 +lon_0=-90.16111111111111 +no_defs +proj=tmerc +units=us-ft +x_0=113081.0261620523 +y_0=0.004572009144018288',NULL,'NAD83(2011) / WISCRS Iowa (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7611,'EPSG','7611','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000677153 +lat_0=45.43333333333333 +lon_0=-90.25555555555556 +no_defs +proj=tmerc +units=us-ft +x_0=220980.4419608839 +y_0=0.008534417068834137',NULL,'NAD83(2011) / WISCRS Iron (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7612,'EPSG','7612','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000353 +lat_0=44.25333512777778 +lon_0=-90.84429651944444 +no_defs +proj=tmerc +units=us-ft +x_0=27000 +y_0=24999.99989839979',NULL,'NAD83(2011) / WISCRS Jackson (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7613,'EPSG','7613','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000260649 +lat_0=42.21666666666667 +lon_0=-87.89444444444445 +no_defs +proj=tmerc +units=us-ft +x_0=185928.3727711455 +y_0=0.0009144018288036576',NULL,'NAD83(2011) / WISCRS Kenosha, Milwaukee, Ozaukee and Racine (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7614,'EPSG','7614','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000233704 +lat_0=43.26666666666667 +lon_0=-87.55 +no_defs +proj=tmerc +units=us-ft +x_0=79857.76154432308 +y_0=0.001219202438404877',NULL,'NAD83(2011) / WISCRS Kewaunee, Manitowoc and Sheboygan (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7615,'EPSG','7615','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000319985 +lat_0=43.45111111111111 +lon_0=-91.31666666666666 +no_defs +proj=tmerc +units=us-ft +x_0=130454.6596901194 +y_0=0.003352806705613411',NULL,'NAD83(2011) / WISCRS La Crosse (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7616,'EPSG','7616','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000627024 +lat_0=45.15423710527778 +lat_1=45.15423710527778 +lon_0=-89.03333333333333 +no_defs +proj=lcc +units=us-ft +x_0=198425.1968503937 +y_0=105279.7828803657',NULL,'NAD83(2011) / WISCRS Langlade (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7617,'EPSG','7617','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000599003 +lat_0=44.84444444444445 +lon_0=-89.73333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=116129.0322580645 +y_0=0.005791211582423164',NULL,'NAD83(2011) / WISCRS Lincoln (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7618,'EPSG','7618','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000053289 +lat_0=44.90090442361111 +lat_1=44.90090442361111 +lon_0=-89.77 +no_defs +proj=lcc +units=us-ft +x_0=74676.1493522987 +y_0=55049.26695453391',NULL,'NAD83(2011) / WISCRS Marathon (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7619,'EPSG','7619','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000234982 +lat_0=44.69166666666666 +lon_0=-87.71111111111111 +no_defs +proj=tmerc +units=us-ft +x_0=238658.8794513589 +y_0=0.003048006096012192',NULL,'NAD83(2011) / WISCRS Marinette (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7620,'EPSG','7620','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000362499 +lat_0=44.71666666666667 +lon_0=-88.41666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=105461.0121412243 +y_0=0.003048006096012192',NULL,'NAD83(2011) / WISCRS Menominee (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7621,'EPSG','7621','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000434122 +lat_0=44.00007392861111 +lat_1=44.00007392861111 +lon_0=-90.64166666666668 +no_defs +proj=lcc +units=us-ft +x_0=204521.2090424181 +y_0=121923.9861823724',NULL,'NAD83(2011) / WISCRS Monroe (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7622,'EPSG','7622','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000236869 +lat_0=44.39722222222222 +lon_0=-87.90833333333335 +no_defs +proj=tmerc +units=us-ft +x_0=182880.3675895352 +y_0=0.003352806705613411',NULL,'NAD83(2011) / WISCRS Oconto (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7623,'EPSG','7623','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000686968 +lat_0=45.70422377027778 +lat_1=45.70422377027778 +lon_0=-89.54444444444444 +no_defs +proj=lcc +units=us-ft +x_0=70104.14020828041 +y_0=57588.03474726949',NULL,'NAD83(2011) / WISCRS Oneida (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7624,'EPSG','7624','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000362977 +lat_0=44.63614887194444 +lat_1=44.63614887194444 +lon_0=-92.22777777777777 +no_defs +proj=lcc +units=us-ft +x_0=167640.3352806706 +y_0=86033.08773177546',NULL,'NAD83(2011) / WISCRS Pepin and Pierce (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7625,'EPSG','7625','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000433849 +lat_0=44.66111111111111 +lon_0=-92.63333333333334 +no_defs +proj=tmerc +units=us-ft +x_0=141732.2822453645 +y_0=0.005791211582423164',NULL,'NAD83(2011) / WISCRS Polk (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7626,'EPSG','7626','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.000039936 +lat_0=44.41682397527777 +lat_1=44.41682397527777 +lon_0=-89.5 +no_defs +proj=lcc +units=us-ft +x_0=56388.11277622555 +y_0=50022.1874523749',NULL,'NAD83(2011) / WISCRS Portage (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7627,'EPSG','7627','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000649554 +lat_0=44.55555555555555 +lon_0=-90.48888888888889 +no_defs +proj=tmerc +units=us-ft +x_0=227990.8544577089 +y_0=0.01097282194564389',NULL,'NAD83(2011) / WISCRS Price (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7628,'EPSG','7628','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000375653 +lat_0=43.3223129275 +lat_1=43.3223129275 +lon_0=-90.43055555555556 +no_defs +proj=lcc +units=us-ft +x_0=202387.6047752095 +y_0=134255.4254508509',NULL,'NAD83(2011) / WISCRS Richland (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7629,'EPSG','7629','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000337311 +lat_0=41.94444444444444 +lon_0=-89.07222222222222 +no_defs +proj=tmerc +units=us-ft +x_0=146304.2926085852 +y_0=0.006705613411226822',NULL,'NAD83(2011) / WISCRS Rock (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7630,'EPSG','7630','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000495976 +lat_0=43.91944444444444 +lon_0=-91.06666666666666 +no_defs +proj=tmerc +units=us-ft +x_0=250546.1013970028 +y_0=0.02346964693929388',NULL,'NAD83(2011) / WISCRS Rusk (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7631,'EPSG','7631','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000373868 +lat_0=42.81944444444445 +lon_0=-89.90000000000001 +no_defs +proj=tmerc +units=us-ft +x_0=185623.5715519431 +y_0=0.005181610363220727',NULL,'NAD83(2011) / WISCRS Sauk (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7632,'EPSG','7632','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000573461 +lat_0=45.90009913138888 +lat_1=45.90009913138888 +lon_0=-91.11666666666666 +no_defs +proj=lcc +units=us-ft +x_0=216713.2337312675 +y_0=120734.1631699263',NULL,'NAD83(2011) / WISCRS Sawyer (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7633,'EPSG','7633','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.000032144 +lat_0=44.03611111111111 +lon_0=-88.60555555555555 +no_defs +proj=tmerc +units=us-ft +x_0=262433.3251714504 +y_0=0.009448818897637795',NULL,'NAD83(2011) / WISCRS Shawano (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7634,'EPSG','7634','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000381803 +lat_0=44.03611111111111 +lon_0=-92.63333333333334 +no_defs +proj=tmerc +units=us-ft +x_0=165506.7300990602 +y_0=0.01036322072644145',NULL,'NAD83(2011) / WISCRS St. Croix (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7635,'EPSG','7635','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000597566 +lat_0=45.17782208583333 +lat_1=45.17782208583333 +lon_0=-90.48333333333333 +no_defs +proj=lcc +units=us-ft +x_0=187147.5742951486 +y_0=107746.7521463043',NULL,'NAD83(2011) / WISCRS Taylor (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7636,'EPSG','7636','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000361538 +lat_0=43.16111111111111 +lon_0=-91.36666666666666 +no_defs +proj=tmerc +units=us-ft +x_0=256946.9138938278 +y_0=0.003962407924815849',NULL,'NAD83(2011) / WISCRS Trempealeau (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7637,'EPSG','7637','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000408158 +lat_0=43.57503293972223 +lat_1=43.57503293972223 +lon_0=-90.78333333333333 +no_defs +proj=lcc +units=us-ft +x_0=222504.44500889 +y_0=47532.0603505207',NULL,'NAD83(2011) / WISCRS Vernon (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7638,'EPSG','7638','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000730142 +lat_0=46.07784409055556 +lat_1=46.07784409055556 +lon_0=-89.48888888888889 +no_defs +proj=lcc +units=us-ft +x_0=134417.0688341377 +y_0=50337.10927101854',NULL,'NAD83(2011) / WISCRS Vilas (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7639,'EPSG','7639','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000367192 +lat_0=42.66946209694444 +lat_1=42.66946209694444 +lon_0=-88.54166666666667 +no_defs +proj=lcc +units=us-ft +x_0=232562.8651257302 +y_0=111088.2224028448',NULL,'NAD83(2011) / WISCRS Walworth (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7640,'EPSG','7640','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000475376 +lat_0=45.96121983333334 +lat_1=45.96121983333334 +lon_0=-91.78333333333333 +no_defs +proj=lcc +units=us-ft +x_0=234086.8681737363 +y_0=188358.6059436119',NULL,'NAD83(2011) / WISCRS Washburn (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7641,'EPSG','7641','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.00003738 +lat_0=42.91805555555555 +lon_0=-88.06388888888888 +no_defs +proj=tmerc +units=us-ft +x_0=120091.4414020828 +y_0=0.003048006096012192',NULL,'NAD83(2011) / WISCRS Washington (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7642,'EPSG','7642','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000346179 +lat_0=42.56944444444445 +lon_0=-88.22499999999999 +no_defs +proj=tmerc +units=us-ft +x_0=208788.4178816358 +y_0=0.003352806705613411',NULL,'NAD83(2011) / WISCRS Waukesha (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7643,'EPSG','7643','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1.0000333645 +lat_0=43.42027777777778 +lon_0=-88.81666666666666 +no_defs +proj=tmerc +units=us-ft +x_0=185013.9709423419 +y_0=0.007010414020828041',NULL,'NAD83(2011) / WISCRS Waupaca (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7644,'EPSG','7644','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000392096 +lat_0=44.11394404583334 +lat_1=44.11394404583334 +lon_0=-89.24166666666667 +no_defs +proj=lcc +units=us-ft +x_0=120091.4401828804 +y_0=45069.7588011176',NULL,'NAD83(2011) / WISCRS Waushara (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7645,'EPSG','7645','proj4_data/epsg',NULL,'+ellps=GRS80 +k_0=1.0000421209 +lat_0=44.36259546944444 +lat_1=44.36259546944444 +lon_0=-90 +no_defs +proj=lcc +units=us-ft +x_0=208483.6172720346 +y_0=134589.7539243078',NULL,'NAD83(2011) / WISCRS Wood (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7684,'EPSG','7684','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=geocent +units=m',NULL,'Kyrg-06',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7686,'EPSG','7686','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=longlat',NULL,'Kyrg-06',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7692,'EPSG','7692','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=68.51666666666667 +no_defs +proj=tmerc +units=m +x_0=1300000 +y_0=14743.5',NULL,'Kyrg-06 / zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7693,'EPSG','7693','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=71.51666666666667 +no_defs +proj=tmerc +units=m +x_0=2300000 +y_0=14743.5',NULL,'Kyrg-06 / zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7694,'EPSG','7694','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=74.51666666666667 +no_defs +proj=tmerc +units=m +x_0=3300000 +y_0=14743.5',NULL,'Kyrg-06 / zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7695,'EPSG','7695','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=77.51666666666667 +no_defs +proj=tmerc +units=m +x_0=4300000 +y_0=14743.5',NULL,'Kyrg-06 / zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(7696,'EPSG','7696','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=80.51666666666667 +no_defs +proj=tmerc +units=m +x_0=5300000 +y_0=14743.5',NULL,'Kyrg-06 / zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20002,'ESRI','20002','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=9 +proj=tmerc +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 GK Zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20003,'ESRI','20003','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=15 +proj=tmerc +units=m +x_0=3500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 GK Zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20004,'EPSG','20004','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=4500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20004,'ESRI','20004','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20005,'EPSG','20005','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=5500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20005,'ESRI','20005','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20006,'EPSG','20006','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=6500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20006,'ESRI','20006','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +units=m +x_0=6500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20007,'EPSG','20007','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=7500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20007,'ESRI','20007','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +units=m +x_0=7500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20008,'EPSG','20008','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=8500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20008,'ESRI','20008','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +units=m +x_0=8500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20009,'EPSG','20009','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=9500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20009,'ESRI','20009','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +units=m +x_0=9500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20010,'EPSG','20010','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=10500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20010,'ESRI','20010','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +units=m +x_0=10500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20011,'EPSG','20011','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=11500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20011,'ESRI','20011','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +units=m +x_0=11500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20012,'EPSG','20012','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=12500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20012,'ESRI','20012','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +units=m +x_0=12500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20013,'EPSG','20013','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=13500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20013,'ESRI','20013','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=13500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20014,'EPSG','20014','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=14500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20014,'ESRI','20014','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=14500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20015,'EPSG','20015','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=15500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20015,'ESRI','20015','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=15500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20016,'EPSG','20016','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=16500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20016,'ESRI','20016','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=16500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20017,'EPSG','20017','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=17500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20017,'ESRI','20017','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=17500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20018,'EPSG','20018','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=18500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20018,'ESRI','20018','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=18500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20019,'EPSG','20019','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=19500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20019,'ESRI','20019','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=19500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 19',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_56() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20020,'EPSG','20020','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=20500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20020,'ESRI','20020','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=20500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20021,'EPSG','20021','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=21500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20021,'ESRI','20021','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=21500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20022,'EPSG','20022','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=22500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20022,'ESRI','20022','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=22500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20023,'EPSG','20023','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=23500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20023,'ESRI','20023','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=23500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20024,'EPSG','20024','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=24500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20024,'ESRI','20024','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +units=m +x_0=24500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20025,'EPSG','20025','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=25500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20025,'ESRI','20025','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +units=m +x_0=25500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20026,'EPSG','20026','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=26500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20026,'ESRI','20026','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +units=m +x_0=26500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20027,'EPSG','20027','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=27500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20027,'ESRI','20027','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +units=m +x_0=27500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20028,'EPSG','20028','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=28500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20028,'ESRI','20028','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +units=m +x_0=28500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20029,'EPSG','20029','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=29500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20029,'ESRI','20029','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +units=m +x_0=29500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20030,'EPSG','20030','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=30500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20030,'ESRI','20030','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +units=m +x_0=30500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20031,'EPSG','20031','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=31500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20031,'ESRI','20031','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=m +x_0=31500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20032,'EPSG','20032','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=32500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20032,'ESRI','20032','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +units=m +x_0=32500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20062,'ESRI','20062','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=9 +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 GK Zone 2N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20063,'ESRI','20063','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=15 +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 GK Zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20064,'EPSG','20064','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 4N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20064,'ESRI','20064','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20065,'EPSG','20065','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 5N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20065,'ESRI','20065','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20066,'EPSG','20066','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 6N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20066,'ESRI','20066','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20067,'EPSG','20067','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 7N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20067,'ESRI','20067','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20068,'EPSG','20068','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 8N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20068,'ESRI','20068','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20069,'EPSG','20069','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 9N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20069,'ESRI','20069','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20070,'EPSG','20070','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 10N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20070,'ESRI','20070','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20071,'EPSG','20071','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 11N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20071,'ESRI','20071','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20072,'EPSG','20072','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 12N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20072,'ESRI','20072','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20073,'EPSG','20073','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 13N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20073,'ESRI','20073','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20074,'EPSG','20074','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 14N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20074,'ESRI','20074','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20075,'EPSG','20075','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 15N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20075,'ESRI','20075','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20076,'EPSG','20076','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 16N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20076,'ESRI','20076','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20077,'EPSG','20077','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 17N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20077,'ESRI','20077','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20078,'EPSG','20078','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 18N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20078,'ESRI','20078','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20079,'EPSG','20079','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 19N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20079,'ESRI','20079','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20080,'EPSG','20080','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 20N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20080,'ESRI','20080','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20081,'EPSG','20081','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 21N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20081,'ESRI','20081','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20082,'EPSG','20082','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 22N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20082,'ESRI','20082','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20083,'EPSG','20083','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 23N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20083,'ESRI','20083','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20084,'EPSG','20084','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 24N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20084,'ESRI','20084','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 24N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20085,'EPSG','20085','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 25N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20085,'ESRI','20085','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 25N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20086,'EPSG','20086','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 26N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20086,'ESRI','20086','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20087,'EPSG','20087','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 27N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20087,'ESRI','20087','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 27N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20088,'EPSG','20088','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 28N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20088,'ESRI','20088','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20089,'EPSG','20089','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 29N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20089,'ESRI','20089','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20090,'EPSG','20090','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 30N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20090,'ESRI','20090','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20091,'EPSG','20091','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 31N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20091,'ESRI','20091','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20092,'EPSG','20092','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +towgs84=24.47,-130.89,-81.56,0,0,0.13,-0.22 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1995 / Gauss-Kruger 32N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20092,'ESRI','20092','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1995 / Gauss-Kruger 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20135,'EPSG','20135','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-166,-15,204,0,0,0,0 +units=m +zone=35',NULL,'Adindan / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20136,'EPSG','20136','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-166,-15,204,0,0,0,0 +units=m +zone=36',NULL,'Adindan / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20137,'EPSG','20137','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-166,-15,204,0,0,0,0 +units=m +zone=37',NULL,'Adindan / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20137,'ESRI','20137','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=37 no_defs',NULL,'Adindan / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20138,'EPSG','20138','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-166,-15,204,0,0,0,0 +units=m +zone=38',NULL,'Adindan / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20138,'ESRI','20138','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=38 no_defs',NULL,'Adindan / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20248,'EPSG','20248','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +zone=48',NULL,'AGD66 / AMG zone 48 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20248,'ESRI','20248','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=48 no_defs',NULL,'AGD66 / AMG zone 48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20249,'EPSG','20249','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +zone=49',NULL,'AGD66 / AMG zone 49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20249,'ESRI','20249','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=49 no_defs',NULL,'AGD66 / AMG zone 49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20250,'EPSG','20250','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +zone=50',NULL,'AGD66 / AMG zone 50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20250,'ESRI','20250','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=50 no_defs',NULL,'AGD66 / AMG zone 50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20251,'EPSG','20251','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +zone=51',NULL,'AGD66 / AMG zone 51',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20251,'ESRI','20251','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=51 no_defs',NULL,'AGD66 / AMG zone 51',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_57() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20252,'EPSG','20252','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +zone=52',NULL,'AGD66 / AMG zone 52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20252,'ESRI','20252','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=52 no_defs',NULL,'AGD66 / AMG zone 52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20253,'EPSG','20253','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +zone=53',NULL,'AGD66 / AMG zone 53',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20253,'ESRI','20253','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=53 no_defs',NULL,'AGD66 / AMG zone 53',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20254,'EPSG','20254','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +zone=54',NULL,'AGD66 / AMG zone 54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20254,'ESRI','20254','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=54 no_defs',NULL,'AGD66 / AMG zone 54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20255,'EPSG','20255','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +zone=55',NULL,'AGD66 / AMG zone 55',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20255,'ESRI','20255','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=55 no_defs',NULL,'AGD66 / AMG zone 55',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20256,'EPSG','20256','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +zone=56',NULL,'AGD66 / AMG zone 56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20256,'ESRI','20256','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=56 no_defs',NULL,'AGD66 / AMG zone 56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20257,'EPSG','20257','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +zone=57',NULL,'AGD66 / AMG zone 57',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20257,'ESRI','20257','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=57 no_defs',NULL,'AGD66 / AMG zone 57',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20258,'EPSG','20258','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-117.808,-51.536,137.784,0.303,0.446,0.234,-0.29 +units=m +zone=58',NULL,'AGD66 / AMG zone 58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20258,'ESRI','20258','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=58 no_defs',NULL,'AGD66 / AMG zone 58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20348,'EPSG','20348','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-134,-48,149,0,0,0,0 +units=m +zone=48',NULL,'AGD84 / AMG zone 48 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20348,'ESRI','20348','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=48 no_defs',NULL,'AGD84 / AMG zone 48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20349,'EPSG','20349','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-134,-48,149,0,0,0,0 +units=m +zone=49',NULL,'AGD84 / AMG zone 49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20349,'ESRI','20349','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=49 no_defs',NULL,'AGD84 / AMG zone 49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20350,'EPSG','20350','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-134,-48,149,0,0,0,0 +units=m +zone=50',NULL,'AGD84 / AMG zone 50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20350,'ESRI','20350','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=50 no_defs',NULL,'AGD84 / AMG zone 50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20351,'EPSG','20351','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-134,-48,149,0,0,0,0 +units=m +zone=51',NULL,'AGD84 / AMG zone 51',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20351,'ESRI','20351','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=51 no_defs',NULL,'AGD84 / AMG zone 51',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20352,'EPSG','20352','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-134,-48,149,0,0,0,0 +units=m +zone=52',NULL,'AGD84 / AMG zone 52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20352,'ESRI','20352','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=52 no_defs',NULL,'AGD84 / AMG zone 52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20353,'EPSG','20353','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-134,-48,149,0,0,0,0 +units=m +zone=53',NULL,'AGD84 / AMG zone 53',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20353,'ESRI','20353','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=53 no_defs',NULL,'AGD84 / AMG zone 53',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20354,'EPSG','20354','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-134,-48,149,0,0,0,0 +units=m +zone=54',NULL,'AGD84 / AMG zone 54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20354,'ESRI','20354','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=54 no_defs',NULL,'AGD84 / AMG zone 54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20355,'EPSG','20355','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-134,-48,149,0,0,0,0 +units=m +zone=55',NULL,'AGD84 / AMG zone 55',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20355,'ESRI','20355','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=55 no_defs',NULL,'AGD84 / AMG zone 55',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20356,'EPSG','20356','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-134,-48,149,0,0,0,0 +units=m +zone=56',NULL,'AGD84 / AMG zone 56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20356,'ESRI','20356','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=56 no_defs',NULL,'AGD84 / AMG zone 56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20357,'EPSG','20357','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-134,-48,149,0,0,0,0 +units=m +zone=57',NULL,'AGD84 / AMG zone 57 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20357,'ESRI','20357','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=57 no_defs',NULL,'AGD84 / AMG zone 57',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20358,'EPSG','20358','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-134,-48,149,0,0,0,0 +units=m +zone=58',NULL,'AGD84 / AMG zone 58 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20358,'ESRI','20358','proj4_data/esri',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +units=m +zone=58 no_defs',NULL,'AGD84 / AMG zone 58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20436,'EPSG','20436','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-143,-236,7,0,0,0,0 +units=m +zone=36',NULL,'Ain el Abd / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20437,'EPSG','20437','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-143,-236,7,0,0,0,0 +units=m +zone=37',NULL,'Ain el Abd / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20437,'ESRI','20437','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=37 no_defs',NULL,'Ain el Abd / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20438,'EPSG','20438','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-143,-236,7,0,0,0,0 +units=m +zone=38',NULL,'Ain el Abd / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20438,'ESRI','20438','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=38 no_defs',NULL,'Ain el Abd / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20439,'EPSG','20439','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-143,-236,7,0,0,0,0 +units=m +zone=39',NULL,'Ain el Abd / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20439,'ESRI','20439','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=39 no_defs',NULL,'Ain el Abd / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20440,'EPSG','20440','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-143,-236,7,0,0,0,0 +units=m +zone=40',NULL,'Ain el Abd / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20499,'EPSG','20499','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-143,-236,7,0,0,0,0 +units=m +zone=39',NULL,'Ain el Abd / Bahrain Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20499,'ESRI','20499','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=39 no_defs',NULL,'Ain el Abd / Bahrain Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20538,'EPSG','20538','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=utm +towgs84=-43,-163,45,0,0,0,0 +units=m +zone=38',NULL,'Afgooye / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20538,'ESRI','20538','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=utm +towgs84=-43,-163,45,0,0,0,0 +units=m +zone=38 no_defs',NULL,'Afgooye / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20539,'EPSG','20539','proj4_data/epsg',NULL,'+ellps=krass +no_defs +proj=utm +towgs84=-43,-163,45,0,0,0,0 +units=m +zone=39',NULL,'Afgooye / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20539,'ESRI','20539','proj4_data/esri',NULL,'+ellps=krass +no_defs +proj=utm +towgs84=-43,-163,45,0,0,0,0 +units=m +zone=39 no_defs',NULL,'Afgooye / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20790,'EPSG','20790','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=39.66666666666666 +lon_0=1 +no_defs +pm=lisbon +proj=tmerc +towgs84=-304.046,-60.576,103.64,0,0,0,0 +units=m +x_0=200000 +y_0=300000',NULL,'Lisbon (Lisbon) / Portuguese National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20790,'ESRI','20790','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=39.66666666666666 +lon_0=-8.131906111111112 +no_defs +pm=lisbon +proj=tmerc +units=m +x_0=200000 +y_0=300000 no_defs',NULL,'Lisbon (Lisbon)/Portuguese National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20791,'EPSG','20791','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=39.66666666666666 +lon_0=1 +no_defs +pm=lisbon +proj=tmerc +towgs84=-304.046,-60.576,103.64,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Lisbon (Lisbon) / Portuguese Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20791,'ESRI','20791','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=39.66666666666666 +lon_0=-8.131906111111112 +no_defs +pm=lisbon +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Lisbon (Lisbon)/Portuguese Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20822,'EPSG','20822','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-151.99,287.04,-147.45,0,0,0,0 +units=m +zone=22',NULL,'Aratu / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20822,'ESRI','20822','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=22 no_defs',NULL,'Aratu / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20823,'EPSG','20823','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-151.99,287.04,-147.45,0,0,0,0 +units=m +zone=23',NULL,'Aratu / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20823,'ESRI','20823','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=23 no_defs',NULL,'Aratu / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20824,'EPSG','20824','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-151.99,287.04,-147.45,0,0,0,0 +units=m +zone=24',NULL,'Aratu / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20824,'ESRI','20824','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=24 no_defs',NULL,'Aratu / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20934,'EPSG','20934','proj4_data/epsg',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=utm +south +towgs84=-143,-90,-294,0,0,0,0 +units=m +zone=34',NULL,'Arc 1950 / UTM zone 34S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20934,'ESRI','20934','proj4_data/esri',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=utm +south +units=m +zone=34 no_defs',NULL,'Arc 1950 / UTM zone 34S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20935,'EPSG','20935','proj4_data/epsg',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=utm +south +towgs84=-143,-90,-294,0,0,0,0 +units=m +zone=35',NULL,'Arc 1950 / UTM zone 35S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20935,'ESRI','20935','proj4_data/esri',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=utm +south +units=m +zone=35 no_defs',NULL,'Arc 1950 / UTM zone 35S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20936,'EPSG','20936','proj4_data/epsg',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=utm +south +towgs84=-143,-90,-294,0,0,0,0 +units=m +zone=36',NULL,'Arc 1950 / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(20936,'ESRI','20936','proj4_data/esri',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=utm +south +units=m +zone=36 no_defs',NULL,'Arc 1950 / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21035,'EPSG','21035','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +south +towgs84=-160,-6,-302,0,0,0,0 +units=m +zone=35',NULL,'Arc 1960 / UTM zone 35S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21035,'ESRI','21035','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +south +units=m +zone=35 no_defs',NULL,'Arc 1960 / UTM zone 35S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21036,'EPSG','21036','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +south +towgs84=-160,-6,-302,0,0,0,0 +units=m +zone=36',NULL,'Arc 1960 / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21036,'ESRI','21036','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +south +units=m +zone=36 no_defs',NULL,'Arc 1960 / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21037,'EPSG','21037','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +south +towgs84=-160,-6,-302,0,0,0,0 +units=m +zone=37',NULL,'Arc 1960 / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21037,'ESRI','21037','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +south +units=m +zone=37 no_defs',NULL,'Arc 1960 / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21095,'EPSG','21095','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-160,-6,-302,0,0,0,0 +units=m +zone=35',NULL,'Arc 1960 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21095,'ESRI','21095','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=35 no_defs',NULL,'Arc 1960 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21096,'EPSG','21096','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-160,-6,-302,0,0,0,0 +units=m +zone=36',NULL,'Arc 1960 / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21096,'ESRI','21096','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=36 no_defs',NULL,'Arc 1960 / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21097,'EPSG','21097','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-160,-6,-302,0,0,0,0 +units=m +zone=37',NULL,'Arc 1960 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21097,'ESRI','21097','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=37 no_defs',NULL,'Arc 1960 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21100,'EPSG','21100','proj4_data/epsg',NULL,'+ellps=bessel +k=0.997 +lon_0=110 +no_defs +pm=jakarta +proj=merc +towgs84=-377,681,-50,0,0,0,0 +units=m +x_0=3900000 +y_0=900000',NULL,'Batavia (Jakarta) / NEIEZ (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21100,'ESRI','21100','proj4_data/esri',NULL,'+ellps=bessel +k=0.997000 +lat_ts=0 +lon_0=216.8077194444444 +no_defs +pm=jakarta +proj=merc +units=m +x_0=3900000 +y_0=900000 no_defs',NULL,'Batavia (Jakarta) / NEIEZ',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21148,'EPSG','21148','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=utm +south +towgs84=-377,681,-50,0,0,0,0 +units=m +zone=48',NULL,'Batavia / UTM zone 48S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21148,'ESRI','21148','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=utm +south +units=m +zone=48 no_defs',NULL,'Batavia / UTM zone 48S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21149,'EPSG','21149','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=utm +south +towgs84=-377,681,-50,0,0,0,0 +units=m +zone=49',NULL,'Batavia / UTM zone 49S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21149,'ESRI','21149','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=utm +south +units=m +zone=49 no_defs',NULL,'Batavia / UTM zone 49S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21150,'EPSG','21150','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=utm +south +towgs84=-377,681,-50,0,0,0,0 +units=m +zone=50',NULL,'Batavia / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21150,'ESRI','21150','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=utm +south +units=m +zone=50 no_defs',NULL,'Batavia / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21291,'EPSG','21291','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9995000000000001 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +towgs84=31.95,300.99,419.19,0,0,0,0 +units=m +x_0=400000 +y_0=0',NULL,'Barbados 1938 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21291,'ESRI','21291','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999500 +lat_0=0 +lon_0=-62 +no_defs +proj=tmerc +units=m +x_0=400000 +y_0=0 no_defs',NULL,'Barbados 1938 / British West Indies Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21292,'EPSG','21292','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9999986 +lat_0=13.17638888888889 +lon_0=-59.55972222222222 +no_defs +proj=tmerc +towgs84=31.95,300.99,419.19,0,0,0,0 +units=m +x_0=30000 +y_0=75000',NULL,'Barbados 1938 / Barbados National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21292,'ESRI','21292','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999999 +lat_0=13.17638888888889 +lon_0=-59.55972222222222 +no_defs +proj=tmerc +units=m +x_0=30000 +y_0=75000 no_defs',NULL,'Barbados 1938 / Barbados National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21413,'EPSG','21413','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=13500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21413,'ESRI','21413','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=13500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21414,'EPSG','21414','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=14500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21414,'ESRI','21414','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=14500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21415,'EPSG','21415','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=15500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21415,'ESRI','21415','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=15500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21416,'EPSG','21416','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=16500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21416,'ESRI','21416','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=16500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21417,'EPSG','21417','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=17500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21417,'ESRI','21417','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=17500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger zone 17',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_58() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21418,'EPSG','21418','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=18500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21418,'ESRI','21418','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=18500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21419,'EPSG','21419','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=19500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21419,'ESRI','21419','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=19500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21420,'EPSG','21420','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=20500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21420,'ESRI','21420','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=20500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21421,'EPSG','21421','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=21500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21421,'ESRI','21421','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=21500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21422,'EPSG','21422','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=22500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21422,'ESRI','21422','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=22500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21423,'EPSG','21423','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=23500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21423,'ESRI','21423','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=23500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21453,'EPSG','21453','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21453,'ESRI','21453','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger CM 75E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21454,'EPSG','21454','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21454,'ESRI','21454','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger CM 81E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21455,'EPSG','21455','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21455,'ESRI','21455','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger CM 87E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21456,'EPSG','21456','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21456,'ESRI','21456','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger CM 93E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21457,'EPSG','21457','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21457,'ESRI','21457','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger CM 99E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21458,'EPSG','21458','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21458,'ESRI','21458','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger CM 105E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21459,'EPSG','21459','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21459,'ESRI','21459','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger CM 111E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21460,'EPSG','21460','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21460,'ESRI','21460','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger CM 117E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21461,'EPSG','21461','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21461,'ESRI','21461','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger CM 123E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21462,'EPSG','21462','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21462,'ESRI','21462','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger CM 129E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21463,'EPSG','21463','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21463,'ESRI','21463','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger CM 135E',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21473,'EPSG','21473','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger 13N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21473,'ESRI','21473','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21474,'EPSG','21474','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger 14N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21474,'ESRI','21474','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21475,'EPSG','21475','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger 15N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21475,'ESRI','21475','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21476,'EPSG','21476','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger 16N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21476,'ESRI','21476','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21477,'EPSG','21477','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger 17N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21477,'ESRI','21477','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21478,'EPSG','21478','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger 18N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21478,'ESRI','21478','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21479,'EPSG','21479','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger 19N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21479,'ESRI','21479','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21480,'EPSG','21480','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger 20N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21480,'ESRI','21480','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21481,'EPSG','21481','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger 21N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21481,'ESRI','21481','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21482,'EPSG','21482','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger 22N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21482,'ESRI','21482','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21483,'EPSG','21483','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=15.8,-154.4,-82.3,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Beijing 1954 / Gauss-Kruger 23N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21483,'ESRI','21483','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Beijing 1954 / Gauss-Kruger 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21500,'EPSG','21500','proj4_data/epsg',NULL,'+ellps=intl +lat_0=90 +lat_1=49.83333333333334 +lat_2=51.16666666666666 +lon_0=0 +no_defs +pm=brussels +proj=lcc +units=m +x_0=150000 +y_0=5400000',NULL,'Belge 1950 (Brussels) / Belge Lambert 50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21500,'ESRI','21500','proj4_data/esri',NULL,'+ellps=intl +lat_0=90 +lat_1=49.83333333333334 +lat_2=51.16666666666666 +lon_0=4.367975 +no_defs +pm=brussels +proj=lcc +units=m +x_0=150000 +y_0=5400000 no_defs',NULL,'Belge 1950 (Brussels) / Belge Lambert 50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21780,'EPSG','21780','proj4_data/epsg',NULL,'+ellps=bessel +k_0=1 +lat_0=46.95240555555556 +lon_0=0 +no_defs +pm=bern +proj=somerc +towgs84=674.4,15.1,405.3,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Bern 1898 (Bern) / LV03C',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21780,'ESRI','21780','proj4_data/esri',NULL,'+alpha=90 +ellps=bessel +k=1 +lat_0=46.95240555555556 +lonc=7.439583333333333 +no_defs +pm=bern +proj=omerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Bern 1898 (Bern) / LV03C',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21781,'EPSG','21781','proj4_data/epsg',NULL,'+ellps=bessel +k_0=1 +lat_0=46.95240555555556 +lon_0=7.439583333333333 +no_defs +proj=somerc +towgs84=674.4,15.1,405.3,0,0,0,0 +units=m +x_0=600000 +y_0=200000',NULL,'CH1903 / LV03',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21781,'ESRI','21781','proj4_data/esri',NULL,'+alpha=90 +ellps=bessel +k=1 +lat_0=46.95240555555556 +lonc=7.439583333333333 +no_defs +proj=omerc +units=m +x_0=600000 +y_0=200000 no_defs',NULL,'CH1903 / LV03',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21782,'EPSG','21782','proj4_data/epsg',NULL,'+ellps=bessel +k_0=1 +lat_0=46.95240555555556 +lon_0=7.439583333333333 +no_defs +proj=somerc +towgs84=674.4,15.1,405.3,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'CH1903 / LV03C-G',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21817,'EPSG','21817','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=307,304,-318,0,0,0,0 +units=m +zone=17',NULL,'Bogota 1975 / UTM zone 17N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21817,'ESRI','21817','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=17 no_defs',NULL,'Bogota 1975 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21818,'EPSG','21818','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=307,304,-318,0,0,0,0 +units=m +zone=18',NULL,'Bogota 1975 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21818,'ESRI','21818','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=18 no_defs',NULL,'Bogota 1975 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21891,'EPSG','21891','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=4.599047222222222 +lon_0=-77.08091666666667 +no_defs +proj=tmerc +towgs84=307,304,-318,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'Bogota 1975 / Colombia West zone (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21891,'ESRI','21891','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=4.599047222222222 +lon_0=-77.08091666666667 +no_defs +proj=tmerc +units=m +x_0=1000000 +y_0=1000000 no_defs',NULL,'Bogota 1975 / Colombia West zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21892,'EPSG','21892','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=4.599047222222222 +lon_0=-74.08091666666667 +no_defs +proj=tmerc +towgs84=307,304,-318,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'Bogota 1975 / Colombia Bogota zone (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21892,'ESRI','21892','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=4.599047222222222 +lon_0=-74.08091666666667 +no_defs +proj=tmerc +units=m +x_0=1000000 +y_0=1000000 no_defs',NULL,'Bogota 1975 / Colombia Bogota zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21893,'EPSG','21893','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=4.599047222222222 +lon_0=-71.08091666666667 +no_defs +proj=tmerc +towgs84=307,304,-318,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'Bogota 1975 / Colombia East Central zone (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21893,'ESRI','21893','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=4.599047222222222 +lon_0=-71.08091666666667 +no_defs +proj=tmerc +units=m +x_0=1000000 +y_0=1000000 no_defs',NULL,'Bogota 1975 / Colombia East Central zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21894,'EPSG','21894','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=4.599047222222222 +lon_0=-68.08091666666667 +no_defs +proj=tmerc +towgs84=307,304,-318,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'Bogota 1975 / Colombia East (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21894,'ESRI','21894','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=4.599047222222222 +lon_0=-68.08091666666667 +no_defs +proj=tmerc +units=m +x_0=1000000 +y_0=1000000 no_defs',NULL,'Bogota 1975 / Colombia East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21896,'EPSG','21896','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=4.599047222222222 +lon_0=-77.08091666666667 +no_defs +proj=tmerc +towgs84=307,304,-318,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'Bogota 1975 / Colombia West zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21897,'EPSG','21897','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=4.599047222222222 +lon_0=-74.08091666666667 +no_defs +proj=tmerc +towgs84=307,304,-318,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'Bogota 1975 / Colombia Bogota zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21898,'EPSG','21898','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=4.599047222222222 +lon_0=-71.08091666666667 +no_defs +proj=tmerc +towgs84=307,304,-318,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'Bogota 1975 / Colombia East Central zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(21899,'EPSG','21899','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=4.599047222222222 +lon_0=-68.08091666666667 +no_defs +proj=tmerc +towgs84=307,304,-318,0,0,0,0 +units=m +x_0=1000000 +y_0=1000000',NULL,'Bogota 1975 / Colombia East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22032,'EPSG','22032','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +south +towgs84=-50.9,-347.6,-231,0,0,0,0 +units=m +zone=32',NULL,'Camacupa / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22032,'ESRI','22032','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +south +units=m +zone=32 no_defs',NULL,'Camacupa / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22033,'EPSG','22033','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +south +towgs84=-50.9,-347.6,-231,0,0,0,0 +units=m +zone=33',NULL,'Camacupa / UTM zone 33S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22033,'ESRI','22033','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +south +units=m +zone=33 no_defs',NULL,'Camacupa / UTM zone 33S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22091,'EPSG','22091','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9996 +lat_0=0 +lon_0=11.5 +no_defs +proj=tmerc +towgs84=-50.9,-347.6,-231,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'Camacupa / TM 11.30 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22091,'ESRI','22091','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999600 +lat_0=0 +lon_0=11.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000 no_defs',NULL,'Camacupa / TM 11.30 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22092,'EPSG','22092','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.9996 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +towgs84=-50.9,-347.6,-231,0,0,0,0 +units=m +x_0=500000 +y_0=10000000',NULL,'Camacupa / TM 12 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22092,'ESRI','22092','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999600 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000 no_defs',NULL,'Camacupa / TM 12 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22171,'EPSG','22171','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-72 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=0',NULL,'POSGAR 98 / Argentina 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22172,'EPSG','22172','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-69 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=0',NULL,'POSGAR 98 / Argentina 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22173,'EPSG','22173','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-66 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=0',NULL,'POSGAR 98 / Argentina 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22174,'EPSG','22174','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-63 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4500000 +y_0=0',NULL,'POSGAR 98 / Argentina 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22175,'EPSG','22175','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-60 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=5500000 +y_0=0',NULL,'POSGAR 98 / Argentina 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22176,'EPSG','22176','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-57 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=6500000 +y_0=0',NULL,'POSGAR 98 / Argentina 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22177,'EPSG','22177','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=-90 +lon_0=-54 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=7500000 +y_0=0',NULL,'POSGAR 98 / Argentina 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22181,'EPSG','22181','proj4_data/epsg',NULL,'+ellps=WGS84 +k=1 +lat_0=-90 +lon_0=-72 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1500000 +y_0=0',NULL,'POSGAR 94 / Argentina 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22182,'EPSG','22182','proj4_data/epsg',NULL,'+ellps=WGS84 +k=1 +lat_0=-90 +lon_0=-69 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=2500000 +y_0=0',NULL,'POSGAR 94 / Argentina 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22183,'EPSG','22183','proj4_data/epsg',NULL,'+ellps=WGS84 +k=1 +lat_0=-90 +lon_0=-66 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=3500000 +y_0=0',NULL,'POSGAR 94 / Argentina 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22184,'EPSG','22184','proj4_data/epsg',NULL,'+ellps=WGS84 +k=1 +lat_0=-90 +lon_0=-63 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=4500000 +y_0=0',NULL,'POSGAR 94 / Argentina 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22185,'EPSG','22185','proj4_data/epsg',NULL,'+ellps=WGS84 +k=1 +lat_0=-90 +lon_0=-60 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=5500000 +y_0=0',NULL,'POSGAR 94 / Argentina 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22186,'EPSG','22186','proj4_data/epsg',NULL,'+ellps=WGS84 +k=1 +lat_0=-90 +lon_0=-57 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=6500000 +y_0=0',NULL,'POSGAR 94 / Argentina 6',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_59() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22187,'EPSG','22187','proj4_data/epsg',NULL,'+ellps=WGS84 +k=1 +lat_0=-90 +lon_0=-54 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=7500000 +y_0=0',NULL,'POSGAR 94 / Argentina 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22191,'EPSG','22191','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-90 +lon_0=-72 +no_defs +proj=tmerc +towgs84=-148,136,90,0,0,0,0 +units=m +x_0=1500000 +y_0=0',NULL,'Campo Inchauspe / Argentina 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22191,'ESRI','22191','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-90 +lon_0=-72 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0 no_defs',NULL,'Campo Inchauspe / Argentina 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22192,'EPSG','22192','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-90 +lon_0=-69 +no_defs +proj=tmerc +towgs84=-148,136,90,0,0,0,0 +units=m +x_0=2500000 +y_0=0',NULL,'Campo Inchauspe / Argentina 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22192,'ESRI','22192','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-90 +lon_0=-69 +no_defs +proj=tmerc +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'Campo Inchauspe / Argentina 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22193,'EPSG','22193','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-90 +lon_0=-66 +no_defs +proj=tmerc +towgs84=-148,136,90,0,0,0,0 +units=m +x_0=3500000 +y_0=0',NULL,'Campo Inchauspe / Argentina 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22193,'ESRI','22193','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-90 +lon_0=-66 +no_defs +proj=tmerc +units=m +x_0=3500000 +y_0=0 no_defs',NULL,'Campo Inchauspe / Argentina 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22194,'EPSG','22194','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-90 +lon_0=-63 +no_defs +proj=tmerc +towgs84=-148,136,90,0,0,0,0 +units=m +x_0=4500000 +y_0=0',NULL,'Campo Inchauspe / Argentina 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22194,'ESRI','22194','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-90 +lon_0=-63 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0 no_defs',NULL,'Campo Inchauspe / Argentina 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22195,'EPSG','22195','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-90 +lon_0=-60 +no_defs +proj=tmerc +towgs84=-148,136,90,0,0,0,0 +units=m +x_0=5500000 +y_0=0',NULL,'Campo Inchauspe / Argentina 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22195,'ESRI','22195','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-90 +lon_0=-60 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0 no_defs',NULL,'Campo Inchauspe / Argentina 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22196,'EPSG','22196','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-90 +lon_0=-57 +no_defs +proj=tmerc +towgs84=-148,136,90,0,0,0,0 +units=m +x_0=6500000 +y_0=0',NULL,'Campo Inchauspe / Argentina 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22196,'ESRI','22196','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-90 +lon_0=-57 +no_defs +proj=tmerc +units=m +x_0=6500000 +y_0=0 no_defs',NULL,'Campo Inchauspe / Argentina 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22197,'EPSG','22197','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=-90 +lon_0=-54 +no_defs +proj=tmerc +towgs84=-148,136,90,0,0,0,0 +units=m +x_0=7500000 +y_0=0',NULL,'Campo Inchauspe / Argentina 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22197,'ESRI','22197','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-90 +lon_0=-54 +no_defs +proj=tmerc +units=m +x_0=7500000 +y_0=0 no_defs',NULL,'Campo Inchauspe / Argentina 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22234,'EPSG','22234','proj4_data/epsg',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=utm +south +towgs84=-136,-108,-292,0,0,0,0 +units=m +zone=34',NULL,'Cape / UTM zone 34S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22234,'ESRI','22234','proj4_data/esri',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=utm +south +units=m +zone=34 no_defs',NULL,'Cape / UTM zone 34S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22235,'EPSG','22235','proj4_data/epsg',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=utm +south +towgs84=-136,-108,-292,0,0,0,0 +units=m +zone=35',NULL,'Cape / UTM zone 35S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22235,'ESRI','22235','proj4_data/esri',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=utm +south +units=m +zone=35 no_defs',NULL,'Cape / UTM zone 35S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22236,'EPSG','22236','proj4_data/epsg',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=utm +south +towgs84=-136,-108,-292,0,0,0,0 +units=m +zone=36',NULL,'Cape / UTM zone 36S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22236,'ESRI','22236','proj4_data/esri',NULL,'+a=6378249.145 +b=6356514.966398753 +no_defs +proj=utm +south +units=m +zone=36 no_defs',NULL,'Cape / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22275,'EPSG','22275','proj4_data/epsg',NULL,'+a=6378249.145 +axis=wsu +b=6356514.966398753 +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=-136,-108,-292,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Cape / Lo15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22277,'EPSG','22277','proj4_data/epsg',NULL,'+a=6378249.145 +axis=wsu +b=6356514.966398753 +k=1 +lat_0=0 +lon_0=17 +no_defs +proj=tmerc +towgs84=-136,-108,-292,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Cape / Lo17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22279,'EPSG','22279','proj4_data/epsg',NULL,'+a=6378249.145 +axis=wsu +b=6356514.966398753 +k=1 +lat_0=0 +lon_0=19 +no_defs +proj=tmerc +towgs84=-136,-108,-292,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Cape / Lo19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22281,'EPSG','22281','proj4_data/epsg',NULL,'+a=6378249.145 +axis=wsu +b=6356514.966398753 +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=-136,-108,-292,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Cape / Lo21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22283,'EPSG','22283','proj4_data/epsg',NULL,'+a=6378249.145 +axis=wsu +b=6356514.966398753 +k=1 +lat_0=0 +lon_0=23 +no_defs +proj=tmerc +towgs84=-136,-108,-292,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Cape / Lo23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22285,'EPSG','22285','proj4_data/epsg',NULL,'+a=6378249.145 +axis=wsu +b=6356514.966398753 +k=1 +lat_0=0 +lon_0=25 +no_defs +proj=tmerc +towgs84=-136,-108,-292,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Cape / Lo25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22287,'EPSG','22287','proj4_data/epsg',NULL,'+a=6378249.145 +axis=wsu +b=6356514.966398753 +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=-136,-108,-292,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Cape / Lo27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22289,'EPSG','22289','proj4_data/epsg',NULL,'+a=6378249.145 +axis=wsu +b=6356514.966398753 +k=1 +lat_0=0 +lon_0=29 +no_defs +proj=tmerc +towgs84=-136,-108,-292,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Cape / Lo29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22291,'EPSG','22291','proj4_data/epsg',NULL,'+a=6378249.145 +axis=wsu +b=6356514.966398753 +k=1 +lat_0=0 +lon_0=31 +no_defs +proj=tmerc +towgs84=-136,-108,-292,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Cape / Lo31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22293,'EPSG','22293','proj4_data/epsg',NULL,'+a=6378249.145 +axis=wsu +b=6356514.966398753 +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=-136,-108,-292,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Cape / Lo33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22332,'EPSG','22332','proj4_data/epsg',NULL,'+datum=carthage +no_defs +proj=utm +units=m +zone=32',NULL,'Carthage (Paris) / Tunisia Mining Grid\12Unable to translate coordinate system EPSG:22300 into PROJ.4 format.\12\12Carthage / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22332,'ESRI','22332','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=32 no_defs',NULL,'South African Coordinate System zone 15\12South African Coordinate System zone 17\12South African Coordinate System zone 19\12South African Coordinate System zone 21\12South African Coordinate System zone 23\12South African Coordinate System zone 25\12South African Coordinate System zone 27\12South African Coordinate System zone 29\12South African Coordinate System zone 31\12South African Coordinate System zone 33\12Carthage (Paris) / Tunisia Mining Grid\12Carthage / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22391,'EPSG','22391','proj4_data/epsg',NULL,'+datum=carthage +k_0=0.999625544 +lat_0=36 +lat_1=36 +lon_0=9.9 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=300000',NULL,'Carthage / Nord Tunisie',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22391,'ESRI','22391','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999625544 +lat_0=36 +lat_1=36 +lon_0=9.9 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=300000 no_defs',NULL,'Carthage / Nord Tunisie',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22392,'EPSG','22392','proj4_data/epsg',NULL,'+datum=carthage +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=9.9 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=300000',NULL,'Carthage / Sud Tunisie',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22392,'ESRI','22392','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=9.9 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=300000 no_defs',NULL,'Carthage / Sud Tunisie',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22521,'EPSG','22521','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-205.57,168.77,-4.12,0,0,0,0 +units=m +zone=21',NULL,'Corrego Alegre 1970-72 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22522,'EPSG','22522','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-205.57,168.77,-4.12,0,0,0,0 +units=m +zone=22',NULL,'Corrego Alegre 1970-72 / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22523,'EPSG','22523','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-205.57,168.77,-4.12,0,0,0,0 +units=m +zone=23',NULL,'Corrego Alegre 1970-72 / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22523,'ESRI','22523','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-206,172,-6,0,0,0,0 +units=m +zone=23 no_defs',NULL,'Corrego Alegre / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22524,'EPSG','22524','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-205.57,168.77,-4.12,0,0,0,0 +units=m +zone=24',NULL,'Corrego Alegre 1970-72 / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22524,'ESRI','22524','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-206,172,-6,0,0,0,0 +units=m +zone=24 no_defs',NULL,'Corrego Alegre / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22525,'EPSG','22525','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-205.57,168.77,-4.12,0,0,0,0 +units=m +zone=25',NULL,'Corrego Alegre 1970-72 / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22700,'EPSG','22700','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.9996256 +lat_0=34.65 +lat_1=34.65 +lon_0=37.35 +no_defs +proj=lcc +towgs84=-190.421,8.532,238.69,0,0,0,0 +units=m +x_0=300000 +y_0=300000',NULL,'Deir ez Zor / Levant Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22700,'ESRI','22700','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.9996256 +lat_0=34.65 +lat_1=34.65 +lon_0=37.35 +no_defs +proj=lcc +units=m +x_0=300000 +y_0=300000 no_defs',NULL,'Deir ez Zor / Levant Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22770,'EPSG','22770','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.9996256 +lat_0=34.65 +lat_1=34.65 +lon_0=37.35 +no_defs +proj=lcc +towgs84=-190.421,8.532,238.69,0,0,0,0 +units=m +x_0=300000 +y_0=300000',NULL,'Deir ez Zor / Syria Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22770,'ESRI','22770','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.9996256 +lat_0=34.65 +lat_1=34.65 +lon_0=37.35 +no_defs +proj=lcc +units=m +x_0=300000 +y_0=300000 no_defs',NULL,'Deir ez Zor / Syria Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22780,'EPSG','22780','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k=0.9995341 +lat_0=34.2 +lon_0=39.15 +no_defs +proj=sterea +towgs84=-190.421,8.532,238.69,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Deir ez Zor / Levant Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22780,'ESRI','22780','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k=0.999534 +lat_0=34.2 +lon_0=39.15 +no_defs +proj=stere +units=m +x_0=0 +y_0=0 no_defs',NULL,'Deir ez Zor / Levant Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22832,'EPSG','22832','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=32',NULL,'Douala / UTM zone 32N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22832,'ESRI','22832','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=32 no_defs',NULL,'Douala / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22991,'EPSG','22991','proj4_data/epsg',NULL,'+ellps=helmert +k=1 +lat_0=30 +lon_0=35 +no_defs +proj=tmerc +towgs84=-130,110,-13,0,0,0,0 +units=m +x_0=300000 +y_0=1100000',NULL,'Egypt 1907 / Blue Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22991,'ESRI','22991','proj4_data/esri',NULL,'+ellps=helmert +k=1.000000 +lat_0=30 +lon_0=35 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=1100000 no_defs',NULL,'Egypt 1907 / Blue Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22992,'EPSG','22992','proj4_data/epsg',NULL,'+ellps=helmert +k=1 +lat_0=30 +lon_0=31 +no_defs +proj=tmerc +towgs84=-130,110,-13,0,0,0,0 +units=m +x_0=615000 +y_0=810000',NULL,'Egypt 1907 / Red Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22992,'ESRI','22992','proj4_data/esri',NULL,'+ellps=helmert +k=1.000000 +lat_0=30 +lon_0=31 +no_defs +proj=tmerc +units=m +x_0=615000 +y_0=810000 no_defs',NULL,'Egypt 1907 / Red Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22993,'EPSG','22993','proj4_data/epsg',NULL,'+ellps=helmert +k=1 +lat_0=30 +lon_0=27 +no_defs +proj=tmerc +towgs84=-130,110,-13,0,0,0,0 +units=m +x_0=700000 +y_0=200000',NULL,'Egypt 1907 / Purple Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22993,'ESRI','22993','proj4_data/esri',NULL,'+ellps=helmert +k=1.000000 +lat_0=30 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=200000 no_defs',NULL,'Egypt 1907 / Purple Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22994,'EPSG','22994','proj4_data/epsg',NULL,'+ellps=helmert +k=1 +lat_0=30 +lon_0=27 +no_defs +proj=tmerc +towgs84=-130,110,-13,0,0,0,0 +units=m +x_0=700000 +y_0=1200000',NULL,'Egypt 1907 / Extended Purple Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(22994,'ESRI','22994','proj4_data/esri',NULL,'+ellps=helmert +k=1.000000 +lat_0=30 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=1200000 no_defs',NULL,'Egypt 1907 / Extended Purple Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23028,'EPSG','23028','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-87,-98,-121,0,0,0,0 +units=m +zone=28',NULL,'ED50 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23028,'ESRI','23028','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=28 no_defs',NULL,'ED50 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23029,'EPSG','23029','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-87,-98,-121,0,0,0,0 +units=m +zone=29',NULL,'ED50 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23029,'ESRI','23029','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=29 no_defs',NULL,'ED50 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23030,'EPSG','23030','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-87,-98,-121,0,0,0,0 +units=m +zone=30',NULL,'ED50 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23030,'ESRI','23030','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=30 no_defs',NULL,'ED50 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23031,'EPSG','23031','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-87,-98,-121,0,0,0,0 +units=m +zone=31',NULL,'ED50 / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23031,'ESRI','23031','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=31 no_defs',NULL,'ED50 / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23032,'EPSG','23032','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-87,-98,-121,0,0,0,0 +units=m +zone=32',NULL,'ED50 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23032,'ESRI','23032','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=32 no_defs',NULL,'ED50 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23033,'EPSG','23033','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-87,-98,-121,0,0,0,0 +units=m +zone=33',NULL,'ED50 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23033,'ESRI','23033','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=33 no_defs',NULL,'ED50 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23034,'EPSG','23034','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-87,-98,-121,0,0,0,0 +units=m +zone=34',NULL,'ED50 / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23034,'ESRI','23034','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=34 no_defs',NULL,'ED50 / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23035,'EPSG','23035','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-87,-98,-121,0,0,0,0 +units=m +zone=35',NULL,'ED50 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23035,'ESRI','23035','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=35 no_defs',NULL,'ED50 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23036,'EPSG','23036','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-87,-98,-121,0,0,0,0 +units=m +zone=36',NULL,'ED50 / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23036,'ESRI','23036','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=36 no_defs',NULL,'ED50 / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23037,'EPSG','23037','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-87,-98,-121,0,0,0,0 +units=m +zone=37',NULL,'ED50 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23037,'ESRI','23037','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=37 no_defs',NULL,'ED50 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23038,'EPSG','23038','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-87,-98,-121,0,0,0,0 +units=m +zone=38',NULL,'ED50 / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23038,'ESRI','23038','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=38 no_defs',NULL,'ED50 / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23090,'EPSG','23090','proj4_data/epsg',NULL,'+ellps=intl +k=0.9996 +lat_0=0 +lon_0=0 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ED50 / TM 0 N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23090,'ESRI','23090','proj4_data/esri',NULL,'+ellps=intl +k=0.999600 +lat_0=0 +lon_0=0 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ED50 / TM 0 N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23095,'EPSG','23095','proj4_data/epsg',NULL,'+ellps=intl +k=0.9996 +lat_0=0 +lon_0=5 +no_defs +proj=tmerc +towgs84=-87,-98,-121,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ED50 / TM 5 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23095,'ESRI','23095','proj4_data/esri',NULL,'+ellps=intl +k=0.999600 +lat_0=0 +lon_0=5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ED50 / TM 5 NE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23239,'EPSG','23239','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-333.102,-11.02,230.69,0,0,0.554,0.219 +units=m +zone=39',NULL,'Fahud / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23239,'ESRI','23239','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=39 no_defs',NULL,'Fahud / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23240,'EPSG','23240','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-333.102,-11.02,230.69,0,0,0.554,0.219 +units=m +zone=40',NULL,'Fahud / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23240,'ESRI','23240','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=40 no_defs',NULL,'Fahud / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23433,'EPSG','23433','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=33',NULL,'Garoua / UTM zone 33N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23433,'ESRI','23433','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=33 no_defs',NULL,'Garoua / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23700,'EPSG','23700','proj4_data/epsg',NULL,'+ellps=GRS67 +k_0=0.99993 +lat_0=47.14439372222222 +lon_0=19.04857177777778 +no_defs +proj=somerc +towgs84=52.17,-71.82,-14.9,0,0,0,0 +units=m +x_0=650000 +y_0=200000',NULL,'HD72 / EOV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23700,'ESRI','23700','proj4_data/esri',NULL,'+alpha=90 +ellps=GRS67 +k=0.99993 +lat_0=47.14439372222222 +lonc=19.04857177777778 +no_defs +proj=omerc +units=m +x_0=650000 +y_0=200000 no_defs',NULL,'HD72 / EOV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23830,'EPSG','23830','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=94.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 46.2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23831,'EPSG','23831','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=97.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 47.1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23832,'EPSG','23832','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=100.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 47.2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23833,'EPSG','23833','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=103.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 48.1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23834,'EPSG','23834','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=106.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 48.2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23835,'EPSG','23835','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=109.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 49.1',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_60() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23836,'EPSG','23836','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=112.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 49.2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23837,'EPSG','23837','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=115.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 50.1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23838,'EPSG','23838','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=118.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 50.2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23839,'EPSG','23839','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=121.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 51.1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23840,'EPSG','23840','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=124.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 51.2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23841,'EPSG','23841','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=127.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 52.1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23842,'EPSG','23842','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=130.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 52.2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23843,'EPSG','23843','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=133.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 53.1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23844,'EPSG','23844','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=136.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 53.2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23845,'EPSG','23845','proj4_data/epsg',NULL,'+ellps=WGS84 +k=0.9999 +lat_0=0 +lon_0=139.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=200000 +y_0=1500000',NULL,'DGN95 / Indonesia TM-3 zone 54.1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23846,'EPSG','23846','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=46',NULL,'ID74 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23846,'ESRI','23846','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +units=m +zone=46 no_defs',NULL,'ID74 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23847,'EPSG','23847','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=47',NULL,'ID74 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23847,'ESRI','23847','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +units=m +zone=47 no_defs',NULL,'ID74 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23848,'EPSG','23848','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=48',NULL,'ID74 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23848,'ESRI','23848','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +units=m +zone=48 no_defs',NULL,'ID74 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23849,'EPSG','23849','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=49',NULL,'ID74 / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23849,'ESRI','23849','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +units=m +zone=49 no_defs',NULL,'ID74 / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23850,'EPSG','23850','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=50',NULL,'ID74 / UTM zone 50N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23850,'ESRI','23850','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +units=m +zone=50 no_defs',NULL,'ID74 / UTM zone 50N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23851,'EPSG','23851','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=51',NULL,'ID74 / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23851,'ESRI','23851','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +units=m +zone=51 no_defs',NULL,'ID74 / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23852,'EPSG','23852','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=52',NULL,'ID74 / UTM zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23852,'ESRI','23852','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +units=m +zone=52 no_defs',NULL,'ID74 / UTM zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23853,'EPSG','23853','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=53',NULL,'ID74 / UTM zone 53N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23853,'ESRI','23853','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +units=m +zone=53 no_defs',NULL,'ID74 / UTM zone 53N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23866,'EPSG','23866','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=46',NULL,'DGN95 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23867,'EPSG','23867','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=47',NULL,'DGN95 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23868,'EPSG','23868','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=48',NULL,'DGN95 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23869,'EPSG','23869','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=49',NULL,'DGN95 / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23870,'EPSG','23870','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=50',NULL,'DGN95 / UTM zone 50N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23871,'EPSG','23871','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=51',NULL,'DGN95 / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23872,'EPSG','23872','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=52',NULL,'DGN95 / UTM zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23877,'EPSG','23877','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=47',NULL,'DGN95 / UTM zone 47S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23878,'EPSG','23878','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=48',NULL,'DGN95 / UTM zone 48S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23879,'EPSG','23879','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=49',NULL,'DGN95 / UTM zone 49S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23880,'EPSG','23880','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=50',NULL,'DGN95 / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23881,'EPSG','23881','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=51',NULL,'DGN95 / UTM zone 51S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23882,'EPSG','23882','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=52',NULL,'DGN95 / UTM zone 52S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23883,'EPSG','23883','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=53',NULL,'DGN95 / UTM zone 53S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23884,'EPSG','23884','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=54',NULL,'DGN95 / UTM zone 54S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23886,'EPSG','23886','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=46',NULL,'ID74 / UTM zone 46S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23886,'ESRI','23886','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +units=m +zone=46 no_defs',NULL,'ID74 / UTM zone 46S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23887,'EPSG','23887','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=47',NULL,'ID74 / UTM zone 47S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23887,'ESRI','23887','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +units=m +zone=47 no_defs',NULL,'ID74 / UTM zone 47S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23888,'EPSG','23888','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=48',NULL,'ID74 / UTM zone 48S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23888,'ESRI','23888','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +units=m +zone=48 no_defs',NULL,'ID74 / UTM zone 48S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23889,'EPSG','23889','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=49',NULL,'ID74 / UTM zone 49S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23889,'ESRI','23889','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +units=m +zone=49 no_defs',NULL,'ID74 / UTM zone 49S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23890,'EPSG','23890','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=50',NULL,'ID74 / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23890,'ESRI','23890','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +units=m +zone=50 no_defs',NULL,'ID74 / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23891,'EPSG','23891','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=51',NULL,'ID74 / UTM zone 51S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23891,'ESRI','23891','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +units=m +zone=51 no_defs',NULL,'ID74 / UTM zone 51S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23892,'EPSG','23892','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=52',NULL,'ID74 / UTM zone 52S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23892,'ESRI','23892','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +units=m +zone=52 no_defs',NULL,'ID74 / UTM zone 52S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23893,'EPSG','23893','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=53',NULL,'ID74 / UTM zone 53S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23893,'ESRI','23893','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +units=m +zone=53 no_defs',NULL,'ID74 / UTM zone 53S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23894,'EPSG','23894','proj4_data/epsg',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +towgs84=-24,-15,5,0,0,0,0 +units=m +zone=54',NULL,'ID74 / UTM zone 54S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23894,'ESRI','23894','proj4_data/esri',NULL,'+a=6378160 +b=6356774.50408554 +no_defs +proj=utm +south +units=m +zone=54 no_defs',NULL,'ID74 / UTM zone 54S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23946,'EPSG','23946','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=utm +towgs84=217,823,299,0,0,0,0 +units=m +zone=46',NULL,'Indian 1954 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23946,'ESRI','23946','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=utm +towgs84=217,823,299,0,0,0,0 +units=m +zone=46 no_defs',NULL,'Indian 1954 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23947,'EPSG','23947','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=utm +towgs84=217,823,299,0,0,0,0 +units=m +zone=47',NULL,'Indian 1954 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23947,'ESRI','23947','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=utm +towgs84=217,823,299,0,0,0,0 +units=m +zone=47 no_defs',NULL,'Indian 1954 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23948,'EPSG','23948','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=utm +towgs84=217,823,299,0,0,0,0 +units=m +zone=48',NULL,'Indian 1954 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(23948,'ESRI','23948','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=utm +towgs84=217,823,299,0,0,0,0 +units=m +zone=48 no_defs',NULL,'Indian 1954 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24047,'EPSG','24047','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=utm +towgs84=210,814,289,0,0,0,0 +units=m +zone=47',NULL,'Indian 1975 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24047,'ESRI','24047','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=utm +units=m +zone=47 no_defs',NULL,'Indian 1975 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24048,'EPSG','24048','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=utm +towgs84=210,814,289,0,0,0,0 +units=m +zone=48',NULL,'Indian 1975 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24048,'ESRI','24048','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=utm +units=m +zone=48 no_defs',NULL,'Indian 1975 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24100,'EPSG','24100','proj4_data/epsg',NULL,'+a=6378249.144808011 +b=6356514.966204134 +k_0=1 +lat_0=18 +lat_1=18 +lon_0=-77 +no_defs +proj=lcc +to_meter=0.3047972654 +x_0=167638.49597 +y_0=121918.90616',NULL,'Jamaica 1875 / Jamaica (Old Grid)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24100,'ESRI','24100','proj4_data/esri',NULL,'+ellps=clrk80 +k_0=1 +lat_0=18 +lat_1=18 +lon_0=-77 +no_defs +proj=lcc +to_meter=0.304797265 +x_0=167638.49575 +y_0=121918.906 no_defs',NULL,'Jamaica 1875 / Jamaica (Old Grid)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24200,'EPSG','24200','proj4_data/epsg',NULL,'+ellps=clrk66 +k_0=1 +lat_0=18 +lat_1=18 +lon_0=-77 +no_defs +proj=lcc +towgs84=70,207,389.5,0,0,0,0 +units=m +x_0=250000 +y_0=150000',NULL,'JAD69 / Jamaica National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24200,'ESRI','24200','proj4_data/esri',NULL,'+ellps=clrk66 +k_0=1 +lat_0=18 +lat_1=18 +lon_0=-77 +no_defs +proj=lcc +units=m +x_0=250000 +y_0=150000 no_defs',NULL,'JAD69 / Jamaica National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24305,'EPSG','24305','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=utm +towgs84=214,804,268,0,0,0,0 +units=m +zone=45',NULL,'Kalianpur 1937 / UTM zone 45N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24305,'ESRI','24305','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=utm +units=m +zone=45 no_defs',NULL,'Kalianpur 1937 / UTM zone 45N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24306,'EPSG','24306','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +no_defs +proj=utm +towgs84=214,804,268,0,0,0,0 +units=m +zone=46',NULL,'Kalianpur 1937 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24306,'ESRI','24306','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +no_defs +proj=utm +units=m +zone=46 no_defs',NULL,'Kalianpur 1937 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24311,'EPSG','24311','proj4_data/epsg',NULL,'+a=6377301.243 +b=6356100.230165384 +no_defs +proj=utm +towgs84=283,682,231,0,0,0,0 +units=m +zone=41',NULL,'Kalianpur 1962 / UTM zone 41N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24311,'ESRI','24311','proj4_data/esri',NULL,'+a=6377301.243 +b=6356100.230165385 +no_defs +proj=utm +towgs84=283,682,231,0,0,0,0 +units=m +zone=41 no_defs',NULL,'Kalianpur 1962 / UTM zone 41N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24312,'EPSG','24312','proj4_data/epsg',NULL,'+a=6377301.243 +b=6356100.230165384 +no_defs +proj=utm +towgs84=283,682,231,0,0,0,0 +units=m +zone=42',NULL,'Kalianpur 1962 / UTM zone 42N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24312,'ESRI','24312','proj4_data/esri',NULL,'+a=6377301.243 +b=6356100.230165385 +no_defs +proj=utm +towgs84=283,682,231,0,0,0,0 +units=m +zone=42 no_defs',NULL,'Kalianpur 1962 / UTM zone 42N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24313,'EPSG','24313','proj4_data/epsg',NULL,'+a=6377301.243 +b=6356100.230165384 +no_defs +proj=utm +towgs84=283,682,231,0,0,0,0 +units=m +zone=43',NULL,'Kalianpur 1962 / UTM zone 43N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24313,'ESRI','24313','proj4_data/esri',NULL,'+a=6377301.243 +b=6356100.230165385 +no_defs +proj=utm +towgs84=283,682,231,0,0,0,0 +units=m +zone=43 no_defs',NULL,'Kalianpur 1962 / UTM zone 43N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24342,'EPSG','24342','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=utm +towgs84=295,736,257,0,0,0,0 +units=m +zone=42',NULL,'Kalianpur 1975 / UTM zone 42N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24342,'ESRI','24342','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=utm +towgs84=295,736,257,0,0,0,0 +units=m +zone=42 no_defs',NULL,'Kalianpur 1975 / UTM zone 42N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24343,'EPSG','24343','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=utm +towgs84=295,736,257,0,0,0,0 +units=m +zone=43',NULL,'Kalianpur 1975 / UTM zone 43N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24343,'ESRI','24343','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=utm +towgs84=295,736,257,0,0,0,0 +units=m +zone=43 no_defs',NULL,'Kalianpur 1975 / UTM zone 43N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24344,'EPSG','24344','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=utm +towgs84=295,736,257,0,0,0,0 +units=m +zone=44',NULL,'Kalianpur 1975 / UTM zone 44N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24344,'ESRI','24344','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=utm +towgs84=295,736,257,0,0,0,0 +units=m +zone=44 no_defs',NULL,'Kalianpur 1975 / UTM zone 44N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24345,'EPSG','24345','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=utm +towgs84=295,736,257,0,0,0,0 +units=m +zone=45',NULL,'Kalianpur 1975 / UTM zone 45N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24345,'ESRI','24345','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=utm +towgs84=295,736,257,0,0,0,0 +units=m +zone=45 no_defs',NULL,'Kalianpur 1975 / UTM zone 45N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24346,'EPSG','24346','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=utm +towgs84=295,736,257,0,0,0,0 +units=m +zone=46',NULL,'Kalianpur 1975 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24346,'ESRI','24346','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=utm +towgs84=295,736,257,0,0,0,0 +units=m +zone=46 no_defs',NULL,'Kalianpur 1975 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24347,'EPSG','24347','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=utm +towgs84=295,736,257,0,0,0,0 +units=m +zone=47',NULL,'Kalianpur 1975 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24347,'ESRI','24347','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +no_defs +proj=utm +towgs84=295,736,257,0,0,0,0 +units=m +zone=47 no_defs',NULL,'Kalianpur 1975 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24370,'EPSG','24370','proj4_data/epsg',NULL,'+a=6377299.36559538 +b=6356098.359005156 +k_0=0.99846154 +lat_0=39.5 +lat_1=39.5 +lon_0=68 +no_defs +proj=lcc +to_meter=0.9143985307444408 +x_0=2153865.73916853 +y_0=2368292.194628102',NULL,'Kalianpur 1880 / India zone 0',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24370,'ESRI','24370','proj4_data/esri',NULL,'+a=6377299.36559538 +b=6356098.357204817 +k_0=0.99846154 +lat_0=39.5 +lat_1=39.5 +lon_0=68 +no_defs +proj=lcc +to_meter=0.9143985307444408 +x_0=2153865.73916853 +y_0=2368292.194628102 no_defs',NULL,'Kalianpur 1880 / India zone 0',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24371,'EPSG','24371','proj4_data/epsg',NULL,'+a=6377299.36559538 +b=6356098.359005156 +k_0=0.99878641 +lat_0=32.5 +lat_1=32.5 +lon_0=68 +no_defs +proj=lcc +to_meter=0.9143985307444408 +x_0=2743195.592233322 +y_0=914398.5307444407',NULL,'Kalianpur 1880 / India zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24371,'ESRI','24371','proj4_data/esri',NULL,'+a=6377299.36559538 +b=6356098.357204817 +k_0=0.99878641 +lat_0=32.5 +lat_1=32.5 +lon_0=68 +no_defs +proj=lcc +to_meter=0.9143985307444408 +x_0=2743195.592233322 +y_0=914398.5307444407 no_defs',NULL,'Kalianpur 1880 / India zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24372,'EPSG','24372','proj4_data/epsg',NULL,'+a=6377299.36559538 +b=6356098.359005156 +k_0=0.99878641 +lat_0=26 +lat_1=26 +lon_0=74 +no_defs +proj=lcc +to_meter=0.9143985307444408 +x_0=2743195.592233322 +y_0=914398.5307444407',NULL,'Kalianpur 1880 / India zone IIa',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_61() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24372,'ESRI','24372','proj4_data/esri',NULL,'+a=6377299.36559538 +b=6356098.357204817 +k_0=0.99878641 +lat_0=26 +lat_1=26 +lon_0=74 +no_defs +proj=lcc +to_meter=0.9143985307444408 +x_0=2743195.592233322 +y_0=914398.5307444407 no_defs',NULL,'Kalianpur 1880 / India zone IIa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24373,'EPSG','24373','proj4_data/epsg',NULL,'+a=6377299.36559538 +b=6356098.359005156 +k_0=0.99878641 +lat_0=19 +lat_1=19 +lon_0=80 +no_defs +proj=lcc +to_meter=0.9143985307444408 +x_0=2743195.592233322 +y_0=914398.5307444407',NULL,'Kalianpur 1880 / India zone IIIa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24373,'ESRI','24373','proj4_data/esri',NULL,'+a=6377299.36559538 +b=6356098.357204817 +k_0=0.99878641 +lat_0=19 +lat_1=19 +lon_0=80 +no_defs +proj=lcc +to_meter=0.9143985307444408 +x_0=2743195.592233322 +y_0=914398.5307444407 no_defs',NULL,'Kalianpur 1880 / India zone III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24374,'EPSG','24374','proj4_data/epsg',NULL,'+a=6377299.36559538 +b=6356098.359005156 +k_0=0.99878641 +lat_0=12 +lat_1=12 +lon_0=80 +no_defs +proj=lcc +to_meter=0.9143985307444408 +x_0=2743195.592233322 +y_0=914398.5307444407',NULL,'Kalianpur 1880 / India zone IVa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24374,'ESRI','24374','proj4_data/esri',NULL,'+a=6377299.36559538 +b=6356098.357204817 +k_0=0.99878641 +lat_0=12 +lat_1=12 +lon_0=80 +no_defs +proj=lcc +to_meter=0.9143985307444408 +x_0=2743195.592233322 +y_0=914398.5307444407 no_defs',NULL,'Kalianpur 1880 / India zone IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24375,'EPSG','24375','proj4_data/epsg',NULL,'+a=6377276.345 +b=6356075.41314024 +k_0=0.99878641 +lat_0=26 +lat_1=26 +lon_0=90 +no_defs +proj=lcc +towgs84=214,804,268,0,0,0,0 +units=m +x_0=2743185.69 +y_0=914395.23',NULL,'Kalianpur 1937 / India zone IIb',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24375,'ESRI','24375','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +k_0=0.99878641 +lat_0=26 +lat_1=26 +lon_0=90 +no_defs +proj=lcc +units=m +x_0=2743185.69 +y_0=914395.23 no_defs',NULL,'Kalianpur 1937 / India zone IIb',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24376,'EPSG','24376','proj4_data/epsg',NULL,'+a=6377301.243 +b=6356100.230165384 +k_0=0.99878641 +lat_0=32.5 +lat_1=32.5 +lon_0=68 +no_defs +proj=lcc +towgs84=283,682,231,0,0,0,0 +units=m +x_0=2743196.4 +y_0=914398.8',NULL,'Kalianpur 1962 / India zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24376,'ESRI','24376','proj4_data/esri',NULL,'+a=6377301.243 +b=6356100.230165385 +k_0=0.99878641 +lat_0=32.5 +lat_1=32.5 +lon_0=68 +no_defs +proj=lcc +towgs84=283,682,231,0,0,0,0 +units=m +x_0=2743196.4 +y_0=914398.8 no_defs',NULL,'Kalianpur 1962 / India zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24377,'EPSG','24377','proj4_data/epsg',NULL,'+a=6377301.243 +b=6356100.230165384 +k_0=0.99878641 +lat_0=26 +lat_1=26 +lon_0=74 +no_defs +proj=lcc +towgs84=283,682,231,0,0,0,0 +units=m +x_0=2743196.4 +y_0=914398.8',NULL,'Kalianpur 1962 / India zone IIa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24377,'ESRI','24377','proj4_data/esri',NULL,'+a=6377301.243 +b=6356100.230165385 +k_0=0.99878641 +lat_0=26 +lat_1=26 +lon_0=74 +no_defs +proj=lcc +towgs84=283,682,231,0,0,0,0 +units=m +x_0=2743196.4 +y_0=914398.8 no_defs',NULL,'Kalianpur 1962 / India zone IIa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24378,'EPSG','24378','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +k_0=0.99878641 +lat_0=32.5 +lat_1=32.5 +lon_0=68 +no_defs +proj=lcc +towgs84=295,736,257,0,0,0,0 +units=m +x_0=2743195.5 +y_0=914398.5',NULL,'Kalianpur 1975 / India zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24378,'ESRI','24378','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +k_0=0.99878641 +lat_0=32.5 +lat_1=32.5 +lon_0=68 +no_defs +proj=lcc +towgs84=295,736,257,0,0,0,0 +units=m +x_0=2743195.5 +y_0=914398.5 no_defs',NULL,'Kalianpur 1975 / India zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24379,'EPSG','24379','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +k_0=0.99878641 +lat_0=26 +lat_1=26 +lon_0=74 +no_defs +proj=lcc +towgs84=295,736,257,0,0,0,0 +units=m +x_0=2743195.5 +y_0=914398.5',NULL,'Kalianpur 1975 / India zone IIa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24379,'ESRI','24379','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +k_0=0.99878641 +lat_0=26 +lat_1=26 +lon_0=74 +no_defs +proj=lcc +towgs84=295,736,257,0,0,0,0 +units=m +x_0=2743195.5 +y_0=914398.5 no_defs',NULL,'Kalianpur 1975 / India zone IIa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24380,'EPSG','24380','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +k_0=0.99878641 +lat_0=26 +lat_1=26 +lon_0=90 +no_defs +proj=lcc +towgs84=295,736,257,0,0,0,0 +units=m +x_0=2743195.5 +y_0=914398.5',NULL,'Kalianpur 1975 / India zone IIb',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24380,'ESRI','24380','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +k_0=0.99878641 +lat_0=26 +lat_1=26 +lon_0=90 +no_defs +proj=lcc +towgs84=295,736,257,0,0,0,0 +units=m +x_0=2743195.5 +y_0=914398.5 no_defs',NULL,'Kalianpur 1975 / India zone IIb',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24381,'EPSG','24381','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +k_0=0.99878641 +lat_0=19 +lat_1=19 +lon_0=80 +no_defs +proj=lcc +towgs84=295,736,257,0,0,0,0 +units=m +x_0=2743195.5 +y_0=914398.5',NULL,'Kalianpur 1975 / India zone IIIa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24381,'ESRI','24381','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +k_0=0.99878641 +lat_0=19 +lat_1=19 +lon_0=80 +no_defs +proj=lcc +towgs84=295,736,257,0,0,0,0 +units=m +x_0=2743195.5 +y_0=914398.5 no_defs',NULL,'Kalianpur 1975 / India zone III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24382,'EPSG','24382','proj4_data/epsg',NULL,'+a=6377299.36559538 +b=6356098.359005156 +k_0=0.99878641 +lat_0=26 +lat_1=26 +lon_0=90 +no_defs +proj=lcc +to_meter=0.9143985307444408 +x_0=2743195.592233322 +y_0=914398.5307444407',NULL,'Kalianpur 1880 / India zone IIb',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24382,'ESRI','24382','proj4_data/esri',NULL,'+a=6377299.36559538 +b=6356098.357204817 +k_0=0.99878641 +lat_0=26 +lat_1=26 +lon_0=90 +no_defs +proj=lcc +to_meter=0.9143985307444408 +x_0=2743195.592233322 +y_0=914398.5307444407 no_defs',NULL,'Kalianpur 1880 / India zone IIb',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24383,'EPSG','24383','proj4_data/epsg',NULL,'+a=6377299.151 +b=6356098.145120132 +k_0=0.99878641 +lat_0=12 +lat_1=12 +lon_0=80 +no_defs +proj=lcc +towgs84=295,736,257,0,0,0,0 +units=m +x_0=2743195.5 +y_0=914398.5',NULL,'Kalianpur 1975 / India zone IVa',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24383,'ESRI','24383','proj4_data/esri',NULL,'+a=6377299.151 +b=6356098.145120132 +k_0=0.99878641 +lat_0=12 +lat_1=12 +lon_0=80 +no_defs +proj=lcc +towgs84=295,736,257,0,0,0,0 +units=m +x_0=2743195.5 +y_0=914398.5 no_defs',NULL,'Kalianpur 1975 / India zone IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24500,'EPSG','24500','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +lat_0=1.287646666666667 +lon_0=103.8530022222222 +no_defs +proj=cass +towgs84=-11,851,5,0,0,0,0 +units=m +x_0=30000 +y_0=30000',NULL,'Kertau 1968 / Singapore Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24500,'ESRI','24500','proj4_data/esri',NULL,'+a=6377304.063 +b=6356103.038993155 +lat_0=1.287646666666667 +lon_0=103.8530022222222 +no_defs +proj=cass +towgs84=-11,851,5,0,0,0,0 +units=m +x_0=30000 +y_0=30000 no_defs',NULL,'Kertau / Singapore Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24547,'EPSG','24547','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +no_defs +proj=utm +towgs84=-11,851,5,0,0,0,0 +units=m +zone=47',NULL,'Kertau 1968 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24547,'ESRI','24547','proj4_data/esri',NULL,'+a=6377304.063 +b=6356103.038993155 +no_defs +proj=utm +towgs84=-11,851,5,0,0,0,0 +units=m +zone=47 no_defs',NULL,'Kertau / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24548,'EPSG','24548','proj4_data/epsg',NULL,'+a=6377304.063 +b=6356103.038993155 +no_defs +proj=utm +towgs84=-11,851,5,0,0,0,0 +units=m +zone=48',NULL,'Kertau 1968 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24548,'ESRI','24548','proj4_data/esri',NULL,'+a=6377304.063 +b=6356103.038993155 +no_defs +proj=utm +towgs84=-11,851,5,0,0,0,0 +units=m +zone=48 no_defs',NULL,'Kertau / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24571,'EPSG','24571','proj4_data/epsg',NULL,'+a=6377304.063 +alpha=323.0257905 +b=6356103.038993155 +gamma=323.1301023611111 +k=0.99984 +lat_0=4 +lonc=102.25 +no_defs +no_uoff +proj=omerc +to_meter=20.11678249437587 +towgs84=-11,851,5,0,0,0,0 +x_0=804671.2997750348 +y_0=0',NULL,'Kertau / R.S.O. Malaya (ch) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24571,'ESRI','24571','proj4_data/esri',NULL,'+a=6377304.063 +alpha=323.0257905 +b=6356103.038993155 +k=0.99984 +lat_0=4 +lonc=102.25 +no_defs +proj=omerc +to_meter=20.11678249437587 +towgs84=-11,851,5,0,0,0,0 +x_0=804671.2997750348 +y_0=0 no_defs',NULL,'Kertau / R.S.O. Malaya (ch)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24600,'EPSG','24600','proj4_data/epsg',NULL,'+ellps=clrk80 +k_0=0.9987864078000001 +lat_0=32.5 +lat_1=32.5 +lon_0=45 +no_defs +proj=lcc +towgs84=-294.7,-200.1,525.5,0,0,0,0 +units=m +x_0=1500000 +y_0=1166200',NULL,'KOC Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24600,'ESRI','24600','proj4_data/esri',NULL,'+ellps=clrk80 +k_0=0.9987864078000001 +lat_0=32.5 +lat_1=32.5 +lon_0=45 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=1166200 no_defs',NULL,'KOC Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24718,'EPSG','24718','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-273.5,110.6,-357.9,0,0,0,0 +units=m +zone=18',NULL,'La Canoa / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24718,'ESRI','24718','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-273.5,110.6,-357.9,0,0,0,0 +units=m +zone=18 no_defs',NULL,'La Canoa / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24719,'EPSG','24719','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-273.5,110.6,-357.9,0,0,0,0 +units=m +zone=19',NULL,'La Canoa / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24719,'ESRI','24719','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-273.5,110.6,-357.9,0,0,0,0 +units=m +zone=19 no_defs',NULL,'La Canoa / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24720,'EPSG','24720','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-273.5,110.6,-357.9,0,0,0,0 +units=m +zone=20',NULL,'La Canoa / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24720,'ESRI','24720','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-273.5,110.6,-357.9,0,0,0,0 +units=m +zone=20 no_defs',NULL,'La Canoa / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24721,'ESRI','24721','proj4_data/esri',NULL,'+ellps=intl +proj=utm +units=m +zone=21 no_defs',NULL,'La Canoa UTM Zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24817,'EPSG','24817','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-288,175,-376,0,0,0,0 +units=m +zone=17',NULL,'PSAD56 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24818,'EPSG','24818','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-288,175,-376,0,0,0,0 +units=m +zone=18',NULL,'PSAD56 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24818,'ESRI','24818','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=18 no_defs',NULL,'PSAD56 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24819,'EPSG','24819','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-288,175,-376,0,0,0,0 +units=m +zone=19',NULL,'PSAD56 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24819,'ESRI','24819','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=19 no_defs',NULL,'PSAD56 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24820,'EPSG','24820','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-288,175,-376,0,0,0,0 +units=m +zone=20',NULL,'PSAD56 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24820,'ESRI','24820','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=20 no_defs',NULL,'PSAD56 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24821,'EPSG','24821','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-288,175,-376,0,0,0,0 +units=m +zone=21',NULL,'PSAD56 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24821,'ESRI','24821','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=21 no_defs',NULL,'PSAD56 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24877,'EPSG','24877','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-288,175,-376,0,0,0,0 +units=m +zone=17',NULL,'PSAD56 / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24877,'ESRI','24877','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=17 no_defs',NULL,'PSAD56 / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24878,'EPSG','24878','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-288,175,-376,0,0,0,0 +units=m +zone=18',NULL,'PSAD56 / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24878,'ESRI','24878','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=18 no_defs',NULL,'PSAD56 / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24879,'EPSG','24879','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-288,175,-376,0,0,0,0 +units=m +zone=19',NULL,'PSAD56 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24879,'ESRI','24879','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=19 no_defs',NULL,'PSAD56 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24880,'EPSG','24880','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-288,175,-376,0,0,0,0 +units=m +zone=20',NULL,'PSAD56 / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24880,'ESRI','24880','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=20 no_defs',NULL,'PSAD56 / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24881,'EPSG','24881','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-288,175,-376,0,0,0,0 +units=m +zone=21',NULL,'PSAD56 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24882,'EPSG','24882','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-288,175,-376,0,0,0,0 +units=m +zone=22',NULL,'PSAD56 / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24882,'ESRI','24882','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=22 no_defs',NULL,'PSAD56 / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24891,'EPSG','24891','proj4_data/epsg',NULL,'+ellps=intl +k=0.99983008 +lat_0=-6 +lon_0=-80.5 +no_defs +proj=tmerc +towgs84=-288,175,-376,0,0,0,0 +units=m +x_0=222000 +y_0=1426834.743',NULL,'PSAD56 / Peru west zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24891,'ESRI','24891','proj4_data/esri',NULL,'+ellps=intl +k=0.999830 +lat_0=-6 +lon_0=-80.5 +no_defs +proj=tmerc +units=m +x_0=222000 +y_0=1426834.743 no_defs',NULL,'PSAD56 / Peru west zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24892,'EPSG','24892','proj4_data/epsg',NULL,'+ellps=intl +k=0.99932994 +lat_0=-9.5 +lon_0=-76 +no_defs +proj=tmerc +towgs84=-288,175,-376,0,0,0,0 +units=m +x_0=720000 +y_0=1039979.159',NULL,'PSAD56 / Peru central zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24892,'ESRI','24892','proj4_data/esri',NULL,'+ellps=intl +k=0.999330 +lat_0=-9.5 +lon_0=-76 +no_defs +proj=tmerc +units=m +x_0=720000 +y_0=1039979.159 no_defs',NULL,'PSAD56 / Peru central zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24893,'EPSG','24893','proj4_data/epsg',NULL,'+ellps=intl +k=0.99952992 +lat_0=-9.5 +lon_0=-70.5 +no_defs +proj=tmerc +towgs84=-288,175,-376,0,0,0,0 +units=m +x_0=1324000 +y_0=1040084.558',NULL,'PSAD56 / Peru east zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(24893,'ESRI','24893','proj4_data/esri',NULL,'+ellps=intl +k=0.999530 +lat_0=-9.5 +lon_0=-70.5 +no_defs +proj=tmerc +units=m +x_0=1324000 +y_0=1040084.558 no_defs',NULL,'PSAD56 / Peru east zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25000,'EPSG','25000','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.99975 +lat_0=4.666666666666667 +lon_0=-1 +no_defs +proj=tmerc +towgs84=-130,29,364,0,0,0,0 +units=m +x_0=274319.51 +y_0=0',NULL,'Leigon / Ghana Metre Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25000,'ESRI','25000','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999750 +lat_0=4.666666666666667 +lon_0=-1 +no_defs +proj=tmerc +towgs84=-130,29,364,0,0,0,0 +units=m +x_0=274319.51 +y_0=0 no_defs',NULL,'Leigon / Ghana Metre Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25231,'EPSG','25231','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=31',NULL,'Lome / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25231,'ESRI','25231','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=31 no_defs',NULL,'Lome / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25391,'EPSG','25391','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.99995 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=-133,-77,-51,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Luzon 1911 / Philippines zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25391,'ESRI','25391','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999950 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Luzon 1911 / Philippines zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25392,'EPSG','25392','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.99995 +lat_0=0 +lon_0=119 +no_defs +proj=tmerc +towgs84=-133,-77,-51,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Luzon 1911 / Philippines zone II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25392,'ESRI','25392','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999950 +lat_0=0 +lon_0=119 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Luzon 1911 / Philippines zone II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25393,'EPSG','25393','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.99995 +lat_0=0 +lon_0=121 +no_defs +proj=tmerc +towgs84=-133,-77,-51,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Luzon 1911 / Philippines zone III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25393,'ESRI','25393','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999950 +lat_0=0 +lon_0=121 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Luzon 1911 / Philippines zone III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25394,'EPSG','25394','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.99995 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=-133,-77,-51,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Luzon 1911 / Philippines zone IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25394,'ESRI','25394','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999950 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Luzon 1911 / Philippines zone IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25395,'EPSG','25395','proj4_data/epsg',NULL,'+ellps=clrk66 +k=0.99995 +lat_0=0 +lon_0=125 +no_defs +proj=tmerc +towgs84=-133,-77,-51,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Luzon 1911 / Philippines zone V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25395,'ESRI','25395','proj4_data/esri',NULL,'+ellps=clrk66 +k=0.999950 +lat_0=0 +lon_0=125 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Luzon 1911 / Philippines zone V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25700,'EPSG','25700','proj4_data/epsg',NULL,'+ellps=bessel +k=0.997 +lon_0=110 +no_defs +pm=jakarta +proj=merc +towgs84=-587.8,519.75,145.76,0,0,0,0 +units=m +x_0=3900000 +y_0=900000',NULL,'Makassar (Jakarta) / NEIEZ (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25700,'ESRI','25700','proj4_data/esri',NULL,'+ellps=bessel +k=0.997000 +lat_ts=0 +lon_0=216.8077194444444 +no_defs +pm=jakarta +proj=merc +towgs84=-587.8,519.75,145.76,0,0,0,0 +units=m +x_0=3900000 +y_0=900000 no_defs',NULL,'Makassar (Jakarta) / NEIEZ',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25828,'EPSG','25828','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=28',NULL,'ETRS89 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25828,'ESRI','25828','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=28 no_defs',NULL,'ETRS89 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25829,'EPSG','25829','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=29',NULL,'ETRS89 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25829,'ESRI','25829','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=29 no_defs',NULL,'ETRS89 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25830,'EPSG','25830','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=30',NULL,'ETRS89 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25830,'ESRI','25830','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=30 no_defs',NULL,'ETRS89 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25831,'EPSG','25831','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=31',NULL,'ETRS89 / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25831,'ESRI','25831','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=31 no_defs',NULL,'ETRS89 / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25832,'EPSG','25832','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=32',NULL,'ETRS89 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25832,'ESRI','25832','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=32 no_defs',NULL,'ETRS89 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25833,'EPSG','25833','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=33',NULL,'ETRS89 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25833,'ESRI','25833','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=33 no_defs',NULL,'ETRS89 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25834,'EPSG','25834','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=34',NULL,'ETRS89 / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25834,'ESRI','25834','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=34 no_defs',NULL,'ETRS89 / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25835,'EPSG','25835','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=35',NULL,'ETRS89 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25835,'ESRI','25835','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=35 no_defs',NULL,'ETRS89 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25836,'EPSG','25836','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=36',NULL,'ETRS89 / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25836,'ESRI','25836','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=36 no_defs',NULL,'ETRS89 / UTM zone 36N',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_62() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25837,'EPSG','25837','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=37',NULL,'ETRS89 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25837,'ESRI','25837','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=37 no_defs',NULL,'ETRS89 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25838,'EPSG','25838','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=38',NULL,'ETRS89 / UTM zone 38N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25838,'ESRI','25838','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +units=m +zone=38 no_defs',NULL,'ETRS89 / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25884,'EPSG','25884','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'ETRS89 / TM Baltic93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25884,'ESRI','25884','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999600 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'ETRS89 / TM Baltic93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25932,'EPSG','25932','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-254.1,-5.36,-100.29,0,0,0,0 +units=m +zone=32',NULL,'Malongo 1987 / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(25932,'ESRI','25932','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=32 no_defs',NULL,'Malongo 1987 / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26191,'EPSG','26191','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=-5.4 +no_defs +proj=lcc +towgs84=31,146,47,0,0,0,0 +units=m +x_0=500000 +y_0=300000',NULL,'Merchich / Nord Maroc',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26191,'ESRI','26191','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=-5.4 +no_defs +proj=lcc +towgs84=31,146,47,0,0,0,0 +units=m +x_0=500000 +y_0=300000 no_defs',NULL,'Merchich / Nord Maroc',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26192,'EPSG','26192','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.9996155960000001 +lat_0=29.7 +lat_1=29.7 +lon_0=-5.4 +no_defs +proj=lcc +towgs84=31,146,47,0,0,0,0 +units=m +x_0=500000 +y_0=300000',NULL,'Merchich / Sud Maroc',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26192,'ESRI','26192','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.9996155960000001 +lat_0=29.7 +lat_1=29.7 +lon_0=-5.4 +no_defs +proj=lcc +towgs84=31,146,47,0,0,0,0 +units=m +x_0=500000 +y_0=300000 no_defs',NULL,'Merchich / Sud Maroc',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26193,'EPSG','26193','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.9996 +lat_0=26.1 +lat_1=26.1 +lon_0=-5.4 +no_defs +proj=lcc +towgs84=31,146,47,0,0,0,0 +units=m +x_0=1200000 +y_0=400000',NULL,'Merchich / Sahara (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26193,'ESRI','26193','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.9996 +lat_0=26.1 +lat_1=26.1 +lon_0=-5.4 +no_defs +proj=lcc +towgs84=31,146,47,0,0,0,0 +units=m +x_0=1200000 +y_0=400000 no_defs',NULL,'Merchich / Sahara',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26194,'EPSG','26194','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999616304 +lat_0=26.1 +lat_1=26.1 +lon_0=-5.4 +no_defs +proj=lcc +towgs84=31,146,47,0,0,0,0 +units=m +x_0=1200000 +y_0=400000',NULL,'Merchich / Sahara Nord',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26195,'EPSG','26195','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999616437 +lat_0=22.5 +lat_1=22.5 +lon_0=-5.4 +no_defs +proj=lcc +towgs84=31,146,47,0,0,0,0 +units=m +x_0=1500000 +y_0=400000',NULL,'Merchich / Sahara Sud',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26237,'EPSG','26237','proj4_data/epsg',NULL,'+ellps=bessel +no_defs +proj=utm +towgs84=639,405,60,0,0,0,0 +units=m +zone=37',NULL,'Massawa / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26237,'ESRI','26237','proj4_data/esri',NULL,'+ellps=bessel +no_defs +proj=utm +towgs84=639,405,60,0,0,0,0 +units=m +zone=37 no_defs',NULL,'Massawa / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26331,'EPSG','26331','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-92,-93,122,0,0,0,0 +units=m +zone=31',NULL,'Minna / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26331,'ESRI','26331','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=31 no_defs',NULL,'Minna / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26332,'EPSG','26332','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-92,-93,122,0,0,0,0 +units=m +zone=32',NULL,'Minna / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26332,'ESRI','26332','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=32 no_defs',NULL,'Minna / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26391,'EPSG','26391','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.99975 +lat_0=4 +lon_0=4.5 +no_defs +proj=tmerc +towgs84=-92,-93,122,0,0,0,0 +units=m +x_0=230738.26 +y_0=0',NULL,'Minna / Nigeria West Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26391,'ESRI','26391','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999750 +lat_0=4 +lon_0=4.5 +no_defs +proj=tmerc +units=m +x_0=230738.26 +y_0=0 no_defs',NULL,'Minna / Nigeria West Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26392,'EPSG','26392','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.99975 +lat_0=4 +lon_0=8.5 +no_defs +proj=tmerc +towgs84=-92,-93,122,0,0,0,0 +units=m +x_0=670553.98 +y_0=0',NULL,'Minna / Nigeria Mid Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26392,'ESRI','26392','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999750 +lat_0=4 +lon_0=8.5 +no_defs +proj=tmerc +units=m +x_0=670553.98 +y_0=0 no_defs',NULL,'Minna / Nigeria Mid Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26393,'EPSG','26393','proj4_data/epsg',NULL,'+ellps=clrk80 +k=0.99975 +lat_0=4 +lon_0=12.5 +no_defs +proj=tmerc +towgs84=-92,-93,122,0,0,0,0 +units=m +x_0=1110369.7 +y_0=0',NULL,'Minna / Nigeria East Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26393,'ESRI','26393','proj4_data/esri',NULL,'+ellps=clrk80 +k=0.999750 +lat_0=4 +lon_0=12.5 +no_defs +proj=tmerc +units=m +x_0=1110369.7 +y_0=0 no_defs',NULL,'Minna / Nigeria East Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26432,'EPSG','26432','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-252.95,-4.11,-96.38,0,0,0,0 +units=m +zone=32',NULL,'Mhast / UTM zone 32S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26432,'ESRI','26432','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-252.95,-4.11,-96.38,0,0,0,0 +units=m +zone=32 no_defs',NULL,'Mhast / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26591,'EPSG','26591','proj4_data/epsg',NULL,'+ellps=intl +k=0.9996 +lat_0=0 +lon_0=-3.45233333333333 +no_defs +pm=rome +proj=tmerc +towgs84=-104.1,-49.1,-9.9,0.971,-2.917,0.714,-11.68 +units=m +x_0=1500000 +y_0=0',NULL,'Monte Mario (Rome) / Italy zone 1 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26591,'ESRI','26591','proj4_data/esri',NULL,'+ellps=intl +k=0.999600 +lat_0=0 +lon_0=21.45233333333333 +no_defs +pm=rome +proj=tmerc +units=m +x_0=1500000 +y_0=0 no_defs',NULL,'Monte Mario (Rome) / Italy zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26592,'EPSG','26592','proj4_data/epsg',NULL,'+ellps=intl +k=0.9996 +lat_0=0 +lon_0=2.54766666666666 +no_defs +pm=rome +proj=tmerc +towgs84=-104.1,-49.1,-9.9,0.971,-2.917,0.714,-11.68 +units=m +x_0=2520000 +y_0=0',NULL,'Monte Mario (Rome) / Italy zone 2 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26592,'ESRI','26592','proj4_data/esri',NULL,'+ellps=intl +k=0.999600 +lat_0=0 +lon_0=27.45233333333333 +no_defs +pm=rome +proj=tmerc +units=m +x_0=2520000 +y_0=0 no_defs',NULL,'Monte Mario (Rome) / Italy zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26632,'EPSG','26632','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-74,-130,42,0,0,0,0 +units=m +zone=32',NULL,'M\47poraloko / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26632,'ESRI','26632','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=32 no_defs',NULL,'M\47poraloko / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26692,'EPSG','26692','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +south +towgs84=-74,-130,42,0,0,0,0 +units=m +zone=32',NULL,'M\47poraloko / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26692,'ESRI','26692','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +south +units=m +zone=32 no_defs',NULL,'M\47poraloko / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26701,'EPSG','26701','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=1',NULL,'NAD27 / UTM zone 1N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26702,'EPSG','26702','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=2',NULL,'NAD27 / UTM zone 2N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26703,'EPSG','26703','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=3',NULL,'NAD27 / UTM zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26703,'ESRI','26703','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=3 no_defs',NULL,'NAD27 / UTM zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26704,'EPSG','26704','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=4',NULL,'NAD27 / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26704,'ESRI','26704','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=4 no_defs',NULL,'NAD27 / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26705,'EPSG','26705','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=5',NULL,'NAD27 / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26705,'ESRI','26705','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=5 no_defs',NULL,'NAD27 / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26706,'EPSG','26706','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=6',NULL,'NAD27 / UTM zone 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26706,'ESRI','26706','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=6 no_defs',NULL,'NAD27 / UTM zone 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26707,'EPSG','26707','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=7',NULL,'NAD27 / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26707,'ESRI','26707','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=7 no_defs',NULL,'NAD27 / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26708,'EPSG','26708','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=8',NULL,'NAD27 / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26708,'ESRI','26708','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=8 no_defs',NULL,'NAD27 / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26709,'EPSG','26709','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=9',NULL,'NAD27 / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26709,'ESRI','26709','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=9 no_defs',NULL,'NAD27 / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26710,'EPSG','26710','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=10',NULL,'NAD27 / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26710,'ESRI','26710','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=10 no_defs',NULL,'NAD27 / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26711,'EPSG','26711','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=11',NULL,'NAD27 / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26711,'ESRI','26711','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=11 no_defs',NULL,'NAD27 / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26712,'EPSG','26712','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=12',NULL,'NAD27 / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26712,'ESRI','26712','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=12 no_defs',NULL,'NAD27 / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26713,'EPSG','26713','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=13',NULL,'NAD27 / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26713,'ESRI','26713','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=13 no_defs',NULL,'NAD27 / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26714,'EPSG','26714','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=14',NULL,'NAD27 / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26714,'ESRI','26714','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=14 no_defs',NULL,'NAD27 / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26715,'EPSG','26715','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=15',NULL,'NAD27 / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26715,'ESRI','26715','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=15 no_defs',NULL,'NAD27 / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26716,'EPSG','26716','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=16',NULL,'NAD27 / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26716,'ESRI','26716','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=16 no_defs',NULL,'NAD27 / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26717,'EPSG','26717','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=17',NULL,'NAD27 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26717,'ESRI','26717','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=17 no_defs',NULL,'NAD27 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26718,'EPSG','26718','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=18',NULL,'NAD27 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26718,'ESRI','26718','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=18 no_defs',NULL,'NAD27 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26719,'EPSG','26719','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=19',NULL,'NAD27 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26719,'ESRI','26719','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=19 no_defs',NULL,'NAD27 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26720,'EPSG','26720','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=20',NULL,'NAD27 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26720,'ESRI','26720','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=20 no_defs',NULL,'NAD27 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26721,'EPSG','26721','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=21',NULL,'NAD27 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26721,'ESRI','26721','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=21 no_defs',NULL,'NAD27 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26722,'EPSG','26722','proj4_data/epsg',NULL,'+datum=NAD27 +no_defs +proj=utm +units=m +zone=22',NULL,'NAD27 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26722,'ESRI','26722','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +no_defs +proj=utm +units=m +zone=22 no_defs',NULL,'NAD27 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26729,'EPSG','26729','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.99996 +lat_0=30.5 +lon_0=-85.83333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Alabama East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26729,'ESRI','26729','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999960 +lat_0=30.5 +lon_0=-85.83333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Alabama East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26730,'EPSG','26730','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999933333 +lat_0=30 +lon_0=-87.5 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Alabama West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26730,'ESRI','26730','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999933 +lat_0=30 +lon_0=-87.5 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Alabama West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26731,'EPSG','26731','proj4_data/epsg',NULL,'+alpha=323.1301023611111 +datum=NAD27 +gamma=323.1301023611111 +k=0.9999 +lat_0=57 +lonc=-133.6666666666667 +no_defs +no_uoff +proj=omerc +units=us-ft +x_0=5000000.001016002 +y_0=-5000000.001016002',NULL,'NAD27 / Alaska zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26731,'ESRI','26731','proj4_data/esri',NULL,'+alpha=323.1301023611111 +datum=NAD27 +ellps=clrk66 +k=0.9999 +lat_0=57 +lonc=-133.6666666666667 +no_defs +proj=omerc +to_meter=0.3048006096012192 +x_0=5000000.001016002 +y_0=-5000000.001016002 no_defs',NULL,'NAD27 / Alaska zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26732,'EPSG','26732','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=54 +lon_0=-142 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Alaska zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26732,'ESRI','26732','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=54 +lon_0=-142 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Alaska zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26733,'EPSG','26733','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=54 +lon_0=-146 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Alaska zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26733,'ESRI','26733','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=54 +lon_0=-146 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Alaska zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26734,'EPSG','26734','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=54 +lon_0=-150 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Alaska zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26734,'ESRI','26734','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=54 +lon_0=-150 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Alaska zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26735,'EPSG','26735','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=54 +lon_0=-154 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Alaska zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26735,'ESRI','26735','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=54 +lon_0=-154 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Alaska zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26736,'EPSG','26736','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=54 +lon_0=-158 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Alaska zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26736,'ESRI','26736','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=54 +lon_0=-158 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Alaska zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26737,'EPSG','26737','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=54 +lon_0=-162 +no_defs +proj=tmerc +units=us-ft +x_0=213360.4267208534 +y_0=0',NULL,'NAD27 / Alaska zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26737,'ESRI','26737','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=54 +lon_0=-162 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=213360.4267208534 +y_0=0 no_defs',NULL,'NAD27 / Alaska zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26738,'EPSG','26738','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=54 +lon_0=-166 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Alaska zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26738,'ESRI','26738','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=54 +lon_0=-166 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Alaska zone 8',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_63() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26739,'EPSG','26739','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=54 +lon_0=-170 +no_defs +proj=tmerc +units=us-ft +x_0=182880.3657607315 +y_0=0',NULL,'NAD27 / Alaska zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26739,'ESRI','26739','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=54 +lon_0=-170 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=182880.3657607315 +y_0=0 no_defs',NULL,'NAD27 / Alaska zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26740,'EPSG','26740','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=51 +lat_1=53.83333333333334 +lat_2=51.83333333333334 +lon_0=-176 +no_defs +proj=lcc +units=us-ft +x_0=914401.8288036576 +y_0=0',NULL,'NAD27 / Alaska zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26740,'ESRI','26740','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=51 +lat_1=53.83333333333334 +lat_2=51.83333333333334 +lon_0=-176 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=914401.8288036576 +y_0=0 no_defs',NULL,'NAD27 / Alaska zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26741,'EPSG','26741','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / California zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26741,'ESRI','26741','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / California zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26742,'EPSG','26742','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / California zone II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26742,'ESRI','26742','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / California zone II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26743,'EPSG','26743','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / California zone III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26743,'ESRI','26743','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / California zone III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26744,'EPSG','26744','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / California zone IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26744,'ESRI','26744','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / California zone IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26745,'EPSG','26745','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / California zone V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26745,'ESRI','26745','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / California zone V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26746,'EPSG','26746','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / California zone VI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26746,'ESRI','26746','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / California zone VI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26747,'EPSG','26747','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=34.13333333333333 +lat_1=34.41666666666666 +lat_2=33.86666666666667 +lon_0=-118.3333333333333 +no_defs +proj=lcc +units=us-ft +x_0=1276106.450596901 +y_0=127079.524511049',NULL,'NAD27 / California zone VII (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26747,'ESRI','26747','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=34.13333333333333 +lat_1=34.41666666666666 +lat_2=33.86666666666667 +lon_0=-118.3333333333333 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=1276106.450596901 +y_0=127079.524511049 no_defs',NULL,'NAD27 / California zone VII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26748,'EPSG','26748','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Arizona East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26748,'ESRI','26748','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Arizona East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26749,'EPSG','26749','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Arizona Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26749,'ESRI','26749','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Arizona Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26750,'EPSG','26750','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999933333 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Arizona West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26750,'ESRI','26750','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999933 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Arizona West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26751,'EPSG','26751','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=34.33333333333334 +lat_1=36.23333333333333 +lat_2=34.93333333333333 +lon_0=-92 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Arkansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26751,'ESRI','26751','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=34.33333333333334 +lat_1=36.23333333333333 +lat_2=34.93333333333333 +lon_0=-92 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Arkansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26752,'EPSG','26752','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=32.66666666666666 +lat_1=34.76666666666667 +lat_2=33.3 +lon_0=-92 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Arkansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26752,'ESRI','26752','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=32.66666666666666 +lat_1=34.76666666666667 +lat_2=33.3 +lon_0=-92 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Arkansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26753,'EPSG','26753','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=39.33333333333334 +lat_1=39.71666666666667 +lat_2=40.78333333333333 +lon_0=-105.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Colorado North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26753,'ESRI','26753','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=39.33333333333334 +lat_1=39.71666666666667 +lat_2=40.78333333333333 +lon_0=-105.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Colorado North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26754,'EPSG','26754','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Colorado Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26754,'ESRI','26754','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Colorado Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26755,'EPSG','26755','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Colorado South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26755,'ESRI','26755','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Colorado South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26756,'EPSG','26756','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +units=us-ft +x_0=182880.3657607315 +y_0=0',NULL,'NAD27 / Connecticut',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26756,'ESRI','26756','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=182880.3657607315 +y_0=0 no_defs',NULL,'NAD27 / Connecticut',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26757,'EPSG','26757','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Delaware',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26757,'ESRI','26757','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Delaware',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26758,'EPSG','26758','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Florida East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26758,'ESRI','26758','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Florida East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26759,'EPSG','26759','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Florida West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26759,'ESRI','26759','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Florida West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26760,'EPSG','26760','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Florida North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26760,'ESRI','26760','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Florida North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26761,'ESRI','26761','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999967 +lat_0=18.83333333333333 +lon_0=-155.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD 1927 StatePlane Hawaii 1 FIPS 5101',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26762,'ESRI','26762','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999967 +lat_0=20.33333333333333 +lon_0=-156.6666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD 1927 StatePlane Hawaii 2 FIPS 5102',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26763,'ESRI','26763','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999990 +lat_0=21.16666666666667 +lon_0=-158 +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD 1927 StatePlane Hawaii 3 FIPS 5103',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26764,'ESRI','26764','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999990 +lat_0=21.83333333333333 +lon_0=-159.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD 1927 StatePlane Hawaii 4 FIPS 5104',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26765,'ESRI','26765','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=1.000000 +lat_0=21.66666666666667 +lon_0=-160.1666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD 1927 StatePlane Hawaii 5 FIPS 5105',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26766,'EPSG','26766','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Georgia East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26766,'ESRI','26766','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Georgia East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26767,'EPSG','26767','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Georgia West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26767,'ESRI','26767','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Georgia West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26768,'EPSG','26768','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Idaho East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26768,'ESRI','26768','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Idaho East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26769,'EPSG','26769','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Idaho Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26769,'ESRI','26769','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Idaho Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26770,'EPSG','26770','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999933333 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Idaho West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26770,'ESRI','26770','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999933 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Idaho West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26771,'EPSG','26771','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999749999999999 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Illinois East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26771,'ESRI','26771','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999975 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Illinois East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26772,'EPSG','26772','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999941177 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Illinois West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26772,'ESRI','26772','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999941 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Illinois West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26773,'EPSG','26773','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999966667 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Indiana East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26773,'ESRI','26773','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999967 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Indiana East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26774,'EPSG','26774','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999966667 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Indiana West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26774,'ESRI','26774','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999967 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Indiana West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26775,'EPSG','26775','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=41.5 +lat_1=43.26666666666667 +lat_2=42.06666666666667 +lon_0=-93.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Iowa North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26775,'ESRI','26775','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=41.5 +lat_1=43.26666666666667 +lat_2=42.06666666666667 +lon_0=-93.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Iowa North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26776,'EPSG','26776','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=40 +lat_1=41.78333333333333 +lat_2=40.61666666666667 +lon_0=-93.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Iowa South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26776,'ESRI','26776','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=40 +lat_1=41.78333333333333 +lat_2=40.61666666666667 +lon_0=-93.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Iowa South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26777,'EPSG','26777','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=38.33333333333334 +lat_1=39.78333333333333 +lat_2=38.71666666666667 +lon_0=-98 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Kansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26777,'ESRI','26777','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=38.33333333333334 +lat_1=39.78333333333333 +lat_2=38.71666666666667 +lon_0=-98 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Kansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26778,'EPSG','26778','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=36.66666666666666 +lat_1=38.56666666666667 +lat_2=37.26666666666667 +lon_0=-98.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Kansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26778,'ESRI','26778','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=36.66666666666666 +lat_1=38.56666666666667 +lat_2=37.26666666666667 +lon_0=-98.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Kansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26779,'EPSG','26779','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Kentucky North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26779,'ESRI','26779','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Kentucky North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26780,'EPSG','26780','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=36.33333333333334 +lat_1=36.73333333333333 +lat_2=37.93333333333333 +lon_0=-85.75 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Kentucky South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26780,'ESRI','26780','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=36.33333333333334 +lat_1=36.73333333333333 +lat_2=37.93333333333333 +lon_0=-85.75 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Kentucky South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26781,'EPSG','26781','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=30.66666666666667 +lat_1=31.16666666666667 +lat_2=32.66666666666666 +lon_0=-92.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Louisiana North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26781,'ESRI','26781','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=30.66666666666667 +lat_1=31.16666666666667 +lat_2=32.66666666666666 +lon_0=-92.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Louisiana North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26782,'EPSG','26782','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=28.66666666666667 +lat_1=29.3 +lat_2=30.7 +lon_0=-91.33333333333333 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Louisiana South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26782,'ESRI','26782','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=28.66666666666667 +lat_1=29.3 +lat_2=30.7 +lon_0=-91.33333333333333 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Louisiana South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26783,'EPSG','26783','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=43.83333333333334 +lon_0=-68.5 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Maine East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26783,'ESRI','26783','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=43.83333333333334 +lon_0=-68.5 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Maine East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26784,'EPSG','26784','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999966667 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Maine West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26784,'ESRI','26784','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999967 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Maine West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26785,'EPSG','26785','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=37.83333333333334 +lat_1=38.3 +lat_2=39.45 +lon_0=-77 +no_defs +proj=lcc +units=us-ft +x_0=243840.4876809754 +y_0=0',NULL,'NAD27 / Maryland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26785,'ESRI','26785','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=37.83333333333334 +lat_1=38.3 +lat_2=39.45 +lon_0=-77 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=243840.4876809754 +y_0=0 no_defs',NULL,'NAD27 / Maryland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26786,'EPSG','26786','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=41 +lat_1=41.71666666666667 +lat_2=42.68333333333333 +lon_0=-71.5 +no_defs +proj=lcc +units=us-ft +x_0=182880.3657607315 +y_0=0',NULL,'NAD27 / Massachusetts Mainland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26786,'ESRI','26786','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=41 +lat_1=41.71666666666667 +lat_2=42.68333333333333 +lon_0=-71.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=182880.3657607315 +y_0=0 no_defs',NULL,'NAD27 / Massachusetts Mainland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26787,'EPSG','26787','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=41 +lat_1=41.28333333333333 +lat_2=41.48333333333333 +lon_0=-70.5 +no_defs +proj=lcc +units=us-ft +x_0=60960.12192024384 +y_0=0',NULL,'NAD27 / Massachusetts Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26787,'ESRI','26787','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=41 +lat_1=41.28333333333333 +lat_2=41.48333333333333 +lon_0=-70.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=60960.12192024384 +y_0=0 no_defs',NULL,'NAD27 / Massachusetts Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26788,'ESRI','26788','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=44.78333333333333 +lat_1=45.48333333333333 +lat_2=47.08333333333334 +lon_0=-87 +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024385 +y_0=0 no_defs',NULL,'NAD 1927 StatePlane Michigan North FIPS 2111',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26789,'ESRI','26789','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=43.31666666666667 +lat_1=44.18333333333333 +lat_2=45.7 +lon_0=-84.33333333333333 +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024385 +y_0=0 no_defs',NULL,'NAD 1927 StatePlane Michigan Central FIPS 2112',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26790,'ESRI','26790','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=41.5 +lat_1=42.1 +lat_2=43.66666666666666 +lon_0=-84.33333333333333 +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024385 +y_0=0 no_defs',NULL,'NAD 1927 StatePlane Michigan South FIPS 2113',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26791,'EPSG','26791','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=46.5 +lat_1=47.03333333333333 +lat_2=48.63333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Minnesota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26791,'ESRI','26791','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=46.5 +lat_1=47.03333333333333 +lat_2=48.63333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Minnesota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26792,'EPSG','26792','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=45 +lat_1=45.61666666666667 +lat_2=47.05 +lon_0=-94.25 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Minnesota Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26792,'ESRI','26792','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=45 +lat_1=45.61666666666667 +lat_2=47.05 +lon_0=-94.25 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Minnesota Central',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_64() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26793,'EPSG','26793','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=43 +lat_1=43.78333333333333 +lat_2=45.21666666666667 +lon_0=-94 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Minnesota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26793,'ESRI','26793','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=43 +lat_1=43.78333333333333 +lat_2=45.21666666666667 +lon_0=-94 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Minnesota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26794,'EPSG','26794','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.99996 +lat_0=29.66666666666667 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Mississippi East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26794,'ESRI','26794','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999960 +lat_0=29.66666666666667 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Mississippi East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26795,'EPSG','26795','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999941177 +lat_0=30.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Mississippi West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26795,'ESRI','26795','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999941 +lat_0=30.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Mississippi West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26796,'EPSG','26796','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999933333 +lat_0=35.83333333333334 +lon_0=-90.5 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Missouri East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26796,'ESRI','26796','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999933 +lat_0=35.83333333333334 +lon_0=-90.5 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Missouri East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26797,'EPSG','26797','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999933333 +lat_0=35.83333333333334 +lon_0=-92.5 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Missouri Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26797,'ESRI','26797','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999933 +lat_0=35.83333333333334 +lon_0=-92.5 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Missouri Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26798,'EPSG','26798','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999941177 +lat_0=36.16666666666666 +lon_0=-94.5 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Missouri West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26798,'ESRI','26798','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999941 +lat_0=36.16666666666666 +lon_0=-94.5 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Missouri West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26799,'EPSG','26799','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=34.13333333333333 +lat_1=34.41666666666666 +lat_2=33.86666666666667 +lon_0=-118.3333333333333 +no_defs +proj=lcc +units=us-ft +x_0=1276106.450596901 +y_0=1268253.006858014',NULL,'NAD27 / California zone VII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26801,'EPSG','26801','proj4_data/epsg',NULL,'+a=6378450.047548896 +b=6356826.621488444 +k=0.999942857 +lat_0=41.5 +lon_0=-83.66666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD Michigan / Michigan East (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26801,'ESRI','26801','proj4_data/esri',NULL,'+a=6378450.047548896 +b=6356826.621488444 +k=0.999943 +lat_0=41.5 +lon_0=-83.66666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD Michigan / Michigan East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26802,'EPSG','26802','proj4_data/epsg',NULL,'+a=6378450.047548896 +b=6356826.621488444 +k=0.999909091 +lat_0=41.5 +lon_0=-85.75 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD Michigan / Michigan Old Central (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26802,'ESRI','26802','proj4_data/esri',NULL,'+a=6378450.047548896 +b=6356826.621488444 +k=0.999909 +lat_0=41.5 +lon_0=-85.75 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD Michigan / Michigan Old Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26803,'EPSG','26803','proj4_data/epsg',NULL,'+a=6378450.047548896 +b=6356826.621488444 +k=0.999909091 +lat_0=41.5 +lon_0=-88.75 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD Michigan / Michigan West (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26803,'ESRI','26803','proj4_data/esri',NULL,'+a=6378450.047548896 +b=6356826.621488444 +k=0.999909 +lat_0=41.5 +lon_0=-88.75 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD Michigan / Michigan West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26811,'EPSG','26811','proj4_data/epsg',NULL,'+a=6378450.047548896 +b=6356826.621488444 +lat_0=44.78333333333333 +lat_1=45.48333333333333 +lat_2=47.08333333333334 +lon_0=-87 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD Michigan / Michigan North (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26811,'ESRI','26811','proj4_data/esri',NULL,'+a=6378450.047548896 +b=6356826.621488444 +lat_0=44.78333333333333 +lat_1=45.48333333333333 +lat_2=47.08333333333334 +lon_0=-87 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD Michigan / Michigan North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26812,'EPSG','26812','proj4_data/epsg',NULL,'+a=6378450.047548896 +b=6356826.621488444 +lat_0=43.31666666666667 +lat_1=44.18333333333333 +lat_2=45.7 +lon_0=-84.33333333333333 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD Michigan / Michigan Central (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26812,'ESRI','26812','proj4_data/esri',NULL,'+a=6378450.047548896 +b=6356826.621488444 +lat_0=43.31666666666667 +lat_1=44.18333333333333 +lat_2=45.7 +lon_0=-84.33333333333333 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD Michigan / Michigan Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26813,'EPSG','26813','proj4_data/epsg',NULL,'+a=6378450.047548896 +b=6356826.621488444 +lat_0=41.5 +lat_1=42.1 +lat_2=43.66666666666666 +lon_0=-84.33333333333333 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD Michigan / Michigan South (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26813,'ESRI','26813','proj4_data/esri',NULL,'+a=6378450.047548896 +b=6356826.621488444 +lat_0=41.5 +lat_1=42.1 +lat_2=43.66666666666666 +lon_0=-84.33333333333333 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD Michigan / Michigan South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26814,'EPSG','26814','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0',NULL,'NAD83 / Maine East (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26815,'EPSG','26815','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +units=m +x_0=900000 +y_0=0',NULL,'NAD83 / Maine West (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26819,'EPSG','26819','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +units=m +x_0=800000.0000101601 +y_0=99999.99998984',NULL,'NAD83 / Minnesota North (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26820,'EPSG','26820','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +units=m +x_0=800000.0000101601 +y_0=99999.99998984',NULL,'NAD83 / Minnesota Central (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26821,'EPSG','26821','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +units=m +x_0=800000.0000101601 +y_0=99999.99998984',NULL,'NAD83 / Minnesota South (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26822,'EPSG','26822','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +units=m +x_0=500000.0000101601 +y_0=0',NULL,'NAD83 / Nebraska (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26823,'EPSG','26823','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +units=m +x_0=1968500 +y_0=0',NULL,'NAD83 / West Virginia North (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26824,'EPSG','26824','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +units=m +x_0=1968500 +y_0=0',NULL,'NAD83 / West Virginia South (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26825,'EPSG','26825','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(HARN) / Maine East (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26826,'EPSG','26826','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=900000 +y_0=0',NULL,'NAD83(HARN) / Maine West (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26830,'EPSG','26830','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000.0000101601 +y_0=99999.99998984',NULL,'NAD83(HARN) / Minnesota North (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26831,'EPSG','26831','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000.0000101601 +y_0=99999.99998984',NULL,'NAD83(HARN) / Minnesota Central (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26832,'EPSG','26832','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000.0000101601 +y_0=99999.99998984',NULL,'NAD83(HARN) / Minnesota South (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26833,'EPSG','26833','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000.0000101601 +y_0=0',NULL,'NAD83(HARN) / Nebraska (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26834,'EPSG','26834','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1968500 +y_0=0',NULL,'NAD83(HARN) / West Virginia North (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26835,'EPSG','26835','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1968500 +y_0=0',NULL,'NAD83(HARN) / West Virginia South (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26836,'EPSG','26836','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=300000 +y_0=0',NULL,'NAD83(NSRS2007) / Maine East (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26837,'EPSG','26837','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=900000 +y_0=0',NULL,'NAD83(NSRS2007) / Maine West (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26841,'EPSG','26841','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000.0000101601 +y_0=99999.99998984',NULL,'NAD83(NSRS2007) / Minnesota North (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26842,'EPSG','26842','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000.0000101601 +y_0=99999.99998984',NULL,'NAD83(NSRS2007) / Minnesota Central (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26843,'EPSG','26843','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=800000.0000101601 +y_0=99999.99998984',NULL,'NAD83(NSRS2007) / Minnesota South (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26844,'EPSG','26844','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=500000.0000101601 +y_0=0',NULL,'NAD83(NSRS2007) / Nebraska (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26845,'EPSG','26845','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1968500 +y_0=0',NULL,'NAD83(NSRS2007) / West Virginia North (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26846,'EPSG','26846','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=1968500 +y_0=0',NULL,'NAD83(NSRS2007) / West Virginia South (ftUS) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26847,'EPSG','26847','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83 / Maine East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26848,'EPSG','26848','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=900000 +y_0=0',NULL,'NAD83 / Maine West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26849,'EPSG','26849','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83 / Minnesota North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26850,'EPSG','26850','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83 / Minnesota Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26851,'EPSG','26851','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83 / Minnesota South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26852,'EPSG','26852','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83 / Nebraska (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26853,'EPSG','26853','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / West Virginia North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26854,'EPSG','26854','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83 / West Virginia South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26855,'EPSG','26855','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(HARN) / Maine East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26856,'EPSG','26856','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=900000 +y_0=0',NULL,'NAD83(HARN) / Maine West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26857,'EPSG','26857','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83(HARN) / Minnesota North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26858,'EPSG','26858','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83(HARN) / Minnesota Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26859,'EPSG','26859','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83(HARN) / Minnesota South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26860,'EPSG','26860','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83(HARN) / Nebraska (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26861,'EPSG','26861','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / West Virginia North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26862,'EPSG','26862','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(HARN) / West Virginia South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26863,'EPSG','26863','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=300000.0000000001 +y_0=0',NULL,'NAD83(NSRS2007) / Maine East (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26864,'EPSG','26864','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.999966667 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=900000 +y_0=0',NULL,'NAD83(NSRS2007) / Maine West (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26865,'EPSG','26865','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83(NSRS2007) / Minnesota North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26866,'EPSG','26866','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83(NSRS2007) / Minnesota Central (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26867,'EPSG','26867','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=800000.0000101599 +y_0=99999.99998983997',NULL,'NAD83(NSRS2007) / Minnesota South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26868,'EPSG','26868','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=500000.00001016 +y_0=0',NULL,'NAD83(NSRS2007) / Nebraska (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26869,'EPSG','26869','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / West Virginia North (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26870,'EPSG','26870','proj4_data/epsg',NULL,'+ellps=GRS80 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +towgs84=0,0,0,0,0,0,0 +units=us-ft +x_0=600000 +y_0=0',NULL,'NAD83(NSRS2007) / West Virginia South (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26891,'EPSG','26891','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-82.5 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26892,'EPSG','26892','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-81 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26893,'EPSG','26893','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-84 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26894,'EPSG','26894','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-87 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26895,'EPSG','26895','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-90 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26896,'EPSG','26896','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-93 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26897,'EPSG','26897','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-96 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26898,'EPSG','26898','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-53 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26899,'EPSG','26899','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9999 +lat_0=0 +lon_0=-56 +no_defs +proj=tmerc +towgs84=0,0,0,0,0,0,0 +units=m +x_0=304800 +y_0=0',NULL,'NAD83(CSRS) / MTM zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26901,'EPSG','26901','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=1',NULL,'NAD83 / UTM zone 1N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26902,'EPSG','26902','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=2',NULL,'NAD83 / UTM zone 2N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26903,'EPSG','26903','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=3',NULL,'NAD83 / UTM zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26903,'ESRI','26903','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=3 no_defs',NULL,'NAD83 / UTM zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26904,'EPSG','26904','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=4',NULL,'NAD83 / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26904,'ESRI','26904','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=4 no_defs',NULL,'NAD83 / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26905,'EPSG','26905','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=5',NULL,'NAD83 / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26905,'ESRI','26905','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=5 no_defs',NULL,'NAD83 / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26906,'EPSG','26906','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=6',NULL,'NAD83 / UTM zone 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26906,'ESRI','26906','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=6 no_defs',NULL,'NAD83 / UTM zone 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26907,'EPSG','26907','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=7',NULL,'NAD83 / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26907,'ESRI','26907','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=7 no_defs',NULL,'NAD83 / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26908,'EPSG','26908','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=8',NULL,'NAD83 / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26908,'ESRI','26908','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=8 no_defs',NULL,'NAD83 / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26909,'EPSG','26909','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=9',NULL,'NAD83 / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26909,'ESRI','26909','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=9 no_defs',NULL,'NAD83 / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26910,'EPSG','26910','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=10',NULL,'NAD83 / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26910,'ESRI','26910','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=10 no_defs',NULL,'NAD83 / UTM zone 10N',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_65() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26911,'EPSG','26911','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=11',NULL,'NAD83 / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26911,'ESRI','26911','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=11 no_defs',NULL,'NAD83 / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26912,'EPSG','26912','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=12',NULL,'NAD83 / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26912,'ESRI','26912','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=12 no_defs',NULL,'NAD83 / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26913,'EPSG','26913','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=13',NULL,'NAD83 / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26913,'ESRI','26913','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=13 no_defs',NULL,'NAD83 / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26914,'EPSG','26914','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=14',NULL,'NAD83 / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26914,'ESRI','26914','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=14 no_defs',NULL,'NAD83 / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26915,'EPSG','26915','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=15',NULL,'NAD83 / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26915,'ESRI','26915','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=15 no_defs',NULL,'NAD83 / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26916,'EPSG','26916','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=16',NULL,'NAD83 / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26916,'ESRI','26916','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=16 no_defs',NULL,'NAD83 / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26917,'EPSG','26917','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=17',NULL,'NAD83 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26917,'ESRI','26917','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=17 no_defs',NULL,'NAD83 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26918,'EPSG','26918','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=18',NULL,'NAD83 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26918,'ESRI','26918','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=18 no_defs',NULL,'NAD83 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26919,'EPSG','26919','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=19',NULL,'NAD83 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26919,'ESRI','26919','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=19 no_defs',NULL,'NAD83 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26920,'EPSG','26920','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=20',NULL,'NAD83 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26920,'ESRI','26920','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=20 no_defs',NULL,'NAD83 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26921,'EPSG','26921','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=21',NULL,'NAD83 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26921,'ESRI','26921','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=21 no_defs',NULL,'NAD83 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26922,'EPSG','26922','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=22',NULL,'NAD83 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26922,'ESRI','26922','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=22 no_defs',NULL,'NAD83 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26923,'EPSG','26923','proj4_data/epsg',NULL,'+datum=NAD83 +no_defs +proj=utm +units=m +zone=23',NULL,'NAD83 / UTM zone 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26923,'ESRI','26923','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +no_defs +proj=utm +units=m +zone=23 no_defs',NULL,'NAD83 / UTM zone 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26929,'EPSG','26929','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99996 +lat_0=30.5 +lon_0=-85.83333333333333 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83 / Alabama East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26929,'ESRI','26929','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999960 +lat_0=30.5 +lon_0=-85.83333333333333 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83 / Alabama East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26930,'EPSG','26930','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999933333 +lat_0=30 +lon_0=-87.5 +no_defs +proj=tmerc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Alabama West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26930,'ESRI','26930','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999933 +lat_0=30 +lon_0=-87.5 +no_defs +proj=tmerc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Alabama West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26931,'EPSG','26931','proj4_data/epsg',NULL,'+alpha=323.1301023611111 +datum=NAD83 +gamma=323.1301023611111 +k=0.9999 +lat_0=57 +lonc=-133.6666666666667 +no_defs +no_uoff +proj=omerc +units=m +x_0=5000000 +y_0=-5000000',NULL,'NAD83 / Alaska zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26931,'ESRI','26931','proj4_data/esri',NULL,'+alpha=323.1301023611111 +datum=NAD83 +ellps=GRS80 +k=0.9999 +lat_0=57 +lonc=-133.6666666666667 +no_defs +proj=omerc +units=m +x_0=5000000 +y_0=-5000000 no_defs',NULL,'NAD83 / Alaska zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26932,'EPSG','26932','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=54 +lon_0=-142 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Alaska zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26932,'ESRI','26932','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-142 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Alaska zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26933,'EPSG','26933','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=54 +lon_0=-146 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Alaska zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26933,'ESRI','26933','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-146 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Alaska zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26934,'EPSG','26934','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=54 +lon_0=-150 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Alaska zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26934,'ESRI','26934','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-150 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Alaska zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26935,'EPSG','26935','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=54 +lon_0=-154 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Alaska zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26935,'ESRI','26935','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-154 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Alaska zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26936,'EPSG','26936','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=54 +lon_0=-158 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Alaska zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26936,'ESRI','26936','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-158 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Alaska zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26937,'EPSG','26937','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=54 +lon_0=-162 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Alaska zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26937,'ESRI','26937','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-162 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Alaska zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26938,'EPSG','26938','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=54 +lon_0=-166 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Alaska zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26938,'ESRI','26938','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-166 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Alaska zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26939,'EPSG','26939','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=54 +lon_0=-170 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Alaska zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26939,'ESRI','26939','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-170 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Alaska zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26940,'EPSG','26940','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=51 +lat_1=53.83333333333334 +lat_2=51.83333333333334 +lon_0=-176 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=0',NULL,'NAD83 / Alaska zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26940,'ESRI','26940','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=51 +lat_1=53.83333333333334 +lat_2=51.83333333333334 +lon_0=-176 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=0 no_defs',NULL,'NAD83 / Alaska zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26941,'EPSG','26941','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83 / California zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26941,'ESRI','26941','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.33333333333334 +lat_1=41.66666666666666 +lat_2=40 +lon_0=-122 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD83 / California zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26942,'EPSG','26942','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83 / California zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26942,'ESRI','26942','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.83333333333334 +lat_2=38.33333333333334 +lon_0=-122 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD83 / California zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26943,'EPSG','26943','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83 / California zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26943,'ESRI','26943','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.5 +lat_1=38.43333333333333 +lat_2=37.06666666666667 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD83 / California zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26944,'EPSG','26944','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83 / California zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26944,'ESRI','26944','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=35.33333333333334 +lat_1=37.25 +lat_2=36 +lon_0=-119 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD83 / California zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26945,'EPSG','26945','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83 / California zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26945,'ESRI','26945','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=33.5 +lat_1=35.46666666666667 +lat_2=34.03333333333333 +lon_0=-118 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD83 / California zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26946,'EPSG','26946','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000',NULL,'NAD83 / California zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26946,'ESRI','26946','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=32.16666666666666 +lat_1=33.88333333333333 +lat_2=32.78333333333333 +lon_0=-116.25 +no_defs +proj=lcc +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD83 / California zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26948,'EPSG','26948','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +units=m +x_0=213360 +y_0=0',NULL,'NAD83 / Arizona East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26948,'ESRI','26948','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-110.1666666666667 +no_defs +proj=tmerc +units=m +x_0=213360 +y_0=0 no_defs',NULL,'NAD83 / Arizona East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26949,'EPSG','26949','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +units=m +x_0=213360 +y_0=0',NULL,'NAD83 / Arizona Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26949,'ESRI','26949','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-111.9166666666667 +no_defs +proj=tmerc +units=m +x_0=213360 +y_0=0 no_defs',NULL,'NAD83 / Arizona Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26950,'EPSG','26950','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999933333 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +units=m +x_0=213360 +y_0=0',NULL,'NAD83 / Arizona West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26950,'ESRI','26950','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999933 +lat_0=31 +lon_0=-113.75 +no_defs +proj=tmerc +units=m +x_0=213360 +y_0=0 no_defs',NULL,'NAD83 / Arizona West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26951,'EPSG','26951','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=34.33333333333334 +lat_1=36.23333333333333 +lat_2=34.93333333333333 +lon_0=-92 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0',NULL,'NAD83 / Arkansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26951,'ESRI','26951','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.23333333333333 +lat_2=34.93333333333333 +lon_0=-92 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0 no_defs',NULL,'NAD83 / Arkansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26952,'EPSG','26952','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=32.66666666666666 +lat_1=34.76666666666667 +lat_2=33.3 +lon_0=-92 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=400000',NULL,'NAD83 / Arkansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26952,'ESRI','26952','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=32.66666666666666 +lat_1=34.76666666666667 +lat_2=33.3 +lon_0=-92 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=400000 no_defs',NULL,'NAD83 / Arkansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26953,'EPSG','26953','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=39.33333333333334 +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lon_0=-105.5 +no_defs +proj=lcc +units=m +x_0=914401.8289 +y_0=304800.6096',NULL,'NAD83 / Colorado North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26953,'ESRI','26953','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.78333333333333 +lat_2=39.71666666666667 +lon_0=-105.5 +no_defs +proj=lcc +units=m +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'NAD83 / Colorado North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26954,'EPSG','26954','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +units=m +x_0=914401.8289 +y_0=304800.6096',NULL,'NAD83 / Colorado Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26954,'ESRI','26954','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.83333333333334 +lat_1=39.75 +lat_2=38.45 +lon_0=-105.5 +no_defs +proj=lcc +units=m +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'NAD83 / Colorado Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26955,'EPSG','26955','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +units=m +x_0=914401.8289 +y_0=304800.6096',NULL,'NAD83 / Colorado South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26955,'ESRI','26955','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.43333333333333 +lat_2=37.23333333333333 +lon_0=-105.5 +no_defs +proj=lcc +units=m +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'NAD83 / Colorado South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26956,'EPSG','26956','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +units=m +x_0=304800.6096 +y_0=152400.3048',NULL,'NAD83 / Connecticut',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26956,'ESRI','26956','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40.83333333333334 +lat_1=41.86666666666667 +lat_2=41.2 +lon_0=-72.75 +no_defs +proj=lcc +units=m +x_0=304800.6096 +y_0=152400.3048 no_defs',NULL,'NAD83 / Connecticut',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26957,'EPSG','26957','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83 / Delaware',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26957,'ESRI','26957','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83 / Delaware',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26958,'EPSG','26958','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83 / Florida East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26958,'ESRI','26958','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-81 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83 / Florida East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26959,'EPSG','26959','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999941177 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83 / Florida West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26959,'ESRI','26959','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-82 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83 / Florida West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26960,'EPSG','26960','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Florida North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26960,'ESRI','26960','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=29 +lat_1=30.75 +lat_2=29.58333333333333 +lon_0=-84.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Florida North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26961,'EPSG','26961','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=18.83333333333333 +lon_0=-155.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Hawaii zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26961,'ESRI','26961','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=18.83333333333333 +lon_0=-155.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Hawaii zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26962,'EPSG','26962','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=20.33333333333333 +lon_0=-156.6666666666667 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Hawaii zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26962,'ESRI','26962','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=20.33333333333333 +lon_0=-156.6666666666667 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Hawaii zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26963,'EPSG','26963','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99999 +lat_0=21.16666666666667 +lon_0=-158 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Hawaii zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26963,'ESRI','26963','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999990 +lat_0=21.16666666666667 +lon_0=-158 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Hawaii zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26964,'EPSG','26964','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99999 +lat_0=21.83333333333333 +lon_0=-159.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Hawaii zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26964,'ESRI','26964','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999990 +lat_0=21.83333333333333 +lon_0=-159.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Hawaii zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26965,'EPSG','26965','proj4_data/epsg',NULL,'+datum=NAD83 +k=1 +lat_0=21.66666666666667 +lon_0=-160.1666666666667 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Hawaii zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26965,'ESRI','26965','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=1.000000 +lat_0=21.66666666666667 +lon_0=-160.1666666666667 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Hawaii zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26966,'EPSG','26966','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83 / Georgia East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26966,'ESRI','26966','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=30 +lon_0=-82.16666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83 / Georgia East',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_66() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26967,'EPSG','26967','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=0',NULL,'NAD83 / Georgia West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26967,'ESRI','26967','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=30 +lon_0=-84.16666666666667 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=0 no_defs',NULL,'NAD83 / Georgia West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26968,'EPSG','26968','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83 / Idaho East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26968,'ESRI','26968','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83 / Idaho East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26969,'EPSG','26969','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999473679999999 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Idaho Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26969,'ESRI','26969','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-114 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Idaho Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26970,'EPSG','26970','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999933333 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +units=m +x_0=800000 +y_0=0',NULL,'NAD83 / Idaho West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26970,'ESRI','26970','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999933 +lat_0=41.66666666666666 +lon_0=-115.75 +no_defs +proj=tmerc +units=m +x_0=800000 +y_0=0 no_defs',NULL,'NAD83 / Idaho West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26971,'EPSG','26971','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999749999999999 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0',NULL,'NAD83 / Illinois East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26971,'ESRI','26971','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999975 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD83 / Illinois East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26972,'EPSG','26972','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999941177 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=0',NULL,'NAD83 / Illinois West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26972,'ESRI','26972','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999941 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=0 no_defs',NULL,'NAD83 / Illinois West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26973,'EPSG','26973','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +units=m +x_0=100000 +y_0=250000',NULL,'NAD83 / Indiana East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26973,'ESRI','26973','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=37.5 +lon_0=-85.66666666666667 +no_defs +proj=tmerc +units=m +x_0=100000 +y_0=250000 no_defs',NULL,'NAD83 / Indiana East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26974,'EPSG','26974','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +units=m +x_0=900000 +y_0=250000',NULL,'NAD83 / Indiana West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26974,'ESRI','26974','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=37.5 +lon_0=-87.08333333333333 +no_defs +proj=tmerc +units=m +x_0=900000 +y_0=250000 no_defs',NULL,'NAD83 / Indiana West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26975,'EPSG','26975','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=41.5 +lat_1=43.26666666666667 +lat_2=42.06666666666667 +lon_0=-93.5 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=1000000',NULL,'NAD83 / Iowa North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26975,'ESRI','26975','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41.5 +lat_1=43.26666666666667 +lat_2=42.06666666666667 +lon_0=-93.5 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=1000000 no_defs',NULL,'NAD83 / Iowa North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26976,'EPSG','26976','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=40 +lat_1=41.78333333333333 +lat_2=40.61666666666667 +lon_0=-93.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Iowa South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26976,'ESRI','26976','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40 +lat_1=41.78333333333333 +lat_2=40.61666666666667 +lon_0=-93.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Iowa South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26977,'EPSG','26977','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=38.33333333333334 +lat_1=39.78333333333333 +lat_2=38.71666666666667 +lon_0=-98 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0',NULL,'NAD83 / Kansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26977,'ESRI','26977','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=38.33333333333334 +lat_1=39.78333333333333 +lat_2=38.71666666666667 +lon_0=-98 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0 no_defs',NULL,'NAD83 / Kansas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26978,'EPSG','26978','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.66666666666666 +lat_1=38.56666666666667 +lat_2=37.26666666666667 +lon_0=-98.5 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=400000',NULL,'NAD83 / Kansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26978,'ESRI','26978','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.56666666666667 +lat_2=37.26666666666667 +lon_0=-98.5 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=400000 no_defs',NULL,'NAD83 / Kansas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26979,'EPSG','26979','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=37.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Kentucky North (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26979,'ESRI','26979','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=37.96666666666667 +lon_0=-84.25 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Kentucky North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26980,'EPSG','26980','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.33333333333334 +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lon_0=-85.75 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=500000',NULL,'NAD83 / Kentucky South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26980,'ESRI','26980','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.93333333333333 +lat_2=36.73333333333333 +lon_0=-85.75 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=500000 no_defs',NULL,'NAD83 / Kentucky South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26981,'EPSG','26981','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=30.5 +lat_1=32.66666666666666 +lat_2=31.16666666666667 +lon_0=-92.5 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=0',NULL,'NAD83 / Louisiana North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26981,'ESRI','26981','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=30.5 +lat_1=32.66666666666666 +lat_2=31.16666666666667 +lon_0=-92.5 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=0 no_defs',NULL,'NAD83 / Louisiana North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26982,'EPSG','26982','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=28.5 +lat_1=30.7 +lat_2=29.3 +lon_0=-91.33333333333333 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=0',NULL,'NAD83 / Louisiana South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26982,'ESRI','26982','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=28.5 +lat_1=30.7 +lat_2=29.3 +lon_0=-91.33333333333333 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=0 no_defs',NULL,'NAD83 / Louisiana South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26983,'EPSG','26983','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0',NULL,'NAD83 / Maine East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26983,'ESRI','26983','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=43.66666666666666 +lon_0=-68.5 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD83 / Maine East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26984,'EPSG','26984','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +units=m +x_0=900000 +y_0=0',NULL,'NAD83 / Maine West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26984,'ESRI','26984','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +no_defs +proj=tmerc +units=m +x_0=900000 +y_0=0 no_defs',NULL,'NAD83 / Maine West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26985,'EPSG','26985','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37.66666666666666 +lat_1=39.45 +lat_2=38.3 +lon_0=-77 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0',NULL,'NAD83 / Maryland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26985,'ESRI','26985','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.45 +lat_2=38.3 +lon_0=-77 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=0 no_defs',NULL,'NAD83 / Maryland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26986,'EPSG','26986','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=41 +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lon_0=-71.5 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=750000',NULL,'NAD83 / Massachusetts Mainland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26986,'ESRI','26986','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41 +lat_1=42.68333333333333 +lat_2=41.71666666666667 +lon_0=-71.5 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=750000 no_defs',NULL,'NAD83 / Massachusetts Mainland',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26987,'EPSG','26987','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=41 +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lon_0=-70.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Massachusetts Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26987,'ESRI','26987','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41 +lat_1=41.48333333333333 +lat_2=41.28333333333333 +lon_0=-70.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Massachusetts Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26988,'EPSG','26988','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=44.78333333333333 +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lon_0=-87 +no_defs +proj=lcc +units=m +x_0=8000000 +y_0=0',NULL,'NAD83 / Michigan North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26988,'ESRI','26988','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=44.78333333333333 +lat_1=47.08333333333334 +lat_2=45.48333333333333 +lon_0=-87 +no_defs +proj=lcc +units=m +x_0=8000000 +y_0=0 no_defs',NULL,'NAD83 / Michigan North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26989,'EPSG','26989','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=43.31666666666667 +lat_1=45.7 +lat_2=44.18333333333333 +lon_0=-84.36666666666666 +no_defs +proj=lcc +units=m +x_0=6000000 +y_0=0',NULL,'NAD83 / Michigan Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26989,'ESRI','26989','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43.31666666666667 +lat_1=45.7 +lat_2=44.18333333333333 +lon_0=-84.36666666666666 +no_defs +proj=lcc +units=m +x_0=6000000 +y_0=0 no_defs',NULL,'NAD83 / Michigan Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26990,'EPSG','26990','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=41.5 +lat_1=43.66666666666666 +lat_2=42.1 +lon_0=-84.36666666666666 +no_defs +proj=lcc +units=m +x_0=4000000 +y_0=0',NULL,'NAD83 / Michigan South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26990,'ESRI','26990','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41.5 +lat_1=43.66666666666666 +lat_2=42.1 +lon_0=-84.36666666666666 +no_defs +proj=lcc +units=m +x_0=4000000 +y_0=0 no_defs',NULL,'NAD83 / Michigan South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26991,'EPSG','26991','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +units=m +x_0=800000 +y_0=100000',NULL,'NAD83 / Minnesota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26991,'ESRI','26991','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=46.5 +lat_1=48.63333333333333 +lat_2=47.03333333333333 +lon_0=-93.09999999999999 +no_defs +proj=lcc +units=m +x_0=800000 +y_0=100000 no_defs',NULL,'NAD83 / Minnesota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26992,'EPSG','26992','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +units=m +x_0=800000 +y_0=100000',NULL,'NAD83 / Minnesota Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26992,'ESRI','26992','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=45 +lat_1=47.05 +lat_2=45.61666666666667 +lon_0=-94.25 +no_defs +proj=lcc +units=m +x_0=800000 +y_0=100000 no_defs',NULL,'NAD83 / Minnesota Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26993,'EPSG','26993','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +units=m +x_0=800000 +y_0=100000',NULL,'NAD83 / Minnesota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26993,'ESRI','26993','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43 +lat_1=45.21666666666667 +lat_2=43.78333333333333 +lon_0=-94 +no_defs +proj=lcc +units=m +x_0=800000 +y_0=100000 no_defs',NULL,'NAD83 / Minnesota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26994,'EPSG','26994','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99995 +lat_0=29.5 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0',NULL,'NAD83 / Mississippi East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26994,'ESRI','26994','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999950 +lat_0=29.5 +lon_0=-88.83333333333333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD83 / Mississippi East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26995,'EPSG','26995','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99995 +lat_0=29.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=0',NULL,'NAD83 / Mississippi West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26995,'ESRI','26995','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999950 +lat_0=29.5 +lon_0=-90.33333333333333 +no_defs +proj=tmerc +units=m +x_0=700000 +y_0=0 no_defs',NULL,'NAD83 / Mississippi West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26996,'EPSG','26996','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999933333 +lat_0=35.83333333333334 +lon_0=-90.5 +no_defs +proj=tmerc +units=m +x_0=250000 +y_0=0',NULL,'NAD83 / Missouri East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26996,'ESRI','26996','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999933 +lat_0=35.83333333333334 +lon_0=-90.5 +no_defs +proj=tmerc +units=m +x_0=250000 +y_0=0 no_defs',NULL,'NAD83 / Missouri East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26997,'EPSG','26997','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999933333 +lat_0=35.83333333333334 +lon_0=-92.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Missouri Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26997,'ESRI','26997','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999933 +lat_0=35.83333333333334 +lon_0=-92.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Missouri Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26998,'EPSG','26998','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999941177 +lat_0=36.16666666666666 +lon_0=-94.5 +no_defs +proj=tmerc +units=m +x_0=850000 +y_0=0',NULL,'NAD83 / Missouri West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(26998,'ESRI','26998','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999941 +lat_0=36.16666666666666 +lon_0=-94.5 +no_defs +proj=tmerc +units=m +x_0=850000 +y_0=0 no_defs',NULL,'NAD83 / Missouri West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27037,'EPSG','27037','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-249,-156,381,0,0,0,0 +units=m +zone=37',NULL,'Nahrwan 1967 / UTM zone 37N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27038,'EPSG','27038','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-249,-156,381,0,0,0,0 +units=m +zone=38',NULL,'Nahrwan 1967 / UTM zone 38N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27038,'ESRI','27038','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=38 no_defs',NULL,'Nahrwan 1967 / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27039,'EPSG','27039','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-249,-156,381,0,0,0,0 +units=m +zone=39',NULL,'Nahrwan 1967 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27039,'ESRI','27039','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=39 no_defs',NULL,'Nahrwan 1967 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27040,'EPSG','27040','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-249,-156,381,0,0,0,0 +units=m +zone=40',NULL,'Nahrwan 1967 / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27040,'ESRI','27040','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=40 no_defs',NULL,'Nahrwan 1967 / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27120,'EPSG','27120','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-10,375,165,0,0,0,0 +units=m +zone=20',NULL,'Naparima 1972 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27120,'ESRI','27120','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=20 no_defs',NULL,'Naparima 1972 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27200,'EPSG','27200','proj4_data/epsg',NULL,'+datum=nzgd49 +lat_0=-41 +lon_0=173 +no_defs +proj=nzmg +units=m +x_0=2510000 +y_0=6023150',NULL,'NZGD49 / New Zealand Map Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27200,'ESRI','27200','proj4_data/esri',NULL,'+ellps=intl +lat_0=-41 +lon_0=173 +no_defs +proj=nzmg +units=m +x_0=2510000 +y_0=6023150 no_defs',NULL,'NZGD49 / New Zealand Map Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27205,'EPSG','27205','proj4_data/epsg',NULL,'+datum=nzgd49 +k=0.9999 +lat_0=-36.87986527777778 +lon_0=174.7643393611111 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Mount Eden Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27205,'ESRI','27205','proj4_data/esri',NULL,'+ellps=intl +k=0.999900 +lat_0=-36.87986527777778 +lon_0=174.7643393611111 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Mount Eden Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27206,'EPSG','27206','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-37.76124980555556 +lon_0=176.46619725 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Bay of Plenty Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27206,'ESRI','27206','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-37.76124980555556 +lon_0=176.46619725 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Bay of Plenty Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27207,'EPSG','27207','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-38.62470277777778 +lon_0=177.8856362777778 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Poverty Bay Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27207,'ESRI','27207','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-38.62470277777778 +lon_0=177.8856362777778 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Poverty Bay Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27208,'EPSG','27208','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-39.65092930555556 +lon_0=176.6736805277778 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Hawkes Bay Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27208,'ESRI','27208','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-39.65092930555556 +lon_0=176.6736805277778 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Hawkes Bay Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27209,'EPSG','27209','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-39.13575830555556 +lon_0=174.22801175 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Taranaki Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27209,'ESRI','27209','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-39.13575830555556 +lon_0=174.22801175 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Taranaki Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27210,'EPSG','27210','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-39.51247038888889 +lon_0=175.6400368055556 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Tuhirangi Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27210,'ESRI','27210','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-39.51247038888889 +lon_0=175.6400368055556 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Tuhirangi Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27211,'EPSG','27211','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-40.24194713888889 +lon_0=175.4880996111111 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Wanganui Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27211,'ESRI','27211','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-40.24194713888889 +lon_0=175.4880996111111 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Wanganui Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27212,'EPSG','27212','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-40.92553263888889 +lon_0=175.6473496666667 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Wairarapa Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27212,'ESRI','27212','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-40.92553263888889 +lon_0=175.6473496666667 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Wairarapa Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27213,'EPSG','27213','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-41.30131963888888 +lon_0=174.7766231111111 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Wellington Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27213,'ESRI','27213','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-41.30131963888888 +lon_0=174.7766231111111 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Wellington Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27214,'EPSG','27214','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-40.71475905555556 +lon_0=172.6720465 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Collingwood Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27214,'ESRI','27214','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-40.71475905555556 +lon_0=172.6720465 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Collingwood Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27215,'EPSG','27215','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-41.27454472222222 +lon_0=173.2993168055555 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Nelson Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27215,'ESRI','27215','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-41.27454472222222 +lon_0=173.2993168055555 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Nelson Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27216,'EPSG','27216','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-41.28991152777778 +lon_0=172.1090281944444 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Karamea Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27216,'ESRI','27216','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-41.28991152777778 +lon_0=172.1090281944444 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Karamea Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27217,'EPSG','27217','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-41.81080286111111 +lon_0=171.5812600555556 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Buller Circuit',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_67() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27217,'ESRI','27217','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-41.81080286111111 +lon_0=171.5812600555556 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Buller Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27218,'EPSG','27218','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-42.33369427777778 +lon_0=171.5497713055556 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Grey Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27218,'ESRI','27218','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-42.33369427777778 +lon_0=171.5497713055556 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Grey Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27219,'EPSG','27219','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-42.68911658333333 +lon_0=173.0101333888889 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Amuri Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27219,'ESRI','27219','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-42.68911658333333 +lon_0=173.0101333888889 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Amuri Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27220,'EPSG','27220','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-41.54448666666666 +lon_0=173.8020741111111 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Marlborough Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27220,'ESRI','27220','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-41.54448666666666 +lon_0=173.8020741111111 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Marlborough Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27221,'EPSG','27221','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-42.88632236111111 +lon_0=170.9799935 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Hokitika Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27221,'ESRI','27221','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-42.88632236111111 +lon_0=170.9799935 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Hokitika Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27222,'EPSG','27222','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-43.11012813888889 +lon_0=170.2609258333333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Okarito Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27222,'ESRI','27222','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-43.11012813888889 +lon_0=170.2609258333333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Okarito Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27223,'EPSG','27223','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-43.97780288888889 +lon_0=168.606267 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Jacksons Bay Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27223,'ESRI','27223','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-43.97780288888889 +lon_0=168.606267 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Jacksons Bay Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27224,'EPSG','27224','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-43.59063758333333 +lon_0=172.7271935833333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Mount Pleasant Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27224,'ESRI','27224','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-43.59063758333333 +lon_0=172.7271935833333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Mount Pleasant Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27225,'EPSG','27225','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-43.74871155555556 +lon_0=171.3607484722222 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Gawler Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27225,'ESRI','27225','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-43.74871155555556 +lon_0=171.3607484722222 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Gawler Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27226,'EPSG','27226','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-44.40222036111111 +lon_0=171.0572508333333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Timaru Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27226,'ESRI','27226','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-44.40222036111111 +lon_0=171.0572508333333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Timaru Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27227,'EPSG','27227','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-44.73526797222222 +lon_0=169.4677550833333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Lindis Peak Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27227,'ESRI','27227','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-44.73526797222222 +lon_0=169.4677550833333 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Lindis Peak Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27228,'EPSG','27228','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-45.13290258333333 +lon_0=168.3986411944444 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Mount Nicholas Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27228,'ESRI','27228','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-45.13290258333333 +lon_0=168.3986411944444 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Mount Nicholas Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27229,'EPSG','27229','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-45.56372616666666 +lon_0=167.7388617777778 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Mount York Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27229,'ESRI','27229','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-45.56372616666666 +lon_0=167.7388617777778 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Mount York Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27230,'EPSG','27230','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-45.81619661111111 +lon_0=170.6285951666667 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / Observation Point Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27230,'ESRI','27230','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-45.81619661111111 +lon_0=170.6285951666667 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / Observation Point Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27231,'EPSG','27231','proj4_data/epsg',NULL,'+datum=nzgd49 +k=0.99996 +lat_0=-45.86151336111111 +lon_0=170.2825891111111 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000',NULL,'NZGD49 / North Taieri Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27231,'ESRI','27231','proj4_data/esri',NULL,'+ellps=intl +k=0.999960 +lat_0=-45.86151336111111 +lon_0=170.2825891111111 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=700000 no_defs',NULL,'NZGD49 / North Taieri Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27232,'EPSG','27232','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-46.60000961111111 +lon_0=168.342872 +no_defs +proj=tmerc +units=m +x_0=300002.66 +y_0=699999.58',NULL,'NZGD49 / Bluff Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27232,'ESRI','27232','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-46.60000961111111 +lon_0=168.342872 +no_defs +proj=tmerc +units=m +x_0=300002.66 +y_0=699999.58 no_defs',NULL,'NZGD49 / Bluff Circuit',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27258,'EPSG','27258','proj4_data/epsg',NULL,'+datum=nzgd49 +no_defs +proj=utm +south +units=m +zone=58',NULL,'NZGD49 / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27258,'ESRI','27258','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=58 no_defs',NULL,'NZGD49 / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27259,'EPSG','27259','proj4_data/epsg',NULL,'+datum=nzgd49 +no_defs +proj=utm +south +units=m +zone=59',NULL,'NZGD49 / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27259,'ESRI','27259','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=59 no_defs',NULL,'NZGD49 / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27260,'EPSG','27260','proj4_data/epsg',NULL,'+datum=nzgd49 +no_defs +proj=utm +south +units=m +zone=60',NULL,'NZGD49 / UTM zone 60S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27260,'ESRI','27260','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +units=m +zone=60 no_defs',NULL,'NZGD49 / UTM zone 60S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27291,'EPSG','27291','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-39 +lon_0=175.5 +no_defs +proj=tmerc +to_meter=0.9143984146160287 +x_0=274319.5243848086 +y_0=365759.3658464114',NULL,'NZGD49 / North Island Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27291,'ESRI','27291','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-39 +lon_0=175.5 +no_defs +proj=tmerc +to_meter=0.9143984146160287 +x_0=274319.5243848086 +y_0=365759.3658464114 no_defs',NULL,'NZGD49 / North Island Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27292,'EPSG','27292','proj4_data/epsg',NULL,'+datum=nzgd49 +k=1 +lat_0=-44 +lon_0=171.5 +no_defs +proj=tmerc +to_meter=0.9143984146160287 +x_0=457199.2073080143 +y_0=457199.2073080143',NULL,'NZGD49 / South Island Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27292,'ESRI','27292','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=-44 +lon_0=171.5 +no_defs +proj=tmerc +to_meter=0.9143984146160287 +x_0=457199.2073080143 +y_0=457199.2073080143 no_defs',NULL,'NZGD49 / South Island Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27391,'EPSG','27391','proj4_data/epsg',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1 +lat_0=58 +lon_0=-4.666666666666667 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0',NULL,'NGO 1948 (Oslo) / NGO zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27391,'ESRI','27391','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=6.056250000000003 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 (Oslo) / NGO zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27392,'EPSG','27392','proj4_data/epsg',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1 +lat_0=58 +lon_0=-2.333333333333333 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0',NULL,'NGO 1948 (Oslo) / NGO zone II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27392,'ESRI','27392','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=8.389583333333336 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 (Oslo) / NGO zone II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27393,'EPSG','27393','proj4_data/epsg',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1 +lat_0=58 +lon_0=0 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0',NULL,'NGO 1948 (Oslo) / NGO zone III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27393,'ESRI','27393','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=10.72291666666667 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 (Oslo) / NGO zone III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27394,'EPSG','27394','proj4_data/epsg',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1 +lat_0=58 +lon_0=2.5 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0',NULL,'NGO 1948 (Oslo) / NGO zone IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27394,'ESRI','27394','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=13.22291666666667 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 (Oslo) / NGO zone IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27395,'EPSG','27395','proj4_data/epsg',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1 +lat_0=58 +lon_0=6.166666666666667 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0',NULL,'NGO 1948 (Oslo) / NGO zone V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27395,'ESRI','27395','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=16.88958333333334 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 (Oslo) / NGO zone V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27396,'EPSG','27396','proj4_data/epsg',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1 +lat_0=58 +lon_0=10.16666666666667 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0',NULL,'NGO 1948 (Oslo) / NGO zone VI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27396,'ESRI','27396','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=20.88958333333333 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 (Oslo) / NGO zone VI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27397,'EPSG','27397','proj4_data/epsg',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1 +lat_0=58 +lon_0=14.16666666666667 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0',NULL,'NGO 1948 (Oslo) / NGO zone VII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27397,'ESRI','27397','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=24.88958333333333 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 (Oslo) / NGO zone VII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27398,'EPSG','27398','proj4_data/epsg',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1 +lat_0=58 +lon_0=18.33333333333333 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0',NULL,'NGO 1948 (Oslo) / NGO zone VIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27398,'ESRI','27398','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=29.05625 +no_defs +pm=oslo +proj=tmerc +towgs84=278.3,93,474.5,7.889,0.05,-6.61,6.21 +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 (Oslo) / NGO zone VIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27429,'EPSG','27429','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-223.237,110.193,36.649,0,0,0,0 +units=m +zone=29',NULL,'Datum 73 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27429,'ESRI','27429','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +units=m +zone=29 no_defs',NULL,'Datum 73 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27492,'EPSG','27492','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=39.66666666666666 +lon_0=-8.131906111111112 +no_defs +proj=tmerc +towgs84=-223.237,110.193,36.649,0,0,0,0 +units=m +x_0=180.598 +y_0=-86.98999999999999',NULL,'Datum 73 / Modified Portuguese Grid (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27492,'ESRI','27492','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=39.66666666666666 +lon_0=-8.131906111111112 +no_defs +proj=tmerc +units=m +x_0=180.598 +y_0=-86.98999999999999 no_defs',NULL,'Datum 73 / Modified Portuguese Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27493,'EPSG','27493','proj4_data/epsg',NULL,'+ellps=intl +k=1 +lat_0=39.66666666666666 +lon_0=-8.131906111111112 +no_defs +proj=tmerc +towgs84=-223.237,110.193,36.649,0,0,0,0 +units=m +x_0=180.598 +y_0=-86.98999999999999',NULL,'Datum 73 / Modified Portuguese Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27500,'EPSG','27500','proj4_data/epsg',NULL,'+a=6376523 +b=6355862.933255573 +k_0=0.99950908 +lat_0=49.50000000000001 +lat_1=49.50000000000001 +lon_0=5.399999999999999 +no_defs +pm=2.337208333333333 +proj=lcc +units=m +x_0=500000 +y_0=300000',NULL,'ATF (Paris) / Nord de Guerre',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27500,'ESRI','27500','proj4_data/esri',NULL,'+a=6376523 +b=6355862.933255573 +k_0=0.99950908 +lat_0=49.50000000000001 +lat_1=49.50000000000001 +lon_0=7.737229170000001 +no_defs +pm=paris +proj=lcc +units=m +x_0=500000 +y_0=300000 no_defs',NULL,'ATF (Paris) / Nord de Guerre',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27561,'EPSG','27561','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877341 +lat_0=49.50000000000001 +lat_1=49.50000000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=200000',NULL,'NTF (Paris) / Lambert Nord France',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27561,'ESRI','27561','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877341 +lat_0=49.50000000000001 +lat_1=49.50000000000001 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=200000 no_defs',NULL,'NTF (Paris) / Lambert Nord France',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27562,'EPSG','27562','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=200000',NULL,'NTF (Paris) / Lambert Centre France',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27562,'ESRI','27562','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=200000 no_defs',NULL,'NTF (Paris) / Lambert Centre France',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27563,'EPSG','27563','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877499 +lat_0=44.10000000000001 +lat_1=44.10000000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=200000',NULL,'NTF (Paris) / Lambert Sud France',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27563,'ESRI','27563','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877499 +lat_0=44.10000000000001 +lat_1=44.10000000000001 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=200000 no_defs',NULL,'NTF (Paris) / Lambert Sud France',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27564,'EPSG','27564','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99994471 +lat_0=42.16500000000001 +lat_1=42.16500000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=234.358 +y_0=185861.369',NULL,'NTF (Paris) / Lambert Corse',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27564,'ESRI','27564','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99994471 +lat_0=42.16500000000001 +lat_1=42.16500000000001 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=234.358 +y_0=185861.369 no_defs',NULL,'NTF (Paris) / Lambert Corse',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27571,'EPSG','27571','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877341 +lat_0=49.50000000000001 +lat_1=49.50000000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=1200000',NULL,'NTF (Paris) / Lambert zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27571,'ESRI','27571','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877341 +lat_0=49.50000000000001 +lat_1=49.50000000000001 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=1200000 no_defs',NULL,'NTF (Paris) / Lambert zone I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27572,'EPSG','27572','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=2200000',NULL,'NTF (Paris) / Lambert zone II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27572,'ESRI','27572','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=2200000 no_defs',NULL,'NTF (Paris) / Lambert zone II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27573,'EPSG','27573','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877499 +lat_0=44.10000000000001 +lat_1=44.10000000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=3200000',NULL,'NTF (Paris) / Lambert zone III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27573,'ESRI','27573','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877499 +lat_0=44.10000000000001 +lat_1=44.10000000000001 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=3200000 no_defs',NULL,'NTF (Paris) / Lambert zone III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27574,'EPSG','27574','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99994471 +lat_0=42.16500000000001 +lat_1=42.16500000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=234.358 +y_0=4185861.369',NULL,'NTF (Paris) / Lambert zone IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27574,'ESRI','27574','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99994471 +lat_0=42.16500000000001 +lat_1=42.16500000000001 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=234.358 +y_0=4185861.369 no_defs',NULL,'NTF (Paris) / Lambert zone IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27581,'EPSG','27581','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877341 +lat_0=49.50000000000001 +lat_1=49.50000000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=1200000',NULL,'NTF (Paris) / France I (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27581,'ESRI','27581','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877341 +lat_0=49.50000000000001 +lat_1=49.50000000000001 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=1200000 no_defs',NULL,'NTF (Paris) / France I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27582,'EPSG','27582','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=2200000',NULL,'NTF (Paris) / France II (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27582,'ESRI','27582','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=2200000 no_defs',NULL,'NTF (Paris) / France II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27583,'EPSG','27583','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877499 +lat_0=44.10000000000001 +lat_1=44.10000000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=3200000',NULL,'NTF (Paris) / France III (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27583,'ESRI','27583','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877499 +lat_0=44.10000000000001 +lat_1=44.10000000000001 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=3200000 no_defs',NULL,'NTF (Paris) / France III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27584,'EPSG','27584','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99994471 +lat_0=42.16500000000001 +lat_1=42.16500000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=234.358 +y_0=4185861.369',NULL,'NTF (Paris) / France IV (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27584,'ESRI','27584','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99994471 +lat_0=42.16500000000001 +lat_1=42.16500000000001 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=234.358 +y_0=4185861.369 no_defs',NULL,'NTF (Paris) / France IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27591,'EPSG','27591','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877341 +lat_0=49.50000000000001 +lat_1=49.50000000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=200000',NULL,'NTF (Paris) / Nord France (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27591,'ESRI','27591','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877341 +lat_0=49.50000000000001 +lat_1=49.50000000000001 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=200000 no_defs',NULL,'NTF (Paris) / Nord France',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27592,'EPSG','27592','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=200000',NULL,'NTF (Paris) / Centre France (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27592,'ESRI','27592','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=200000 no_defs',NULL,'NTF (Paris) / Centre France',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27593,'EPSG','27593','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877499 +lat_0=44.10000000000001 +lat_1=44.10000000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=200000',NULL,'NTF (Paris) / Sud France (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27593,'ESRI','27593','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999877499 +lat_0=44.10000000000001 +lat_1=44.10000000000001 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=600000 +y_0=200000 no_defs',NULL,'NTF (Paris) / Sud France',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27594,'EPSG','27594','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99994471 +lat_0=42.16500000000001 +lat_1=42.16500000000001 +lon_0=0 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=234.358 +y_0=185861.369',NULL,'NTF (Paris) / Corse (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27594,'ESRI','27594','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.99994471 +lat_0=42.16500000000001 +lat_1=42.16500000000001 +lon_0=2.33722917 +no_defs +pm=paris +proj=lcc +towgs84=-168,-60,320,0,0,0,0 +units=m +x_0=234.358 +y_0=185861.369 no_defs',NULL,'NTF (Paris) / Corse',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27700,'EPSG','27700','proj4_data/epsg',NULL,'+datum=OSGB36 +k=0.9996012717 +lat_0=49 +lon_0=-2 +no_defs +proj=tmerc +units=m +x_0=400000 +y_0=-100000',NULL,'OSGB 1936 / British National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(27700,'ESRI','27700','proj4_data/esri',NULL,'+ellps=airy +k=0.999601 +lat_0=49 +lon_0=-2 +no_defs +proj=tmerc +units=m +x_0=400000 +y_0=-100000 no_defs',NULL,'OSGB 1936 / British National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28191,'EPSG','28191','proj4_data/epsg',NULL,'+a=6378300.789 +b=6356566.435 +lat_0=31.73409694444445 +lon_0=35.21208055555556 +no_defs +proj=cass +towgs84=-275.7224,94.7824,340.8944,-8.001,-4.42,-11.821,1 +units=m +x_0=170251.555 +y_0=126867.909',NULL,'Palestine 1923 / Palestine Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28191,'ESRI','28191','proj4_data/esri',NULL,'+a=6378300.789 +b=6356566.435 +lat_0=31.73409694444445 +lon_0=35.21208055555556 +no_defs +proj=cass +units=m +x_0=170251.555 +y_0=126867.909 no_defs',NULL,'Palestine 1923 / Palestine Grid',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_68() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28192,'EPSG','28192','proj4_data/epsg',NULL,'+a=6378300.789 +b=6356566.435 +k=1 +lat_0=31.73409694444445 +lon_0=35.21208055555556 +no_defs +proj=tmerc +towgs84=-275.7224,94.7824,340.8944,-8.001,-4.42,-11.821,1 +units=m +x_0=170251.555 +y_0=1126867.909',NULL,'Palestine 1923 / Palestine Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28192,'ESRI','28192','proj4_data/esri',NULL,'+a=6378300.789 +b=6356566.435 +k=1.000000 +lat_0=31.73409694444445 +lon_0=35.21208055555556 +no_defs +proj=tmerc +units=m +x_0=170251.555 +y_0=1126867.909 no_defs',NULL,'Palestine 1923 / Palestine Belt',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28193,'EPSG','28193','proj4_data/epsg',NULL,'+a=6378300.789 +b=6356566.435 +lat_0=31.73409694444445 +lon_0=35.21208055555556 +no_defs +proj=cass +towgs84=-275.7224,94.7824,340.8944,-8.001,-4.42,-11.821,1 +units=m +x_0=170251.555 +y_0=1126867.909',NULL,'Palestine 1923 / Israeli CS Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28193,'ESRI','28193','proj4_data/esri',NULL,'+a=6378300.789 +b=6356566.435 +lat_0=31.73409694444445 +lon_0=35.21208055555556 +no_defs +proj=cass +units=m +x_0=170251.555 +y_0=1126867.909 no_defs',NULL,'Palestine 1923 / Israeli CS Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28232,'EPSG','28232','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +south +towgs84=-148,51,-291,0,0,0,0 +units=m +zone=32',NULL,'Pointe Noire / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28232,'ESRI','28232','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +south +units=m +zone=32 no_defs',NULL,'Pointe Noire / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28348,'EPSG','28348','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=48',NULL,'GDA94 / MGA zone 48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28348,'ESRI','28348','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=48 no_defs',NULL,'GDA94 / MGA zone 48',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28349,'EPSG','28349','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=49',NULL,'GDA94 / MGA zone 49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28349,'ESRI','28349','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=49 no_defs',NULL,'GDA94 / MGA zone 49',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28350,'EPSG','28350','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=50',NULL,'GDA94 / MGA zone 50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28350,'ESRI','28350','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=50 no_defs',NULL,'GDA94 / MGA zone 50',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28351,'EPSG','28351','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=51',NULL,'GDA94 / MGA zone 51',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28351,'ESRI','28351','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=51 no_defs',NULL,'GDA94 / MGA zone 51',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28352,'EPSG','28352','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=52',NULL,'GDA94 / MGA zone 52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28352,'ESRI','28352','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=52 no_defs',NULL,'GDA94 / MGA zone 52',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28353,'EPSG','28353','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=53',NULL,'GDA94 / MGA zone 53',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28353,'ESRI','28353','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=53 no_defs',NULL,'GDA94 / MGA zone 53',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28354,'EPSG','28354','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=54',NULL,'GDA94 / MGA zone 54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28354,'ESRI','28354','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=54 no_defs',NULL,'GDA94 / MGA zone 54',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28355,'EPSG','28355','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=55',NULL,'GDA94 / MGA zone 55',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28355,'ESRI','28355','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=55 no_defs',NULL,'GDA94 / MGA zone 55',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28356,'EPSG','28356','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=56',NULL,'GDA94 / MGA zone 56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28356,'ESRI','28356','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=56 no_defs',NULL,'GDA94 / MGA zone 56',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28357,'EPSG','28357','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=57',NULL,'GDA94 / MGA zone 57',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28357,'ESRI','28357','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=57 no_defs',NULL,'GDA94 / MGA zone 57',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28358,'EPSG','28358','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=58',NULL,'GDA94 / MGA zone 58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28358,'ESRI','28358','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=58 no_defs',NULL,'GDA94 / MGA zone 58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28402,'EPSG','28402','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=2500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 2 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28402,'ESRI','28402','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28403,'EPSG','28403','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=3500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 3 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28403,'ESRI','28403','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=3500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28404,'EPSG','28404','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=4500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28404,'ESRI','28404','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28405,'EPSG','28405','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=5500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28405,'ESRI','28405','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28406,'EPSG','28406','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=6500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28406,'ESRI','28406','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +units=m +x_0=6500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28407,'EPSG','28407','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=7500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28407,'ESRI','28407','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +units=m +x_0=7500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28408,'EPSG','28408','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=8500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28408,'ESRI','28408','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +units=m +x_0=8500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28409,'EPSG','28409','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=9500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28409,'ESRI','28409','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +units=m +x_0=9500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28410,'EPSG','28410','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=10500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28410,'ESRI','28410','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +units=m +x_0=10500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28411,'EPSG','28411','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=11500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28411,'ESRI','28411','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +units=m +x_0=11500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28412,'EPSG','28412','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=12500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28412,'ESRI','28412','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +units=m +x_0=12500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28413,'EPSG','28413','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=13500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28413,'ESRI','28413','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=13500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28414,'EPSG','28414','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=14500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28414,'ESRI','28414','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=14500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28415,'EPSG','28415','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=15500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28415,'ESRI','28415','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=15500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28416,'EPSG','28416','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=16500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28416,'ESRI','28416','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=16500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28417,'EPSG','28417','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=17500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28417,'ESRI','28417','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=17500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28418,'EPSG','28418','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=18500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28418,'ESRI','28418','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=18500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 18',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28419,'EPSG','28419','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=19500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28419,'ESRI','28419','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=19500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28420,'EPSG','28420','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=20500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28420,'ESRI','28420','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=20500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 20',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28421,'EPSG','28421','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=21500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28421,'ESRI','28421','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=21500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28422,'EPSG','28422','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=22500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28422,'ESRI','28422','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=22500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 22',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28423,'EPSG','28423','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=23500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28423,'ESRI','28423','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=23500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28424,'EPSG','28424','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=24500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28424,'ESRI','28424','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +units=m +x_0=24500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 24',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28425,'EPSG','28425','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=25500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28425,'ESRI','28425','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +units=m +x_0=25500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28426,'EPSG','28426','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=26500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28426,'ESRI','28426','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +units=m +x_0=26500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 26',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28427,'EPSG','28427','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=27500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28427,'ESRI','28427','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +units=m +x_0=27500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 27',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28428,'EPSG','28428','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=28500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28428,'ESRI','28428','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +units=m +x_0=28500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28429,'EPSG','28429','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=29500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28429,'ESRI','28429','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +units=m +x_0=29500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 29',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28430,'EPSG','28430','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=30500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28430,'ESRI','28430','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +units=m +x_0=30500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 30',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28431,'EPSG','28431','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=31500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28431,'ESRI','28431','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=m +x_0=31500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28432,'EPSG','28432','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=32500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28432,'ESRI','28432','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +units=m +x_0=32500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger zone 32',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28462,'EPSG','28462','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 2N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28462,'ESRI','28462','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 2N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28463,'EPSG','28463','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 3N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28463,'ESRI','28463','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28464,'EPSG','28464','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 4N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28464,'ESRI','28464','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28465,'EPSG','28465','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 5N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28465,'ESRI','28465','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=27 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28466,'EPSG','28466','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 6N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28466,'ESRI','28466','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=33 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 6N',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_69() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28467,'EPSG','28467','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 7N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28467,'ESRI','28467','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=39 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28468,'EPSG','28468','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 8N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28468,'ESRI','28468','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=45 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28469,'EPSG','28469','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 9N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28469,'ESRI','28469','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=51 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28470,'EPSG','28470','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 10N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28470,'ESRI','28470','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=57 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28471,'EPSG','28471','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 11N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28471,'ESRI','28471','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=63 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28472,'EPSG','28472','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 12N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28472,'ESRI','28472','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=69 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28473,'EPSG','28473','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 13N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28473,'ESRI','28473','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=75 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28474,'EPSG','28474','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 14N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28474,'ESRI','28474','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=81 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28475,'EPSG','28475','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 15N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28475,'ESRI','28475','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=87 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28476,'EPSG','28476','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 16N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28476,'ESRI','28476','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=93 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28477,'EPSG','28477','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 17N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28477,'ESRI','28477','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=99 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28478,'EPSG','28478','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 18N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28478,'ESRI','28478','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=105 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28479,'EPSG','28479','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 19N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28479,'ESRI','28479','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=111 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28480,'EPSG','28480','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 20N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28480,'ESRI','28480','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=117 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28481,'EPSG','28481','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 21N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28481,'ESRI','28481','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=123 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28482,'EPSG','28482','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 22N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28482,'ESRI','28482','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=129 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28483,'EPSG','28483','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 23N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28483,'ESRI','28483','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=135 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28484,'EPSG','28484','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 24N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28484,'ESRI','28484','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=141 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 24N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28485,'EPSG','28485','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 25N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28485,'ESRI','28485','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=147 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 25N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28486,'EPSG','28486','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 26N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28486,'ESRI','28486','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=153 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28487,'EPSG','28487','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 27N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28487,'ESRI','28487','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=159 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 27N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28488,'EPSG','28488','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 28N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28488,'ESRI','28488','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=165 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28489,'EPSG','28489','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 29N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28489,'ESRI','28489','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=171 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28490,'EPSG','28490','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 30N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28490,'ESRI','28490','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=177 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28491,'EPSG','28491','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 31N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28491,'ESRI','28491','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-177 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28492,'EPSG','28492','proj4_data/epsg',NULL,'+ellps=krass +k=1 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +towgs84=23.92,-141.27,-80.9,0,0.35,0.82,-0.12 +units=m +x_0=500000 +y_0=0',NULL,'Pulkovo 1942 / Gauss-Kruger 32N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28492,'ESRI','28492','proj4_data/esri',NULL,'+ellps=krass +k=1.000000 +lat_0=0 +lon_0=-171 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Pulkovo 1942 / Gauss-Kruger 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28600,'EPSG','28600','proj4_data/epsg',NULL,'+ellps=intl +k=0.99999 +lat_0=24.45 +lon_0=51.21666666666667 +no_defs +proj=tmerc +towgs84=-128.16,-282.42,21.93,0,0,0,0 +units=m +x_0=200000 +y_0=300000',NULL,'Qatar 1974 / Qatar National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28600,'ESRI','28600','proj4_data/esri',NULL,'+ellps=intl +k=0.999990 +lat_0=24.45 +lon_0=51.21666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=300000 no_defs',NULL,'Qatar 1974 / Qatar National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28991,'EPSG','28991','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999079 +lat_0=52.15616055555555 +lon_0=5.38763888888889 +no_defs +proj=sterea +towgs84=565.4171,50.3319,465.5524,-0.398957,0.343988,-1.87740,4.0725 +units=m +x_0=0 +y_0=0',NULL,'Amersfoort / RD Old',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28991,'ESRI','28991','proj4_data/esri',NULL,'+ellps=bessel +k=0.999908 +lat_0=52.15616055555555 +lon_0=5.38763888888889 +no_defs +proj=stere +units=m +x_0=0 +y_0=0 no_defs',NULL,'Amersfoort / RD Old',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28992,'EPSG','28992','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999079 +lat_0=52.15616055555555 +lon_0=5.38763888888889 +no_defs +proj=sterea +towgs84=565.4171,50.3319,465.5524,-0.398957,0.343988,-1.87740,4.0725 +units=m +x_0=155000 +y_0=463000',NULL,'Amersfoort / RD New',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(28992,'ESRI','28992','proj4_data/esri',NULL,'+ellps=bessel +k=0.999908 +lat_0=52.15616055555555 +lon_0=5.38763888888889 +no_defs +proj=stere +units=m +x_0=155000 +y_0=463000 no_defs',NULL,'Amersfoort / RD New',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29100,'EPSG','29100','proj4_data/epsg',NULL,'+ellps=GRS67 +lat_0=0 +lon_0=-54 +no_defs +proj=poly +towgs84=-57,1,-41,0,0,0,0 +units=m +x_0=5000000 +y_0=10000000',NULL,'SAD69 / Brazil Polyconic (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29100,'ESRI','29100','proj4_data/esri',NULL,'+ellps=GRS67 +lat_0=0 +lon_0=-54 +no_defs +proj=poly +units=m +x_0=5000000 +y_0=10000000 no_defs',NULL,'SAD69 / Brazil Polyconic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29101,'EPSG','29101','proj4_data/epsg',NULL,'+ellps=aust_SA +lat_0=0 +lon_0=-54 +no_defs +proj=poly +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +x_0=5000000 +y_0=10000000',NULL,'SAD69 / Brazil Polyconic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29118,'EPSG','29118','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=18',NULL,'SAD69 / UTM zone 18N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29118,'ESRI','29118','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +units=m +zone=18 no_defs',NULL,'SAD69 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29119,'EPSG','29119','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=19',NULL,'SAD69 / UTM zone 19N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29119,'ESRI','29119','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +units=m +zone=19 no_defs',NULL,'SAD69 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29120,'EPSG','29120','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=20',NULL,'SAD69 / UTM zone 20N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29120,'ESRI','29120','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +units=m +zone=20 no_defs',NULL,'SAD69 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29121,'EPSG','29121','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=21',NULL,'SAD69 / UTM zone 21N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29121,'ESRI','29121','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +units=m +zone=21 no_defs',NULL,'SAD69 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29122,'EPSG','29122','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=22',NULL,'SAD69 / UTM zone 22N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29122,'ESRI','29122','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +units=m +zone=22 no_defs',NULL,'SAD69 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29168,'EPSG','29168','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=18',NULL,'SAD69 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29169,'EPSG','29169','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=19',NULL,'SAD69 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29170,'EPSG','29170','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=20',NULL,'SAD69 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29171,'EPSG','29171','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=21',NULL,'SAD69 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29172,'EPSG','29172','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=22',NULL,'SAD69 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29177,'EPSG','29177','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=17',NULL,'SAD69 / UTM zone 17S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29177,'ESRI','29177','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +units=m +zone=17 no_defs',NULL,'SAD69 / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29178,'EPSG','29178','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=18',NULL,'SAD69 / UTM zone 18S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29178,'ESRI','29178','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +units=m +zone=18 no_defs',NULL,'SAD69 / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29179,'EPSG','29179','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=19',NULL,'SAD69 / UTM zone 19S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29179,'ESRI','29179','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +units=m +zone=19 no_defs',NULL,'SAD69 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29180,'EPSG','29180','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=20',NULL,'SAD69 / UTM zone 20S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29180,'ESRI','29180','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +units=m +zone=20 no_defs',NULL,'SAD69 / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29181,'EPSG','29181','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=21',NULL,'SAD69 / UTM zone 21S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29181,'ESRI','29181','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +units=m +zone=21 no_defs',NULL,'SAD69 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29182,'EPSG','29182','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=22',NULL,'SAD69 / UTM zone 22S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29182,'ESRI','29182','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +units=m +zone=22 no_defs',NULL,'SAD69 / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29183,'EPSG','29183','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=23',NULL,'SAD69 / UTM zone 23S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29183,'ESRI','29183','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +units=m +zone=23 no_defs',NULL,'SAD69 / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29184,'EPSG','29184','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=24',NULL,'SAD69 / UTM zone 24S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29184,'ESRI','29184','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +units=m +zone=24 no_defs',NULL,'SAD69 / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29185,'EPSG','29185','proj4_data/epsg',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +towgs84=-57,1,-41,0,0,0,0 +units=m +zone=25',NULL,'SAD69 / UTM zone 25S (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29185,'ESRI','29185','proj4_data/esri',NULL,'+ellps=GRS67 +no_defs +proj=utm +south +units=m +zone=25 no_defs',NULL,'SAD69 / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29187,'EPSG','29187','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=17',NULL,'SAD69 / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29188,'EPSG','29188','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=18',NULL,'SAD69 / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29189,'EPSG','29189','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=19',NULL,'SAD69 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29190,'EPSG','29190','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=20',NULL,'SAD69 / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29191,'EPSG','29191','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=21',NULL,'SAD69 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29192,'EPSG','29192','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=22',NULL,'SAD69 / UTM zone 22S',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_70() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29193,'EPSG','29193','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=23',NULL,'SAD69 / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29194,'EPSG','29194','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=24',NULL,'SAD69 / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29195,'EPSG','29195','proj4_data/epsg',NULL,'+ellps=aust_SA +no_defs +proj=utm +south +towgs84=-66.87,4.37,-38.52,0,0,0,0 +units=m +zone=25',NULL,'SAD69 / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29220,'EPSG','29220','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-355,21,72,0,0,0,0 +units=m +zone=20',NULL,'Sapper Hill 1943 / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29220,'ESRI','29220','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-355,21,72,0,0,0,0 +units=m +zone=20 no_defs',NULL,'Sapper Hill 1943 / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29221,'EPSG','29221','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-355,21,72,0,0,0,0 +units=m +zone=21',NULL,'Sapper Hill 1943 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29221,'ESRI','29221','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-355,21,72,0,0,0,0 +units=m +zone=21 no_defs',NULL,'Sapper Hill 1943 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29333,'EPSG','29333','proj4_data/epsg',NULL,'+ellps=bess_nam +no_defs +proj=utm +south +towgs84=616,97,-251,0,0,0,0 +units=m +zone=33',NULL,'Schwarzeck / UTM zone 33S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29333,'ESRI','29333','proj4_data/esri',NULL,'+ellps=bess_nam +no_defs +proj=utm +south +units=m +zone=33 no_defs',NULL,'Schwarzeck / UTM zone 33S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29371,'EPSG','29371','proj4_data/epsg',NULL,'+axis=wsu +ellps=bess_nam +k=1 +lat_0=-22 +lon_0=11 +no_defs +proj=tmerc +to_meter=1.0000135965 +towgs84=616,97,-251,0,0,0,0 +x_0=0 +y_0=0',NULL,'Schwarzeck / Lo22/11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29373,'EPSG','29373','proj4_data/epsg',NULL,'+axis=wsu +ellps=bess_nam +k=1 +lat_0=-22 +lon_0=13 +no_defs +proj=tmerc +to_meter=1.0000135965 +towgs84=616,97,-251,0,0,0,0 +x_0=0 +y_0=0',NULL,'Schwarzeck / Lo22/13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29375,'EPSG','29375','proj4_data/epsg',NULL,'+axis=wsu +ellps=bess_nam +k=1 +lat_0=-22 +lon_0=15 +no_defs +proj=tmerc +to_meter=1.0000135965 +towgs84=616,97,-251,0,0,0,0 +x_0=0 +y_0=0',NULL,'Schwarzeck / Lo22/15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29377,'EPSG','29377','proj4_data/epsg',NULL,'+axis=wsu +ellps=bess_nam +k=1 +lat_0=-22 +lon_0=17 +no_defs +proj=tmerc +to_meter=1.0000135965 +towgs84=616,97,-251,0,0,0,0 +x_0=0 +y_0=0',NULL,'Schwarzeck / Lo22/17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29379,'EPSG','29379','proj4_data/epsg',NULL,'+axis=wsu +ellps=bess_nam +k=1 +lat_0=-22 +lon_0=19 +no_defs +proj=tmerc +to_meter=1.0000135965 +towgs84=616,97,-251,0,0,0,0 +x_0=0 +y_0=0',NULL,'Schwarzeck / Lo22/19',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29381,'EPSG','29381','proj4_data/epsg',NULL,'+axis=wsu +ellps=bess_nam +k=1 +lat_0=-22 +lon_0=21 +no_defs +proj=tmerc +to_meter=1.0000135965 +towgs84=616,97,-251,0,0,0,0 +x_0=0 +y_0=0',NULL,'Schwarzeck / Lo22/21',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29383,'EPSG','29383','proj4_data/epsg',NULL,'+axis=wsu +ellps=bess_nam +k=1 +lat_0=-22 +lon_0=23 +no_defs +proj=tmerc +to_meter=1.0000135965 +towgs84=616,97,-251,0,0,0,0 +x_0=0 +y_0=0',NULL,'Schwarzeck / Lo22/23',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29385,'EPSG','29385','proj4_data/epsg',NULL,'+axis=wsu +ellps=bess_nam +k=1 +lat_0=-22 +lon_0=25 +no_defs +proj=tmerc +to_meter=1.0000135965 +towgs84=616,97,-251,0,0,0,0 +x_0=0 +y_0=0',NULL,'Schwarzeck / Lo22/25',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29635,'EPSG','29635','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=35',NULL,'Sudan / UTM zone 35N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29635,'ESRI','29635','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=35 no_defs',NULL,'South West African Coord. System zone 11\12South West African Coord. System zone 13\12South West African Coord. System zone 15\12South West African Coord. System zone 17\12South West African Coord. System zone 19\12South West African Coord. System zone 21\12South West African Coord. System zone 23\12South West African Coord. System zone 25\12Sudan / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29636,'EPSG','29636','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=36',NULL,'Sudan / UTM zone 36N (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29636,'ESRI','29636','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=36 no_defs',NULL,'Sudan / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29700,'EPSG','29700','proj4_data/epsg',NULL,'+alpha=18.9 +ellps=intl +gamma=18.9 +k=0.9995000000000001 +lat_0=-18.9 +lonc=44.10000000000001 +no_defs +pm=paris +proj=omerc +towgs84=-189,-242,-91,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'Tananarive (Paris) / Laborde Grid (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29700,'ESRI','29700','proj4_data/esri',NULL,'+alpha=18.9 +ellps=intl +k=0.9995000000000001 +lat_0=-18.9 +lonc=46.43722917000001 +no_defs +pm=paris +proj=omerc +towgs84=-189,-242,-91,0,0,0,0 +units=m +x_0=400000 +y_0=800000 no_defs',NULL,'Tananarive (Paris) / Laborde Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29702,'EPSG','29702','proj4_data/epsg',NULL,'+alpha=18.9 +ellps=intl +gamma=18.9 +k=0.9995000000000001 +lat_0=-18.9 +lonc=44.10000000000001 +no_defs +pm=paris +proj=omerc +towgs84=-189,-242,-91,0,0,0,0 +units=m +x_0=400000 +y_0=800000',NULL,'Tananarive (Paris) / Laborde Grid\12Unable to translate coordinate system EPSG:29701 into PROJ.4 format.\12\12Tananarive (Paris) / Laborde Grid approximation',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29738,'EPSG','29738','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-189,-242,-91,0,0,0,0 +units=m +zone=38',NULL,'Tananarive / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29738,'ESRI','29738','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-189,-242,-91,0,0,0,0 +units=m +zone=38 no_defs',NULL,'Tananarive / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29739,'EPSG','29739','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-189,-242,-91,0,0,0,0 +units=m +zone=39',NULL,'Tananarive / UTM zone 39S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29739,'ESRI','29739','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +south +towgs84=-189,-242,-91,0,0,0,0 +units=m +zone=39 no_defs',NULL,'Tananarive / UTM zone 39S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29849,'EPSG','29849','proj4_data/epsg',NULL,'+ellps=evrstSS +no_defs +proj=utm +towgs84=-679,669,-48,0,0,0,0 +units=m +zone=49',NULL,'Timbalai 1948 / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29849,'ESRI','29849','proj4_data/esri',NULL,'+ellps=evrstSS +no_defs +proj=utm +units=m +zone=49 no_defs',NULL,'Timbalai 1948 / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29850,'EPSG','29850','proj4_data/epsg',NULL,'+ellps=evrstSS +no_defs +proj=utm +towgs84=-679,669,-48,0,0,0,0 +units=m +zone=50',NULL,'Timbalai 1948 / UTM zone 50N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29850,'ESRI','29850','proj4_data/esri',NULL,'+ellps=evrstSS +no_defs +proj=utm +units=m +zone=50 no_defs',NULL,'Timbalai 1948 / UTM zone 50N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29871,'EPSG','29871','proj4_data/epsg',NULL,'+alpha=53.31582047222222 +ellps=evrstSS +gamma=53.13010236111111 +k=0.99984 +lat_0=4 +lonc=115 +no_defs +proj=omerc +to_meter=20.11676512155263 +towgs84=-679,669,-48,0,0,0,0 +x_0=590476.8714630401 +y_0=442857.653094361',NULL,'Timbalai 1948 / RSO Borneo (ch)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29871,'ESRI','29871','proj4_data/esri',NULL,'+alpha=53.31582047222222 +ellps=evrstSS +k=0.99984 +lat_0=4 +lonc=115 +no_defs +proj=omerc +to_meter=20.11676512155263 +x_0=590476.8714630401 +y_0=442857.653094361 no_defs',NULL,'Timbalai 1948 / R.S.O. Borneo (ch)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29872,'EPSG','29872','proj4_data/epsg',NULL,'+alpha=53.31582047222222 +ellps=evrstSS +gamma=53.13010236111111 +k=0.99984 +lat_0=4 +lonc=115 +no_defs +proj=omerc +to_meter=0.3047994715386762 +towgs84=-679,669,-48,0,0,0,0 +x_0=590476.8727431979 +y_0=442857.6545573985',NULL,'Timbalai 1948 / RSO Borneo (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29872,'ESRI','29872','proj4_data/esri',NULL,'+alpha=53.31582047222222 +ellps=evrstSS +k=0.99984 +lat_0=4 +lonc=115 +no_defs +proj=omerc +to_meter=0.3047994715386762 +x_0=590476.8727431979 +y_0=442857.6545573985 no_defs',NULL,'Timbalai 1948 / R.S.O. Borneo (ft)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29873,'EPSG','29873','proj4_data/epsg',NULL,'+alpha=53.31582047222222 +ellps=evrstSS +gamma=53.13010236111111 +k=0.99984 +lat_0=4 +lonc=115 +no_defs +proj=omerc +towgs84=-679,669,-48,0,0,0,0 +units=m +x_0=590476.87 +y_0=442857.65',NULL,'Timbalai 1948 / RSO Borneo (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29873,'ESRI','29873','proj4_data/esri',NULL,'+alpha=53.31582047222222 +ellps=evrstSS +k=0.99984 +lat_0=4 +lonc=115 +no_defs +proj=omerc +units=m +x_0=590476.87 +y_0=442857.65 no_defs',NULL,'Timbalai 1948 / R.S.O. Borneo (m)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29900,'EPSG','29900','proj4_data/epsg',NULL,'+datum=ire65 +k=1.000035 +lat_0=53.5 +lon_0=-8 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=250000',NULL,'TM65 / Irish National Grid (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29900,'ESRI','29900','proj4_data/esri',NULL,'+a=6377340.189 +b=6356034.447938534 +k=1.000035 +lat_0=53.5 +lon_0=-8 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=250000 no_defs',NULL,'TM65 / Irish National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29901,'EPSG','29901','proj4_data/epsg',NULL,'+ellps=airy +k=1 +lat_0=53.5 +lon_0=-8 +no_defs +proj=tmerc +towgs84=482.5,-130.6,564.6,-1.042,-0.214,-0.631,8.15 +units=m +x_0=200000 +y_0=250000',NULL,'OSNI 1952 / Irish National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29901,'ESRI','29901','proj4_data/esri',NULL,'+ellps=airy +k=1.000000 +lat_0=53.5 +lon_0=-8 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=250000 no_defs',NULL,'OSNI 1952 / Irish National Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29902,'EPSG','29902','proj4_data/epsg',NULL,'+datum=ire65 +k=1.000035 +lat_0=53.5 +lon_0=-8 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=250000',NULL,'TM65 / Irish Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29902,'ESRI','29902','proj4_data/esri',NULL,'+a=6377340.189 +b=6356034.447938534 +k=1.000035 +lat_0=53.5 +lon_0=-8 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=250000 no_defs',NULL,'TM65 / Irish Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29903,'EPSG','29903','proj4_data/epsg',NULL,'+ellps=mod_airy +k=1.000035 +lat_0=53.5 +lon_0=-8 +no_defs +proj=tmerc +towgs84=482.5,-130.6,564.6,-1.042,-0.214,-0.631,8.15 +units=m +x_0=200000 +y_0=250000',NULL,'TM75 / Irish Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(29903,'ESRI','29903','proj4_data/esri',NULL,'+a=6377340.189 +b=6356034.447938534 +k=1.000035 +lat_0=53.5 +lon_0=-8 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=250000 no_defs',NULL,'TM75 / Irish Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30161,'EPSG','30161','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=33 +lon_0=129.5 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30161,'ESRI','30161','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=33 +lon_0=129.5 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30162,'EPSG','30162','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=33 +lon_0=131 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30162,'ESRI','30162','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=33 +lon_0=131 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30163,'EPSG','30163','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=36 +lon_0=132.1666666666667 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30163,'ESRI','30163','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=36 +lon_0=132.1666666666667 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30164,'EPSG','30164','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=33 +lon_0=133.5 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30164,'ESRI','30164','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=33 +lon_0=133.5 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30165,'EPSG','30165','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=36 +lon_0=134.3333333333333 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30165,'ESRI','30165','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=36 +lon_0=134.3333333333333 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30166,'EPSG','30166','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=36 +lon_0=136 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS VI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30166,'ESRI','30166','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=36 +lon_0=136 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS VI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30167,'EPSG','30167','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=36 +lon_0=137.1666666666667 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS VII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30167,'ESRI','30167','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=36 +lon_0=137.1666666666667 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS VII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30168,'EPSG','30168','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=36 +lon_0=138.5 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS VIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30168,'ESRI','30168','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=36 +lon_0=138.5 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS VIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30169,'EPSG','30169','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=36 +lon_0=139.8333333333333 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS IX',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30169,'ESRI','30169','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=36 +lon_0=139.8333333333333 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS IX',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30170,'EPSG','30170','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=40 +lon_0=140.8333333333333 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS X',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30170,'ESRI','30170','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=40 +lon_0=140.8333333333333 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS X',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30171,'EPSG','30171','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=44 +lon_0=140.25 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS XI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30171,'ESRI','30171','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=44 +lon_0=140.25 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS XI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30172,'EPSG','30172','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=44 +lon_0=142.25 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS XII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30172,'ESRI','30172','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=44 +lon_0=142.25 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS XII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30173,'EPSG','30173','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=44 +lon_0=144.25 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS XIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30173,'ESRI','30173','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=44 +lon_0=144.25 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS XIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30174,'EPSG','30174','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=26 +lon_0=142 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS XIV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30174,'ESRI','30174','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=26 +lon_0=142 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS XIV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30175,'EPSG','30175','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=26 +lon_0=127.5 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS XV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30175,'ESRI','30175','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=26 +lon_0=127.5 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS XV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30176,'EPSG','30176','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=26 +lon_0=124 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS XVI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30176,'ESRI','30176','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=26 +lon_0=124 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS XVI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30177,'EPSG','30177','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=26 +lon_0=131 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS XVII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30177,'ESRI','30177','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=26 +lon_0=131 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS XVII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30178,'EPSG','30178','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=20 +lon_0=136 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS XVIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30178,'ESRI','30178','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=20 +lon_0=136 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS XVIII',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30179,'EPSG','30179','proj4_data/epsg',NULL,'+ellps=bessel +k=0.9999 +lat_0=26 +lon_0=154 +no_defs +proj=tmerc +towgs84=-146.414,507.337,680.507,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'Tokyo / Japan Plane Rectangular CS XIX',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30179,'ESRI','30179','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=26 +lon_0=154 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Tokyo / Japan Plane Rectangular CS XIX',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30200,'EPSG','30200','proj4_data/epsg',NULL,'+a=6378293.645208759 +b=6356617.987679838 +lat_0=10.44166666666667 +lon_0=-61.33333333333334 +no_defs +proj=cass +to_meter=0.201166195164 +towgs84=-61.702,284.488,472.052,0,0,0,0 +x_0=86501.46392051999 +y_0=65379.0134283',NULL,'Trinidad 1903 / Trinidad Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30200,'ESRI','30200','proj4_data/esri',NULL,'+a=6378293.63683822 +b=6356617.979337744 +lat_0=10.44166666666667 +lon_0=-61.33333333333334 +no_defs +proj=cass +to_meter=0.2011661949 +towgs84=-61.702,284.488,472.052,0,0,0,0 +x_0=86501.46380700001 +y_0=65379.0133425 no_defs',NULL,'Trinidad 1903 / Trinidad Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30339,'EPSG','30339','proj4_data/epsg',NULL,'+ellps=helmert +no_defs +proj=utm +units=m +zone=39',NULL,'TC(1948) / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30339,'ESRI','30339','proj4_data/esri',NULL,'+ellps=helmert +no_defs +proj=utm +units=m +zone=39 no_defs',NULL,'TC(1948) / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30340,'EPSG','30340','proj4_data/epsg',NULL,'+ellps=helmert +no_defs +proj=utm +units=m +zone=40',NULL,'TC(1948) / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30340,'ESRI','30340','proj4_data/esri',NULL,'+ellps=helmert +no_defs +proj=utm +units=m +zone=40 no_defs',NULL,'TC(1948) / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30491,'EPSG','30491','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999625544 +lat_0=36 +lat_1=36 +lon_0=2.7 +no_defs +proj=lcc +towgs84=-73,-247,227,0,0,0,0 +units=m +x_0=500000 +y_0=300000',NULL,'Voirol 1875 / Nord Algerie (ancienne)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30491,'ESRI','30491','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999625544 +lat_0=36 +lat_1=36 +lon_0=2.7 +no_defs +proj=lcc +towgs84=-73,-247,227,0,0,0,0 +units=m +x_0=500000 +y_0=300000 no_defs',NULL,'Voirol 1875 / Nord Algerie (ancienne)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30492,'EPSG','30492','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=2.7 +no_defs +proj=lcc +towgs84=-73,-247,227,0,0,0,0 +units=m +x_0=500000 +y_0=300000',NULL,'Voirol 1875 / Sud Algerie (ancienne)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30492,'ESRI','30492','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=2.7 +no_defs +proj=lcc +towgs84=-73,-247,227,0,0,0,0 +units=m +x_0=500000 +y_0=300000 no_defs',NULL,'Voirol 1875 / Sud Algerie (ancienne)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30493,'EPSG','30493','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999625544 +lat_0=36 +lat_1=36 +lon_0=2.7 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=300000',NULL,'Voirol 1879 / Nord Algerie (ancienne)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30494,'EPSG','30494','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=2.7 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=300000',NULL,'Voirol 1879 / Sud Algerie (ancienne)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30591,'ESRI','30591','proj4_data/esri',NULL,'+ellps=clrk80 +k_0=0.999625544 +lat_0=36 +lat_1=36 +lon_0=2.7 +proj=lcc +units=m +x_0=500135 +y_0=300090 no_defs',NULL,'Nord Algerie',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30592,'ESRI','30592','proj4_data/esri',NULL,'+ellps=clrk80 +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=2.7 +proj=lcc +units=m +x_0=500135 +y_0=300090 no_defs',NULL,'Sud Algerie',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30729,'EPSG','30729','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-209.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547 +units=m +zone=29',NULL,'Nord Sahara 1959 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30729,'ESRI','30729','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=29 no_defs',NULL,'Nord Sahara 1959 / UTM zone 29N',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_71() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30730,'EPSG','30730','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-209.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547 +units=m +zone=30',NULL,'Nord Sahara 1959 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30730,'ESRI','30730','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=30 no_defs',NULL,'Nord Sahara 1959 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30731,'EPSG','30731','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-209.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547 +units=m +zone=31',NULL,'Nord Sahara 1959 / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30731,'ESRI','30731','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=31 no_defs',NULL,'Nord Sahara 1959 / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30732,'EPSG','30732','proj4_data/epsg',NULL,'+ellps=clrk80 +no_defs +proj=utm +towgs84=-209.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547 +units=m +zone=32',NULL,'Nord Sahara 1959 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30732,'ESRI','30732','proj4_data/esri',NULL,'+ellps=clrk80 +no_defs +proj=utm +units=m +zone=32 no_defs',NULL,'Nord Sahara 1959 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30791,'EPSG','30791','proj4_data/epsg',NULL,'+ellps=clrk80 +k_0=0.999625544 +lat_0=36 +lat_1=36 +lon_0=2.7 +no_defs +proj=lcc +towgs84=-209.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547 +units=m +x_0=500135 +y_0=300090',NULL,'Nord Sahara 1959 / Nord Algerie',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30791,'ESRI','30791','proj4_data/esri',NULL,'+ellps=clrk80 +k_0=0.999625544 +lat_0=36 +lat_1=36 +lon_0=2.7 +no_defs +proj=lcc +units=m +x_0=500135 +y_0=300090 no_defs',NULL,'Nord Sahara 1959 / Voirol Unifie Nord',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30792,'EPSG','30792','proj4_data/epsg',NULL,'+ellps=clrk80 +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=2.7 +no_defs +proj=lcc +towgs84=-209.3622,-87.8162,404.6198,0.0046,3.4784,0.5805,-1.4547 +units=m +x_0=500135 +y_0=300090',NULL,'Nord Sahara 1959 / Sud Algerie',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30792,'ESRI','30792','proj4_data/esri',NULL,'+ellps=clrk80 +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=2.7 +no_defs +proj=lcc +units=m +x_0=500135 +y_0=300090 no_defs',NULL,'Nord Sahara 1959 / Voirol Unifie Sud',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30800,'EPSG','30800','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=15.80827777777778 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0',NULL,'RT38 2.5 gon W (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(30800,'ESRI','30800','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=15.80827777777778 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0 no_defs',NULL,'RT38 2.5 gon W',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31028,'EPSG','31028','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-30,190,89,0,0,0,0 +units=m +zone=28',NULL,'Yoff / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31028,'ESRI','31028','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +units=m +zone=28 no_defs',NULL,'Yoff / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31121,'EPSG','31121','proj4_data/epsg',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-265,120,-358,0,0,0,0 +units=m +zone=21',NULL,'Zanderij / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31121,'ESRI','31121','proj4_data/esri',NULL,'+ellps=intl +no_defs +proj=utm +towgs84=-265,120,-358,0,0,0,0 +units=m +zone=21 no_defs',NULL,'Zanderij / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31154,'EPSG','31154','proj4_data/epsg',NULL,'+ellps=intl +k=0.9996 +lat_0=0 +lon_0=-54 +no_defs +proj=tmerc +towgs84=-265,120,-358,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Zanderij / TM 54 NW',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31154,'ESRI','31154','proj4_data/esri',NULL,'+ellps=intl +k=0.999600 +lat_0=0 +lon_0=-54 +no_defs +proj=tmerc +towgs84=-265,120,-358,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Zanderij / TM 54 NW',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31170,'EPSG','31170','proj4_data/epsg',NULL,'+ellps=intl +k=0.9996 +lat_0=0 +lon_0=-55.68333333333333 +no_defs +proj=tmerc +towgs84=-265,120,-358,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Zanderij / Suriname Old TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31170,'ESRI','31170','proj4_data/esri',NULL,'+ellps=intl +k=0.999600 +lat_0=0 +lon_0=-55.68333333333333 +no_defs +proj=tmerc +towgs84=-265,120,-358,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Zanderij / Suriname Old TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31171,'EPSG','31171','proj4_data/epsg',NULL,'+ellps=intl +k=0.9999 +lat_0=0 +lon_0=-55.68333333333333 +no_defs +proj=tmerc +towgs84=-265,120,-358,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'Zanderij / Suriname TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31171,'ESRI','31171','proj4_data/esri',NULL,'+ellps=intl +k=0.999900 +lat_0=0 +lon_0=-55.68333333333333 +no_defs +proj=tmerc +towgs84=-265,120,-358,0,0,0,0 +units=m +x_0=500000 +y_0=0 no_defs',NULL,'Zanderij / Suriname TM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31251,'EPSG','31251','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=28 +no_defs +pm=ferro +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=0 +y_0=-5000000',NULL,'MGI (Ferro) / Austria GK West Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31252,'EPSG','31252','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=31 +no_defs +pm=ferro +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=0 +y_0=-5000000',NULL,'MGI (Ferro) / Austria GK Central Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31253,'EPSG','31253','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=34 +no_defs +pm=ferro +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=0 +y_0=-5000000',NULL,'MGI (Ferro) / Austria GK East Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31254,'EPSG','31254','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=10.33333333333333 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=-5000000',NULL,'MGI / Austria GK West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31255,'EPSG','31255','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=13.33333333333333 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=-5000000',NULL,'MGI / Austria GK Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31256,'EPSG','31256','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=16.33333333333333 +no_defs +proj=tmerc +units=m +x_0=0 +y_0=-5000000',NULL,'MGI / Austria GK East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31257,'EPSG','31257','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=10.33333333333333 +no_defs +proj=tmerc +units=m +x_0=150000 +y_0=-5000000',NULL,'MGI / Austria GK M28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31258,'EPSG','31258','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=13.33333333333333 +no_defs +proj=tmerc +units=m +x_0=450000 +y_0=-5000000',NULL,'MGI / Austria GK M31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31259,'EPSG','31259','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=16.33333333333333 +no_defs +proj=tmerc +units=m +x_0=750000 +y_0=-5000000',NULL,'MGI / Austria GK M34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31265,'EPSG','31265','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0',NULL,'MGI / 3-degree Gauss zone 5 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31265,'ESRI','31265','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0 no_defs',NULL,'MGI / 3-degree Gauss zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31266,'EPSG','31266','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +units=m +x_0=6500000 +y_0=0',NULL,'MGI / 3-degree Gauss zone 6 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31266,'ESRI','31266','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +units=m +x_0=6500000 +y_0=0 no_defs',NULL,'MGI / 3-degree Gauss zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31267,'EPSG','31267','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=7500000 +y_0=0',NULL,'MGI / 3-degree Gauss zone 7 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31267,'ESRI','31267','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=7500000 +y_0=0 no_defs',NULL,'MGI / 3-degree Gauss zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31268,'EPSG','31268','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=8500000 +y_0=0',NULL,'MGI / 3-degree Gauss zone 8 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31268,'ESRI','31268','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=8500000 +y_0=0 no_defs',NULL,'MGI / 3-degree Gauss zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31275,'EPSG','31275','proj4_data/epsg',NULL,'+datum=hermannskogel +k=0.9999 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0',NULL,'MGI / Balkans zone 5 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31275,'ESRI','31275','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0 no_defs',NULL,'MGI / Balkans zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31276,'EPSG','31276','proj4_data/epsg',NULL,'+datum=hermannskogel +k=0.9999 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +units=m +x_0=6500000 +y_0=0',NULL,'MGI / Balkans zone 6 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31276,'ESRI','31276','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=0 +lon_0=18 +no_defs +proj=tmerc +units=m +x_0=6500000 +y_0=0 no_defs',NULL,'MGI / Balkans zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31277,'EPSG','31277','proj4_data/epsg',NULL,'+datum=hermannskogel +k=0.9999 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=7500000 +y_0=0',NULL,'MGI / Balkans zone 7 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31277,'ESRI','31277','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=7500000 +y_0=0 no_defs',NULL,'MGI / Balkans zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31278,'EPSG','31278','proj4_data/epsg',NULL,'+datum=hermannskogel +k=0.9999 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=7500000 +y_0=0',NULL,'MGI / Balkans zone 8 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31278,'ESRI','31278','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=0 +lon_0=21 +no_defs +proj=tmerc +units=m +x_0=7500000 +y_0=0 no_defs',NULL,'MGI / Balkans zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31279,'EPSG','31279','proj4_data/epsg',NULL,'+datum=hermannskogel +k=0.9999 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=8500000 +y_0=0',NULL,'MGI / Balkans zone 8 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31279,'ESRI','31279','proj4_data/esri',NULL,'+ellps=bessel +k=0.999900 +lat_0=0 +lon_0=24 +no_defs +proj=tmerc +units=m +x_0=8500000 +y_0=0 no_defs',NULL,'MGI / Balkans zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31281,'EPSG','31281','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=28 +no_defs +pm=ferro +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'MGI (Ferro) / Austria West Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31281,'ESRI','31281','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=10.33333333333333 +no_defs +pm=ferro +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'MGI (Ferro) / Austria West Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31282,'EPSG','31282','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=31 +no_defs +pm=ferro +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'MGI (Ferro) / Austria Central Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31282,'ESRI','31282','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=13.33333333333333 +no_defs +pm=ferro +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'MGI (Ferro) / Austria Central Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31283,'EPSG','31283','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=34 +no_defs +pm=ferro +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'MGI (Ferro) / Austria East Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31283,'ESRI','31283','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=16.33333333333333 +no_defs +pm=ferro +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'MGI (Ferro) / Austria East Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31284,'EPSG','31284','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=10.33333333333333 +no_defs +proj=tmerc +units=m +x_0=150000 +y_0=0',NULL,'MGI / Austria M28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31284,'ESRI','31284','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=10.33333333333333 +no_defs +proj=tmerc +units=m +x_0=150000 +y_0=0 no_defs',NULL,'MGI / M28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31285,'EPSG','31285','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=13.33333333333333 +no_defs +proj=tmerc +units=m +x_0=450000 +y_0=0',NULL,'MGI / Austria M31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31285,'ESRI','31285','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=13.33333333333333 +no_defs +proj=tmerc +units=m +x_0=450000 +y_0=0 no_defs',NULL,'MGI / M31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31286,'EPSG','31286','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=16.33333333333333 +no_defs +proj=tmerc +units=m +x_0=750000 +y_0=0',NULL,'MGI / Austria M34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31286,'ESRI','31286','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=16.33333333333333 +no_defs +proj=tmerc +units=m +x_0=750000 +y_0=0 no_defs',NULL,'MGI / M34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31287,'EPSG','31287','proj4_data/epsg',NULL,'+datum=hermannskogel +lat_0=47.5 +lat_1=49 +lat_2=46 +lon_0=13.33333333333333 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=400000',NULL,'MGI / Austria Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31287,'ESRI','31287','proj4_data/esri',NULL,'+ellps=bessel +lat_0=47.5 +lat_1=49 +lat_2=46 +lon_0=13.33333333333333 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=400000 no_defs',NULL,'MGI / Austria Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31288,'EPSG','31288','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=28 +no_defs +pm=ferro +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=150000 +y_0=0',NULL,'MGI (Ferro) / M28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31289,'EPSG','31289','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=31 +no_defs +pm=ferro +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=450000 +y_0=0',NULL,'MGI (Ferro) / M31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31290,'EPSG','31290','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=34 +no_defs +pm=ferro +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=750000 +y_0=0',NULL,'MGI (Ferro) / M34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31291,'EPSG','31291','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=28 +no_defs +pm=ferro +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'MGI (Ferro) / Austria West Zone (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31291,'ESRI','31291','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=10.33333333333333 +no_defs +pm=ferro +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'MGI (Ferro) / Austria West Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31292,'EPSG','31292','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=31 +no_defs +pm=ferro +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'MGI (Ferro) / Austria Central Zone (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31292,'ESRI','31292','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=13.33333333333333 +no_defs +pm=ferro +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'MGI (Ferro) / Austria Central Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31293,'EPSG','31293','proj4_data/epsg',NULL,'+ellps=bessel +k=1 +lat_0=0 +lon_0=34 +no_defs +pm=ferro +proj=tmerc +towgs84=682,-203,480,0,0,0,0 +units=m +x_0=0 +y_0=0',NULL,'MGI (Ferro) / Austria East Zone (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31293,'ESRI','31293','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=16.33333333333333 +no_defs +pm=ferro +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'MGI (Ferro) / Austria East Zone',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31294,'EPSG','31294','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=10.33333333333333 +no_defs +proj=tmerc +units=m +x_0=150000 +y_0=0',NULL,'MGI / M28 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31294,'ESRI','31294','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=10.33333333333333 +no_defs +proj=tmerc +units=m +x_0=150000 +y_0=0 no_defs',NULL,'MGI / M28',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31295,'EPSG','31295','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=13.33333333333333 +no_defs +proj=tmerc +units=m +x_0=450000 +y_0=0',NULL,'MGI / M31 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31295,'ESRI','31295','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=13.33333333333333 +no_defs +proj=tmerc +units=m +x_0=450000 +y_0=0 no_defs',NULL,'MGI / M31',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31296,'EPSG','31296','proj4_data/epsg',NULL,'+datum=hermannskogel +k=1 +lat_0=0 +lon_0=16.33333333333333 +no_defs +proj=tmerc +units=m +x_0=750000 +y_0=0',NULL,'MGI / M34 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31296,'ESRI','31296','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=16.33333333333333 +no_defs +proj=tmerc +units=m +x_0=750000 +y_0=0 no_defs',NULL,'MGI / M34',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31297,'EPSG','31297','proj4_data/epsg',NULL,'+datum=hermannskogel +lat_0=47.5 +lat_1=49 +lat_2=46 +lon_0=13.33333333333333 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=400000',NULL,'MGI / Austria Lambert (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31297,'ESRI','31297','proj4_data/esri',NULL,'+ellps=bessel +lat_0=47.5 +lat_1=49 +lat_2=46 +lon_0=13.33333333333333 +no_defs +proj=lcc +units=m +x_0=400000 +y_0=400000 no_defs',NULL,'MGI / Austria Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31300,'EPSG','31300','proj4_data/epsg',NULL,'+ellps=intl +lat_0=90 +lat_1=49.83333333333334 +lat_2=51.16666666666666 +lon_0=4.356939722222222 +no_defs +proj=lcc +towgs84=-106.8686,52.2978,-103.7239,0.3366,-0.457,1.8422,-1.2747 +units=m +x_0=150000.01256 +y_0=5400088.4378',NULL,'Belge 1972 / Belge Lambert 72',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31300,'ESRI','31300','proj4_data/esri',NULL,'+ellps=intl +lat_0=90 +lat_1=49.83333333333334 +lat_2=51.16666666666666 +lon_0=4.356939722222222 +no_defs +proj=lcc +units=m +x_0=150000.01256 +y_0=5400088.4378 no_defs',NULL,'Belge 1972 / Belge Lambert 72',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31370,'EPSG','31370','proj4_data/epsg',NULL,'+ellps=intl +lat_0=90 +lat_1=51.16666723333333 +lat_2=49.8333339 +lon_0=4.367486666666666 +no_defs +proj=lcc +towgs84=-106.8686,52.2978,-103.7239,0.3366,-0.457,1.8422,-1.2747 +units=m +x_0=150000.013 +y_0=5400088.438',NULL,'Belge 1972 / Belgian Lambert 72',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31370,'ESRI','31370','proj4_data/esri',NULL,'+ellps=intl +lat_0=90 +lat_1=51.16666723333333 +lat_2=49.8333339 +lon_0=4.367486666666666 +no_defs +proj=lcc +units=m +x_0=150000.013 +y_0=5400088.438 no_defs',NULL,'Belge 1972 / Belgian Lambert 72',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31461,'EPSG','31461','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=3 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0',NULL,'DHDN / 3-degree Gauss zone 1 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31461,'ESRI','31461','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=3 +no_defs +proj=tmerc +units=m +x_0=1500000 +y_0=0 no_defs',NULL,'DHDN / 3-degree Gauss zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31462,'EPSG','31462','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=6 +no_defs +proj=tmerc +units=m +x_0=2500000 +y_0=0',NULL,'DHDN / 3-degree Gauss zone 2 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31462,'ESRI','31462','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=6 +no_defs +proj=tmerc +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'DHDN / 3-degree Gauss zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31463,'EPSG','31463','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +x_0=3500000 +y_0=0',NULL,'DHDN / 3-degree Gauss zone 3 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31463,'ESRI','31463','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +x_0=3500000 +y_0=0 no_defs',NULL,'DHDN / 3-degree Gauss zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31464,'EPSG','31464','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0',NULL,'DHDN / 3-degree Gauss zone 4 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31464,'ESRI','31464','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0 no_defs',NULL,'DHDN / 3-degree Gauss zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31465,'EPSG','31465','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0',NULL,'DHDN / 3-degree Gauss zone 5 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31465,'ESRI','31465','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0 no_defs',NULL,'DHDN / 3-degree Gauss zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31466,'EPSG','31466','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=6 +no_defs +proj=tmerc +units=m +x_0=2500000 +y_0=0',NULL,'DHDN / 3-degree Gauss-Kruger zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31466,'ESRI','31466','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=6 +no_defs +proj=tmerc +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'DHDN / Gauss-Kruger zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31467,'EPSG','31467','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +x_0=3500000 +y_0=0',NULL,'DHDN / 3-degree Gauss-Kruger zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31467,'ESRI','31467','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=9 +no_defs +proj=tmerc +units=m +x_0=3500000 +y_0=0 no_defs',NULL,'DHDN / Gauss-Kruger zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31468,'EPSG','31468','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0',NULL,'DHDN / 3-degree Gauss-Kruger zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31468,'ESRI','31468','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=12 +no_defs +proj=tmerc +units=m +x_0=4500000 +y_0=0 no_defs',NULL,'DHDN / Gauss-Kruger zone 4',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_72() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31469,'EPSG','31469','proj4_data/epsg',NULL,'+datum=potsdam +k=1 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0',NULL,'DHDN / 3-degree Gauss-Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31469,'ESRI','31469','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=15 +no_defs +proj=tmerc +units=m +x_0=5500000 +y_0=0 no_defs',NULL,'DHDN / Gauss-Kruger zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31491,'ESRI','31491','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=3 +proj=tmerc +units=m +x_0=1500000 +y_0=0 no_defs',NULL,'Germany Zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31492,'ESRI','31492','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=6 +proj=tmerc +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'Germany Zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31493,'ESRI','31493','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=9 +proj=tmerc +units=m +x_0=3500000 +y_0=0 no_defs',NULL,'Germany Zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31494,'ESRI','31494','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=12 +proj=tmerc +units=m +x_0=4500000 +y_0=0 no_defs',NULL,'Germany Zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31495,'ESRI','31495','proj4_data/esri',NULL,'+ellps=bessel +k=1.000000 +lat_0=0 +lon_0=15 +proj=tmerc +units=m +x_0=5500000 +y_0=0 no_defs',NULL,'Germany Zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31528,'EPSG','31528','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-23,259,-9,0,0,0,0 +units=m +zone=28',NULL,'Conakry 1905 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31528,'ESRI','31528','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-23,259,-9,0,0,0,0 +units=m +zone=28 no_defs',NULL,'Conakry 1905 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31529,'EPSG','31529','proj4_data/epsg',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-23,259,-9,0,0,0,0 +units=m +zone=29',NULL,'Conakry 1905 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31529,'ESRI','31529','proj4_data/esri',NULL,'+a=6378249.2 +b=6356515 +no_defs +proj=utm +towgs84=-23,259,-9,0,0,0,0 +units=m +zone=29 no_defs',NULL,'Conakry 1905 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31600,'EPSG','31600','proj4_data/epsg',NULL,'+ellps=intl +k=0.9996667 +lat_0=45.9 +lon_0=25.39246588888889 +no_defs +proj=sterea +towgs84=103.25,-100.4,-307.19,0,0,0,0 +units=m +x_0=500000 +y_0=500000',NULL,'Dealul Piscului 1930 / Stereo 33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31600,'ESRI','31600','proj4_data/esri',NULL,'+ellps=intl +k=0.999667 +lat_0=45.9 +lon_0=25.39246588888889 +no_defs +proj=stere +towgs84=103.25,-100.4,-307.19,0,0,0,0 +units=m +x_0=500000 +y_0=500000 no_defs',NULL,'Dealul Piscului 1933/ Stereo 33',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31700,'EPSG','31700','proj4_data/epsg',NULL,'+ellps=krass +k=0.99975 +lat_0=46 +lon_0=25 +no_defs +proj=sterea +towgs84=28,-121,-77,0,0,0,0 +units=m +x_0=500000 +y_0=500000',NULL,'Dealul Piscului 1970/ Stereo 70 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31700,'ESRI','31700','proj4_data/esri',NULL,'+ellps=krass +k=0.999750 +lat_0=46 +lon_0=25 +no_defs +proj=stere +units=m +x_0=500000 +y_0=500000 no_defs',NULL,'Dealul Piscului 1970/ Stereo 70',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31838,'EPSG','31838','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=-3.2,-5.7,2.8,0,0,0,0 +units=m +zone=38',NULL,'NGN / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31838,'ESRI','31838','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=utm +units=m +zone=38 no_defs',NULL,'NGN / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31839,'EPSG','31839','proj4_data/epsg',NULL,'+ellps=WGS84 +no_defs +proj=utm +towgs84=-3.2,-5.7,2.8,0,0,0,0 +units=m +zone=39',NULL,'NGN / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31839,'ESRI','31839','proj4_data/esri',NULL,'+ellps=WGS84 +no_defs +proj=utm +units=m +zone=39 no_defs',NULL,'NGN / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31900,'EPSG','31900','proj4_data/epsg',NULL,'+ellps=GRS80 +k=0.9996 +lat_0=0 +lon_0=48 +no_defs +proj=tmerc +towgs84=-20.8,11.3,2.4,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'KUDAMS / KTM (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31900,'ESRI','31900','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999600 +lat_0=0 +lon_0=48 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'KUDAMS / KTM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31901,'EPSG','31901','proj4_data/epsg',NULL,'+ellps=GRS80 +k=1 +lat_0=0 +lon_0=48 +no_defs +proj=tmerc +towgs84=-20.8,11.3,2.4,0,0,0,0 +units=m +x_0=500000 +y_0=0',NULL,'KUDAMS / KTM',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31965,'EPSG','31965','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=11',NULL,'SIRGAS 2000 / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31966,'EPSG','31966','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=12',NULL,'SIRGAS 2000 / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31967,'EPSG','31967','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=13',NULL,'SIRGAS 2000 / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31968,'EPSG','31968','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=14',NULL,'SIRGAS 2000 / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31969,'EPSG','31969','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=15',NULL,'SIRGAS 2000 / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31970,'EPSG','31970','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=16',NULL,'SIRGAS 2000 / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31971,'EPSG','31971','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=17',NULL,'SIRGAS 2000 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31972,'EPSG','31972','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'SIRGAS 2000 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31973,'EPSG','31973','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'SIRGAS 2000 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31974,'EPSG','31974','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20',NULL,'SIRGAS 2000 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31975,'EPSG','31975','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=21',NULL,'SIRGAS 2000 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31976,'EPSG','31976','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=22',NULL,'SIRGAS 2000 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31977,'EPSG','31977','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=17',NULL,'SIRGAS 2000 / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31978,'EPSG','31978','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'SIRGAS 2000 / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31979,'EPSG','31979','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'SIRGAS 2000 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31980,'EPSG','31980','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=20',NULL,'SIRGAS 2000 / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31981,'EPSG','31981','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=21',NULL,'SIRGAS 2000 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31982,'EPSG','31982','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=22',NULL,'SIRGAS 2000 / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31983,'EPSG','31983','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=23',NULL,'SIRGAS 2000 / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31984,'EPSG','31984','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=24',NULL,'SIRGAS 2000 / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31985,'EPSG','31985','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=25',NULL,'SIRGAS 2000 / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31986,'EPSG','31986','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=17',NULL,'SIRGAS 1995 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31986,'ESRI','31986','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=17 no_defs',NULL,'SIRGAS / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31987,'EPSG','31987','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'SIRGAS 1995 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31987,'ESRI','31987','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=18 no_defs',NULL,'SIRGAS / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31988,'EPSG','31988','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'SIRGAS 1995 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31988,'ESRI','31988','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=19 no_defs',NULL,'SIRGAS / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31989,'EPSG','31989','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20',NULL,'SIRGAS 1995 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31989,'ESRI','31989','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=20 no_defs',NULL,'SIRGAS / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31990,'EPSG','31990','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=21',NULL,'SIRGAS 1995 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31990,'ESRI','31990','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=21 no_defs',NULL,'SIRGAS / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31991,'EPSG','31991','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=22',NULL,'SIRGAS 1995 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31991,'ESRI','31991','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +towgs84=0,0,0,0,0,0,0 +units=m +zone=22 no_defs',NULL,'SIRGAS / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31992,'EPSG','31992','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=17',NULL,'SIRGAS 1995 / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31992,'ESRI','31992','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=17 no_defs',NULL,'SIRGAS / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31993,'EPSG','31993','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=18',NULL,'SIRGAS 1995 / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31993,'ESRI','31993','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=18 no_defs',NULL,'SIRGAS / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31994,'EPSG','31994','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=19',NULL,'SIRGAS 1995 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31994,'ESRI','31994','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=19 no_defs',NULL,'SIRGAS / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31995,'EPSG','31995','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=20',NULL,'SIRGAS 1995 / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31995,'ESRI','31995','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=20 no_defs',NULL,'SIRGAS / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31996,'EPSG','31996','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=21',NULL,'SIRGAS 1995 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31996,'ESRI','31996','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=21 no_defs',NULL,'SIRGAS / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31997,'EPSG','31997','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=22',NULL,'SIRGAS 1995 / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31997,'ESRI','31997','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=22 no_defs',NULL,'SIRGAS / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31998,'EPSG','31998','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=23',NULL,'SIRGAS 1995 / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31998,'ESRI','31998','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=23 no_defs',NULL,'SIRGAS / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31999,'EPSG','31999','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=24',NULL,'SIRGAS 1995 / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(31999,'ESRI','31999','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=24 no_defs',NULL,'SIRGAS / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32000,'EPSG','32000','proj4_data/epsg',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=25',NULL,'SIRGAS 1995 / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32000,'ESRI','32000','proj4_data/esri',NULL,'+ellps=GRS80 +no_defs +proj=utm +south +towgs84=0,0,0,0,0,0,0 +units=m +zone=25 no_defs',NULL,'SIRGAS / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32001,'EPSG','32001','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=47 +lat_1=48.71666666666667 +lat_2=47.85 +lon_0=-109.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Montana North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32001,'ESRI','32001','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=47 +lat_1=48.71666666666667 +lat_2=47.85 +lon_0=-109.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Montana North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32002,'EPSG','32002','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=45.83333333333334 +lat_1=47.88333333333333 +lat_2=46.45 +lon_0=-109.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Montana Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32002,'ESRI','32002','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=45.83333333333334 +lat_1=47.88333333333333 +lat_2=46.45 +lon_0=-109.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Montana Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32003,'EPSG','32003','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=44 +lat_1=46.4 +lat_2=44.86666666666667 +lon_0=-109.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Montana South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32003,'ESRI','32003','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=44 +lat_1=46.4 +lat_2=44.86666666666667 +lon_0=-109.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Montana South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32005,'EPSG','32005','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=41.33333333333334 +lat_1=41.85 +lat_2=42.81666666666667 +lon_0=-100 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Nebraska North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32005,'ESRI','32005','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=41.33333333333334 +lat_1=41.85 +lat_2=42.81666666666667 +lon_0=-100 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Nebraska North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32006,'EPSG','32006','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=39.66666666666666 +lat_1=40.28333333333333 +lat_2=41.71666666666667 +lon_0=-99.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Nebraska South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32006,'ESRI','32006','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=39.66666666666666 +lat_1=40.28333333333333 +lat_2=41.71666666666667 +lon_0=-99.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Nebraska South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32007,'EPSG','32007','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=34.75 +lon_0=-115.5833333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Nevada East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32007,'ESRI','32007','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=34.75 +lon_0=-115.5833333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Nevada East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32008,'EPSG','32008','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=34.75 +lon_0=-116.6666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Nevada Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32008,'ESRI','32008','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=34.75 +lon_0=-116.6666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Nevada Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32009,'EPSG','32009','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=34.75 +lon_0=-118.5833333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Nevada West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32009,'ESRI','32009','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=34.75 +lon_0=-118.5833333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Nevada West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32010,'EPSG','32010','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999966667 +lat_0=42.5 +lon_0=-71.66666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / New Hampshire',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32010,'ESRI','32010','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999967 +lat_0=42.5 +lon_0=-71.66666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / New Hampshire',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32011,'EPSG','32011','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999749999999999 +lat_0=38.83333333333334 +lon_0=-74.66666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / New Jersey',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32011,'ESRI','32011','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999975 +lat_0=38.83333333333334 +lon_0=-74.66666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / New Jersey',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32012,'EPSG','32012','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999909091 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / New Mexico East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32012,'ESRI','32012','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999909 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / New Mexico East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32013,'EPSG','32013','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / New Mexico Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32013,'ESRI','32013','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / New Mexico Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32014,'EPSG','32014','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999916667 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / New Mexico West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32014,'ESRI','32014','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999917 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / New Mexico West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32015,'EPSG','32015','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999966667 +lat_0=40 +lon_0=-74.33333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / New York East',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_73() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32015,'ESRI','32015','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999967 +lat_0=40 +lon_0=-74.33333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / New York East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32016,'EPSG','32016','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999375 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / New York Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32016,'ESRI','32016','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999938 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / New York Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32017,'EPSG','32017','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999375 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / New York West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32017,'ESRI','32017','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999938 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / New York West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32018,'EPSG','32018','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=40.5 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +units=us-ft +x_0=304800.6096012192 +y_0=0',NULL,'NAD27 / New York Long Island (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32018,'ESRI','32018','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=40.5 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=304800.6096012192 +y_0=0 no_defs',NULL,'NAD27 / New York Long Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32019,'EPSG','32019','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=33.75 +lat_1=34.33333333333334 +lat_2=36.16666666666666 +lon_0=-79 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / North Carolina',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32019,'ESRI','32019','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=33.75 +lat_1=34.33333333333334 +lat_2=36.16666666666666 +lon_0=-79 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / North Carolina',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32020,'EPSG','32020','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=47 +lat_1=47.43333333333333 +lat_2=48.73333333333333 +lon_0=-100.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / North Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32020,'ESRI','32020','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=47 +lat_1=47.43333333333333 +lat_2=48.73333333333333 +lon_0=-100.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / North Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32021,'EPSG','32021','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=45.66666666666666 +lat_1=46.18333333333333 +lat_2=47.48333333333333 +lon_0=-100.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / North Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32021,'ESRI','32021','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=45.66666666666666 +lat_1=46.18333333333333 +lat_2=47.48333333333333 +lon_0=-100.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / North Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32022,'EPSG','32022','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=39.66666666666666 +lat_1=40.43333333333333 +lat_2=41.7 +lon_0=-82.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Ohio North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32022,'ESRI','32022','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=39.66666666666666 +lat_1=40.43333333333333 +lat_2=41.7 +lon_0=-82.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Ohio North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32023,'EPSG','32023','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=38 +lat_1=38.73333333333333 +lat_2=40.03333333333333 +lon_0=-82.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Ohio South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32023,'ESRI','32023','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=38 +lat_1=38.73333333333333 +lat_2=40.03333333333333 +lon_0=-82.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Ohio South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32024,'EPSG','32024','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=35 +lat_1=35.56666666666667 +lat_2=36.76666666666667 +lon_0=-98 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Oklahoma North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32024,'ESRI','32024','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=35 +lat_1=35.56666666666667 +lat_2=36.76666666666667 +lon_0=-98 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Oklahoma North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32025,'EPSG','32025','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=33.33333333333334 +lat_1=33.93333333333333 +lat_2=35.23333333333333 +lon_0=-98 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Oklahoma South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32025,'ESRI','32025','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=33.33333333333334 +lat_1=33.93333333333333 +lat_2=35.23333333333333 +lon_0=-98 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Oklahoma South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32026,'EPSG','32026','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=43.66666666666666 +lat_1=44.33333333333334 +lat_2=46 +lon_0=-120.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Oregon North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32026,'ESRI','32026','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=43.66666666666666 +lat_1=44.33333333333334 +lat_2=46 +lon_0=-120.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Oregon North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32027,'EPSG','32027','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=41.66666666666666 +lat_1=42.33333333333334 +lat_2=44 +lon_0=-120.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Oregon South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32027,'ESRI','32027','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=41.66666666666666 +lat_1=42.33333333333334 +lat_2=44 +lon_0=-120.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Oregon South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32028,'EPSG','32028','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=40.16666666666666 +lat_1=40.88333333333333 +lat_2=41.95 +lon_0=-77.75 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Pennsylvania North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32028,'ESRI','32028','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=40.16666666666666 +lat_1=40.88333333333333 +lat_2=41.95 +lon_0=-77.75 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Pennsylvania North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32029,'EPSG','32029','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=39.33333333333334 +lat_1=39.93333333333333 +lat_2=40.8 +lon_0=-77.75 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Pennsylvania South (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32029,'ESRI','32029','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=39.33333333333334 +lat_1=39.93333333333333 +lat_2=40.8 +lon_0=-77.75 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Pennsylvania South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32030,'EPSG','32030','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999938 +lat_0=41.08333333333334 +lon_0=-71.5 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Rhode Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32030,'ESRI','32030','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999994 +lat_0=41.08333333333334 +lon_0=-71.5 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Rhode Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32031,'EPSG','32031','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=33 +lat_1=33.76666666666667 +lat_2=34.96666666666667 +lon_0=-81 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / South Carolina North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32031,'ESRI','32031','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=33 +lat_1=33.76666666666667 +lat_2=34.96666666666667 +lon_0=-81 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / South Carolina North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32033,'EPSG','32033','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=31.83333333333333 +lat_1=32.33333333333334 +lat_2=33.66666666666666 +lon_0=-81 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / South Carolina South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32033,'ESRI','32033','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=31.83333333333333 +lat_1=32.33333333333334 +lat_2=33.66666666666666 +lon_0=-81 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / South Carolina South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32034,'EPSG','32034','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=43.83333333333334 +lat_1=44.41666666666666 +lat_2=45.68333333333333 +lon_0=-100 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / South Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32034,'ESRI','32034','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=43.83333333333334 +lat_1=44.41666666666666 +lat_2=45.68333333333333 +lon_0=-100 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / South Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32035,'EPSG','32035','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=42.33333333333334 +lat_1=42.83333333333334 +lat_2=44.4 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / South Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32035,'ESRI','32035','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=42.33333333333334 +lat_1=42.83333333333334 +lat_2=44.4 +lon_0=-100.3333333333333 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / South Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32036,'EPSG','32036','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=34.66666666666666 +lat_1=35.25 +lat_2=36.41666666666666 +lon_0=-86 +no_defs +proj=lcc +units=us-ft +x_0=30480.06096012192 +y_0=0',NULL,'NAD27 / Tennessee (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32036,'ESRI','32036','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=34.66666666666666 +lat_1=35.25 +lat_2=36.41666666666666 +lon_0=-86 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=30480.06096012192 +y_0=0 no_defs',NULL,'NAD27 / Tennessee',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32037,'EPSG','32037','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=34 +lat_1=34.65 +lat_2=36.18333333333333 +lon_0=-101.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Texas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32037,'ESRI','32037','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=34 +lat_1=34.65 +lat_2=36.18333333333333 +lon_0=-101.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Texas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32038,'EPSG','32038','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=31.66666666666667 +lat_1=32.13333333333333 +lat_2=33.96666666666667 +lon_0=-97.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Texas North Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32038,'ESRI','32038','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=31.66666666666667 +lat_1=32.13333333333333 +lat_2=33.96666666666667 +lon_0=-97.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Texas North Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32039,'EPSG','32039','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=29.66666666666667 +lat_1=30.11666666666667 +lat_2=31.88333333333333 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Texas Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32039,'ESRI','32039','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=29.66666666666667 +lat_1=30.11666666666667 +lat_2=31.88333333333333 +lon_0=-100.3333333333333 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Texas Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32040,'EPSG','32040','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=27.83333333333333 +lat_1=28.38333333333333 +lat_2=30.28333333333333 +lon_0=-99 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Texas South Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32040,'ESRI','32040','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=27.83333333333333 +lat_1=28.38333333333333 +lat_2=30.28333333333333 +lon_0=-99 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Texas South Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32041,'EPSG','32041','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=25.66666666666667 +lat_1=26.16666666666667 +lat_2=27.83333333333333 +lon_0=-98.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Texas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32041,'ESRI','32041','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=25.66666666666667 +lat_1=26.16666666666667 +lat_2=27.83333333333333 +lon_0=-98.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Texas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32042,'EPSG','32042','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=40.33333333333334 +lat_1=40.71666666666667 +lat_2=41.78333333333333 +lon_0=-111.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Utah North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32042,'ESRI','32042','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=40.33333333333334 +lat_1=40.71666666666667 +lat_2=41.78333333333333 +lon_0=-111.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Utah North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32043,'EPSG','32043','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=38.33333333333334 +lat_1=39.01666666666667 +lat_2=40.65 +lon_0=-111.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Utah Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32043,'ESRI','32043','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=38.33333333333334 +lat_1=39.01666666666667 +lat_2=40.65 +lon_0=-111.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Utah Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32044,'EPSG','32044','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=36.66666666666666 +lat_1=37.21666666666667 +lat_2=38.35 +lon_0=-111.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Utah South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32044,'ESRI','32044','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=36.66666666666666 +lat_1=37.21666666666667 +lat_2=38.35 +lon_0=-111.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Utah South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32045,'EPSG','32045','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999964286 +lat_0=42.5 +lon_0=-72.5 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Vermont',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32045,'ESRI','32045','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999964 +lat_0=42.5 +lon_0=-72.5 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Vermont',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32046,'EPSG','32046','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=37.66666666666666 +lat_1=38.03333333333333 +lat_2=39.2 +lon_0=-78.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32046,'ESRI','32046','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=37.66666666666666 +lat_1=38.03333333333333 +lat_2=39.2 +lon_0=-78.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32047,'EPSG','32047','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=36.33333333333334 +lat_1=36.76666666666667 +lat_2=37.96666666666667 +lon_0=-78.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32047,'ESRI','32047','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=36.33333333333334 +lat_1=36.76666666666667 +lat_2=37.96666666666667 +lon_0=-78.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32048,'EPSG','32048','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=47 +lat_1=47.5 +lat_2=48.73333333333333 +lon_0=-120.8333333333333 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Washington North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32048,'ESRI','32048','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=47 +lat_1=47.5 +lat_2=48.73333333333333 +lon_0=-120.8333333333333 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Washington North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32049,'EPSG','32049','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=45.33333333333334 +lat_1=45.83333333333334 +lat_2=47.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Washington South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32049,'ESRI','32049','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=45.33333333333334 +lat_1=45.83333333333334 +lat_2=47.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Washington South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32050,'EPSG','32050','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=38.5 +lat_1=39 +lat_2=40.25 +lon_0=-79.5 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / West Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32050,'ESRI','32050','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=38.5 +lat_1=39 +lat_2=40.25 +lon_0=-79.5 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / West Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32051,'EPSG','32051','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=37 +lat_1=37.48333333333333 +lat_2=38.88333333333333 +lon_0=-81 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / West Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32051,'ESRI','32051','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=37 +lat_1=37.48333333333333 +lat_2=38.88333333333333 +lon_0=-81 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / West Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32052,'EPSG','32052','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=45.16666666666666 +lat_1=45.56666666666667 +lat_2=46.76666666666667 +lon_0=-90 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Wisconsin North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32052,'ESRI','32052','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=45.16666666666666 +lat_1=45.56666666666667 +lat_2=46.76666666666667 +lon_0=-90 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Wisconsin North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32053,'EPSG','32053','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=43.83333333333334 +lat_1=44.25 +lat_2=45.5 +lon_0=-90 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Wisconsin Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32053,'ESRI','32053','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=43.83333333333334 +lat_1=44.25 +lat_2=45.5 +lon_0=-90 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Wisconsin Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32054,'EPSG','32054','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=42 +lat_1=42.73333333333333 +lat_2=44.06666666666667 +lon_0=-90 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Wisconsin South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32054,'ESRI','32054','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=42 +lat_1=42.73333333333333 +lat_2=44.06666666666667 +lon_0=-90 +no_defs +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2192024384 +y_0=0 no_defs',NULL,'NAD27 / Wisconsin South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32055,'EPSG','32055','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999941177 +lat_0=40.66666666666666 +lon_0=-105.1666666666667 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Wyoming East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32055,'ESRI','32055','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999941 +lat_0=40.66666666666666 +lon_0=-105.1666666666667 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Wyoming East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32056,'EPSG','32056','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999941177 +lat_0=40.66666666666666 +lon_0=-107.3333333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Wyoming East Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32056,'ESRI','32056','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999941 +lat_0=40.66666666666666 +lon_0=-107.3333333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Wyoming East Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32057,'EPSG','32057','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999941177 +lat_0=40.66666666666666 +lon_0=-108.75 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Wyoming West Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32057,'ESRI','32057','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999941 +lat_0=40.66666666666666 +lon_0=-108.75 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Wyoming West Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32058,'EPSG','32058','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.999941177 +lat_0=40.66666666666666 +lon_0=-110.0833333333333 +no_defs +proj=tmerc +units=us-ft +x_0=152400.3048006096 +y_0=0',NULL,'NAD27 / Wyoming West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32058,'ESRI','32058','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999941 +lat_0=40.66666666666666 +lon_0=-110.0833333333333 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD27 / Wyoming West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32059,'ESRI','32059','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=17.83333333333333 +lat_1=18.03333333333334 +lat_2=18.43333333333333 +lon_0=-66.43333333333334 +proj=lcc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=0 no_defs',NULL,'NAD 1927 StatePlane Puerto Rico FIPS 5201',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32060,'ESRI','32060','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=17.83333333333333 +lat_1=18.03333333333334 +lat_2=18.43333333333333 +lon_0=-66.43333333333334 +proj=lcc +to_meter=0.3048006096012192 +x_0=152400.3048006096 +y_0=30480.06096012193 no_defs',NULL,'NAD 1927 StatePlane Virgin Islands St Croix FIPS 5202',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32061,'EPSG','32061','proj4_data/epsg',NULL,'+datum=NAD27 +k_0=0.99992226 +lat_0=16.81666666666667 +lat_1=16.81666666666667 +lon_0=-90.33333333333333 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=292209.579',NULL,'NAD27 / Guatemala Norte (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32061,'ESRI','32061','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k_0=0.99992226 +lat_0=16.81666666666667 +lat_1=16.81666666666667 +lon_0=-90.33333333333333 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=292209.579 no_defs',NULL,'NAD27 / Guatemala Norte',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32062,'EPSG','32062','proj4_data/epsg',NULL,'+datum=NAD27 +k_0=0.99989906 +lat_0=14.9 +lat_1=14.9 +lon_0=-90.33333333333333 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=325992.681',NULL,'NAD27 / Guatemala Sur (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32062,'ESRI','32062','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k_0=0.99989906 +lat_0=14.9 +lat_1=14.9 +lon_0=-90.33333333333333 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=325992.681 no_defs',NULL,'NAD27 / Guatemala Sur',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32064,'EPSG','32064','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-99 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 14N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32064,'ESRI','32064','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999600 +lat_0=0 +lon_0=-99 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.001016002 +y_0=0 no_defs',NULL,'NAD27 / BLM 14N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32065,'EPSG','32065','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-93 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 15N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32065,'ESRI','32065','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999600 +lat_0=0 +lon_0=-93 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.001016002 +y_0=0 no_defs',NULL,'NAD27 / BLM 15N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32066,'EPSG','32066','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-87 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 16N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32066,'ESRI','32066','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999600 +lat_0=0 +lon_0=-87 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.001016002 +y_0=0 no_defs',NULL,'NAD27 / BLM 16N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32067,'EPSG','32067','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-81 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 17N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32067,'ESRI','32067','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999600 +lat_0=0 +lon_0=-81 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.001016002 +y_0=0 no_defs',NULL,'NAD27 / BLM 17N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32074,'EPSG','32074','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-99 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 14N (feet) (deprecated)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_74() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32074,'ESRI','32074','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999600 +lat_0=0 +lon_0=-99 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.001016002 +y_0=0 no_defs',NULL,'NAD27 / BLM 14N (feet)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32075,'EPSG','32075','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-93 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 15N (feet) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32075,'ESRI','32075','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999600 +lat_0=0 +lon_0=-93 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.001016002 +y_0=0 no_defs',NULL,'NAD27 / BLM 15N (feet)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32076,'EPSG','32076','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-87 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 16N (feet) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32076,'ESRI','32076','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999600 +lat_0=0 +lon_0=-87 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.001016002 +y_0=0 no_defs',NULL,'NAD27 / BLM 16N (feet)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32077,'EPSG','32077','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9996 +lat_0=0 +lon_0=-81 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD27 / BLM 17N (feet) (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32077,'ESRI','32077','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999600 +lat_0=0 +lon_0=-81 +no_defs +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.001016002 +y_0=0 no_defs',NULL,'NAD27 / BLM 17N (feet)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32081,'EPSG','32081','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=0 +lon_0=-53 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27 / MTM zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32081,'ESRI','32081','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-53 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27 / MTM zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32082,'EPSG','32082','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=0 +lon_0=-56 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27 / MTM zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32082,'ESRI','32082','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-56 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27 / MTM zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32083,'EPSG','32083','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=0 +lon_0=-58.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27 / MTM zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32083,'ESRI','32083','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-58.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27 / MTM zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32084,'EPSG','32084','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=0 +lon_0=-61.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27 / MTM zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32084,'ESRI','32084','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-61.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27 / MTM zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32085,'EPSG','32085','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=0 +lon_0=-64.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27 / MTM zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32085,'ESRI','32085','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-64.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27 / MTM zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32086,'EPSG','32086','proj4_data/epsg',NULL,'+datum=NAD27 +k=0.9999 +lat_0=0 +lon_0=-67.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD27 / MTM zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32086,'ESRI','32086','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +k=0.999900 +lat_0=0 +lon_0=-67.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD27 / MTM zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32098,'EPSG','32098','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=44 +lat_1=60 +lat_2=46 +lon_0=-68.5 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'NAD27 / Quebec Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32098,'ESRI','32098','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=44 +lat_1=60 +lat_2=46 +lon_0=-68.5 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'NAD27 / Quebec Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32099,'EPSG','32099','proj4_data/epsg',NULL,'+datum=NAD27 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-91.33333333333333 +no_defs +proj=lcc +units=us-ft +x_0=609601.2192024384 +y_0=0',NULL,'NAD27 / Louisiana Offshore',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32100,'EPSG','32100','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=44.25 +lat_1=49 +lat_2=45 +lon_0=-109.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Montana',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32100,'ESRI','32100','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=44.25 +lat_1=49 +lat_2=45 +lon_0=-109.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Montana',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32104,'EPSG','32104','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Nebraska',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32104,'ESRI','32104','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.83333333333334 +lat_1=43 +lat_2=40 +lon_0=-100 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Nebraska',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32107,'EPSG','32107','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=34.75 +lon_0=-115.5833333333333 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=8000000',NULL,'NAD83 / Nevada East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32107,'ESRI','32107','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=34.75 +lon_0=-115.5833333333333 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=8000000 no_defs',NULL,'NAD83 / Nevada East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32108,'EPSG','32108','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=34.75 +lon_0=-116.6666666666667 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=6000000',NULL,'NAD83 / Nevada Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32108,'ESRI','32108','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=34.75 +lon_0=-116.6666666666667 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=6000000 no_defs',NULL,'NAD83 / Nevada Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32109,'EPSG','32109','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=34.75 +lon_0=-118.5833333333333 +no_defs +proj=tmerc +units=m +x_0=800000 +y_0=4000000',NULL,'NAD83 / Nevada West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32109,'ESRI','32109','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=34.75 +lon_0=-118.5833333333333 +no_defs +proj=tmerc +units=m +x_0=800000 +y_0=4000000 no_defs',NULL,'NAD83 / Nevada West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32110,'EPSG','32110','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999966667 +lat_0=42.5 +lon_0=-71.66666666666667 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0',NULL,'NAD83 / New Hampshire',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32110,'ESRI','32110','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=42.5 +lon_0=-71.66666666666667 +no_defs +proj=tmerc +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD83 / New Hampshire',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32111,'EPSG','32111','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +units=m +x_0=150000 +y_0=0',NULL,'NAD83 / New Jersey',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32111,'ESRI','32111','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +units=m +x_0=150000 +y_0=0 no_defs',NULL,'NAD83 / New Jersey',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32112,'EPSG','32112','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999909091 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +units=m +x_0=165000 +y_0=0',NULL,'NAD83 / New Mexico East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32112,'ESRI','32112','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999909 +lat_0=31 +lon_0=-104.3333333333333 +no_defs +proj=tmerc +units=m +x_0=165000 +y_0=0 no_defs',NULL,'NAD83 / New Mexico East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32113,'EPSG','32113','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / New Mexico Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32113,'ESRI','32113','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-106.25 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / New Mexico Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32114,'EPSG','32114','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999916667 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +units=m +x_0=830000 +y_0=0',NULL,'NAD83 / New Mexico West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32114,'ESRI','32114','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999917 +lat_0=31 +lon_0=-107.8333333333333 +no_defs +proj=tmerc +units=m +x_0=830000 +y_0=0 no_defs',NULL,'NAD83 / New Mexico West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32115,'EPSG','32115','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +units=m +x_0=150000 +y_0=0',NULL,'NAD83 / New York East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32115,'ESRI','32115','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=38.83333333333334 +lon_0=-74.5 +no_defs +proj=tmerc +units=m +x_0=150000 +y_0=0 no_defs',NULL,'NAD83 / New York East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32116,'EPSG','32116','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999375 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +units=m +x_0=250000 +y_0=0',NULL,'NAD83 / New York Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32116,'ESRI','32116','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40 +lon_0=-76.58333333333333 +no_defs +proj=tmerc +units=m +x_0=250000 +y_0=0 no_defs',NULL,'NAD83 / New York Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32117,'EPSG','32117','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999375 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +units=m +x_0=350000 +y_0=0',NULL,'NAD83 / New York West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32117,'ESRI','32117','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40 +lon_0=-78.58333333333333 +no_defs +proj=tmerc +units=m +x_0=350000 +y_0=0 no_defs',NULL,'NAD83 / New York West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32118,'EPSG','32118','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=40.16666666666666 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +units=m +x_0=300000 +y_0=0',NULL,'NAD83 / New York Long Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32118,'ESRI','32118','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.03333333333333 +lat_2=40.66666666666666 +lon_0=-74 +no_defs +proj=lcc +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD83 / New York Long Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32119,'EPSG','32119','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=33.75 +lat_1=36.16666666666666 +lat_2=34.33333333333334 +lon_0=-79 +no_defs +proj=lcc +units=m +x_0=609601.22 +y_0=0',NULL,'NAD83 / North Carolina',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32119,'ESRI','32119','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=33.75 +lat_1=36.16666666666666 +lat_2=34.33333333333334 +lon_0=-79 +no_defs +proj=lcc +units=m +x_0=609601.22 +y_0=0 no_defs',NULL,'NAD83 / North Carolina',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32120,'EPSG','32120','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.43333333333333 +lon_0=-100.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / North Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32120,'ESRI','32120','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.43333333333333 +lon_0=-100.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / North Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32121,'EPSG','32121','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=45.66666666666666 +lat_1=47.48333333333333 +lat_2=46.18333333333333 +lon_0=-100.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / North Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32121,'ESRI','32121','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=45.66666666666666 +lat_1=47.48333333333333 +lat_2=46.18333333333333 +lon_0=-100.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / North Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32122,'EPSG','32122','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=39.66666666666666 +lat_1=41.7 +lat_2=40.43333333333333 +lon_0=-82.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Ohio North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32122,'ESRI','32122','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.66666666666666 +lat_1=41.7 +lat_2=40.43333333333333 +lon_0=-82.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Ohio North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32123,'EPSG','32123','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=38 +lat_1=40.03333333333333 +lat_2=38.73333333333333 +lon_0=-82.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Ohio South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32123,'ESRI','32123','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=38 +lat_1=40.03333333333333 +lat_2=38.73333333333333 +lon_0=-82.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Ohio South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32124,'EPSG','32124','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=35 +lat_1=36.76666666666667 +lat_2=35.56666666666667 +lon_0=-98 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Oklahoma North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32124,'ESRI','32124','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=35 +lat_1=36.76666666666667 +lat_2=35.56666666666667 +lon_0=-98 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Oklahoma North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32125,'EPSG','32125','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=33.33333333333334 +lat_1=35.23333333333333 +lat_2=33.93333333333333 +lon_0=-98 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Oklahoma South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32125,'ESRI','32125','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=33.33333333333334 +lat_1=35.23333333333333 +lat_2=33.93333333333333 +lon_0=-98 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Oklahoma South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32126,'EPSG','32126','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=2500000 +y_0=0',NULL,'NAD83 / Oregon North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32126,'ESRI','32126','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43.66666666666666 +lat_1=46 +lat_2=44.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'NAD83 / Oregon North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32127,'EPSG','32127','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=0',NULL,'NAD83 / Oregon South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32127,'ESRI','32127','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41.66666666666666 +lat_1=44 +lat_2=42.33333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=1500000 +y_0=0 no_defs',NULL,'NAD83 / Oregon South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32128,'EPSG','32128','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=40.16666666666666 +lat_1=41.95 +lat_2=40.88333333333333 +lon_0=-77.75 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Pennsylvania North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32128,'ESRI','32128','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40.16666666666666 +lat_1=41.95 +lat_2=40.88333333333333 +lon_0=-77.75 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Pennsylvania North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32129,'EPSG','32129','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=39.33333333333334 +lat_1=40.96666666666667 +lat_2=39.93333333333333 +lon_0=-77.75 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Pennsylvania South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32129,'ESRI','32129','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40.96666666666667 +lat_2=39.93333333333333 +lon_0=-77.75 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Pennsylvania South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32130,'EPSG','32130','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.99999375 +lat_0=41.08333333333334 +lon_0=-71.5 +no_defs +proj=tmerc +units=m +x_0=100000 +y_0=0',NULL,'NAD83 / Rhode Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32130,'ESRI','32130','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999994 +lat_0=41.08333333333334 +lon_0=-71.5 +no_defs +proj=tmerc +units=m +x_0=100000 +y_0=0 no_defs',NULL,'NAD83 / Rhode Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32133,'EPSG','32133','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=31.83333333333333 +lat_1=34.83333333333334 +lat_2=32.5 +lon_0=-81 +no_defs +proj=lcc +units=m +x_0=609600 +y_0=0',NULL,'NAD83 / South Carolina',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32133,'ESRI','32133','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=31.83333333333333 +lat_1=34.83333333333334 +lat_2=32.5 +lon_0=-81 +no_defs +proj=lcc +units=m +x_0=609600 +y_0=0 no_defs',NULL,'NAD83 / South Carolina',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32134,'EPSG','32134','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=43.83333333333334 +lat_1=45.68333333333333 +lat_2=44.41666666666666 +lon_0=-100 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / South Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32134,'ESRI','32134','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.68333333333333 +lat_2=44.41666666666666 +lon_0=-100 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / South Dakota North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32135,'EPSG','32135','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=42.33333333333334 +lat_1=44.4 +lat_2=42.83333333333334 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / South Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32135,'ESRI','32135','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=42.33333333333334 +lat_1=44.4 +lat_2=42.83333333333334 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / South Dakota South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32136,'EPSG','32136','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=34.33333333333334 +lat_1=36.41666666666666 +lat_2=35.25 +lon_0=-86 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Tennessee',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32136,'ESRI','32136','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=34.33333333333334 +lat_1=36.41666666666666 +lat_2=35.25 +lon_0=-86 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Tennessee',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32137,'EPSG','32137','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=34 +lat_1=36.18333333333333 +lat_2=34.65 +lon_0=-101.5 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=1000000',NULL,'NAD83 / Texas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32137,'ESRI','32137','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=34 +lat_1=36.18333333333333 +lat_2=34.65 +lon_0=-101.5 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=1000000 no_defs',NULL,'NAD83 / Texas North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32138,'EPSG','32138','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=31.66666666666667 +lat_1=33.96666666666667 +lat_2=32.13333333333333 +lon_0=-98.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=2000000',NULL,'NAD83 / Texas North Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32138,'ESRI','32138','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=31.66666666666667 +lat_1=33.96666666666667 +lat_2=32.13333333333333 +lon_0=-98.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=2000000 no_defs',NULL,'NAD83 / Texas North Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32139,'EPSG','32139','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=29.66666666666667 +lat_1=31.88333333333333 +lat_2=30.11666666666667 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=m +x_0=700000 +y_0=3000000',NULL,'NAD83 / Texas Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32139,'ESRI','32139','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=29.66666666666667 +lat_1=31.88333333333333 +lat_2=30.11666666666667 +lon_0=-100.3333333333333 +no_defs +proj=lcc +units=m +x_0=700000 +y_0=3000000 no_defs',NULL,'NAD83 / Texas Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32140,'EPSG','32140','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=27.83333333333333 +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lon_0=-99 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=4000000',NULL,'NAD83 / Texas South Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32140,'ESRI','32140','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=27.83333333333333 +lat_1=30.28333333333333 +lat_2=28.38333333333333 +lon_0=-99 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=4000000 no_defs',NULL,'NAD83 / Texas South Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32141,'EPSG','32141','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-98.5 +no_defs +proj=lcc +units=m +x_0=300000 +y_0=5000000',NULL,'NAD83 / Texas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32141,'ESRI','32141','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=25.66666666666667 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-98.5 +no_defs +proj=lcc +units=m +x_0=300000 +y_0=5000000 no_defs',NULL,'NAD83 / Texas South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32142,'EPSG','32142','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=1000000',NULL,'NAD83 / Utah North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32142,'ESRI','32142','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40.33333333333334 +lat_1=41.78333333333333 +lat_2=40.71666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=1000000 no_defs',NULL,'NAD83 / Utah North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32143,'EPSG','32143','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=2000000',NULL,'NAD83 / Utah Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32143,'ESRI','32143','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=38.33333333333334 +lat_1=40.65 +lat_2=39.01666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=2000000 no_defs',NULL,'NAD83 / Utah Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32144,'EPSG','32144','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=3000000',NULL,'NAD83 / Utah South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32144,'ESRI','32144','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.66666666666666 +lat_1=38.35 +lat_2=37.21666666666667 +lon_0=-111.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=3000000 no_defs',NULL,'NAD83 / Utah South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32145,'EPSG','32145','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.999964286 +lat_0=42.5 +lon_0=-72.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Vermont',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32145,'ESRI','32145','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999964 +lat_0=42.5 +lon_0=-72.5 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Vermont',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_75() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32146,'EPSG','32146','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37.66666666666666 +lat_1=39.2 +lat_2=38.03333333333333 +lon_0=-78.5 +no_defs +proj=lcc +units=m +x_0=3500000 +y_0=2000000',NULL,'NAD83 / Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32146,'ESRI','32146','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.66666666666666 +lat_1=39.2 +lat_2=38.03333333333333 +lon_0=-78.5 +no_defs +proj=lcc +units=m +x_0=3500000 +y_0=2000000 no_defs',NULL,'NAD83 / Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32147,'EPSG','32147','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=36.33333333333334 +lat_1=37.96666666666667 +lat_2=36.76666666666667 +lon_0=-78.5 +no_defs +proj=lcc +units=m +x_0=3500000 +y_0=1000000',NULL,'NAD83 / Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32147,'ESRI','32147','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.33333333333334 +lat_1=37.96666666666667 +lat_2=36.76666666666667 +lon_0=-78.5 +no_defs +proj=lcc +units=m +x_0=3500000 +y_0=1000000 no_defs',NULL,'NAD83 / Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32148,'EPSG','32148','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.5 +lon_0=-120.8333333333333 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Washington North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32148,'ESRI','32148','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=47 +lat_1=48.73333333333333 +lat_2=47.5 +lon_0=-120.8333333333333 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Washington North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32149,'EPSG','32149','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=45.33333333333334 +lat_1=47.33333333333334 +lat_2=45.83333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0',NULL,'NAD83 / Washington South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32149,'ESRI','32149','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=45.33333333333334 +lat_1=47.33333333333334 +lat_2=45.83333333333334 +lon_0=-120.5 +no_defs +proj=lcc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD83 / Washington South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32150,'EPSG','32150','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / West Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32150,'ESRI','32150','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=38.5 +lat_1=40.25 +lat_2=39 +lon_0=-79.5 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / West Virginia North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32151,'EPSG','32151','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / West Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32151,'ESRI','32151','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37 +lat_1=38.88333333333333 +lat_2=37.48333333333333 +lon_0=-81 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / West Virginia South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32152,'EPSG','32152','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=45.16666666666666 +lat_1=46.76666666666667 +lat_2=45.56666666666667 +lon_0=-90 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Wisconsin North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32152,'ESRI','32152','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=45.16666666666666 +lat_1=46.76666666666667 +lat_2=45.56666666666667 +lon_0=-90 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Wisconsin North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32153,'EPSG','32153','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Wisconsin Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32153,'ESRI','32153','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43.83333333333334 +lat_1=45.5 +lat_2=44.25 +lon_0=-90 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Wisconsin Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32154,'EPSG','32154','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=42 +lat_1=44.06666666666667 +lat_2=42.73333333333333 +lon_0=-90 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Wisconsin South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32154,'ESRI','32154','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=42 +lat_1=44.06666666666667 +lat_2=42.73333333333333 +lon_0=-90 +no_defs +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Wisconsin South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32155,'EPSG','32155','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999375 +lat_0=40.5 +lon_0=-105.1666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0',NULL,'NAD83 / Wyoming East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32155,'ESRI','32155','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-105.1666666666667 +no_defs +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD83 / Wyoming East',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32156,'EPSG','32156','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999375 +lat_0=40.5 +lon_0=-107.3333333333333 +no_defs +proj=tmerc +units=m +x_0=400000 +y_0=100000',NULL,'NAD83 / Wyoming East Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32156,'ESRI','32156','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-107.3333333333333 +no_defs +proj=tmerc +units=m +x_0=400000 +y_0=100000 no_defs',NULL,'NAD83 / Wyoming East Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32157,'EPSG','32157','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999375 +lat_0=40.5 +lon_0=-108.75 +no_defs +proj=tmerc +units=m +x_0=600000 +y_0=0',NULL,'NAD83 / Wyoming West Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32157,'ESRI','32157','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-108.75 +no_defs +proj=tmerc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD83 / Wyoming West Central',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32158,'EPSG','32158','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999375 +lat_0=40.5 +lon_0=-110.0833333333333 +no_defs +proj=tmerc +units=m +x_0=800000 +y_0=100000',NULL,'NAD83 / Wyoming West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32158,'ESRI','32158','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-110.0833333333333 +no_defs +proj=tmerc +units=m +x_0=800000 +y_0=100000 no_defs',NULL,'NAD83 / Wyoming West',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32161,'EPSG','32161','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=17.83333333333333 +lat_1=18.43333333333333 +lat_2=18.03333333333333 +lon_0=-66.43333333333334 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=200000',NULL,'NAD83 / Puerto Rico & Virgin Is.',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32161,'ESRI','32161','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=17.83333333333333 +lat_1=18.43333333333333 +lat_2=18.03333333333333 +lon_0=-66.43333333333334 +no_defs +proj=lcc +units=m +x_0=200000 +y_0=200000 no_defs',NULL,'NAD83 / Puerto Rico & Virgin Is.',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32164,'EPSG','32164','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-99 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 14N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32165,'EPSG','32165','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-93 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 15N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32166,'EPSG','32166','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-87 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 16N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32167,'EPSG','32167','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9996 +lat_0=0 +lon_0=-81 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'NAD83 / BLM 17N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32180,'EPSG','32180','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-55.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / SCoPQ zone 2 (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32180,'ESRI','32180','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-55.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / SCoPQ zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32181,'EPSG','32181','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-53 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32181,'ESRI','32181','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-53 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32182,'EPSG','32182','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-56 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32182,'ESRI','32182','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-56 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32183,'EPSG','32183','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-58.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32183,'ESRI','32183','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-58.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32184,'EPSG','32184','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-61.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32184,'ESRI','32184','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-61.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32185,'EPSG','32185','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-64.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32185,'ESRI','32185','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-64.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32186,'EPSG','32186','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-67.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32186,'ESRI','32186','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-67.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32187,'EPSG','32187','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-70.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32187,'ESRI','32187','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-70.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32188,'EPSG','32188','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-73.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32188,'ESRI','32188','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-73.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32189,'EPSG','32189','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-76.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32189,'ESRI','32189','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-76.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 9',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32190,'EPSG','32190','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-79.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32190,'ESRI','32190','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-79.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 10',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32191,'EPSG','32191','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-82.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32191,'ESRI','32191','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-82.5 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 11',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32192,'EPSG','32192','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-81 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32192,'ESRI','32192','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-81 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 12',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32193,'EPSG','32193','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-84 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32193,'ESRI','32193','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-84 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 13',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32194,'EPSG','32194','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-87 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32194,'ESRI','32194','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-87 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 14',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32195,'EPSG','32195','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-90 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32195,'ESRI','32195','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-90 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 15',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32196,'EPSG','32196','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-93 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32196,'ESRI','32196','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-93 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 16',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32197,'EPSG','32197','proj4_data/epsg',NULL,'+datum=NAD83 +k=0.9999 +lat_0=0 +lon_0=-96 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0',NULL,'NAD83 / MTM zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32197,'ESRI','32197','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=0 +lon_0=-96 +no_defs +proj=tmerc +units=m +x_0=304800 +y_0=0 no_defs',NULL,'NAD83 / MTM zone 17',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32198,'EPSG','32198','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=44 +lat_1=60 +lat_2=46 +lon_0=-68.5 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0',NULL,'NAD83 / Quebec Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32198,'ESRI','32198','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=44 +lat_1=60 +lat_2=46 +lon_0=-68.5 +no_defs +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'NAD83 / Quebec Lambert',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32199,'EPSG','32199','proj4_data/epsg',NULL,'+datum=NAD83 +lat_0=25.5 +lat_1=27.83333333333333 +lat_2=26.16666666666667 +lon_0=-91.33333333333333 +no_defs +proj=lcc +units=m +x_0=1000000 +y_0=0',NULL,'NAD83 / Louisiana Offshore',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32201,'EPSG','32201','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=1',NULL,'WGS 72 / UTM zone 1N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32201,'ESRI','32201','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=1 no_defs',NULL,'WGS 72 / UTM zone 1N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32202,'EPSG','32202','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=2',NULL,'WGS 72 / UTM zone 2N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32202,'ESRI','32202','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=2 no_defs',NULL,'WGS 72 / UTM zone 2N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32203,'EPSG','32203','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=3',NULL,'WGS 72 / UTM zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32203,'ESRI','32203','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=3 no_defs',NULL,'WGS 72 / UTM zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32204,'EPSG','32204','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=4',NULL,'WGS 72 / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32204,'ESRI','32204','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=4 no_defs',NULL,'WGS 72 / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32205,'EPSG','32205','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=5',NULL,'WGS 72 / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32205,'ESRI','32205','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=5 no_defs',NULL,'WGS 72 / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32206,'EPSG','32206','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=6',NULL,'WGS 72 / UTM zone 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32206,'ESRI','32206','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=6 no_defs',NULL,'WGS 72 / UTM zone 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32207,'EPSG','32207','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=7',NULL,'WGS 72 / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32207,'ESRI','32207','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=7 no_defs',NULL,'WGS 72 / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32208,'EPSG','32208','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=8',NULL,'WGS 72 / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32208,'ESRI','32208','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=8 no_defs',NULL,'WGS 72 / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32209,'EPSG','32209','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=9',NULL,'WGS 72 / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32209,'ESRI','32209','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=9 no_defs',NULL,'WGS 72 / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32210,'EPSG','32210','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=10',NULL,'WGS 72 / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32210,'ESRI','32210','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=10 no_defs',NULL,'WGS 72 / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32211,'EPSG','32211','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=11',NULL,'WGS 72 / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32211,'ESRI','32211','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=11 no_defs',NULL,'WGS 72 / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32212,'EPSG','32212','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=12',NULL,'WGS 72 / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32212,'ESRI','32212','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=12 no_defs',NULL,'WGS 72 / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32213,'EPSG','32213','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=13',NULL,'WGS 72 / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32213,'ESRI','32213','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=13 no_defs',NULL,'WGS 72 / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32214,'EPSG','32214','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=14',NULL,'WGS 72 / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32214,'ESRI','32214','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=14 no_defs',NULL,'WGS 72 / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32215,'EPSG','32215','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=15',NULL,'WGS 72 / UTM zone 15N',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_76() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32215,'ESRI','32215','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=15 no_defs',NULL,'WGS 72 / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32216,'EPSG','32216','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=16',NULL,'WGS 72 / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32216,'ESRI','32216','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=16 no_defs',NULL,'WGS 72 / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32217,'EPSG','32217','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=17',NULL,'WGS 72 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32217,'ESRI','32217','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=17 no_defs',NULL,'WGS 72 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32218,'EPSG','32218','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=18',NULL,'WGS 72 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32218,'ESRI','32218','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=18 no_defs',NULL,'WGS 72 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32219,'EPSG','32219','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=19',NULL,'WGS 72 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32219,'ESRI','32219','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=19 no_defs',NULL,'WGS 72 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32220,'EPSG','32220','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=20',NULL,'WGS 72 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32220,'ESRI','32220','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=20 no_defs',NULL,'WGS 72 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32221,'EPSG','32221','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=21',NULL,'WGS 72 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32221,'ESRI','32221','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=21 no_defs',NULL,'WGS 72 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32222,'EPSG','32222','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=22',NULL,'WGS 72 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32222,'ESRI','32222','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=22 no_defs',NULL,'WGS 72 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32223,'EPSG','32223','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=23',NULL,'WGS 72 / UTM zone 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32223,'ESRI','32223','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=23 no_defs',NULL,'WGS 72 / UTM zone 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32224,'EPSG','32224','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=24',NULL,'WGS 72 / UTM zone 24N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32224,'ESRI','32224','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=24 no_defs',NULL,'WGS 72 / UTM zone 24N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32225,'EPSG','32225','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=25',NULL,'WGS 72 / UTM zone 25N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32225,'ESRI','32225','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=25 no_defs',NULL,'WGS 72 / UTM zone 25N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32226,'EPSG','32226','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=26',NULL,'WGS 72 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32226,'ESRI','32226','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=26 no_defs',NULL,'WGS 72 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32227,'EPSG','32227','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=27',NULL,'WGS 72 / UTM zone 27N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32227,'ESRI','32227','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=27 no_defs',NULL,'WGS 72 / UTM zone 27N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32228,'EPSG','32228','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=28',NULL,'WGS 72 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32228,'ESRI','32228','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=28 no_defs',NULL,'WGS 72 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32229,'EPSG','32229','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=29',NULL,'WGS 72 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32229,'ESRI','32229','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=29 no_defs',NULL,'WGS 72 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32230,'EPSG','32230','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=30',NULL,'WGS 72 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32230,'ESRI','32230','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=30 no_defs',NULL,'WGS 72 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32231,'EPSG','32231','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=31',NULL,'WGS 72 / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32231,'ESRI','32231','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=31 no_defs',NULL,'WGS 72 / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32232,'EPSG','32232','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=32',NULL,'WGS 72 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32232,'ESRI','32232','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=32 no_defs',NULL,'WGS 72 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32233,'EPSG','32233','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=33',NULL,'WGS 72 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32233,'ESRI','32233','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=33 no_defs',NULL,'WGS 72 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32234,'EPSG','32234','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=34',NULL,'WGS 72 / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32234,'ESRI','32234','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=34 no_defs',NULL,'WGS 72 / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32235,'EPSG','32235','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=35',NULL,'WGS 72 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32235,'ESRI','32235','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=35 no_defs',NULL,'WGS 72 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32236,'EPSG','32236','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=36',NULL,'WGS 72 / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32236,'ESRI','32236','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=36 no_defs',NULL,'WGS 72 / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32237,'EPSG','32237','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=37',NULL,'WGS 72 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32237,'ESRI','32237','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=37 no_defs',NULL,'WGS 72 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32238,'EPSG','32238','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=38',NULL,'WGS 72 / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32238,'ESRI','32238','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=38 no_defs',NULL,'WGS 72 / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32239,'EPSG','32239','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=39',NULL,'WGS 72 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32239,'ESRI','32239','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=39 no_defs',NULL,'WGS 72 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32240,'EPSG','32240','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=40',NULL,'WGS 72 / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32240,'ESRI','32240','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=40 no_defs',NULL,'WGS 72 / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32241,'EPSG','32241','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=41',NULL,'WGS 72 / UTM zone 41N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32241,'ESRI','32241','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=41 no_defs',NULL,'WGS 72 / UTM zone 41N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32242,'EPSG','32242','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=42',NULL,'WGS 72 / UTM zone 42N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32242,'ESRI','32242','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=42 no_defs',NULL,'WGS 72 / UTM zone 42N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32243,'EPSG','32243','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=43',NULL,'WGS 72 / UTM zone 43N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32243,'ESRI','32243','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=43 no_defs',NULL,'WGS 72 / UTM zone 43N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32244,'EPSG','32244','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=44',NULL,'WGS 72 / UTM zone 44N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32244,'ESRI','32244','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=44 no_defs',NULL,'WGS 72 / UTM zone 44N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32245,'EPSG','32245','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=45',NULL,'WGS 72 / UTM zone 45N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32245,'ESRI','32245','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=45 no_defs',NULL,'WGS 72 / UTM zone 45N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32246,'EPSG','32246','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=46',NULL,'WGS 72 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32246,'ESRI','32246','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=46 no_defs',NULL,'WGS 72 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32247,'EPSG','32247','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=47',NULL,'WGS 72 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32247,'ESRI','32247','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=47 no_defs',NULL,'WGS 72 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32248,'EPSG','32248','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=48',NULL,'WGS 72 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32248,'ESRI','32248','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=48 no_defs',NULL,'WGS 72 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32249,'EPSG','32249','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=49',NULL,'WGS 72 / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32249,'ESRI','32249','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=49 no_defs',NULL,'WGS 72 / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32250,'EPSG','32250','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=50',NULL,'WGS 72 / UTM zone 50N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32250,'ESRI','32250','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=50 no_defs',NULL,'WGS 72 / UTM zone 50N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32251,'EPSG','32251','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=51',NULL,'WGS 72 / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32251,'ESRI','32251','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=51 no_defs',NULL,'WGS 72 / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32252,'EPSG','32252','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=52',NULL,'WGS 72 / UTM zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32252,'ESRI','32252','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=52 no_defs',NULL,'WGS 72 / UTM zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32253,'EPSG','32253','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=53',NULL,'WGS 72 / UTM zone 53N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32253,'ESRI','32253','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=53 no_defs',NULL,'WGS 72 / UTM zone 53N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32254,'EPSG','32254','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=54',NULL,'WGS 72 / UTM zone 54N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32254,'ESRI','32254','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=54 no_defs',NULL,'WGS 72 / UTM zone 54N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32255,'EPSG','32255','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=55',NULL,'WGS 72 / UTM zone 55N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32255,'ESRI','32255','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=55 no_defs',NULL,'WGS 72 / UTM zone 55N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32256,'EPSG','32256','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=56',NULL,'WGS 72 / UTM zone 56N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32256,'ESRI','32256','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=56 no_defs',NULL,'WGS 72 / UTM zone 56N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32257,'EPSG','32257','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=57',NULL,'WGS 72 / UTM zone 57N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32257,'ESRI','32257','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=57 no_defs',NULL,'WGS 72 / UTM zone 57N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32258,'EPSG','32258','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=58',NULL,'WGS 72 / UTM zone 58N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32258,'ESRI','32258','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=58 no_defs',NULL,'WGS 72 / UTM zone 58N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32259,'EPSG','32259','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=59',NULL,'WGS 72 / UTM zone 59N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32259,'ESRI','32259','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=59 no_defs',NULL,'WGS 72 / UTM zone 59N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32260,'EPSG','32260','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=60',NULL,'WGS 72 / UTM zone 60N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32260,'ESRI','32260','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +units=m +zone=60 no_defs',NULL,'WGS 72 / UTM zone 60N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32301,'EPSG','32301','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=1',NULL,'WGS 72 / UTM zone 1S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32301,'ESRI','32301','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=1 no_defs',NULL,'WGS 72 / UTM zone 1S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32302,'EPSG','32302','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=2',NULL,'WGS 72 / UTM zone 2S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32302,'ESRI','32302','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=2 no_defs',NULL,'WGS 72 / UTM zone 2S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32303,'EPSG','32303','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=3',NULL,'WGS 72 / UTM zone 3S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32303,'ESRI','32303','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=3 no_defs',NULL,'WGS 72 / UTM zone 3S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32304,'EPSG','32304','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=4',NULL,'WGS 72 / UTM zone 4S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32304,'ESRI','32304','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=4 no_defs',NULL,'WGS 72 / UTM zone 4S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32305,'EPSG','32305','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=5',NULL,'WGS 72 / UTM zone 5S',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_77() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32305,'ESRI','32305','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=5 no_defs',NULL,'WGS 72 / UTM zone 5S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32306,'EPSG','32306','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=6',NULL,'WGS 72 / UTM zone 6S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32306,'ESRI','32306','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=6 no_defs',NULL,'WGS 72 / UTM zone 6S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32307,'EPSG','32307','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=7',NULL,'WGS 72 / UTM zone 7S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32307,'ESRI','32307','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=7 no_defs',NULL,'WGS 72 / UTM zone 7S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32308,'EPSG','32308','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=8',NULL,'WGS 72 / UTM zone 8S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32308,'ESRI','32308','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=8 no_defs',NULL,'WGS 72 / UTM zone 8S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32309,'EPSG','32309','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=9',NULL,'WGS 72 / UTM zone 9S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32309,'ESRI','32309','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=9 no_defs',NULL,'WGS 72 / UTM zone 9S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32310,'EPSG','32310','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=10',NULL,'WGS 72 / UTM zone 10S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32310,'ESRI','32310','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=10 no_defs',NULL,'WGS 72 / UTM zone 10S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32311,'EPSG','32311','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=11',NULL,'WGS 72 / UTM zone 11S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32311,'ESRI','32311','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=11 no_defs',NULL,'WGS 72 / UTM zone 11S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32312,'EPSG','32312','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=12',NULL,'WGS 72 / UTM zone 12S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32312,'ESRI','32312','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=12 no_defs',NULL,'WGS 72 / UTM zone 12S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32313,'EPSG','32313','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=13',NULL,'WGS 72 / UTM zone 13S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32313,'ESRI','32313','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=13 no_defs',NULL,'WGS 72 / UTM zone 13S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32314,'EPSG','32314','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=14',NULL,'WGS 72 / UTM zone 14S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32314,'ESRI','32314','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=14 no_defs',NULL,'WGS 72 / UTM zone 14S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32315,'EPSG','32315','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=15',NULL,'WGS 72 / UTM zone 15S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32315,'ESRI','32315','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=15 no_defs',NULL,'WGS 72 / UTM zone 15S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32316,'EPSG','32316','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=16',NULL,'WGS 72 / UTM zone 16S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32316,'ESRI','32316','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=16 no_defs',NULL,'WGS 72 / UTM zone 16S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32317,'EPSG','32317','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=17',NULL,'WGS 72 / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32317,'ESRI','32317','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=17 no_defs',NULL,'WGS 72 / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32318,'EPSG','32318','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=18',NULL,'WGS 72 / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32318,'ESRI','32318','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=18 no_defs',NULL,'WGS 72 / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32319,'EPSG','32319','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=19',NULL,'WGS 72 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32319,'ESRI','32319','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=19 no_defs',NULL,'WGS 72 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32320,'EPSG','32320','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=20',NULL,'WGS 72 / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32320,'ESRI','32320','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=20 no_defs',NULL,'WGS 72 / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32321,'EPSG','32321','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=21',NULL,'WGS 72 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32321,'ESRI','32321','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=21 no_defs',NULL,'WGS 72 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32322,'EPSG','32322','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=22',NULL,'WGS 72 / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32322,'ESRI','32322','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=22 no_defs',NULL,'WGS 72 / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32323,'EPSG','32323','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=23',NULL,'WGS 72 / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32323,'ESRI','32323','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=23 no_defs',NULL,'WGS 72 / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32324,'EPSG','32324','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=24',NULL,'WGS 72 / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32324,'ESRI','32324','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=24 no_defs',NULL,'WGS 72 / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32325,'EPSG','32325','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=25',NULL,'WGS 72 / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32325,'ESRI','32325','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=25 no_defs',NULL,'WGS 72 / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32326,'EPSG','32326','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=26',NULL,'WGS 72 / UTM zone 26S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32326,'ESRI','32326','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=26 no_defs',NULL,'WGS 72 / UTM zone 26S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32327,'EPSG','32327','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=27',NULL,'WGS 72 / UTM zone 27S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32327,'ESRI','32327','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=27 no_defs',NULL,'WGS 72 / UTM zone 27S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32328,'EPSG','32328','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=28',NULL,'WGS 72 / UTM zone 28S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32328,'ESRI','32328','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=28 no_defs',NULL,'WGS 72 / UTM zone 28S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32329,'EPSG','32329','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=29',NULL,'WGS 72 / UTM zone 29S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32329,'ESRI','32329','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=29 no_defs',NULL,'WGS 72 / UTM zone 29S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32330,'EPSG','32330','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=30',NULL,'WGS 72 / UTM zone 30S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32330,'ESRI','32330','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=30 no_defs',NULL,'WGS 72 / UTM zone 30S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32331,'EPSG','32331','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=31',NULL,'WGS 72 / UTM zone 31S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32331,'ESRI','32331','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=31 no_defs',NULL,'WGS 72 / UTM zone 31S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32332,'EPSG','32332','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=32',NULL,'WGS 72 / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32332,'ESRI','32332','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=32 no_defs',NULL,'WGS 72 / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32333,'EPSG','32333','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=33',NULL,'WGS 72 / UTM zone 33S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32333,'ESRI','32333','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=33 no_defs',NULL,'WGS 72 / UTM zone 33S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32334,'EPSG','32334','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=34',NULL,'WGS 72 / UTM zone 34S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32334,'ESRI','32334','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=34 no_defs',NULL,'WGS 72 / UTM zone 34S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32335,'EPSG','32335','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=35',NULL,'WGS 72 / UTM zone 35S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32335,'ESRI','32335','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=35 no_defs',NULL,'WGS 72 / UTM zone 35S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32336,'EPSG','32336','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=36',NULL,'WGS 72 / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32336,'ESRI','32336','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=36 no_defs',NULL,'WGS 72 / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32337,'EPSG','32337','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=37',NULL,'WGS 72 / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32337,'ESRI','32337','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=37 no_defs',NULL,'WGS 72 / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32338,'EPSG','32338','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=38',NULL,'WGS 72 / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32338,'ESRI','32338','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=38 no_defs',NULL,'WGS 72 / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32339,'EPSG','32339','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=39',NULL,'WGS 72 / UTM zone 39S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32339,'ESRI','32339','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=39 no_defs',NULL,'WGS 72 / UTM zone 39S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32340,'EPSG','32340','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=40',NULL,'WGS 72 / UTM zone 40S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32340,'ESRI','32340','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=40 no_defs',NULL,'WGS 72 / UTM zone 40S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32341,'EPSG','32341','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=41',NULL,'WGS 72 / UTM zone 41S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32341,'ESRI','32341','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=41 no_defs',NULL,'WGS 72 / UTM zone 41S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32342,'EPSG','32342','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=42',NULL,'WGS 72 / UTM zone 42S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32342,'ESRI','32342','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=42 no_defs',NULL,'WGS 72 / UTM zone 42S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32343,'EPSG','32343','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=43',NULL,'WGS 72 / UTM zone 43S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32343,'ESRI','32343','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=43 no_defs',NULL,'WGS 72 / UTM zone 43S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32344,'EPSG','32344','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=44',NULL,'WGS 72 / UTM zone 44S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32344,'ESRI','32344','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=44 no_defs',NULL,'WGS 72 / UTM zone 44S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32345,'EPSG','32345','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=45',NULL,'WGS 72 / UTM zone 45S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32345,'ESRI','32345','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=45 no_defs',NULL,'WGS 72 / UTM zone 45S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32346,'EPSG','32346','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=46',NULL,'WGS 72 / UTM zone 46S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32346,'ESRI','32346','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=46 no_defs',NULL,'WGS 72 / UTM zone 46S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32347,'EPSG','32347','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=47',NULL,'WGS 72 / UTM zone 47S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32347,'ESRI','32347','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=47 no_defs',NULL,'WGS 72 / UTM zone 47S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32348,'EPSG','32348','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=48',NULL,'WGS 72 / UTM zone 48S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32348,'ESRI','32348','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=48 no_defs',NULL,'WGS 72 / UTM zone 48S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32349,'EPSG','32349','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=49',NULL,'WGS 72 / UTM zone 49S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32349,'ESRI','32349','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=49 no_defs',NULL,'WGS 72 / UTM zone 49S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32350,'EPSG','32350','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=50',NULL,'WGS 72 / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32350,'ESRI','32350','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=50 no_defs',NULL,'WGS 72 / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32351,'EPSG','32351','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=51',NULL,'WGS 72 / UTM zone 51S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32351,'ESRI','32351','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=51 no_defs',NULL,'WGS 72 / UTM zone 51S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32352,'EPSG','32352','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=52',NULL,'WGS 72 / UTM zone 52S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32352,'ESRI','32352','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=52 no_defs',NULL,'WGS 72 / UTM zone 52S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32353,'EPSG','32353','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=53',NULL,'WGS 72 / UTM zone 53S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32353,'ESRI','32353','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=53 no_defs',NULL,'WGS 72 / UTM zone 53S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32354,'EPSG','32354','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=54',NULL,'WGS 72 / UTM zone 54S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32354,'ESRI','32354','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=54 no_defs',NULL,'WGS 72 / UTM zone 54S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32355,'EPSG','32355','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=55',NULL,'WGS 72 / UTM zone 55S',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_78() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32355,'ESRI','32355','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=55 no_defs',NULL,'WGS 72 / UTM zone 55S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32356,'EPSG','32356','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=56',NULL,'WGS 72 / UTM zone 56S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32356,'ESRI','32356','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=56 no_defs',NULL,'WGS 72 / UTM zone 56S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32357,'EPSG','32357','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=57',NULL,'WGS 72 / UTM zone 57S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32357,'ESRI','32357','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=57 no_defs',NULL,'WGS 72 / UTM zone 57S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32358,'EPSG','32358','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=58',NULL,'WGS 72 / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32358,'ESRI','32358','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=58 no_defs',NULL,'WGS 72 / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32359,'EPSG','32359','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=59',NULL,'WGS 72 / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32359,'ESRI','32359','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=59 no_defs',NULL,'WGS 72 / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32360,'EPSG','32360','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,4.5,0,0,0.554,0.2263 +units=m +zone=60',NULL,'WGS 72 / UTM zone 60S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32360,'ESRI','32360','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +units=m +zone=60 no_defs',NULL,'WGS 72 / UTM zone 60S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32401,'EPSG','32401','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=1',NULL,'WGS 72BE / UTM zone 1N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32401,'ESRI','32401','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=1 no_defs',NULL,'WGS 72BE / UTM zone 1N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32402,'EPSG','32402','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=2',NULL,'WGS 72BE / UTM zone 2N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32402,'ESRI','32402','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=2 no_defs',NULL,'WGS 72BE / UTM zone 2N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32403,'EPSG','32403','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=3',NULL,'WGS 72BE / UTM zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32403,'ESRI','32403','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=3 no_defs',NULL,'WGS 72BE / UTM zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32404,'EPSG','32404','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=4',NULL,'WGS 72BE / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32404,'ESRI','32404','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=4 no_defs',NULL,'WGS 72BE / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32405,'EPSG','32405','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=5',NULL,'WGS 72BE / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32405,'ESRI','32405','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=5 no_defs',NULL,'WGS 72BE / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32406,'EPSG','32406','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=6',NULL,'WGS 72BE / UTM zone 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32406,'ESRI','32406','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=6 no_defs',NULL,'WGS 72BE / UTM zone 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32407,'EPSG','32407','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=7',NULL,'WGS 72BE / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32407,'ESRI','32407','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=7 no_defs',NULL,'WGS 72BE / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32408,'EPSG','32408','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=8',NULL,'WGS 72BE / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32408,'ESRI','32408','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=8 no_defs',NULL,'WGS 72BE / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32409,'EPSG','32409','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=9',NULL,'WGS 72BE / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32409,'ESRI','32409','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=9 no_defs',NULL,'WGS 72BE / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32410,'EPSG','32410','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=10',NULL,'WGS 72BE / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32410,'ESRI','32410','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=10 no_defs',NULL,'WGS 72BE / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32411,'EPSG','32411','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=11',NULL,'WGS 72BE / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32411,'ESRI','32411','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=11 no_defs',NULL,'WGS 72BE / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32412,'EPSG','32412','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=12',NULL,'WGS 72BE / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32412,'ESRI','32412','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=12 no_defs',NULL,'WGS 72BE / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32413,'EPSG','32413','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=13',NULL,'WGS 72BE / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32413,'ESRI','32413','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=13 no_defs',NULL,'WGS 72BE / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32414,'EPSG','32414','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=14',NULL,'WGS 72BE / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32414,'ESRI','32414','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=14 no_defs',NULL,'WGS 72BE / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32415,'EPSG','32415','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=15',NULL,'WGS 72BE / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32415,'ESRI','32415','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=15 no_defs',NULL,'WGS 72BE / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32416,'EPSG','32416','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=16',NULL,'WGS 72BE / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32416,'ESRI','32416','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=16 no_defs',NULL,'WGS 72BE / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32417,'EPSG','32417','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=17',NULL,'WGS 72BE / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32417,'ESRI','32417','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=17 no_defs',NULL,'WGS 72BE / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32418,'EPSG','32418','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=18',NULL,'WGS 72BE / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32418,'ESRI','32418','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=18 no_defs',NULL,'WGS 72BE / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32419,'EPSG','32419','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=19',NULL,'WGS 72BE / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32419,'ESRI','32419','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=19 no_defs',NULL,'WGS 72BE / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32420,'EPSG','32420','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=20',NULL,'WGS 72BE / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32420,'ESRI','32420','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=20 no_defs',NULL,'WGS 72BE / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32421,'EPSG','32421','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=21',NULL,'WGS 72BE / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32421,'ESRI','32421','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=21 no_defs',NULL,'WGS 72BE / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32422,'EPSG','32422','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=22',NULL,'WGS 72BE / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32422,'ESRI','32422','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=22 no_defs',NULL,'WGS 72BE / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32423,'EPSG','32423','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=23',NULL,'WGS 72BE / UTM zone 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32423,'ESRI','32423','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=23 no_defs',NULL,'WGS 72BE / UTM zone 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32424,'EPSG','32424','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=24',NULL,'WGS 72BE / UTM zone 24N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32424,'ESRI','32424','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=24 no_defs',NULL,'WGS 72BE / UTM zone 24N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32425,'EPSG','32425','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=25',NULL,'WGS 72BE / UTM zone 25N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32425,'ESRI','32425','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=25 no_defs',NULL,'WGS 72BE / UTM zone 25N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32426,'EPSG','32426','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=26',NULL,'WGS 72BE / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32426,'ESRI','32426','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=26 no_defs',NULL,'WGS 72BE / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32427,'EPSG','32427','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=27',NULL,'WGS 72BE / UTM zone 27N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32427,'ESRI','32427','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=27 no_defs',NULL,'WGS 72BE / UTM zone 27N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32428,'EPSG','32428','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=28',NULL,'WGS 72BE / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32428,'ESRI','32428','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=28 no_defs',NULL,'WGS 72BE / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32429,'EPSG','32429','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=29',NULL,'WGS 72BE / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32429,'ESRI','32429','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=29 no_defs',NULL,'WGS 72BE / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32430,'EPSG','32430','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=30',NULL,'WGS 72BE / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32430,'ESRI','32430','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=30 no_defs',NULL,'WGS 72BE / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32431,'EPSG','32431','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=31',NULL,'WGS 72BE / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32431,'ESRI','32431','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=31 no_defs',NULL,'WGS 72BE / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32432,'EPSG','32432','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=32',NULL,'WGS 72BE / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32432,'ESRI','32432','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=32 no_defs',NULL,'WGS 72BE / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32433,'EPSG','32433','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=33',NULL,'WGS 72BE / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32433,'ESRI','32433','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=33 no_defs',NULL,'WGS 72BE / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32434,'EPSG','32434','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=34',NULL,'WGS 72BE / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32434,'ESRI','32434','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=34 no_defs',NULL,'WGS 72BE / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32435,'EPSG','32435','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=35',NULL,'WGS 72BE / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32435,'ESRI','32435','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=35 no_defs',NULL,'WGS 72BE / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32436,'EPSG','32436','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=36',NULL,'WGS 72BE / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32436,'ESRI','32436','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=36 no_defs',NULL,'WGS 72BE / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32437,'EPSG','32437','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=37',NULL,'WGS 72BE / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32437,'ESRI','32437','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=37 no_defs',NULL,'WGS 72BE / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32438,'EPSG','32438','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=38',NULL,'WGS 72BE / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32438,'ESRI','32438','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=38 no_defs',NULL,'WGS 72BE / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32439,'EPSG','32439','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=39',NULL,'WGS 72BE / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32439,'ESRI','32439','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=39 no_defs',NULL,'WGS 72BE / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32440,'EPSG','32440','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=40',NULL,'WGS 72BE / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32440,'ESRI','32440','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=40 no_defs',NULL,'WGS 72BE / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32441,'EPSG','32441','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=41',NULL,'WGS 72BE / UTM zone 41N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32441,'ESRI','32441','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=41 no_defs',NULL,'WGS 72BE / UTM zone 41N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32442,'EPSG','32442','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=42',NULL,'WGS 72BE / UTM zone 42N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32442,'ESRI','32442','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=42 no_defs',NULL,'WGS 72BE / UTM zone 42N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32443,'EPSG','32443','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=43',NULL,'WGS 72BE / UTM zone 43N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32443,'ESRI','32443','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=43 no_defs',NULL,'WGS 72BE / UTM zone 43N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32444,'EPSG','32444','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=44',NULL,'WGS 72BE / UTM zone 44N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32444,'ESRI','32444','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=44 no_defs',NULL,'WGS 72BE / UTM zone 44N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32445,'EPSG','32445','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=45',NULL,'WGS 72BE / UTM zone 45N',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_79() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32445,'ESRI','32445','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=45 no_defs',NULL,'WGS 72BE / UTM zone 45N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32446,'EPSG','32446','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=46',NULL,'WGS 72BE / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32446,'ESRI','32446','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=46 no_defs',NULL,'WGS 72BE / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32447,'EPSG','32447','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=47',NULL,'WGS 72BE / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32447,'ESRI','32447','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=47 no_defs',NULL,'WGS 72BE / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32448,'EPSG','32448','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=48',NULL,'WGS 72BE / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32448,'ESRI','32448','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=48 no_defs',NULL,'WGS 72BE / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32449,'EPSG','32449','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=49',NULL,'WGS 72BE / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32449,'ESRI','32449','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=49 no_defs',NULL,'WGS 72BE / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32450,'EPSG','32450','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=50',NULL,'WGS 72BE / UTM zone 50N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32450,'ESRI','32450','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=50 no_defs',NULL,'WGS 72BE / UTM zone 50N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32451,'EPSG','32451','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=51',NULL,'WGS 72BE / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32451,'ESRI','32451','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=51 no_defs',NULL,'WGS 72BE / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32452,'EPSG','32452','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=52',NULL,'WGS 72BE / UTM zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32452,'ESRI','32452','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=52 no_defs',NULL,'WGS 72BE / UTM zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32453,'EPSG','32453','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=53',NULL,'WGS 72BE / UTM zone 53N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32453,'ESRI','32453','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=53 no_defs',NULL,'WGS 72BE / UTM zone 53N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32454,'EPSG','32454','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=54',NULL,'WGS 72BE / UTM zone 54N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32454,'ESRI','32454','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=54 no_defs',NULL,'WGS 72BE / UTM zone 54N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32455,'EPSG','32455','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=55',NULL,'WGS 72BE / UTM zone 55N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32455,'ESRI','32455','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=55 no_defs',NULL,'WGS 72BE / UTM zone 55N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32456,'EPSG','32456','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=56',NULL,'WGS 72BE / UTM zone 56N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32456,'ESRI','32456','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=56 no_defs',NULL,'WGS 72BE / UTM zone 56N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32457,'EPSG','32457','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=57',NULL,'WGS 72BE / UTM zone 57N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32457,'ESRI','32457','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=57 no_defs',NULL,'WGS 72BE / UTM zone 57N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32458,'EPSG','32458','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=58',NULL,'WGS 72BE / UTM zone 58N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32458,'ESRI','32458','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=58 no_defs',NULL,'WGS 72BE / UTM zone 58N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32459,'EPSG','32459','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=59',NULL,'WGS 72BE / UTM zone 59N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32459,'ESRI','32459','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=59 no_defs',NULL,'WGS 72BE / UTM zone 59N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32460,'EPSG','32460','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=60',NULL,'WGS 72BE / UTM zone 60N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32460,'ESRI','32460','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=60 no_defs',NULL,'WGS 72BE / UTM zone 60N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32501,'EPSG','32501','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=1',NULL,'WGS 72BE / UTM zone 1S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32501,'ESRI','32501','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=1 no_defs',NULL,'WGS 72BE / UTM zone 1S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32502,'EPSG','32502','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=2',NULL,'WGS 72BE / UTM zone 2S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32502,'ESRI','32502','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=2 no_defs',NULL,'WGS 72BE / UTM zone 2S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32503,'EPSG','32503','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=3',NULL,'WGS 72BE / UTM zone 3S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32503,'ESRI','32503','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=3 no_defs',NULL,'WGS 72BE / UTM zone 3S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32504,'EPSG','32504','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=4',NULL,'WGS 72BE / UTM zone 4S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32504,'ESRI','32504','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=4 no_defs',NULL,'WGS 72BE / UTM zone 4S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32505,'EPSG','32505','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=5',NULL,'WGS 72BE / UTM zone 5S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32505,'ESRI','32505','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=5 no_defs',NULL,'WGS 72BE / UTM zone 5S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32506,'EPSG','32506','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=6',NULL,'WGS 72BE / UTM zone 6S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32506,'ESRI','32506','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=6 no_defs',NULL,'WGS 72BE / UTM zone 6S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32507,'EPSG','32507','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=7',NULL,'WGS 72BE / UTM zone 7S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32507,'ESRI','32507','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=7 no_defs',NULL,'WGS 72BE / UTM zone 7S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32508,'EPSG','32508','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=8',NULL,'WGS 72BE / UTM zone 8S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32508,'ESRI','32508','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=8 no_defs',NULL,'WGS 72BE / UTM zone 8S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32509,'EPSG','32509','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=9',NULL,'WGS 72BE / UTM zone 9S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32509,'ESRI','32509','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=9 no_defs',NULL,'WGS 72BE / UTM zone 9S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32510,'EPSG','32510','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=10',NULL,'WGS 72BE / UTM zone 10S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32510,'ESRI','32510','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=10 no_defs',NULL,'WGS 72BE / UTM zone 10S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32511,'EPSG','32511','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=11',NULL,'WGS 72BE / UTM zone 11S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32511,'ESRI','32511','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=11 no_defs',NULL,'WGS 72BE / UTM zone 11S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32512,'EPSG','32512','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=12',NULL,'WGS 72BE / UTM zone 12S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32512,'ESRI','32512','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=12 no_defs',NULL,'WGS 72BE / UTM zone 12S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32513,'EPSG','32513','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=13',NULL,'WGS 72BE / UTM zone 13S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32513,'ESRI','32513','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=13 no_defs',NULL,'WGS 72BE / UTM zone 13S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32514,'EPSG','32514','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=14',NULL,'WGS 72BE / UTM zone 14S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32514,'ESRI','32514','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=14 no_defs',NULL,'WGS 72BE / UTM zone 14S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32515,'EPSG','32515','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=15',NULL,'WGS 72BE / UTM zone 15S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32515,'ESRI','32515','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=15 no_defs',NULL,'WGS 72BE / UTM zone 15S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32516,'EPSG','32516','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=16',NULL,'WGS 72BE / UTM zone 16S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32516,'ESRI','32516','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=16 no_defs',NULL,'WGS 72BE / UTM zone 16S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32517,'EPSG','32517','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=17',NULL,'WGS 72BE / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32517,'ESRI','32517','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=17 no_defs',NULL,'WGS 72BE / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32518,'EPSG','32518','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=18',NULL,'WGS 72BE / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32518,'ESRI','32518','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=18 no_defs',NULL,'WGS 72BE / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32519,'EPSG','32519','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=19',NULL,'WGS 72BE / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32519,'ESRI','32519','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=19 no_defs',NULL,'WGS 72BE / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32520,'EPSG','32520','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=20',NULL,'WGS 72BE / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32520,'ESRI','32520','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=20 no_defs',NULL,'WGS 72BE / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32521,'EPSG','32521','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=21',NULL,'WGS 72BE / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32521,'ESRI','32521','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=21 no_defs',NULL,'WGS 72BE / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32522,'EPSG','32522','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=22',NULL,'WGS 72BE / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32522,'ESRI','32522','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=22 no_defs',NULL,'WGS 72BE / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32523,'EPSG','32523','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=23',NULL,'WGS 72BE / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32523,'ESRI','32523','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=23 no_defs',NULL,'WGS 72BE / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32524,'EPSG','32524','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=24',NULL,'WGS 72BE / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32524,'ESRI','32524','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=24 no_defs',NULL,'WGS 72BE / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32525,'EPSG','32525','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=25',NULL,'WGS 72BE / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32525,'ESRI','32525','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=25 no_defs',NULL,'WGS 72BE / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32526,'EPSG','32526','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=26',NULL,'WGS 72BE / UTM zone 26S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32526,'ESRI','32526','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=26 no_defs',NULL,'WGS 72BE / UTM zone 26S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32527,'EPSG','32527','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=27',NULL,'WGS 72BE / UTM zone 27S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32527,'ESRI','32527','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=27 no_defs',NULL,'WGS 72BE / UTM zone 27S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32528,'EPSG','32528','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=28',NULL,'WGS 72BE / UTM zone 28S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32528,'ESRI','32528','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=28 no_defs',NULL,'WGS 72BE / UTM zone 28S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32529,'EPSG','32529','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=29',NULL,'WGS 72BE / UTM zone 29S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32529,'ESRI','32529','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=29 no_defs',NULL,'WGS 72BE / UTM zone 29S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32530,'EPSG','32530','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=30',NULL,'WGS 72BE / UTM zone 30S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32530,'ESRI','32530','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=30 no_defs',NULL,'WGS 72BE / UTM zone 30S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32531,'EPSG','32531','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=31',NULL,'WGS 72BE / UTM zone 31S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32531,'ESRI','32531','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=31 no_defs',NULL,'WGS 72BE / UTM zone 31S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32532,'EPSG','32532','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=32',NULL,'WGS 72BE / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32532,'ESRI','32532','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=32 no_defs',NULL,'WGS 72BE / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32533,'EPSG','32533','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=33',NULL,'WGS 72BE / UTM zone 33S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32533,'ESRI','32533','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=33 no_defs',NULL,'WGS 72BE / UTM zone 33S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32534,'EPSG','32534','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=34',NULL,'WGS 72BE / UTM zone 34S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32534,'ESRI','32534','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=34 no_defs',NULL,'WGS 72BE / UTM zone 34S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32535,'EPSG','32535','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=35',NULL,'WGS 72BE / UTM zone 35S',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_80() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32535,'ESRI','32535','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=35 no_defs',NULL,'WGS 72BE / UTM zone 35S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32536,'EPSG','32536','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=36',NULL,'WGS 72BE / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32536,'ESRI','32536','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=36 no_defs',NULL,'WGS 72BE / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32537,'EPSG','32537','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=37',NULL,'WGS 72BE / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32537,'ESRI','32537','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=37 no_defs',NULL,'WGS 72BE / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32538,'EPSG','32538','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=38',NULL,'WGS 72BE / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32538,'ESRI','32538','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=38 no_defs',NULL,'WGS 72BE / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32539,'EPSG','32539','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=39',NULL,'WGS 72BE / UTM zone 39S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32539,'ESRI','32539','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=39 no_defs',NULL,'WGS 72BE / UTM zone 39S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32540,'EPSG','32540','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=40',NULL,'WGS 72BE / UTM zone 40S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32540,'ESRI','32540','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=40 no_defs',NULL,'WGS 72BE / UTM zone 40S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32541,'EPSG','32541','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=41',NULL,'WGS 72BE / UTM zone 41S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32541,'ESRI','32541','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=41 no_defs',NULL,'WGS 72BE / UTM zone 41S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32542,'EPSG','32542','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=42',NULL,'WGS 72BE / UTM zone 42S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32542,'ESRI','32542','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=42 no_defs',NULL,'WGS 72BE / UTM zone 42S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32543,'EPSG','32543','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=43',NULL,'WGS 72BE / UTM zone 43S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32543,'ESRI','32543','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=43 no_defs',NULL,'WGS 72BE / UTM zone 43S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32544,'EPSG','32544','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=44',NULL,'WGS 72BE / UTM zone 44S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32544,'ESRI','32544','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=44 no_defs',NULL,'WGS 72BE / UTM zone 44S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32545,'EPSG','32545','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=45',NULL,'WGS 72BE / UTM zone 45S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32545,'ESRI','32545','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=45 no_defs',NULL,'WGS 72BE / UTM zone 45S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32546,'EPSG','32546','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=46',NULL,'WGS 72BE / UTM zone 46S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32546,'ESRI','32546','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=46 no_defs',NULL,'WGS 72BE / UTM zone 46S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32547,'EPSG','32547','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=47',NULL,'WGS 72BE / UTM zone 47S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32547,'ESRI','32547','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=47 no_defs',NULL,'WGS 72BE / UTM zone 47S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32548,'EPSG','32548','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=48',NULL,'WGS 72BE / UTM zone 48S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32548,'ESRI','32548','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=48 no_defs',NULL,'WGS 72BE / UTM zone 48S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32549,'EPSG','32549','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=49',NULL,'WGS 72BE / UTM zone 49S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32549,'ESRI','32549','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=49 no_defs',NULL,'WGS 72BE / UTM zone 49S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32550,'EPSG','32550','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=50',NULL,'WGS 72BE / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32550,'ESRI','32550','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=50 no_defs',NULL,'WGS 72BE / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32551,'EPSG','32551','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=51',NULL,'WGS 72BE / UTM zone 51S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32551,'ESRI','32551','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=51 no_defs',NULL,'WGS 72BE / UTM zone 51S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32552,'EPSG','32552','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=52',NULL,'WGS 72BE / UTM zone 52S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32552,'ESRI','32552','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=52 no_defs',NULL,'WGS 72BE / UTM zone 52S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32553,'EPSG','32553','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=53',NULL,'WGS 72BE / UTM zone 53S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32553,'ESRI','32553','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=53 no_defs',NULL,'WGS 72BE / UTM zone 53S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32554,'EPSG','32554','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=54',NULL,'WGS 72BE / UTM zone 54S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32554,'ESRI','32554','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=54 no_defs',NULL,'WGS 72BE / UTM zone 54S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32555,'EPSG','32555','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=55',NULL,'WGS 72BE / UTM zone 55S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32555,'ESRI','32555','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=55 no_defs',NULL,'WGS 72BE / UTM zone 55S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32556,'EPSG','32556','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=56',NULL,'WGS 72BE / UTM zone 56S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32556,'ESRI','32556','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=56 no_defs',NULL,'WGS 72BE / UTM zone 56S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32557,'EPSG','32557','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=57',NULL,'WGS 72BE / UTM zone 57S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32557,'ESRI','32557','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=57 no_defs',NULL,'WGS 72BE / UTM zone 57S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32558,'EPSG','32558','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=58',NULL,'WGS 72BE / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32558,'ESRI','32558','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=58 no_defs',NULL,'WGS 72BE / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32559,'EPSG','32559','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=59',NULL,'WGS 72BE / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32559,'ESRI','32559','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=59 no_defs',NULL,'WGS 72BE / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32560,'EPSG','32560','proj4_data/epsg',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=60',NULL,'WGS 72BE / UTM zone 60S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32560,'ESRI','32560','proj4_data/esri',NULL,'+ellps=WGS72 +no_defs +proj=utm +south +towgs84=0,0,1.9,0,0,0.814,-0.38 +units=m +zone=60 no_defs',NULL,'WGS 72BE / UTM zone 60S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32601,'EPSG','32601','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=1',NULL,'WGS 84 / UTM grid system (northern hemisphere)\12Unable to translate coordinate system EPSG:32600 into PROJ.4 format.\12\12WGS 84 / UTM zone 1N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32601,'ESRI','32601','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=1 no_defs',NULL,'WGS 84 / UTM zone 1N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32602,'EPSG','32602','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=2',NULL,'WGS 84 / UTM zone 2N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32602,'ESRI','32602','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=2 no_defs',NULL,'WGS 84 / UTM zone 2N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32603,'EPSG','32603','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=3',NULL,'WGS 84 / UTM zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32603,'ESRI','32603','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=3 no_defs',NULL,'WGS 84 / UTM zone 3N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32604,'EPSG','32604','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=4',NULL,'WGS 84 / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32604,'ESRI','32604','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=4 no_defs',NULL,'WGS 84 / UTM zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32605,'EPSG','32605','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=5',NULL,'WGS 84 / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32605,'ESRI','32605','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=5 no_defs',NULL,'WGS 84 / UTM zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32606,'EPSG','32606','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=6',NULL,'WGS 84 / UTM zone 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32606,'ESRI','32606','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=6 no_defs',NULL,'WGS 84 / UTM zone 6N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32607,'EPSG','32607','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=7',NULL,'WGS 84 / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32607,'ESRI','32607','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=7 no_defs',NULL,'WGS 84 / UTM zone 7N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32608,'EPSG','32608','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=8',NULL,'WGS 84 / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32608,'ESRI','32608','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=8 no_defs',NULL,'WGS 84 / UTM zone 8N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32609,'EPSG','32609','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=9',NULL,'WGS 84 / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32609,'ESRI','32609','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=9 no_defs',NULL,'WGS 84 / UTM zone 9N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32610,'EPSG','32610','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=10',NULL,'WGS 84 / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32610,'ESRI','32610','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=10 no_defs',NULL,'WGS 84 / UTM zone 10N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32611,'EPSG','32611','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=11',NULL,'WGS 84 / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32611,'ESRI','32611','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=11 no_defs',NULL,'WGS 84 / UTM zone 11N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32612,'EPSG','32612','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=12',NULL,'WGS 84 / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32612,'ESRI','32612','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=12 no_defs',NULL,'WGS 84 / UTM zone 12N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32613,'EPSG','32613','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=13',NULL,'WGS 84 / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32613,'ESRI','32613','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=13 no_defs',NULL,'WGS 84 / UTM zone 13N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32614,'EPSG','32614','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=14',NULL,'WGS 84 / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32614,'ESRI','32614','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=14 no_defs',NULL,'WGS 84 / UTM zone 14N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32615,'EPSG','32615','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=15',NULL,'WGS 84 / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32615,'ESRI','32615','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=15 no_defs',NULL,'WGS 84 / UTM zone 15N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32616,'EPSG','32616','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=16',NULL,'WGS 84 / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32616,'ESRI','32616','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=16 no_defs',NULL,'WGS 84 / UTM zone 16N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32617,'EPSG','32617','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=17',NULL,'WGS 84 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32617,'ESRI','32617','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=17 no_defs',NULL,'WGS 84 / UTM zone 17N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32618,'EPSG','32618','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=18',NULL,'WGS 84 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32618,'ESRI','32618','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=18 no_defs',NULL,'WGS 84 / UTM zone 18N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32619,'EPSG','32619','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=19',NULL,'WGS 84 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32619,'ESRI','32619','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=19 no_defs',NULL,'WGS 84 / UTM zone 19N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32620,'EPSG','32620','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=20',NULL,'WGS 84 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32620,'ESRI','32620','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=20 no_defs',NULL,'WGS 84 / UTM zone 20N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32621,'EPSG','32621','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=21',NULL,'WGS 84 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32621,'ESRI','32621','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=21 no_defs',NULL,'WGS 84 / UTM zone 21N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32622,'EPSG','32622','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=22',NULL,'WGS 84 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32622,'ESRI','32622','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=22 no_defs',NULL,'WGS 84 / UTM zone 22N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32623,'EPSG','32623','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=23',NULL,'WGS 84 / UTM zone 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32623,'ESRI','32623','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=23 no_defs',NULL,'WGS 84 / UTM zone 23N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32624,'EPSG','32624','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=24',NULL,'WGS 84 / UTM zone 24N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32624,'ESRI','32624','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=24 no_defs',NULL,'WGS 84 / UTM zone 24N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32625,'EPSG','32625','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=25',NULL,'WGS 84 / UTM zone 25N',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_81() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32625,'ESRI','32625','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=25 no_defs',NULL,'WGS 84 / UTM zone 25N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32626,'EPSG','32626','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=26',NULL,'WGS 84 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32626,'ESRI','32626','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=26 no_defs',NULL,'WGS 84 / UTM zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32627,'EPSG','32627','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=27',NULL,'WGS 84 / UTM zone 27N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32627,'ESRI','32627','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=27 no_defs',NULL,'WGS 84 / UTM zone 27N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32628,'EPSG','32628','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=28',NULL,'WGS 84 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32628,'ESRI','32628','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=28 no_defs',NULL,'WGS 84 / UTM zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32629,'EPSG','32629','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=29',NULL,'WGS 84 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32629,'ESRI','32629','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=29 no_defs',NULL,'WGS 84 / UTM zone 29N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32630,'EPSG','32630','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=30',NULL,'WGS 84 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32630,'ESRI','32630','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=30 no_defs',NULL,'WGS 84 / UTM zone 30N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32631,'EPSG','32631','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=31',NULL,'WGS 84 / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32631,'ESRI','32631','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=31 no_defs',NULL,'WGS 84 / UTM zone 31N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32632,'EPSG','32632','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=32',NULL,'WGS 84 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32632,'ESRI','32632','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=32 no_defs',NULL,'WGS 84 / UTM zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32633,'EPSG','32633','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=33',NULL,'WGS 84 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32633,'ESRI','32633','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=33 no_defs',NULL,'WGS 84 / UTM zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32634,'EPSG','32634','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=34',NULL,'WGS 84 / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32634,'ESRI','32634','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=34 no_defs',NULL,'WGS 84 / UTM zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32635,'EPSG','32635','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=35',NULL,'WGS 84 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32635,'ESRI','32635','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=35 no_defs',NULL,'WGS 84 / UTM zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32636,'EPSG','32636','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=36',NULL,'WGS 84 / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32636,'ESRI','32636','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=36 no_defs',NULL,'WGS 84 / UTM zone 36N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32637,'EPSG','32637','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=37',NULL,'WGS 84 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32637,'ESRI','32637','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=37 no_defs',NULL,'WGS 84 / UTM zone 37N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32638,'EPSG','32638','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=38',NULL,'WGS 84 / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32638,'ESRI','32638','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=38 no_defs',NULL,'WGS 84 / UTM zone 38N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32639,'EPSG','32639','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=39',NULL,'WGS 84 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32639,'ESRI','32639','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=39 no_defs',NULL,'WGS 84 / UTM zone 39N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32640,'EPSG','32640','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=40',NULL,'WGS 84 / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32640,'ESRI','32640','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=40 no_defs',NULL,'WGS 84 / UTM zone 40N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32641,'EPSG','32641','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=41',NULL,'WGS 84 / UTM zone 41N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32641,'ESRI','32641','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=41 no_defs',NULL,'WGS 84 / UTM zone 41N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32642,'EPSG','32642','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=42',NULL,'WGS 84 / UTM zone 42N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32642,'ESRI','32642','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=42 no_defs',NULL,'WGS 84 / UTM zone 42N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32643,'EPSG','32643','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=43',NULL,'WGS 84 / UTM zone 43N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32643,'ESRI','32643','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=43 no_defs',NULL,'WGS 84 / UTM zone 43N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32644,'EPSG','32644','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=44',NULL,'WGS 84 / UTM zone 44N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32644,'ESRI','32644','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=44 no_defs',NULL,'WGS 84 / UTM zone 44N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32645,'EPSG','32645','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=45',NULL,'WGS 84 / UTM zone 45N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32645,'ESRI','32645','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=45 no_defs',NULL,'WGS 84 / UTM zone 45N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32646,'EPSG','32646','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=46',NULL,'WGS 84 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32646,'ESRI','32646','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=46 no_defs',NULL,'WGS 84 / UTM zone 46N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32647,'EPSG','32647','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=47',NULL,'WGS 84 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32647,'ESRI','32647','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=47 no_defs',NULL,'WGS 84 / UTM zone 47N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32648,'EPSG','32648','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=48',NULL,'WGS 84 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32648,'ESRI','32648','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=48 no_defs',NULL,'WGS 84 / UTM zone 48N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32649,'EPSG','32649','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=49',NULL,'WGS 84 / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32649,'ESRI','32649','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=49 no_defs',NULL,'WGS 84 / UTM zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32650,'EPSG','32650','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=50',NULL,'WGS 84 / UTM zone 50N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32650,'ESRI','32650','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=50 no_defs',NULL,'WGS 84 / UTM zone 50N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32651,'EPSG','32651','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=51',NULL,'WGS 84 / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32651,'ESRI','32651','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=51 no_defs',NULL,'WGS 84 / UTM zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32652,'EPSG','32652','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=52',NULL,'WGS 84 / UTM zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32652,'ESRI','32652','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=52 no_defs',NULL,'WGS 84 / UTM zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32653,'EPSG','32653','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=53',NULL,'WGS 84 / UTM zone 53N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32653,'ESRI','32653','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=53 no_defs',NULL,'WGS 84 / UTM zone 53N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32654,'EPSG','32654','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=54',NULL,'WGS 84 / UTM zone 54N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32654,'ESRI','32654','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=54 no_defs',NULL,'WGS 84 / UTM zone 54N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32655,'EPSG','32655','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=55',NULL,'WGS 84 / UTM zone 55N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32655,'ESRI','32655','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=55 no_defs',NULL,'WGS 84 / UTM zone 55N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32656,'EPSG','32656','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=56',NULL,'WGS 84 / UTM zone 56N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32656,'ESRI','32656','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=56 no_defs',NULL,'WGS 84 / UTM zone 56N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32657,'EPSG','32657','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=57',NULL,'WGS 84 / UTM zone 57N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32657,'ESRI','32657','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=57 no_defs',NULL,'WGS 84 / UTM zone 57N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32658,'EPSG','32658','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=58',NULL,'WGS 84 / UTM zone 58N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32658,'ESRI','32658','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=58 no_defs',NULL,'WGS 84 / UTM zone 58N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32659,'EPSG','32659','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=59',NULL,'WGS 84 / UTM zone 59N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32659,'ESRI','32659','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=59 no_defs',NULL,'WGS 84 / UTM zone 59N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32660,'EPSG','32660','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +units=m +zone=60',NULL,'WGS 84 / UTM zone 60N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32660,'ESRI','32660','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +units=m +zone=60 no_defs',NULL,'WGS 84 / UTM zone 60N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32661,'EPSG','32661','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.994 +lat_0=90 +lat_ts=90 +lon_0=0 +no_defs +proj=stere +units=m +x_0=2000000 +y_0=2000000',NULL,'WGS 84 / UPS North (N,E)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32661,'ESRI','32661','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +k=0.994 +lat_0=90 +lat_ts=90 +lon_0=0 +no_defs +proj=stere +units=m +x_0=2000000 +y_0=2000000 no_defs',NULL,'WGS 84 / UPS North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32662,'EPSG','32662','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=0 +lat_ts=0 +lon_0=0 +no_defs +proj=eqc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / Plate Carree (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32663,'EPSG','32663','proj4_data/epsg',NULL,'+datum=WGS84 +lat_0=0 +lat_ts=0 +lon_0=0 +no_defs +proj=eqc +units=m +x_0=0 +y_0=0',NULL,'WGS 84 / World Equidistant Cylindrical (deprecated)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32664,'EPSG','32664','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.9996 +lat_0=0 +lon_0=-99 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'WGS 84 / BLM 14N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32665,'EPSG','32665','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.9996 +lat_0=0 +lon_0=-93 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'WGS 84 / BLM 15N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32666,'EPSG','32666','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.9996 +lat_0=0 +lon_0=-87 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'WGS 84 / BLM 16N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32667,'EPSG','32667','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.9996 +lat_0=0 +lon_0=-81 +no_defs +proj=tmerc +units=us-ft +x_0=500000.001016002 +y_0=0',NULL,'WGS 84 / BLM 17N (ftUS)',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32701,'EPSG','32701','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=1',NULL,'WGS 84 / UTM grid system (southern hemisphere)\12Unable to translate coordinate system EPSG:32700 into PROJ.4 format.\12\12WGS 84 / UTM zone 1S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32701,'ESRI','32701','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=1 no_defs',NULL,'WGS 84 / UTM zone 1S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32702,'EPSG','32702','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=2',NULL,'WGS 84 / UTM zone 2S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32702,'ESRI','32702','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=2 no_defs',NULL,'WGS 84 / UTM zone 2S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32703,'EPSG','32703','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=3',NULL,'WGS 84 / UTM zone 3S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32703,'ESRI','32703','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=3 no_defs',NULL,'WGS 84 / UTM zone 3S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32704,'EPSG','32704','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=4',NULL,'WGS 84 / UTM zone 4S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32704,'ESRI','32704','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=4 no_defs',NULL,'WGS 84 / UTM zone 4S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32705,'EPSG','32705','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=5',NULL,'WGS 84 / UTM zone 5S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32705,'ESRI','32705','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=5 no_defs',NULL,'WGS 84 / UTM zone 5S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32706,'EPSG','32706','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=6',NULL,'WGS 84 / UTM zone 6S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32706,'ESRI','32706','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=6 no_defs',NULL,'WGS 84 / UTM zone 6S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32707,'EPSG','32707','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=7',NULL,'WGS 84 / UTM zone 7S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32707,'ESRI','32707','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=7 no_defs',NULL,'WGS 84 / UTM zone 7S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32708,'EPSG','32708','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=8',NULL,'WGS 84 / UTM zone 8S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32708,'ESRI','32708','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=8 no_defs',NULL,'WGS 84 / UTM zone 8S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32709,'EPSG','32709','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=9',NULL,'WGS 84 / UTM zone 9S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32709,'ESRI','32709','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=9 no_defs',NULL,'WGS 84 / UTM zone 9S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32710,'EPSG','32710','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=10',NULL,'WGS 84 / UTM zone 10S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32710,'ESRI','32710','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=10 no_defs',NULL,'WGS 84 / UTM zone 10S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32711,'EPSG','32711','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=11',NULL,'WGS 84 / UTM zone 11S',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_82() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32711,'ESRI','32711','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=11 no_defs',NULL,'WGS 84 / UTM zone 11S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32712,'EPSG','32712','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=12',NULL,'WGS 84 / UTM zone 12S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32712,'ESRI','32712','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=12 no_defs',NULL,'WGS 84 / UTM zone 12S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32713,'EPSG','32713','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=13',NULL,'WGS 84 / UTM zone 13S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32713,'ESRI','32713','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=13 no_defs',NULL,'WGS 84 / UTM zone 13S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32714,'EPSG','32714','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=14',NULL,'WGS 84 / UTM zone 14S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32714,'ESRI','32714','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=14 no_defs',NULL,'WGS 84 / UTM zone 14S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32715,'EPSG','32715','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=15',NULL,'WGS 84 / UTM zone 15S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32715,'ESRI','32715','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=15 no_defs',NULL,'WGS 84 / UTM zone 15S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32716,'EPSG','32716','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=16',NULL,'WGS 84 / UTM zone 16S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32716,'ESRI','32716','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=16 no_defs',NULL,'WGS 84 / UTM zone 16S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32717,'EPSG','32717','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=17',NULL,'WGS 84 / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32717,'ESRI','32717','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=17 no_defs',NULL,'WGS 84 / UTM zone 17S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32718,'EPSG','32718','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=18',NULL,'WGS 84 / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32718,'ESRI','32718','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=18 no_defs',NULL,'WGS 84 / UTM zone 18S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32719,'EPSG','32719','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=19',NULL,'WGS 84 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32719,'ESRI','32719','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=19 no_defs',NULL,'WGS 84 / UTM zone 19S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32720,'EPSG','32720','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=20',NULL,'WGS 84 / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32720,'ESRI','32720','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=20 no_defs',NULL,'WGS 84 / UTM zone 20S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32721,'EPSG','32721','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=21',NULL,'WGS 84 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32721,'ESRI','32721','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=21 no_defs',NULL,'WGS 84 / UTM zone 21S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32722,'EPSG','32722','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=22',NULL,'WGS 84 / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32722,'ESRI','32722','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=22 no_defs',NULL,'WGS 84 / UTM zone 22S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32723,'EPSG','32723','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=23',NULL,'WGS 84 / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32723,'ESRI','32723','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=23 no_defs',NULL,'WGS 84 / UTM zone 23S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32724,'EPSG','32724','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=24',NULL,'WGS 84 / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32724,'ESRI','32724','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=24 no_defs',NULL,'WGS 84 / UTM zone 24S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32725,'EPSG','32725','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=25',NULL,'WGS 84 / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32725,'ESRI','32725','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=25 no_defs',NULL,'WGS 84 / UTM zone 25S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32726,'EPSG','32726','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=26',NULL,'WGS 84 / UTM zone 26S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32726,'ESRI','32726','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=26 no_defs',NULL,'WGS 84 / UTM zone 26S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32727,'EPSG','32727','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=27',NULL,'WGS 84 / UTM zone 27S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32727,'ESRI','32727','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=27 no_defs',NULL,'WGS 84 / UTM zone 27S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32728,'EPSG','32728','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=28',NULL,'WGS 84 / UTM zone 28S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32728,'ESRI','32728','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=28 no_defs',NULL,'WGS 84 / UTM zone 28S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32729,'EPSG','32729','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=29',NULL,'WGS 84 / UTM zone 29S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32729,'ESRI','32729','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=29 no_defs',NULL,'WGS 84 / UTM zone 29S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32730,'EPSG','32730','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=30',NULL,'WGS 84 / UTM zone 30S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32730,'ESRI','32730','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=30 no_defs',NULL,'WGS 84 / UTM zone 30S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32731,'EPSG','32731','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=31',NULL,'WGS 84 / UTM zone 31S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32731,'ESRI','32731','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=31 no_defs',NULL,'WGS 84 / UTM zone 31S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32732,'EPSG','32732','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=32',NULL,'WGS 84 / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32732,'ESRI','32732','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=32 no_defs',NULL,'WGS 84 / UTM zone 32S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32733,'EPSG','32733','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=33',NULL,'WGS 84 / UTM zone 33S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32733,'ESRI','32733','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=33 no_defs',NULL,'WGS 84 / UTM zone 33S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32734,'EPSG','32734','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=34',NULL,'WGS 84 / UTM zone 34S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32734,'ESRI','32734','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=34 no_defs',NULL,'WGS 84 / UTM zone 34S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32735,'EPSG','32735','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=35',NULL,'WGS 84 / UTM zone 35S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32735,'ESRI','32735','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=35 no_defs',NULL,'WGS 84 / UTM zone 35S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32736,'EPSG','32736','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=36',NULL,'WGS 84 / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32736,'ESRI','32736','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=36 no_defs',NULL,'WGS 84 / UTM zone 36S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32737,'EPSG','32737','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=37',NULL,'WGS 84 / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32737,'ESRI','32737','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=37 no_defs',NULL,'WGS 84 / UTM zone 37S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32738,'EPSG','32738','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=38',NULL,'WGS 84 / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32738,'ESRI','32738','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=38 no_defs',NULL,'WGS 84 / UTM zone 38S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32739,'EPSG','32739','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=39',NULL,'WGS 84 / UTM zone 39S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32739,'ESRI','32739','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=39 no_defs',NULL,'WGS 84 / UTM zone 39S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32740,'EPSG','32740','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=40',NULL,'WGS 84 / UTM zone 40S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32740,'ESRI','32740','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=40 no_defs',NULL,'WGS 84 / UTM zone 40S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32741,'EPSG','32741','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=41',NULL,'WGS 84 / UTM zone 41S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32741,'ESRI','32741','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=41 no_defs',NULL,'WGS 84 / UTM zone 41S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32742,'EPSG','32742','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=42',NULL,'WGS 84 / UTM zone 42S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32742,'ESRI','32742','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=42 no_defs',NULL,'WGS 84 / UTM zone 42S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32743,'EPSG','32743','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=43',NULL,'WGS 84 / UTM zone 43S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32743,'ESRI','32743','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=43 no_defs',NULL,'WGS 84 / UTM zone 43S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32744,'EPSG','32744','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=44',NULL,'WGS 84 / UTM zone 44S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32744,'ESRI','32744','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=44 no_defs',NULL,'WGS 84 / UTM zone 44S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32745,'EPSG','32745','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=45',NULL,'WGS 84 / UTM zone 45S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32745,'ESRI','32745','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=45 no_defs',NULL,'WGS 84 / UTM zone 45S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32746,'EPSG','32746','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=46',NULL,'WGS 84 / UTM zone 46S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32746,'ESRI','32746','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=46 no_defs',NULL,'WGS 84 / UTM zone 46S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32747,'EPSG','32747','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=47',NULL,'WGS 84 / UTM zone 47S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32747,'ESRI','32747','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=47 no_defs',NULL,'WGS 84 / UTM zone 47S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32748,'EPSG','32748','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=48',NULL,'WGS 84 / UTM zone 48S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32748,'ESRI','32748','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=48 no_defs',NULL,'WGS 84 / UTM zone 48S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32749,'EPSG','32749','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=49',NULL,'WGS 84 / UTM zone 49S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32749,'ESRI','32749','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=49 no_defs',NULL,'WGS 84 / UTM zone 49S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32750,'EPSG','32750','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=50',NULL,'WGS 84 / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32750,'ESRI','32750','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=50 no_defs',NULL,'WGS 84 / UTM zone 50S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32751,'EPSG','32751','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=51',NULL,'WGS 84 / UTM zone 51S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32751,'ESRI','32751','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=51 no_defs',NULL,'WGS 84 / UTM zone 51S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32752,'EPSG','32752','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=52',NULL,'WGS 84 / UTM zone 52S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32752,'ESRI','32752','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=52 no_defs',NULL,'WGS 84 / UTM zone 52S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32753,'EPSG','32753','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=53',NULL,'WGS 84 / UTM zone 53S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32753,'ESRI','32753','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=53 no_defs',NULL,'WGS 84 / UTM zone 53S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32754,'EPSG','32754','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=54',NULL,'WGS 84 / UTM zone 54S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32754,'ESRI','32754','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=54 no_defs',NULL,'WGS 84 / UTM zone 54S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32755,'EPSG','32755','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=55',NULL,'WGS 84 / UTM zone 55S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32755,'ESRI','32755','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=55 no_defs',NULL,'WGS 84 / UTM zone 55S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32756,'EPSG','32756','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=56',NULL,'WGS 84 / UTM zone 56S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32756,'ESRI','32756','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=56 no_defs',NULL,'WGS 84 / UTM zone 56S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32757,'EPSG','32757','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=57',NULL,'WGS 84 / UTM zone 57S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32757,'ESRI','32757','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=57 no_defs',NULL,'WGS 84 / UTM zone 57S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32758,'EPSG','32758','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=58',NULL,'WGS 84 / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32758,'ESRI','32758','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=58 no_defs',NULL,'WGS 84 / UTM zone 58S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32759,'EPSG','32759','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=59',NULL,'WGS 84 / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32759,'ESRI','32759','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=59 no_defs',NULL,'WGS 84 / UTM zone 59S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32760,'EPSG','32760','proj4_data/epsg',NULL,'+datum=WGS84 +no_defs +proj=utm +south +units=m +zone=60',NULL,'WGS 84 / UTM zone 60S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32760,'ESRI','32760','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +no_defs +proj=utm +south +units=m +zone=60 no_defs',NULL,'WGS 84 / UTM zone 60S',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32761,'EPSG','32761','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.994 +lat_0=-90 +lat_ts=-90 +lon_0=0 +no_defs +proj=stere +units=m +x_0=2000000 +y_0=2000000',NULL,'WGS 84 / UPS South (N,E)',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_83() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32761,'ESRI','32761','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +k=0.994 +lat_0=-90 +lat_ts=-90 +lon_0=0 +no_defs +proj=stere +units=m +x_0=2000000 +y_0=2000000 no_defs',NULL,'WGS 84 / UPS South',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32766,'EPSG','32766','proj4_data/epsg',NULL,'+datum=WGS84 +k=0.9996 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000',NULL,'WGS 84 / TM 36 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(32766,'ESRI','32766','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +k=0.999600 +lat_0=0 +lon_0=36 +no_defs +proj=tmerc +units=m +x_0=500000 +y_0=10000000 no_defs',NULL,'WGS 84 / TM 36 SE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37001,'ESRI','37001','proj4_data/esri',NULL,'+ellps=WGS66 +proj=longlat no_defs',NULL,'GCS WGS 1966',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37002,'ESRI','37002','proj4_data/esri',NULL,'+a=6378166 +b=6356784.283607107 +proj=longlat no_defs',NULL,'GCS Fischer 1960',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37003,'ESRI','37003','proj4_data/esri',NULL,'+a=6378150 +b=6356768.337244385 +proj=longlat no_defs',NULL,'GCS Fischer 1968',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37004,'ESRI','37004','proj4_data/esri',NULL,'+ellps=fschr60m +proj=longlat no_defs',NULL,'GCS Fischer Modified',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37005,'ESRI','37005','proj4_data/esri',NULL,'+a=6378270 +b=6356794.343434343 +proj=longlat no_defs',NULL,'GCS Hough 1960',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37006,'ESRI','37006','proj4_data/esri',NULL,'+a=6377295.664 +b=6356094.667915204 +proj=longlat no_defs',NULL,'GCS Everest Modified 1969',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37007,'ESRI','37007','proj4_data/esri',NULL,'+a=6376896 +b=6355834.846687363 +proj=longlat no_defs',NULL,'GCS Walbeck',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37008,'ESRI','37008','proj4_data/esri',NULL,'+a=6370997 +b=6370997 +proj=longlat no_defs',NULL,'GCS Sphere ARC INFO',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37201,'ESRI','37201','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS European 1979',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37202,'ESRI','37202','proj4_data/esri',NULL,'+a=6377276.345 +b=6356075.413140239 +proj=longlat no_defs',NULL,'GCS Everest Bangladesh',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37203,'ESRI','37203','proj4_data/esri',NULL,'+a=6377301.243 +b=6356100.230165385 +proj=longlat no_defs',NULL,'GCS Everest India Nepal',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37204,'ESRI','37204','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Hjorsey 1955',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37205,'ESRI','37205','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Hong Kong 1963',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37206,'ESRI','37206','proj4_data/esri',NULL,'+ellps=clrk80 +proj=longlat no_defs',NULL,'GCS Oman',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37207,'ESRI','37207','proj4_data/esri',NULL,'+ellps=fschr60m +proj=longlat no_defs',NULL,'GCS South Asia Singapore',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37208,'ESRI','37208','proj4_data/esri',NULL,'+ellps=clrk80 +proj=longlat no_defs',NULL,'GCS Ayabelle',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37211,'ESRI','37211','proj4_data/esri',NULL,'+ellps=clrk80 +proj=longlat no_defs',NULL,'GCS Point 58',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37212,'ESRI','37212','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Beacon E 1945',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37213,'ESRI','37213','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Tern Island 1961',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37214,'ESRI','37214','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Astro 1952',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37215,'ESRI','37215','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Bellevue IGN',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37216,'ESRI','37216','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Canton 1966',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37217,'ESRI','37217','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Chatham Island 1971',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37218,'ESRI','37218','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS DOS 1968',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37219,'ESRI','37219','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Easter Island 1967',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37220,'ESRI','37220','proj4_data/esri',NULL,'+ellps=clrk66 +proj=longlat no_defs',NULL,'GCS Guam 1963',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37221,'ESRI','37221','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS GUX 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37222,'ESRI','37222','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Johnston Island 1961',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37223,'ESRI','37223','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.999904194 +proj=longlat no_defs',NULL,'GCS Carthage Degree',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37224,'ESRI','37224','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Midway 1961',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37226,'ESRI','37226','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Pitcairn 1967',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37227,'ESRI','37227','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Santo DOS 1965',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37228,'ESRI','37228','proj4_data/esri',NULL,'+ellps=clrk80 +proj=longlat no_defs',NULL,'GCS Viti Levu 1916',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37229,'ESRI','37229','proj4_data/esri',NULL,'+a=6378270 +b=6356794.343434343 +proj=longlat no_defs',NULL,'GCS Wake Eniwetok 1960',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37230,'ESRI','37230','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Wake Island 1952',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37231,'ESRI','37231','proj4_data/esri',NULL,'+ellps=aust_SA +proj=longlat no_defs',NULL,'GCS Anna 1 1965',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37232,'ESRI','37232','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Gan 1970',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37233,'ESRI','37233','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS ISTS 073 1969',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37234,'ESRI','37234','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Kerguelen Island 1949',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37235,'ESRI','37235','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Reunion',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37237,'ESRI','37237','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Ascension Island 1958',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37238,'ESRI','37238','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS DOS 71 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37239,'ESRI','37239','proj4_data/esri',NULL,'+ellps=clrk66 +proj=longlat no_defs',NULL,'GCS Cape Canaveral',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37240,'ESRI','37240','proj4_data/esri',NULL,'+ellps=clrk80 +proj=longlat no_defs',NULL,'GCS Fort Thomas 1955',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37241,'ESRI','37241','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Graciosa Base SW 1948',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37242,'ESRI','37242','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS ISTS 061 1968',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37243,'ESRI','37243','proj4_data/esri',NULL,'+ellps=clrk66 +proj=longlat no_defs',NULL,'GCS LC5 1961',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37245,'ESRI','37245','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Observ Meteorologico 1939',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37246,'ESRI','37246','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Pico de Las Nieves',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37247,'ESRI','37247','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Porto Santo 1936',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37249,'ESRI','37249','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Sao Braz',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37250,'ESRI','37250','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Selvagem Grande 1938',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37251,'ESRI','37251','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Tristan 1968',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37252,'ESRI','37252','proj4_data/esri',NULL,'+ellps=clrk66 +proj=longlat no_defs',NULL,'GCS Samoa 1962',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37253,'ESRI','37253','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Camp Area',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37254,'ESRI','37254','proj4_data/esri',NULL,'+ellps=clrk80 +proj=longlat no_defs',NULL,'GCS Deception Island',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37255,'ESRI','37255','proj4_data/esri',NULL,'+ellps=bessel +proj=longlat no_defs',NULL,'GCS Gunung Segara',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37257,'ESRI','37257','proj4_data/esri',NULL,'+ellps=krass +proj=longlat no_defs',NULL,'GCS S42 Hungary',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37259,'ESRI','37259','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Kusaie 1951',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(37260,'ESRI','37260','proj4_data/esri',NULL,'+ellps=clrk66 +proj=longlat no_defs',NULL,'GCS Alaskan Islands',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53001,'ESRI','53001','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Plate Carree',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53002,'ESRI','53002','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Equidistant Cylindrical',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53003,'ESRI','53003','proj4_data/esri',NULL,'+R_A +a=6371000 +b=6371000 +lat_0=0 +lon_0=0 +proj=mill +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Miller Cylindrical',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53004,'ESRI','53004','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +k=1.000000 +lat_ts=0 +lon_0=0 +proj=merc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53008,'ESRI','53008','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +lon_0=0 +proj=sinu +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Sinusoidal',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53009,'ESRI','53009','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +lon_0=0 +proj=moll +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Mollweide',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53010,'ESRI','53010','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +lon_0=0 +proj=eck6 +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Eckert VI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53011,'ESRI','53011','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Eckert V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53012,'ESRI','53012','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +lon_0=0 +proj=eck4 +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Eckert IV',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53013,'ESRI','53013','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Eckert III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53014,'ESRI','53014','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Eckert II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53015,'ESRI','53015','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Eckert I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53016,'ESRI','53016','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +lon_0=0 +proj=gall +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Gall Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53017,'ESRI','53017','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Behrmann',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53018,'ESRI','53018','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Winkel I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53019,'ESRI','53019','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Winkel II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53021,'ESRI','53021','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +lat_0=0 +lon_0=0 +proj=poly +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Polyconic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53022,'ESRI','53022','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Quartic Authalic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53023,'ESRI','53023','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Loximuthal',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53024,'ESRI','53024','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Bonne',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53025,'ESRI','53025','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Hotine',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53026,'ESRI','53026','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +lat_0=0 +lon_0=0 +proj=stere +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53027,'ESRI','53027','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +lat_0=0 +lat_1=60 +lat_2=60 +lon_0=0 +proj=eqdc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Equidistant Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53028,'ESRI','53028','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +lat_0=0 +lon_0=0 +proj=cass +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Cassini',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53029,'ESRI','53029','proj4_data/esri',NULL,'+R_A +a=6371000 +b=6371000 +lon_0=0 +proj=vandg +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Van der Grinten I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53030,'ESRI','53030','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +lon_0=0 +proj=robin +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Robinson',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53031,'ESRI','53031','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +units=m no_defs',NULL,'Sphere Two Point Equidistant',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(53032,'ESRI','53032','proj4_data/esri',NULL,'+a=6371000 +b=6371000 +lat_0=0 +lon_0=0 +proj=aeqd +units=m +x_0=0 +y_0=0 no_defs',NULL,'Sphere Azimuthal Equidistant',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54001,'ESRI','54001','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Plate Carree',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54002,'ESRI','54002','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Equidistant Cylindrical',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54003,'ESRI','54003','proj4_data/esri',NULL,'+R_A +datum=WGS84 +ellps=WGS84 +lat_0=0 +lon_0=0 +proj=mill +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Miller Cylindrical',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54004,'ESRI','54004','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +k=1.000000 +lat_ts=0 +lon_0=0 +proj=merc +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Mercator',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54008,'ESRI','54008','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lon_0=0 +proj=sinu +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Sinusoidal',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54009,'ESRI','54009','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lon_0=0 +proj=moll +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Mollweide',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54010,'ESRI','54010','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lon_0=0 +proj=eck6 +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Eckert VI',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54011,'ESRI','54011','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Eckert V',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54012,'ESRI','54012','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lon_0=0 +proj=eck4 +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Eckert IV',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_84() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54013,'ESRI','54013','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Eckert III',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54014,'ESRI','54014','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Eckert II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54015,'ESRI','54015','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Eckert I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54016,'ESRI','54016','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lon_0=0 +proj=gall +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Gall Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54017,'ESRI','54017','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Behrmann',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54018,'ESRI','54018','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Winkel I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54019,'ESRI','54019','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Winkel II',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54021,'ESRI','54021','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=0 +lon_0=0 +proj=poly +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Polyconic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54022,'ESRI','54022','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Quartic Authalic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54023,'ESRI','54023','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Loximuthal',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54024,'ESRI','54024','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Bonne',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54025,'ESRI','54025','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Hotine',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54026,'ESRI','54026','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=0 +lon_0=0 +proj=stere +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54027,'ESRI','54027','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=0 +lat_1=60 +lat_2=60 +lon_0=0 +proj=eqdc +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Equidistant Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54028,'ESRI','54028','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=0 +lon_0=0 +proj=cass +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Cassini',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54029,'ESRI','54029','proj4_data/esri',NULL,'+R_A +datum=WGS84 +ellps=WGS84 +lon_0=0 +proj=vandg +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Van der Grinten I',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54030,'ESRI','54030','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lon_0=0 +proj=robin +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Robinson',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54031,'ESRI','54031','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +units=m no_defs',NULL,'World Two Point Equidistant',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(54032,'ESRI','54032','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=0 +lon_0=0 +proj=aeqd +units=m +x_0=0 +y_0=0 no_defs',NULL,'World Azimuthal Equidistant',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(65061,'ESRI','65061','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +lat_0=13.47246635277778 +lon_0=-144.7487507055556 +proj=poly +to_meter=0.3048006096012192 +x_0=50000.00000000001 +y_0=50000.00000000001 no_defs',NULL,'NAD 1927 StatePlane Guam FIPS 5400',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(65161,'ESRI','65161','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=13.47246635277778 +lon_0=-144.7487507055556 +proj=poly +units=m +x_0=50000 +y_0=50000 no_defs',NULL,'NAD 1983 StatePlane Guam FIPS 5400',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102001,'ESRI','102001','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40 +lat_1=50 +lat_2=70 +lon_0=-96 +proj=aea +units=m +x_0=0 +y_0=0 no_defs',NULL,'Canada Albers Equal Area Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102002,'ESRI','102002','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40 +lat_1=50 +lat_2=70 +lon_0=-96 +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Canada Lambert Conformal Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102003,'ESRI','102003','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.5 +lat_1=29.5 +lat_2=45.5 +lon_0=-96 +proj=aea +units=m +x_0=0 +y_0=0 no_defs',NULL,'USA Contiguous Albers Equal Area Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102004,'ESRI','102004','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39 +lat_1=33 +lat_2=45 +lon_0=-96 +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'USA Contiguous Lambert Conformal Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102005,'ESRI','102005','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=0 +lat_1=33 +lat_2=45 +lon_0=0 +proj=eqdc +units=m +x_0=0 +y_0=0 no_defs',NULL,'USA Contiguous Equidistant Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102006,'ESRI','102006','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=50 +lat_1=55 +lat_2=65 +lon_0=-154 +proj=aea +units=m +x_0=0 +y_0=0 no_defs',NULL,'Alaska Albers Equal Area Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102007,'ESRI','102007','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=13 +lat_1=8 +lat_2=18 +lon_0=-157 +proj=aea +units=m +x_0=0 +y_0=0 no_defs',NULL,'Hawaii Albers Equal Area Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102008,'ESRI','102008','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40 +lat_1=20 +lat_2=60 +lon_0=-96 +proj=aea +units=m +x_0=0 +y_0=0 no_defs',NULL,'North America Albers Equal Area Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102009,'ESRI','102009','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40 +lat_1=20 +lat_2=60 +lon_0=-96 +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'North America Lambert Conformal Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102010,'ESRI','102010','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=0 +lat_1=20 +lat_2=60 +lon_0=0 +proj=eqdc +units=m +x_0=0 +y_0=0 no_defs',NULL,'North America Equidistant Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102011,'ESRI','102011','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lon_0=0 +proj=sinu +units=m +x_0=0 +y_0=0 no_defs',NULL,'Africa Sinusoidal',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102012,'ESRI','102012','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=0 +lat_1=30 +lat_2=62 +lon_0=105 +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Asia Lambert Conformal Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102013,'ESRI','102013','proj4_data/esri',NULL,'+ellps=intl +lat_0=30 +lat_1=43 +lat_2=62 +lon_0=10 +proj=aea +units=m +x_0=0 +y_0=0 no_defs',NULL,'Europe Albers Equal Area Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102014,'ESRI','102014','proj4_data/esri',NULL,'+ellps=intl +lat_0=30 +lat_1=43 +lat_2=62 +lon_0=10 +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Europe Lambert Conformal Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102015,'ESRI','102015','proj4_data/esri',NULL,'+ellps=aust_SA +lat_0=-32 +lat_1=-5 +lat_2=-42 +lon_0=-60 +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'South America Lambert Conformal Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102016,'ESRI','102016','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=90 +lon_0=0 +proj=aeqd +units=m +x_0=0 +y_0=0 no_defs',NULL,'North Pole Azimuthal Equidistant',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102017,'ESRI','102017','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=90 +lon_0=0 +proj=laea +units=m +x_0=0 +y_0=0 no_defs',NULL,'North Pole Lambert Azimuthal Equal Area',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102018,'ESRI','102018','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=90 +lon_0=0 +proj=stere +units=m +x_0=0 +y_0=0 no_defs',NULL,'North Pole Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102019,'ESRI','102019','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=-90 +lon_0=0 +proj=aeqd +units=m +x_0=0 +y_0=0 no_defs',NULL,'South Pole Azimuthal Equidistant',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102020,'ESRI','102020','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=-90 +lon_0=0 +proj=laea +units=m +x_0=0 +y_0=0 no_defs',NULL,'South Pole Lambert Azimuthal Equal Area',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102021,'ESRI','102021','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=-90 +lon_0=0 +proj=stere +units=m +x_0=0 +y_0=0 no_defs',NULL,'South Pole Stereographic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102022,'ESRI','102022','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=0 +lat_1=20 +lat_2=-23 +lon_0=25 +proj=aea +units=m +x_0=0 +y_0=0 no_defs',NULL,'Africa Albers Equal Area Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102023,'ESRI','102023','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=0 +lat_1=20 +lat_2=-23 +lon_0=0 +proj=eqdc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Africa Equidistant Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102024,'ESRI','102024','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=0 +lat_1=20 +lat_2=-23 +lon_0=25 +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Africa Lambert Conformal Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102025,'ESRI','102025','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=30 +lat_1=15 +lat_2=65 +lon_0=95 +proj=aea +units=m +x_0=0 +y_0=0 no_defs',NULL,'Asia North Albers Equal Area Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102026,'ESRI','102026','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=0 +lat_1=15 +lat_2=65 +lon_0=0 +proj=eqdc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Asia North Equidistant Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102027,'ESRI','102027','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=30 +lat_1=15 +lat_2=65 +lon_0=95 +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Asia North Lambert Conformal Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102028,'ESRI','102028','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=-15 +lat_1=7 +lat_2=-32 +lon_0=125 +proj=aea +units=m +x_0=0 +y_0=0 no_defs',NULL,'Asia South Albers Equal Area Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102029,'ESRI','102029','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=0 +lat_1=7 +lat_2=-32 +lon_0=0 +proj=eqdc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Asia South Equidistant Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102030,'ESRI','102030','proj4_data/esri',NULL,'+datum=WGS84 +ellps=WGS84 +lat_0=-15 +lat_1=7 +lat_2=-32 +lon_0=125 +proj=lcc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Asia South Lambert Conformal Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102031,'ESRI','102031','proj4_data/esri',NULL,'+ellps=intl +lat_0=0 +lat_1=43 +lat_2=62 +lon_0=0 +proj=eqdc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Europe Equidistant Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102032,'ESRI','102032','proj4_data/esri',NULL,'+ellps=aust_SA +lat_0=0 +lat_1=-5 +lat_2=-42 +lon_0=0 +proj=eqdc +units=m +x_0=0 +y_0=0 no_defs',NULL,'South America Equidistant Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102033,'ESRI','102033','proj4_data/esri',NULL,'+ellps=aust_SA +lat_0=-32 +lat_1=-5 +lat_2=-42 +lon_0=-60 +proj=aea +units=m +x_0=0 +y_0=0 no_defs',NULL,'South America Albers Equal Area Conic',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102065,'ESRI','102065','proj4_data/esri',NULL,'+alpha=30.28813975277778 +ellps=bessel +k=0.9999 +lat_0=49.5 +lon_0=24.83333333333333 +proj=krovak +units=m +x_0=0 +y_0=0 no_defs',NULL,'S-JTSK Krovak',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102066,'ESRI','102066','proj4_data/esri',NULL,'+alpha=30.28813975277778 +ellps=bessel +k=0.9999 +lat_0=49.5 +lon_0=24.83333333333333 +pm=-17.66666666666667 +proj=krovak +units=m +x_0=0 +y_0=0 no_defs',NULL,'S-JTSK Ferro Krovak East North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102067,'ESRI','102067','proj4_data/esri',NULL,'+alpha=30.28813975277778 +ellps=bessel +k=0.9999 +lat_0=49.5 +lon_0=24.83333333333333 +proj=krovak +units=m +x_0=0 +y_0=0 no_defs',NULL,'S-JTSK Krovak East North',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102091,'ESRI','102091','proj4_data/esri',NULL,'+ellps=intl +k=0.999600 +lat_0=0 +lon_0=9 +proj=tmerc +units=m +x_0=1500000 +y_0=0 no_defs',NULL,'Monte Mario Italy 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102092,'ESRI','102092','proj4_data/esri',NULL,'+ellps=intl +k=0.999600 +lat_0=0 +lon_0=15 +proj=tmerc +units=m +x_0=2520000 +y_0=0 no_defs',NULL,'Monte Mario Italy 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102101,'ESRI','102101','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=6.05625 +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 Norway Zone 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102102,'ESRI','102102','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=8.389583333333333 +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 Norway Zone 2',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102103,'ESRI','102103','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=10.72291666666667 +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 Norway Zone 3',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102104,'ESRI','102104','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=13.22291666666667 +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 Norway Zone 4',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102105,'ESRI','102105','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=16.88958333333333 +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 Norway Zone 5',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102106,'ESRI','102106','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=20.88958333333333 +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 Norway Zone 6',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102107,'ESRI','102107','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=24.88958333333333 +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 Norway Zone 7',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102108,'ESRI','102108','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +k=1.000000 +lat_0=58 +lon_0=29.05625 +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'NGO 1948 Norway Zone 8',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102110,'ESRI','102110','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=44 +lat_2=49 +lon_0=3 +proj=lcc +units=m +x_0=700000 +y_0=6600000 no_defs',NULL,'RGF 1993 Lambert 93',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102114,'ESRI','102114','proj4_data/esri',NULL,'+ellps=clrk66 +proj=utm +units=m +zone=4 no_defs',NULL,'Old Hawaiian UTM Zone 4N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102115,'ESRI','102115','proj4_data/esri',NULL,'+ellps=clrk66 +proj=utm +units=m +zone=5 no_defs',NULL,'Old Hawaiian UTM Zone 5N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102120,'ESRI','102120','proj4_data/esri',NULL,'+alpha=337.255555555556 +datum=NAD27 +ellps=clrk66 +k=0.9996 +lat_0=45.30916666666666 +lonc=-86 +proj=omerc +to_meter=0.3048006096012192 +x_0=2546731.495961392 +y_0=-4354009.816002033 no_defs',NULL,'NAD 1927 Michigan GeoRef Feet US',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102121,'ESRI','102121','proj4_data/esri',NULL,'+alpha=337.255555555556 +datum=NAD83 +ellps=GRS80 +k=0.9996 +lat_0=45.30916666666666 +lonc=-86 +proj=omerc +to_meter=0.3048006096012192 +x_0=2546731.495961392 +y_0=-4354009.816002033 no_defs',NULL,'NAD 1983 Michigan GeoRef Feet US',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102122,'ESRI','102122','proj4_data/esri',NULL,'+alpha=337.255555555556 +datum=NAD27 +ellps=clrk66 +k=0.9996 +lat_0=45.30916666666666 +lonc=-86 +proj=omerc +units=m +x_0=2546731.496 +y_0=-4354009.816 no_defs',NULL,'NAD 1927 Michigan GeoRef Meters',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102123,'ESRI','102123','proj4_data/esri',NULL,'+alpha=337.255555555556 +datum=NAD83 +ellps=GRS80 +k=0.9996 +lat_0=45.30916666666666 +lonc=-86 +proj=omerc +units=m +x_0=2546731.496 +y_0=-4354009.816 no_defs',NULL,'NAD 1983 Michigan GeoRef Meters',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102132,'ESRI','102132','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +proj=utm +units=m +zone=32 no_defs',NULL,'NGO 1948 UTM Zone 32N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102133,'ESRI','102133','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +proj=utm +units=m +zone=33 no_defs',NULL,'NGO 1948 UTM Zone 33N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102134,'ESRI','102134','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +proj=utm +units=m +zone=34 no_defs',NULL,'NGO 1948 UTM Zone 34N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102135,'ESRI','102135','proj4_data/esri',NULL,'+a=6377492.018 +b=6356173.508712696 +proj=utm +units=m +zone=35 no_defs',NULL,'NGO 1948 UTM Zone 35N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102140,'ESRI','102140','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=22.31213333333334 +lon_0=114.1785555555556 +proj=tmerc +units=m +x_0=836694.05 +y_0=819069.8 no_defs',NULL,'Hong Kong 1980 Grid',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102141,'ESRI','102141','proj4_data/esri',NULL,'+ellps=intl +proj=utm +units=m +zone=49 no_defs',NULL,'Hong Kong 1980 UTM Zone 49N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102142,'ESRI','102142','proj4_data/esri',NULL,'+ellps=intl +proj=utm +units=m +zone=50 no_defs',NULL,'Hong Kong 1980 UTM Zone 50N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102151,'ESRI','102151','proj4_data/esri',NULL,'+ellps=bessel +proj=utm +units=m +zone=51 no_defs',NULL,'Tokyo UTM Zone 51N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102152,'ESRI','102152','proj4_data/esri',NULL,'+ellps=bessel +proj=utm +units=m +zone=52 no_defs',NULL,'Tokyo UTM Zone 52N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102153,'ESRI','102153','proj4_data/esri',NULL,'+ellps=bessel +proj=utm +units=m +zone=53 no_defs',NULL,'Tokyo UTM Zone 53N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102154,'ESRI','102154','proj4_data/esri',NULL,'+ellps=bessel +proj=utm +units=m +zone=54 no_defs',NULL,'Tokyo UTM Zone 54N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102155,'ESRI','102155','proj4_data/esri',NULL,'+ellps=bessel +proj=utm +units=m +zone=55 no_defs',NULL,'Tokyo UTM Zone 55N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102156,'ESRI','102156','proj4_data/esri',NULL,'+ellps=bessel +proj=utm +units=m +zone=56 no_defs',NULL,'Tokyo UTM Zone 56N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102160,'ESRI','102160','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=39.66666666666666 +lon_0=-8.131906111111112 +proj=tmerc +units=m +x_0=200180.598 +y_0=299913.01 no_defs',NULL,'Datum 73 Hayford Gauss IGeoE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102161,'ESRI','102161','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=39.66666666666666 +lon_0=-8.131906111111112 +proj=tmerc +units=m +x_0=180.598 +y_0=-86.98999999999999 no_defs',NULL,'Datum 73 Hayford Gauss IPCC',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102162,'ESRI','102162','proj4_data/esri',NULL,'+ellps=intl +proj=utm +units=m +zone=26 no_defs',NULL,'Graciosa Base SW 1948 UTM Zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102163,'ESRI','102163','proj4_data/esri',NULL,'+ellps=bessel +units=m no_defs',NULL,'Lisboa Bessel Bonne',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102164,'ESRI','102164','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=39.66666666666666 +lon_0=-8.131906111111112 +proj=tmerc +units=m +x_0=200000 +y_0=300000 no_defs',NULL,'Lisboa Hayford Gauss IGeoE',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102165,'ESRI','102165','proj4_data/esri',NULL,'+ellps=intl +k=1.000000 +lat_0=39.66666666666666 +lon_0=-8.131906111111112 +proj=tmerc +units=m +x_0=0 +y_0=0 no_defs',NULL,'Lisboa Hayford Gauss IPCC',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102166,'ESRI','102166','proj4_data/esri',NULL,'+ellps=intl +proj=utm +units=m +zone=25 no_defs',NULL,'Observ Meteorologico 1939 UTM Zone 25N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102167,'ESRI','102167','proj4_data/esri',NULL,'+ellps=intl +proj=utm +units=m +zone=28 no_defs',NULL,'Porto Santo 1936 UTM Zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102168,'ESRI','102168','proj4_data/esri',NULL,'+ellps=intl +proj=utm +units=m +zone=26 no_defs',NULL,'Sao Braz UTM Zone 26N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102169,'ESRI','102169','proj4_data/esri',NULL,'+ellps=intl +proj=utm +units=m +zone=28 no_defs',NULL,'Selvagem Grande 1938 UTM Zone 28N',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102191,'ESRI','102191','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.999904194 +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=-5.4 +proj=lcc +units=m +x_0=500000 +y_0=300000 no_defs',NULL,'Nord Maroc Degree',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102192,'ESRI','102192','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.999904194 +k_0=0.9996155960000001 +lat_0=29.7 +lat_1=29.7 +lon_0=-5.4 +proj=lcc +units=m +x_0=500000 +y_0=300000 no_defs',NULL,'Sud Maroc Degree',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102193,'ESRI','102193','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.999904194 +k_0=0.9996 +lat_0=26.1 +lat_1=26.1 +lon_0=-5.4 +proj=lcc +units=m +x_0=1200000 +y_0=400000 no_defs',NULL,'Sahara Degree',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_85() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102229,'ESRI','102229','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999960 +lat_0=30.5 +lon_0=-85.83333333333333 +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Alabama East FIPS 0101',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102230,'ESRI','102230','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999933 +lat_0=30 +lon_0=-87.5 +proj=tmerc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Alabama West FIPS 0102',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102241,'ESRI','102241','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40 +lat_2=41.66666666666666 +lon_0=-122 +proj=lcc +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD 1983 HARN StatePlane California I FIPS 0401',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102242,'ESRI','102242','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=38.33333333333334 +lat_2=39.83333333333334 +lon_0=-122 +proj=lcc +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD 1983 HARN StatePlane California II FIPS 0402',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102243,'ESRI','102243','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.5 +lat_1=37.06666666666667 +lat_2=38.43333333333333 +lon_0=-120.5 +proj=lcc +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD 1983 HARN StatePlane California III FIPS 0403',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102244,'ESRI','102244','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=35.33333333333334 +lat_1=36 +lat_2=37.25 +lon_0=-119 +proj=lcc +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD 1983 HARN StatePlane California IV FIPS 0404',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102245,'ESRI','102245','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=33.5 +lat_1=34.03333333333333 +lat_2=35.46666666666667 +lon_0=-118 +proj=lcc +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD 1983 HARN StatePlane California V FIPS 0405',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102246,'ESRI','102246','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=32.16666666666666 +lat_1=32.78333333333333 +lat_2=33.88333333333333 +lon_0=-116.25 +proj=lcc +units=m +x_0=2000000 +y_0=500000 no_defs',NULL,'NAD 1983 HARN StatePlane California VI FIPS 0406',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102248,'ESRI','102248','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-110.1666666666667 +proj=tmerc +units=m +x_0=213360 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Arizona East FIPS 0201',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102249,'ESRI','102249','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-111.9166666666667 +proj=tmerc +units=m +x_0=213360 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Arizona Central FIPS 0202',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102250,'ESRI','102250','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999933 +lat_0=31 +lon_0=-113.75 +proj=tmerc +units=m +x_0=213360 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Arizona West FIPS 0203',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102251,'ESRI','102251','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=34.93333333333333 +lat_2=36.23333333333333 +lon_0=-92 +proj=lcc +units=m +x_0=400000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Arkansas North FIPS 0301',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102252,'ESRI','102252','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=32.66666666666666 +lat_1=33.3 +lat_2=34.76666666666667 +lon_0=-92 +proj=lcc +units=m +x_0=400000 +y_0=400000 no_defs',NULL,'NAD 1983 HARN StatePlane Arkansas South FIPS 0302',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102253,'ESRI','102253','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=39.33333333333334 +lat_1=39.71666666666667 +lat_2=40.78333333333333 +lon_0=-105.5 +proj=lcc +units=m +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'NAD 1983 HARN StatePlane Colorado North FIPS 0501',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102254,'ESRI','102254','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.83333333333334 +lat_1=38.45 +lat_2=39.75 +lon_0=-105.5 +proj=lcc +units=m +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'NAD 1983 HARN StatePlane Colorado Central FIPS 0502',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102255,'ESRI','102255','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=37.23333333333333 +lat_2=38.43333333333333 +lon_0=-105.5 +proj=lcc +units=m +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'NAD 1983 HARN StatePlane Colorado South FIPS 0503',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102256,'ESRI','102256','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=40.83333333333334 +lat_1=41.2 +lat_2=41.86666666666667 +lon_0=-72.75 +proj=lcc +units=m +x_0=304800.6096 +y_0=152400.3048 no_defs',NULL,'NAD 1983 HARN StatePlane Connecticut FIPS 0600',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102257,'ESRI','102257','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Delaware FIPS 0700',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102258,'ESRI','102258','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-81 +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Florida East FIPS 0901',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102259,'ESRI','102259','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-82 +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Florida West FIPS 0902',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102260,'ESRI','102260','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=29 +lat_1=29.58333333333333 +lat_2=30.75 +lon_0=-84.5 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Florida North FIPS 0903',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102261,'ESRI','102261','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=18.83333333333333 +lon_0=-155.5 +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Hawaii 1 FIPS 5101',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102262,'ESRI','102262','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=20.33333333333333 +lon_0=-156.6666666666667 +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Hawaii 2 FIPS 5102',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102263,'ESRI','102263','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999990 +lat_0=21.16666666666667 +lon_0=-158 +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Hawaii 3 FIPS 5103',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102264,'ESRI','102264','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999990 +lat_0=21.83333333333333 +lon_0=-159.5 +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Hawaii 4 FIPS 5104',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102265,'ESRI','102265','proj4_data/esri',NULL,'+ellps=GRS80 +k=1.000000 +lat_0=21.66666666666667 +lon_0=-160.1666666666667 +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Hawaii 5 FIPS 5105',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102266,'ESRI','102266','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=30 +lon_0=-82.16666666666667 +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Georgia East FIPS 1001',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102267,'ESRI','102267','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=30 +lon_0=-84.16666666666667 +proj=tmerc +units=m +x_0=700000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Georgia West FIPS 1002',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102268,'ESRI','102268','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Idaho East FIPS 1101',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102269,'ESRI','102269','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-114 +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Idaho Central FIPS 1102',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102270,'ESRI','102270','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999933 +lat_0=41.66666666666666 +lon_0=-115.75 +proj=tmerc +units=m +x_0=800000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Idaho West FIPS 1103',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102271,'ESRI','102271','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999975 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +proj=tmerc +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Illinois East FIPS 1201',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102272,'ESRI','102272','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999941 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +proj=tmerc +units=m +x_0=700000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Illinois West FIPS 1202',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102273,'ESRI','102273','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=37.5 +lon_0=-85.66666666666667 +proj=tmerc +units=m +x_0=100000 +y_0=250000 no_defs',NULL,'NAD 1983 HARN StatePlane Indiana East FIPS 1301',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102274,'ESRI','102274','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=37.5 +lon_0=-87.08333333333333 +proj=tmerc +units=m +x_0=900000 +y_0=250000 no_defs',NULL,'NAD 1983 HARN StatePlane Indiana West FIPS 1302',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102277,'ESRI','102277','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=38.71666666666667 +lat_2=39.78333333333333 +lon_0=-98 +proj=lcc +units=m +x_0=400000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Kansas North FIPS 1501',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102278,'ESRI','102278','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=37.26666666666667 +lat_2=38.56666666666667 +lon_0=-98.5 +proj=lcc +units=m +x_0=400000 +y_0=400000 no_defs',NULL,'NAD 1983 HARN StatePlane Kansas South FIPS 1502',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102279,'ESRI','102279','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +proj=lcc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Kentucky North FIPS 1601',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102280,'ESRI','102280','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=36.73333333333333 +lat_2=37.93333333333333 +lon_0=-85.75 +proj=lcc +units=m +x_0=500000 +y_0=500000 no_defs',NULL,'NAD 1983 HARN StatePlane Kentucky South FIPS 1602',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102281,'ESRI','102281','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=30.5 +lat_1=31.16666666666667 +lat_2=32.66666666666666 +lon_0=-92.5 +proj=lcc +units=m +x_0=1000000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Louisiana North FIPS 1701',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102282,'ESRI','102282','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=28.5 +lat_1=29.3 +lat_2=30.7 +lon_0=-91.33333333333333 +proj=lcc +units=m +x_0=1000000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Louisiana South FIPS 1702',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102283,'ESRI','102283','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=43.66666666666666 +lon_0=-68.5 +proj=tmerc +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Maine East FIPS 1801',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102284,'ESRI','102284','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +proj=tmerc +units=m +x_0=900000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Maine West FIPS 1802',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102285,'ESRI','102285','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=38.3 +lat_2=39.45 +lon_0=-77 +proj=lcc +units=m +x_0=400000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Maryland FIPS 1900',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102286,'ESRI','102286','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=41.71666666666667 +lat_2=42.68333333333333 +lon_0=-71.5 +proj=lcc +units=m +x_0=200000 +y_0=750000 no_defs',NULL,'NAD 1983 HARN StatePlane Massachusetts Mainland FIPS 2001',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102287,'ESRI','102287','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41 +lat_1=41.28333333333333 +lat_2=41.48333333333333 +lon_0=-70.5 +proj=lcc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Massachusetts Island FIPS 2002',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102288,'ESRI','102288','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=44.78333333333333 +lat_1=45.48333333333333 +lat_2=47.08333333333334 +lon_0=-87 +proj=lcc +units=m +x_0=8000000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Michigan North FIPS 2111',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102289,'ESRI','102289','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43.31666666666667 +lat_1=44.18333333333333 +lat_2=45.7 +lon_0=-84.36666666666666 +proj=lcc +units=m +x_0=6000000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Michigan Central FIPS 2112',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102290,'ESRI','102290','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41.5 +lat_1=42.1 +lat_2=43.66666666666666 +lon_0=-84.36666666666666 +proj=lcc +units=m +x_0=4000000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Michigan South FIPS 2113',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102291,'ESRI','102291','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=46.5 +lat_1=47.03333333333333 +lat_2=48.63333333333333 +lon_0=-93.09999999999999 +proj=lcc +units=m +x_0=800000 +y_0=100000 no_defs',NULL,'NAD 1983 HARN StatePlane Minnesota North FIPS 2201',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102292,'ESRI','102292','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=45 +lat_1=45.61666666666667 +lat_2=47.05 +lon_0=-94.25 +proj=lcc +units=m +x_0=800000 +y_0=100000 no_defs',NULL,'NAD 1983 HARN StatePlane Minnesota Central FIPS 2202',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102293,'ESRI','102293','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43 +lat_1=43.78333333333333 +lat_2=45.21666666666667 +lon_0=-94 +proj=lcc +units=m +x_0=800000 +y_0=100000 no_defs',NULL,'NAD 1983 HARN StatePlane Minnesota South FIPS 2203',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102294,'ESRI','102294','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999950 +lat_0=29.5 +lon_0=-88.83333333333333 +proj=tmerc +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Mississippi East FIPS 2301',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102295,'ESRI','102295','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999950 +lat_0=29.5 +lon_0=-90.33333333333333 +proj=tmerc +units=m +x_0=700000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Mississippi West FIPS 2302',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102296,'ESRI','102296','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999933 +lat_0=35.83333333333334 +lon_0=-90.5 +proj=tmerc +units=m +x_0=250000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Missouri East FIPS 2401',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102297,'ESRI','102297','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999933 +lat_0=35.83333333333334 +lon_0=-92.5 +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Missouri Central FIPS 2402',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102298,'ESRI','102298','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999941 +lat_0=36.16666666666666 +lon_0=-94.5 +proj=tmerc +units=m +x_0=850000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Missouri West FIPS 2403',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102300,'ESRI','102300','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=44.25 +lat_1=45 +lat_2=49 +lon_0=-109.5 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Montana FIPS 2500',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102304,'ESRI','102304','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=39.83333333333334 +lat_1=40 +lat_2=43 +lon_0=-100 +proj=lcc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Nebraska FIPS 2600',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102307,'ESRI','102307','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=34.75 +lon_0=-115.5833333333333 +proj=tmerc +units=m +x_0=200000 +y_0=8000000 no_defs',NULL,'NAD 1983 HARN StatePlane Nevada East FIPS 2701',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102308,'ESRI','102308','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=34.75 +lon_0=-116.6666666666667 +proj=tmerc +units=m +x_0=500000 +y_0=6000000 no_defs',NULL,'NAD 1983 HARN StatePlane Nevada Central FIPS 2702',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102309,'ESRI','102309','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=34.75 +lon_0=-118.5833333333333 +proj=tmerc +units=m +x_0=800000 +y_0=4000000 no_defs',NULL,'NAD 1983 HARN StatePlane Nevada West FIPS 2703',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102310,'ESRI','102310','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999967 +lat_0=42.5 +lon_0=-71.66666666666667 +proj=tmerc +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane New Hampshire FIPS 2800',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102311,'ESRI','102311','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=38.83333333333334 +lon_0=-74.5 +proj=tmerc +units=m +x_0=150000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane New Jersey FIPS 2900',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102312,'ESRI','102312','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999909 +lat_0=31 +lon_0=-104.3333333333333 +proj=tmerc +units=m +x_0=165000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane New Mexico East FIPS 3001',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102313,'ESRI','102313','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-106.25 +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane New Mexico Central FIPS 3002',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102314,'ESRI','102314','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999917 +lat_0=31 +lon_0=-107.8333333333333 +proj=tmerc +units=m +x_0=830000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane New Mexico West FIPS 3003',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102315,'ESRI','102315','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999900 +lat_0=38.83333333333334 +lon_0=-74.5 +proj=tmerc +units=m +x_0=150000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane New York East FIPS 3101',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102316,'ESRI','102316','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40 +lon_0=-76.58333333333333 +proj=tmerc +units=m +x_0=250000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane New York Central FIPS 3102',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102317,'ESRI','102317','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40 +lon_0=-78.58333333333333 +proj=tmerc +units=m +x_0=350000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane New York West FIPS 3103',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102318,'ESRI','102318','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=40.16666666666666 +lat_1=40.66666666666666 +lat_2=41.03333333333333 +lon_0=-74 +proj=lcc +units=m +x_0=300000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane New York Long Island FIPS 3104',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102320,'ESRI','102320','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=47.43333333333333 +lat_2=48.73333333333333 +lon_0=-100.5 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane North Dakota North FIPS 3301',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102321,'ESRI','102321','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=45.66666666666666 +lat_1=46.18333333333333 +lat_2=47.48333333333333 +lon_0=-100.5 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane North Dakota South FIPS 3302',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102322,'ESRI','102322','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=39.66666666666666 +lat_1=40.43333333333333 +lat_2=41.7 +lon_0=-82.5 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Ohio North FIPS 3401',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102323,'ESRI','102323','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=38 +lat_1=38.73333333333333 +lat_2=40.03333333333333 +lon_0=-82.5 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Ohio South FIPS 3402',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102324,'ESRI','102324','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=35 +lat_1=35.56666666666667 +lat_2=36.76666666666667 +lon_0=-98 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Oklahoma North FIPS 3501',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102325,'ESRI','102325','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=33.33333333333334 +lat_1=33.93333333333333 +lat_2=35.23333333333333 +lon_0=-98 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Oklahoma South FIPS 3502',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102326,'ESRI','102326','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43.66666666666666 +lat_1=44.33333333333334 +lat_2=46 +lon_0=-120.5 +proj=lcc +units=m +x_0=2500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Oregon North FIPS 3601',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102327,'ESRI','102327','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=41.66666666666666 +lat_1=42.33333333333334 +lat_2=44 +lon_0=-120.5 +proj=lcc +units=m +x_0=1500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Oregon South FIPS 3602',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102330,'ESRI','102330','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999994 +lat_0=41.08333333333334 +lon_0=-71.5 +proj=tmerc +units=m +x_0=100000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Rhode Island FIPS 3800',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102334,'ESRI','102334','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=44.41666666666666 +lat_2=45.68333333333333 +lon_0=-100 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane South Dakota North FIPS 4001',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102335,'ESRI','102335','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=42.33333333333334 +lat_1=42.83333333333334 +lat_2=44.4 +lon_0=-100.3333333333333 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane South Dakota South FIPS 4002',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102336,'ESRI','102336','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=34.33333333333334 +lat_1=35.25 +lat_2=36.41666666666666 +lon_0=-86 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Tennessee FIPS 4100',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102337,'ESRI','102337','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=34 +lat_1=34.65 +lat_2=36.18333333333333 +lon_0=-101.5 +proj=lcc +units=m +x_0=200000 +y_0=1000000 no_defs',NULL,'NAD 1983 HARN StatePlane Texas North FIPS 4201',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102338,'ESRI','102338','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=31.66666666666667 +lat_1=32.13333333333333 +lat_2=33.96666666666667 +lon_0=-98.5 +proj=lcc +units=m +x_0=600000 +y_0=2000000 no_defs',NULL,'NAD 1983 HARN StatePlane Texas North Central FIPS 4202',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102339,'ESRI','102339','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=29.66666666666667 +lat_1=30.11666666666667 +lat_2=31.88333333333333 +lon_0=-100.3333333333333 +proj=lcc +units=m +x_0=700000 +y_0=3000000 no_defs',NULL,'NAD 1983 HARN StatePlane Texas Central FIPS 4203',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102340,'ESRI','102340','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=27.83333333333333 +lat_1=28.38333333333333 +lat_2=30.28333333333334 +lon_0=-99 +proj=lcc +units=m +x_0=600000 +y_0=4000000 no_defs',NULL,'NAD 1983 HARN StatePlane Texas South Central FIPS 4204',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102341,'ESRI','102341','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=25.66666666666667 +lat_1=26.16666666666667 +lat_2=27.83333333333333 +lon_0=-98.5 +proj=lcc +units=m +x_0=300000 +y_0=5000000 no_defs',NULL,'NAD 1983 HARN StatePlane Texas South FIPS 4205',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102342,'ESRI','102342','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=40.33333333333334 +lat_1=40.71666666666667 +lat_2=41.78333333333333 +lon_0=-111.5 +proj=lcc +units=m +x_0=500000 +y_0=1000000 no_defs',NULL,'NAD 1983 HARN StatePlane Utah North FIPS 4301',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102343,'ESRI','102343','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=38.33333333333334 +lat_1=39.01666666666667 +lat_2=40.65 +lon_0=-111.5 +proj=lcc +units=m +x_0=500000 +y_0=2000000 no_defs',NULL,'NAD 1983 HARN StatePlane Utah Central FIPS 4302',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102344,'ESRI','102344','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.66666666666666 +lat_1=37.21666666666667 +lat_2=38.35 +lon_0=-111.5 +proj=lcc +units=m +x_0=500000 +y_0=3000000 no_defs',NULL,'NAD 1983 HARN StatePlane Utah South FIPS 4303',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102345,'ESRI','102345','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999964 +lat_0=42.5 +lon_0=-72.5 +proj=tmerc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Vermont FIPS 4400',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102346,'ESRI','102346','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37.66666666666666 +lat_1=38.03333333333333 +lat_2=39.2 +lon_0=-78.5 +proj=lcc +units=m +x_0=3500000 +y_0=2000000 no_defs',NULL,'NAD 1983 HARN StatePlane Virginia North FIPS 4501',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102347,'ESRI','102347','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=36.33333333333334 +lat_1=36.76666666666667 +lat_2=37.96666666666667 +lon_0=-78.5 +proj=lcc +units=m +x_0=3500000 +y_0=1000000 no_defs',NULL,'NAD 1983 HARN StatePlane Virginia South FIPS 4502',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102348,'ESRI','102348','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=47 +lat_1=47.5 +lat_2=48.73333333333333 +lon_0=-120.8333333333333 +proj=lcc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Washington North FIPS 4601',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102349,'ESRI','102349','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=45.33333333333334 +lat_1=45.83333333333334 +lat_2=47.33333333333334 +lon_0=-120.5 +proj=lcc +units=m +x_0=500000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Washington South FIPS 4602',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102350,'ESRI','102350','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=38.5 +lat_1=39 +lat_2=40.25 +lon_0=-79.5 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane West Virginia North FIPS 4701',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102351,'ESRI','102351','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=37 +lat_1=37.48333333333333 +lat_2=38.88333333333333 +lon_0=-81 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane West Virginia South FIPS 4702',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102352,'ESRI','102352','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=45.16666666666666 +lat_1=45.56666666666667 +lat_2=46.76666666666667 +lon_0=-90 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Wisconsin North FIPS 4801',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102353,'ESRI','102353','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=43.83333333333334 +lat_1=44.25 +lat_2=45.5 +lon_0=-90 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Wisconsin Central FIPS 4802',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_86() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102354,'ESRI','102354','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=42 +lat_1=42.73333333333333 +lat_2=44.06666666666667 +lon_0=-90 +proj=lcc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Wisconsin South FIPS 4803',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102355,'ESRI','102355','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-105.1666666666667 +proj=tmerc +units=m +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Wyoming East FIPS 4901',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102356,'ESRI','102356','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-107.3333333333333 +proj=tmerc +units=m +x_0=400000 +y_0=100000 no_defs',NULL,'NAD 1983 HARN StatePlane Wyoming East Central FIPS 4902',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102357,'ESRI','102357','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-108.75 +proj=tmerc +units=m +x_0=600000 +y_0=0 no_defs',NULL,'NAD 1983 HARN StatePlane Wyoming West Central FIPS 4903',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102358,'ESRI','102358','proj4_data/esri',NULL,'+ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-110.0833333333333 +proj=tmerc +units=m +x_0=800000 +y_0=100000 no_defs',NULL,'NAD 1983 HARN StatePlane Wyoming West FIPS 4904',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102361,'ESRI','102361','proj4_data/esri',NULL,'+ellps=GRS80 +lat_0=17.83333333333333 +lat_1=18.03333333333334 +lat_2=18.43333333333333 +lon_0=-66.43333333333334 +proj=lcc +units=m +x_0=200000 +y_0=200000 no_defs',NULL,'NAD 1983 HARN StatePlane Puerto Rico Virgin Islands FIPS 5200',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102491,'ESRI','102491','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.999904194 +k_0=0.999625544 +lat_0=36 +lat_1=36 +lon_0=2.7 +proj=lcc +units=m +x_0=500000 +y_0=300000 no_defs',NULL,'Nord Algerie Ancienne Degree',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102492,'ESRI','102492','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.999904194 +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=2.7 +proj=lcc +units=m +x_0=500000 +y_0=300000 no_defs',NULL,'Sud Algerie Ancienne Degree',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102581,'ESRI','102581','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.999904194 +k_0=0.999877341 +lat_0=49.5 +lat_1=49.5 +lon_0=2.337229166666667 +proj=lcc +units=m +x_0=600000 +y_0=1200000 no_defs',NULL,'NTF France I degrees',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102582,'ESRI','102582','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.999904194 +k_0=0.99987742 +lat_0=46.8 +lat_1=46.8 +lon_0=2.337229166666667 +proj=lcc +units=m +x_0=600000 +y_0=2200000 no_defs',NULL,'NTF France II degrees',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102583,'ESRI','102583','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.999904194 +k_0=0.999877499 +lat_0=44.1 +lat_1=44.1 +lon_0=2.337229166666667 +proj=lcc +units=m +x_0=600000 +y_0=3200000 no_defs',NULL,'NTF France III degrees',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102584,'ESRI','102584','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.999904194 +k_0=0.99994471 +lat_0=42.165 +lat_1=42.165 +lon_0=2.337229166666667 +proj=lcc +units=m +x_0=234.358 +y_0=4185861.369 no_defs',NULL,'NTF France IV degrees',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102591,'ESRI','102591','proj4_data/esri',NULL,'+ellps=clrk80 +k_0=0.999625544 +lat_0=36 +lat_1=36 +lon_0=2.7 +proj=lcc +units=m +x_0=500135 +y_0=300090 no_defs',NULL,'Nord Algerie Degree',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102592,'ESRI','102592','proj4_data/esri',NULL,'+ellps=clrk80 +k_0=0.999625769 +lat_0=33.3 +lat_1=33.3 +lon_0=2.7 +proj=lcc +units=m +x_0=500135 +y_0=300090 no_defs',NULL,'Sud Algerie Degree',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102629,'ESRI','102629','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999960 +lat_0=30.5 +lon_0=-85.83333333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Alabama East FIPS 0101 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102630,'ESRI','102630','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999933 +lat_0=30 +lon_0=-87.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Alabama West FIPS 0102 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102631,'ESRI','102631','proj4_data/esri',NULL,'+alpha=-36.86989764583333 +datum=NAD83 +ellps=GRS80 +k=0.9999 +lat_0=57 +lonc=-133.6666666666667 +proj=omerc +to_meter=0.3048006096012192 +x_0=4999999.999999999 +y_0=-4999999.999999999 no_defs',NULL,'NAD 1983 StatePlane Alaska 1 FIPS 5001 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102632,'ESRI','102632','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-142 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Alaska 2 FIPS 5002 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102633,'ESRI','102633','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-146 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Alaska 3 FIPS 5003 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102634,'ESRI','102634','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-150 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Alaska 4 FIPS 5004 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102635,'ESRI','102635','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-154 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Alaska 5 FIPS 5005 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102636,'ESRI','102636','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-158 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Alaska 6 FIPS 5006 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102637,'ESRI','102637','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-162 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Alaska 7 FIPS 5007 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102638,'ESRI','102638','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-166 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Alaska 8 FIPS 5008 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102639,'ESRI','102639','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=54 +lon_0=-170 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Alaska 9 FIPS 5009 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102640,'ESRI','102640','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=51 +lat_1=51.83333333333334 +lat_2=53.83333333333334 +lon_0=-176 +proj=lcc +to_meter=0.3048006096012192 +x_0=1000000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Alaska 10 FIPS 5010 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102641,'ESRI','102641','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.33333333333334 +lat_1=40 +lat_2=41.66666666666666 +lon_0=-122 +proj=lcc +to_meter=0.3048006096012192 +x_0=2000000 +y_0=500000.0000000002 no_defs',NULL,'NAD 1983 StatePlane California I FIPS 0401 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102642,'ESRI','102642','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.66666666666666 +lat_1=38.33333333333334 +lat_2=39.83333333333334 +lon_0=-122 +proj=lcc +to_meter=0.3048006096012192 +x_0=2000000 +y_0=500000.0000000002 no_defs',NULL,'NAD 1983 StatePlane California II FIPS 0402 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102643,'ESRI','102643','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.5 +lat_1=37.06666666666667 +lat_2=38.43333333333333 +lon_0=-120.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=2000000 +y_0=500000.0000000002 no_defs',NULL,'NAD 1983 StatePlane California III FIPS 0403 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102644,'ESRI','102644','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=35.33333333333334 +lat_1=36 +lat_2=37.25 +lon_0=-119 +proj=lcc +to_meter=0.3048006096012192 +x_0=2000000 +y_0=500000.0000000002 no_defs',NULL,'NAD 1983 StatePlane California IV FIPS 0404 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102645,'ESRI','102645','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=33.5 +lat_1=34.03333333333333 +lat_2=35.46666666666667 +lon_0=-118 +proj=lcc +to_meter=0.3048006096012192 +x_0=2000000 +y_0=500000.0000000002 no_defs',NULL,'NAD 1983 StatePlane California V FIPS 0405 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102646,'ESRI','102646','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=32.16666666666666 +lat_1=32.78333333333333 +lat_2=33.88333333333333 +lon_0=-116.25 +proj=lcc +to_meter=0.3048006096012192 +x_0=2000000 +y_0=500000.0000000002 no_defs',NULL,'NAD 1983 StatePlane California VI FIPS 0406 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102648,'ESRI','102648','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-110.1666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=213360 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Arizona East FIPS 0201 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102649,'ESRI','102649','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-111.9166666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=213360 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Arizona Central FIPS 0202 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102650,'ESRI','102650','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999933 +lat_0=31 +lon_0=-113.75 +proj=tmerc +to_meter=0.3048006096012192 +x_0=213360 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Arizona West FIPS 0203 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102651,'ESRI','102651','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=34.33333333333334 +lat_1=34.93333333333333 +lat_2=36.23333333333333 +lon_0=-92 +proj=lcc +to_meter=0.3048006096012192 +x_0=399999.9999999999 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Arkansas North FIPS 0301 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102652,'ESRI','102652','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=32.66666666666666 +lat_1=33.3 +lat_2=34.76666666666667 +lon_0=-92 +proj=lcc +to_meter=0.3048006096012192 +x_0=399999.9999999999 +y_0=399999.9999999999 no_defs',NULL,'NAD 1983 StatePlane Arkansas South FIPS 0302 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102653,'ESRI','102653','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.33333333333334 +lat_1=39.71666666666667 +lat_2=40.78333333333333 +lon_0=-105.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'NAD 1983 StatePlane Colorado North FIPS 0501 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102654,'ESRI','102654','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.83333333333334 +lat_1=38.45 +lat_2=39.75 +lon_0=-105.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'NAD 1983 StatePlane Colorado Central FIPS 0502 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102655,'ESRI','102655','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.66666666666666 +lat_1=37.23333333333333 +lat_2=38.43333333333333 +lon_0=-105.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=914401.8289 +y_0=304800.6096 no_defs',NULL,'NAD 1983 StatePlane Colorado South FIPS 0503 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102656,'ESRI','102656','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40.83333333333334 +lat_1=41.2 +lat_2=41.86666666666667 +lon_0=-72.75 +proj=lcc +to_meter=0.3048006096012192 +x_0=304800.6096 +y_0=152400.3048 no_defs',NULL,'NAD 1983 StatePlane Connecticut FIPS 0600 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102657,'ESRI','102657','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999995 +lat_0=38 +lon_0=-75.41666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Delaware FIPS 0700 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102658,'ESRI','102658','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-81 +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Florida East FIPS 0901 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102659,'ESRI','102659','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999941 +lat_0=24.33333333333333 +lon_0=-82 +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Florida West FIPS 0902 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102660,'ESRI','102660','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=29 +lat_1=29.58333333333333 +lat_2=30.75 +lon_0=-84.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Florida North FIPS 0903 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102661,'ESRI','102661','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=18.83333333333333 +lon_0=-155.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Hawaii 1 FIPS 5101 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102662,'ESRI','102662','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=20.33333333333333 +lon_0=-156.6666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Hawaii 2 FIPS 5102 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102663,'ESRI','102663','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999990 +lat_0=21.16666666666667 +lon_0=-158 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Hawaii 3 FIPS 5103 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102664,'ESRI','102664','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999990 +lat_0=21.83333333333333 +lon_0=-159.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Hawaii 4 FIPS 5104 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102665,'ESRI','102665','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=1.000000 +lat_0=21.66666666666667 +lon_0=-160.1666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Hawaii 5 FIPS 5105 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102666,'ESRI','102666','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=30 +lon_0=-82.16666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Georgia East FIPS 1001 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102667,'ESRI','102667','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=30 +lon_0=-84.16666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=700000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Georgia West FIPS 1002 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102668,'ESRI','102668','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-112.1666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Idaho East FIPS 1101 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102669,'ESRI','102669','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999947 +lat_0=41.66666666666666 +lon_0=-114 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Idaho Central FIPS 1102 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102670,'ESRI','102670','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999933 +lat_0=41.66666666666666 +lon_0=-115.75 +proj=tmerc +to_meter=0.3048006096012192 +x_0=799999.9999999999 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Idaho West FIPS 1103 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102671,'ESRI','102671','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999975 +lat_0=36.66666666666666 +lon_0=-88.33333333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=300000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Illinois East FIPS 1201 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102672,'ESRI','102672','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999941 +lat_0=36.66666666666666 +lon_0=-90.16666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=700000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Illinois West FIPS 1202 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102673,'ESRI','102673','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=37.5 +lon_0=-85.66666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=100000 +y_0=250000 no_defs',NULL,'NAD 1983 StatePlane Indiana East FIPS 1301 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102674,'ESRI','102674','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=37.5 +lon_0=-87.08333333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=900000.0000000001 +y_0=250000 no_defs',NULL,'NAD 1983 StatePlane Indiana West FIPS 1302 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102675,'ESRI','102675','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41.5 +lat_1=42.06666666666667 +lat_2=43.26666666666667 +lon_0=-93.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=1500000 +y_0=1000000 no_defs',NULL,'NAD 1983 StatePlane Iowa North FIPS 1401 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102676,'ESRI','102676','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40 +lat_1=40.61666666666667 +lat_2=41.78333333333333 +lon_0=-93.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Iowa South FIPS 1402 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102677,'ESRI','102677','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=38.33333333333334 +lat_1=38.71666666666667 +lat_2=39.78333333333333 +lon_0=-98 +proj=lcc +to_meter=0.3048006096012192 +x_0=399999.9999999999 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Kansas North FIPS 1501 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102678,'ESRI','102678','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.66666666666666 +lat_1=37.26666666666667 +lat_2=38.56666666666667 +lon_0=-98.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=399999.9999999999 +y_0=399999.9999999999 no_defs',NULL,'NAD 1983 StatePlane Kansas South FIPS 1502 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102679,'ESRI','102679','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.5 +lat_1=37.96666666666667 +lat_2=38.96666666666667 +lon_0=-84.25 +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Kentucky North FIPS 1601 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102680,'ESRI','102680','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.33333333333334 +lat_1=36.73333333333333 +lat_2=37.93333333333333 +lon_0=-85.75 +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=500000.0000000002 no_defs',NULL,'NAD 1983 StatePlane Kentucky South FIPS 1602 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102681,'ESRI','102681','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=30.5 +lat_1=31.16666666666667 +lat_2=32.66666666666666 +lon_0=-92.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=1000000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Louisiana North FIPS 1701 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102682,'ESRI','102682','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=28.5 +lat_1=29.3 +lat_2=30.7 +lon_0=-91.33333333333333 +proj=lcc +to_meter=0.3048006096012192 +x_0=1000000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Louisiana South FIPS 1702 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102683,'ESRI','102683','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=43.66666666666666 +lon_0=-68.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=300000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Maine East FIPS 1801 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102684,'ESRI','102684','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=42.83333333333334 +lon_0=-70.16666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=900000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Maine West FIPS 1802 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102685,'ESRI','102685','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.66666666666666 +lat_1=38.3 +lat_2=39.45 +lon_0=-77 +proj=lcc +to_meter=0.3048006096012192 +x_0=399999.9999999999 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Maryland FIPS 1900 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102686,'ESRI','102686','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41 +lat_1=41.71666666666667 +lat_2=42.68333333333333 +lon_0=-71.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=200000 +y_0=750000.0000000001 no_defs',NULL,'NAD 1983 StatePlane Massachusetts Mainland FIPS 2001 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102687,'ESRI','102687','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41 +lat_1=41.28333333333333 +lat_2=41.48333333333333 +lon_0=-70.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Massachusetts Island FIPS 2002 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102688,'ESRI','102688','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=44.78333333333333 +lat_1=45.48333333333333 +lat_2=47.08333333333334 +lon_0=-87 +proj=lcc +to_meter=0.3048006096012192 +x_0=7999999.999999999 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Michigan North FIPS 2111 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102689,'ESRI','102689','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43.31666666666667 +lat_1=44.18333333333333 +lat_2=45.7 +lon_0=-84.36666666666666 +proj=lcc +to_meter=0.3048006096012192 +x_0=6000000.000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Michigan Central FIPS 2112 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102690,'ESRI','102690','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41.5 +lat_1=42.1 +lat_2=43.66666666666666 +lon_0=-84.36666666666666 +proj=lcc +to_meter=0.3048006096012192 +x_0=4000000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Michigan South FIPS 2113 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102691,'ESRI','102691','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=46.5 +lat_1=47.03333333333333 +lat_2=48.63333333333333 +lon_0=-93.09999999999999 +proj=lcc +to_meter=0.3048006096012192 +x_0=799999.9999999999 +y_0=100000 no_defs',NULL,'NAD 1983 StatePlane Minnesota North FIPS 2201 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102692,'ESRI','102692','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=45 +lat_1=45.61666666666667 +lat_2=47.05 +lon_0=-94.25 +proj=lcc +to_meter=0.3048006096012192 +x_0=799999.9999999999 +y_0=100000 no_defs',NULL,'NAD 1983 StatePlane Minnesota Central FIPS 2202 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102693,'ESRI','102693','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43 +lat_1=43.78333333333333 +lat_2=45.21666666666667 +lon_0=-94 +proj=lcc +to_meter=0.3048006096012192 +x_0=799999.9999999999 +y_0=100000 no_defs',NULL,'NAD 1983 StatePlane Minnesota South FIPS 2203 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102694,'ESRI','102694','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999950 +lat_0=29.5 +lon_0=-88.83333333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=300000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Mississippi East FIPS 2301 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102695,'ESRI','102695','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999950 +lat_0=29.5 +lon_0=-90.33333333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=700000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Mississippi West FIPS 2302 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102696,'ESRI','102696','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999933 +lat_0=35.83333333333334 +lon_0=-90.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=250000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Missouri East FIPS 2401 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102697,'ESRI','102697','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999933 +lat_0=35.83333333333334 +lon_0=-92.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Missouri Central FIPS 2402 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102698,'ESRI','102698','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999941 +lat_0=36.16666666666666 +lon_0=-94.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=850000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Missouri West FIPS 2403 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102700,'ESRI','102700','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=44.25 +lat_1=45 +lat_2=49 +lon_0=-109.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Montana FIPS 2500 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102704,'ESRI','102704','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.83333333333334 +lat_1=40 +lat_2=43 +lon_0=-100 +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Nebraska FIPS 2600 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102707,'ESRI','102707','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=34.75 +lon_0=-115.5833333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000 +y_0=7999999.999999999 no_defs',NULL,'NAD 1983 StatePlane Nevada East FIPS 2701 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102708,'ESRI','102708','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=34.75 +lon_0=-116.6666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=6000000.000000001 no_defs',NULL,'NAD 1983 StatePlane Nevada Central FIPS 2702 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102709,'ESRI','102709','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=34.75 +lon_0=-118.5833333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=799999.9999999999 +y_0=4000000 no_defs',NULL,'NAD 1983 StatePlane Nevada West FIPS 2703 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102710,'ESRI','102710','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999967 +lat_0=42.5 +lon_0=-71.66666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=300000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane New Hampshire FIPS 2800 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102711,'ESRI','102711','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=38.83333333333334 +lon_0=-74.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=150000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane New Jersey FIPS 2900 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102712,'ESRI','102712','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999909 +lat_0=31 +lon_0=-104.3333333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=165000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane New Mexico East FIPS 3001 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102713,'ESRI','102713','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=31 +lon_0=-106.25 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane New Mexico Central FIPS 3002 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102714,'ESRI','102714','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999917 +lat_0=31 +lon_0=-107.8333333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=829999.9999999999 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane New Mexico West FIPS 3003 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102715,'ESRI','102715','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999900 +lat_0=38.83333333333334 +lon_0=-74.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=150000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane New York East FIPS 3101 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102716,'ESRI','102716','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40 +lon_0=-76.58333333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=250000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane New York Central FIPS 3102 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102717,'ESRI','102717','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40 +lon_0=-78.58333333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=350000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane New York West FIPS 3103 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102718,'ESRI','102718','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40.16666666666666 +lat_1=40.66666666666666 +lat_2=41.03333333333333 +lon_0=-74 +proj=lcc +to_meter=0.3048006096012192 +x_0=300000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane New York Long Island FIPS 3104 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102719,'ESRI','102719','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=33.75 +lat_1=34.33333333333334 +lat_2=36.16666666666666 +lon_0=-79 +proj=lcc +to_meter=0.3048006096012192 +x_0=609601.2199999999 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane North Carolina FIPS 3200 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102720,'ESRI','102720','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=47 +lat_1=47.43333333333333 +lat_2=48.73333333333333 +lon_0=-100.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane North Dakota North FIPS 3301 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102721,'ESRI','102721','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=45.66666666666666 +lat_1=46.18333333333333 +lat_2=47.48333333333333 +lon_0=-100.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane North Dakota South FIPS 3302 Feet',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA_87() +{ + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102722,'ESRI','102722','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.66666666666666 +lat_1=40.43333333333333 +lat_2=41.7 +lon_0=-82.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Ohio North FIPS 3401 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102723,'ESRI','102723','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=38 +lat_1=38.73333333333333 +lat_2=40.03333333333333 +lon_0=-82.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Ohio South FIPS 3402 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102724,'ESRI','102724','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=35 +lat_1=35.56666666666667 +lat_2=36.76666666666667 +lon_0=-98 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Oklahoma North FIPS 3501 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102725,'ESRI','102725','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=33.33333333333334 +lat_1=33.93333333333333 +lat_2=35.23333333333333 +lon_0=-98 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Oklahoma South FIPS 3502 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102726,'ESRI','102726','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43.66666666666666 +lat_1=44.33333333333334 +lat_2=46 +lon_0=-120.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=2500000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Oregon North FIPS 3601 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102727,'ESRI','102727','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=41.66666666666666 +lat_1=42.33333333333334 +lat_2=44 +lon_0=-120.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=1500000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Oregon South FIPS 3602 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102728,'ESRI','102728','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40.16666666666666 +lat_1=40.88333333333333 +lat_2=41.95 +lon_0=-77.75 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Pennsylvania North FIPS 3701 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102729,'ESRI','102729','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=39.33333333333334 +lat_1=39.93333333333333 +lat_2=40.96666666666667 +lon_0=-77.75 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Pennsylvania South FIPS 3702 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102730,'ESRI','102730','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999994 +lat_0=41.08333333333334 +lon_0=-71.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=100000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Rhode Island FIPS 3800 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102733,'ESRI','102733','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=31.83333333333333 +lat_1=32.5 +lat_2=34.83333333333334 +lon_0=-81 +proj=lcc +to_meter=0.3048006096012192 +x_0=609600.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane South Carolina FIPS 3900 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102734,'ESRI','102734','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43.83333333333334 +lat_1=44.41666666666666 +lat_2=45.68333333333333 +lon_0=-100 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane South Dakota North FIPS 4001 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102735,'ESRI','102735','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=42.33333333333334 +lat_1=42.83333333333334 +lat_2=44.4 +lon_0=-100.3333333333333 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane South Dakota South FIPS 4002 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102736,'ESRI','102736','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=34.33333333333334 +lat_1=35.25 +lat_2=36.41666666666666 +lon_0=-86 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Tennessee FIPS 4100 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102737,'ESRI','102737','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=34 +lat_1=34.65 +lat_2=36.18333333333333 +lon_0=-101.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=200000 +y_0=1000000 no_defs',NULL,'NAD 1983 StatePlane Texas North FIPS 4201 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102738,'ESRI','102738','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=31.66666666666667 +lat_1=32.13333333333333 +lat_2=33.96666666666667 +lon_0=-98.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=2000000 no_defs',NULL,'NAD 1983 StatePlane Texas North Central FIPS 4202 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102739,'ESRI','102739','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=29.66666666666667 +lat_1=30.11666666666667 +lat_2=31.88333333333333 +lon_0=-100.3333333333333 +proj=lcc +to_meter=0.3048006096012192 +x_0=700000 +y_0=3000000 no_defs',NULL,'NAD 1983 StatePlane Texas Central FIPS 4203 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102740,'ESRI','102740','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=27.83333333333333 +lat_1=28.38333333333333 +lat_2=30.28333333333334 +lon_0=-99 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=4000000 no_defs',NULL,'NAD 1983 StatePlane Texas South Central FIPS 4204 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102741,'ESRI','102741','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=25.66666666666667 +lat_1=26.16666666666667 +lat_2=27.83333333333333 +lon_0=-98.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=300000 +y_0=4999999.999999999 no_defs',NULL,'NAD 1983 StatePlane Texas South FIPS 4205 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102742,'ESRI','102742','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=40.33333333333334 +lat_1=40.71666666666667 +lat_2=41.78333333333333 +lon_0=-111.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=1000000 no_defs',NULL,'NAD 1983 StatePlane Utah North FIPS 4301 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102743,'ESRI','102743','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=38.33333333333334 +lat_1=39.01666666666667 +lat_2=40.65 +lon_0=-111.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=2000000 no_defs',NULL,'NAD 1983 StatePlane Utah Central FIPS 4302 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102744,'ESRI','102744','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.66666666666666 +lat_1=37.21666666666667 +lat_2=38.35 +lon_0=-111.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=3000000 no_defs',NULL,'NAD 1983 StatePlane Utah South FIPS 4303 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102745,'ESRI','102745','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999964 +lat_0=42.5 +lon_0=-72.5 +proj=tmerc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Vermont FIPS 4400 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102746,'ESRI','102746','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37.66666666666666 +lat_1=38.03333333333333 +lat_2=39.2 +lon_0=-78.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=3499999.999999999 +y_0=2000000 no_defs',NULL,'NAD 1983 StatePlane Virginia North FIPS 4501 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102747,'ESRI','102747','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=36.33333333333334 +lat_1=36.76666666666667 +lat_2=37.96666666666667 +lon_0=-78.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=3499999.999999999 +y_0=1000000 no_defs',NULL,'NAD 1983 StatePlane Virginia South FIPS 4502 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102748,'ESRI','102748','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=47 +lat_1=47.5 +lat_2=48.73333333333333 +lon_0=-120.8333333333333 +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Washington North FIPS 4601 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102749,'ESRI','102749','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=45.33333333333334 +lat_1=45.83333333333334 +lat_2=47.33333333333334 +lon_0=-120.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=500000.0000000002 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Washington South FIPS 4602 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102750,'ESRI','102750','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=38.5 +lat_1=39 +lat_2=40.25 +lon_0=-79.5 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane West Virginia North FIPS 4701 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102751,'ESRI','102751','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=37 +lat_1=37.48333333333333 +lat_2=38.88333333333333 +lon_0=-81 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane West Virginia South FIPS 4702 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102752,'ESRI','102752','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=45.16666666666666 +lat_1=45.56666666666667 +lat_2=46.76666666666667 +lon_0=-90 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Wisconsin North FIPS 4801 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102753,'ESRI','102753','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=43.83333333333334 +lat_1=44.25 +lat_2=45.5 +lon_0=-90 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Wisconsin Central FIPS 4802 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102754,'ESRI','102754','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=42 +lat_1=42.73333333333333 +lat_2=44.06666666666667 +lon_0=-90 +proj=lcc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Wisconsin South FIPS 4803 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102755,'ESRI','102755','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-105.1666666666667 +proj=tmerc +to_meter=0.3048006096012192 +x_0=200000 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Wyoming East FIPS 4901 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102756,'ESRI','102756','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-107.3333333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=399999.9999999999 +y_0=100000 no_defs',NULL,'NAD 1983 StatePlane Wyoming East Central FIPS 4902 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102757,'ESRI','102757','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-108.75 +proj=tmerc +to_meter=0.3048006096012192 +x_0=600000.0000000001 +y_0=0 no_defs',NULL,'NAD 1983 StatePlane Wyoming West Central FIPS 4903 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102758,'ESRI','102758','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +k=0.999938 +lat_0=40.5 +lon_0=-110.0833333333333 +proj=tmerc +to_meter=0.3048006096012192 +x_0=799999.9999999999 +y_0=100000 no_defs',NULL,'NAD 1983 StatePlane Wyoming West FIPS 4904 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102761,'ESRI','102761','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=17.83333333333333 +lat_1=18.03333333333334 +lat_2=18.43333333333333 +lon_0=-66.43333333333334 +proj=lcc +to_meter=0.3048006096012192 +x_0=200000 +y_0=200000 no_defs',NULL,'NAD 1983 StatePlane Puerto Rico Virgin Islands FIPS 5200 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(102766,'ESRI','102766','proj4_data/esri',NULL,'+datum=NAD83 +ellps=GRS80 +lat_0=13.47246635277778 +lon_0=-144.7487507055556 +proj=poly +to_meter=0.3048006096012192 +x_0=49999.99999999999 +y_0=49999.99999999999 no_defs',NULL,'NAD 1983 StatePlane Guam FIPS 5400 Feet',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(103300,'ESRI','103300','proj4_data/esri',NULL,'+ellps=intl +lat_0=90 +lat_1=49.8333339 +lat_2=51.16666733333333 +lon_0=4.367486666666666 +proj=lcc +units=m +x_0=150000.01256 +y_0=5400088.4378 no_defs',NULL,'Belge Lambert 1972',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(104000,'ESRI','104000','proj4_data/esri',NULL,'+datum=NAD27 +ellps=clrk66 +proj=longlat no_defs',NULL,'GCS Assumed Geographic 1',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(104101,'ESRI','104101','proj4_data/esri',NULL,'+ellps=bessel +proj=longlat no_defs',NULL,'GCS Estonia 1937',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(104102,'ESRI','104102','proj4_data/esri',NULL,'+ellps=bessel +proj=longlat no_defs',NULL,'GCS Hermannskogel',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(104103,'ESRI','104103','proj4_data/esri',NULL,'+ellps=clrk80 +proj=longlat no_defs',NULL,'GCS Sierra Leone 1960',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(104104,'ESRI','104104','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Hong Kong 1980',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(104105,'ESRI','104105','proj4_data/esri',NULL,'+ellps=bessel +proj=longlat no_defs',NULL,'GCS Datum Lisboa Bessel',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(104106,'ESRI','104106','proj4_data/esri',NULL,'+ellps=intl +proj=longlat no_defs',NULL,'GCS Datum Lisboa Hayford',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(104107,'ESRI','104107','proj4_data/esri',NULL,'+ellps=GRS80 +proj=longlat no_defs',NULL,'GCS RGF 1993',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(104108,'ESRI','104108','proj4_data/esri',NULL,'+ellps=GRS80 +proj=longlat no_defs',NULL,'GCS NZGD 2000',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(104261,'ESRI','104261','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.999904194 +proj=longlat no_defs',NULL,'GCS Merchich Degree',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(104304,'ESRI','104304','proj4_data/esri',NULL,'+a=6378249.2 +b=6356514.999904194 +proj=longlat no_defs',NULL,'GCS Voirol 1875 Degree',''); + INSERT SOFT DB.DBA.SYS_PROJ4_SRIDS(SR_ID,SR_FAMILY,SR_TAG,SR_ORIGIN,SR_IRI,SR_PROJ4_STRING,SR_WKT,SR_COMMENT,SR_PROJ4_XML) VALUES(104305,'ESRI','104305','proj4_data/esri',NULL,'+ellps=clrk80 +proj=longlat no_defs',NULL,'GCS Voirol Unifie 1960 Degree',''); +} +; + + +CREATE PROCEDURE DB.DBA.PROJ4_INIT_DATA() +{ + DB.DBA.PROJ4_INIT_DATA_1(); + DB.DBA.PROJ4_INIT_DATA_2(); + DB.DBA.PROJ4_INIT_DATA_3(); + DB.DBA.PROJ4_INIT_DATA_4(); + DB.DBA.PROJ4_INIT_DATA_5(); + DB.DBA.PROJ4_INIT_DATA_6(); + DB.DBA.PROJ4_INIT_DATA_7(); + DB.DBA.PROJ4_INIT_DATA_8(); + DB.DBA.PROJ4_INIT_DATA_9(); + DB.DBA.PROJ4_INIT_DATA_10(); + DB.DBA.PROJ4_INIT_DATA_11(); + DB.DBA.PROJ4_INIT_DATA_12(); + DB.DBA.PROJ4_INIT_DATA_13(); + DB.DBA.PROJ4_INIT_DATA_14(); + DB.DBA.PROJ4_INIT_DATA_15(); + DB.DBA.PROJ4_INIT_DATA_16(); + DB.DBA.PROJ4_INIT_DATA_17(); + DB.DBA.PROJ4_INIT_DATA_18(); + DB.DBA.PROJ4_INIT_DATA_19(); + DB.DBA.PROJ4_INIT_DATA_20(); + DB.DBA.PROJ4_INIT_DATA_21(); + DB.DBA.PROJ4_INIT_DATA_22(); + DB.DBA.PROJ4_INIT_DATA_23(); + DB.DBA.PROJ4_INIT_DATA_24(); + DB.DBA.PROJ4_INIT_DATA_25(); + DB.DBA.PROJ4_INIT_DATA_26(); + DB.DBA.PROJ4_INIT_DATA_27(); + DB.DBA.PROJ4_INIT_DATA_28(); + DB.DBA.PROJ4_INIT_DATA_29(); + DB.DBA.PROJ4_INIT_DATA_30(); + DB.DBA.PROJ4_INIT_DATA_31(); + DB.DBA.PROJ4_INIT_DATA_32(); + DB.DBA.PROJ4_INIT_DATA_33(); + DB.DBA.PROJ4_INIT_DATA_34(); + DB.DBA.PROJ4_INIT_DATA_35(); + DB.DBA.PROJ4_INIT_DATA_36(); + DB.DBA.PROJ4_INIT_DATA_37(); + DB.DBA.PROJ4_INIT_DATA_38(); + DB.DBA.PROJ4_INIT_DATA_39(); + DB.DBA.PROJ4_INIT_DATA_40(); + DB.DBA.PROJ4_INIT_DATA_41(); + DB.DBA.PROJ4_INIT_DATA_42(); + DB.DBA.PROJ4_INIT_DATA_43(); + DB.DBA.PROJ4_INIT_DATA_44(); + DB.DBA.PROJ4_INIT_DATA_45(); + DB.DBA.PROJ4_INIT_DATA_46(); + DB.DBA.PROJ4_INIT_DATA_47(); + DB.DBA.PROJ4_INIT_DATA_48(); + DB.DBA.PROJ4_INIT_DATA_49(); + DB.DBA.PROJ4_INIT_DATA_50(); + DB.DBA.PROJ4_INIT_DATA_51(); + DB.DBA.PROJ4_INIT_DATA_52(); + DB.DBA.PROJ4_INIT_DATA_53(); + DB.DBA.PROJ4_INIT_DATA_54(); + DB.DBA.PROJ4_INIT_DATA_55(); + DB.DBA.PROJ4_INIT_DATA_56(); + DB.DBA.PROJ4_INIT_DATA_57(); + DB.DBA.PROJ4_INIT_DATA_58(); + DB.DBA.PROJ4_INIT_DATA_59(); + DB.DBA.PROJ4_INIT_DATA_60(); + DB.DBA.PROJ4_INIT_DATA_61(); + DB.DBA.PROJ4_INIT_DATA_62(); + DB.DBA.PROJ4_INIT_DATA_63(); + DB.DBA.PROJ4_INIT_DATA_64(); + DB.DBA.PROJ4_INIT_DATA_65(); + DB.DBA.PROJ4_INIT_DATA_66(); + DB.DBA.PROJ4_INIT_DATA_67(); + DB.DBA.PROJ4_INIT_DATA_68(); + DB.DBA.PROJ4_INIT_DATA_69(); + DB.DBA.PROJ4_INIT_DATA_70(); + DB.DBA.PROJ4_INIT_DATA_71(); + DB.DBA.PROJ4_INIT_DATA_72(); + DB.DBA.PROJ4_INIT_DATA_73(); + DB.DBA.PROJ4_INIT_DATA_74(); + DB.DBA.PROJ4_INIT_DATA_75(); + DB.DBA.PROJ4_INIT_DATA_76(); + DB.DBA.PROJ4_INIT_DATA_77(); + DB.DBA.PROJ4_INIT_DATA_78(); + DB.DBA.PROJ4_INIT_DATA_79(); + DB.DBA.PROJ4_INIT_DATA_80(); + DB.DBA.PROJ4_INIT_DATA_81(); + DB.DBA.PROJ4_INIT_DATA_82(); + DB.DBA.PROJ4_INIT_DATA_83(); + DB.DBA.PROJ4_INIT_DATA_84(); + DB.DBA.PROJ4_INIT_DATA_85(); + DB.DBA.PROJ4_INIT_DATA_86(); + DB.DBA.PROJ4_INIT_DATA_87(); + + log_message ('DB.DBA.SYS_PROJ4_SRIDS initialized with ' || (select count(1) from DB.DBA.SYS_PROJ4_SRIDS) || ' spatial reference systems'); +} +; diff --git a/binsrc/hosting/proj4/proj4_plugin.c b/binsrc/hosting/proj4/proj4_plugin.c new file mode 100644 index 0000000000..92737946f1 --- /dev/null +++ b/binsrc/hosting/proj4/proj4_plugin.c @@ -0,0 +1,490 @@ +/* + * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) + * project. + * + * Copyright (C) 1998-2019 OpenLink Software + * + * This project is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; only version 2 of the License, dated June 1991. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#include +#include +#include "sqlver.h" +#include "geo.h" +#include "import_gate_virtuoso.h" + +#define PLUGIN_VERSION "1.0" + +query_t *srid_to_proj4_string_qr = NULL; +id_hash_t *virt_proj4_sr_iri_to_srid = NULL; +id_hash_t *virt_proj4_sr_srid_to_iri = NULL; +id_hash_iterator_t *virt_proj4_sr_iri_to_srid_iter = NULL; +id_hash_iterator_t *virt_proj4_sr_srid_to_iri_iter = NULL; + +void +virt_proj4_compile_statics (void) +{ + caddr_t err = NULL; +#define PRINT_ERR(err) \ + do { if (err) \ + { \ + log_error (" Error compiling a Virtuoso Proj4 plugin init statement : %s: %s -- %s:%d", \ + ((caddr_t *) err)[QC_ERRNO], ((caddr_t *) err)[QC_ERROR_STRING], \ + __FILE__, __LINE__ ); \ + dk_free_tree (err); \ + err = NULL; \ + } } while (0) + srid_to_proj4_string_qr = sql_compile_static ( + "select coalesce (" + "(select SR_PROJ4_STRING from DB.DBA.SYS_PROJ4_SRIDS where SR_ID=:0 and SR_FAMILY='PG'), " + "(select SR_PROJ4_STRING from DB.DBA.SYS_PROJ4_SRIDS where SR_ID=:0 and SR_FAMILY='EPSG'), " + "(select SR_PROJ4_STRING from DB.DBA.SYS_PROJ4_SRIDS where SR_ID=:0 and SR_FAMILY='ESRI'), " + "(select SR_PROJ4_STRING from DB.DBA.SYS_PROJ4_SRIDS where SR_ID=:0 and SR_FAMILY='NAD83'), " + "(select SR_PROJ4_STRING from DB.DBA.SYS_PROJ4_SRIDS where SR_ID=:0 and SR_FAMILY='NAD27') ) ", + get_bootstrap_cli(), &err, 0); + PRINT_ERR(err); +} + + +id_hash_t *proj4_string_to_pj_htable = NULL; +id_hash_t *srid_to_pj_htable = NULL; + +static projPJ +virt_proj4_find_pj_by_srid_or_string (caddr_t * qst, caddr_t *err_ret, int srid, caddr_t strg_or_null, const char *bifname, const char *argname) +{ + projPJ res_pj = NULL, *pj_hit; + caddr_t err = NULL; + local_cursor_t *lc; + caddr_t boxed_srid, sys_strg; + caddr_t *parms; + if (NULL == srid_to_proj4_string_qr) + virt_proj4_compile_statics (); + if (NULL != strg_or_null) + { + rwlock_rdlock (proj4_string_to_pj_htable->ht_rwlock); + pj_hit = (projPJ *)id_hash_get (proj4_string_to_pj_htable, (caddr_t)(&strg_or_null)); + if (NULL != pj_hit) + { + res_pj = pj_hit[0]; + rwlock_unlock (proj4_string_to_pj_htable->ht_rwlock); + return res_pj; + } + else + rwlock_unlock (proj4_string_to_pj_htable->ht_rwlock); + res_pj = pj_init_plus (strg_or_null); + if (NULL == res_pj) + { + err_ret[0] = srv_make_new_error ("22023", "PR400", "Invalid or unsupported %s projection string \"%.500s\" in %s()", argname, strg_or_null, bifname); + return NULL; + } + rwlock_wrlock (proj4_string_to_pj_htable->ht_rwlock); + if (NULL == (projPJ *)id_hash_get (proj4_string_to_pj_htable, (caddr_t)(&strg_or_null))) + { + strg_or_null = box_copy (strg_or_null); + id_hash_set (proj4_string_to_pj_htable, (caddr_t)(&strg_or_null), (caddr_t)(&res_pj)); + } + rwlock_unlock (proj4_string_to_pj_htable->ht_rwlock); + return res_pj; + } + if (NULL == srid_to_proj4_string_qr) + { + err_ret[0] = srv_make_new_error ("22023", "PR402", "%s() can not access the dictionary of SRIDs, server should log errors at startup", bifname); + return NULL; + } + rwlock_rdlock (srid_to_pj_htable->ht_rwlock); + boxed_srid = box_num (srid); + pj_hit = (projPJ *)id_hash_get (srid_to_pj_htable, (caddr_t)(&boxed_srid)); + if (NULL != pj_hit) + { + res_pj = pj_hit[0]; + rwlock_unlock (srid_to_pj_htable->ht_rwlock); + dk_free_tree (boxed_srid); + return res_pj; + } + else + rwlock_unlock (srid_to_pj_htable->ht_rwlock); + parms = dk_alloc_list (2); + parms[0] = box_dv_uname_string (":0"); + parms[1] = boxed_srid; + err = qr_exec ( + ((query_instance_t *)qst)->qi_client, srid_to_proj4_string_qr, CALLER_LOCAL, NULL, NULL, &lc, parms, NULL, 1); + dk_free_box ((caddr_t)parms); + if (NULL != err) + { + dk_free_tree (boxed_srid); + err_ret[0] = err; + return NULL; + } + if (lc_next (lc)) + sys_strg = box_copy_tree (lc_nth_col (lc, 0)); + else + sys_strg = NULL; + err = lc->lc_error; + lc_free (lc); + if (NULL != err) + { + err_ret[0] = err; + dk_free_tree (sys_strg); + dk_free_tree (boxed_srid); + return NULL; + } + if (DV_STRING != DV_TYPE_OF (sys_strg)) + { + err_ret[0] = srv_make_new_error ("22023", "PR403", "Table DB.DBA.SYS_V7PROJ_SRIDS contains no data about %s SRID %d in %s()", argname, srid, bifname); + dk_free_tree (sys_strg); + dk_free_tree (boxed_srid); + return NULL; + } + res_pj = pj_init_plus (sys_strg); + if (NULL == res_pj) + { + err_ret[0] = srv_make_new_error ("22023", "PR403", "Table DB.DBA.SYS_V7PROJ_SRIDS contains invalid or unsupported %s projection string \"%.500s\" for SRID %d in %s()", argname, sys_strg, srid, bifname); + dk_free_tree (sys_strg); + dk_free_tree (boxed_srid); + return NULL; + } + dk_free_tree (sys_strg); + rwlock_wrlock (srid_to_pj_htable->ht_rwlock); + if (NULL == (projPJ *)id_hash_get (srid_to_pj_htable, (caddr_t)(&boxed_srid))) + id_hash_set (srid_to_pj_htable, (caddr_t)(&boxed_srid), (caddr_t)(&res_pj)); + else + dk_free_tree (boxed_srid); + rwlock_unlock (srid_to_pj_htable->ht_rwlock); + return res_pj; +} + +/*! A clone of geo_set_srcode_trav() instead of export, to avoid an extra dereferencing in exe export gate */ +void +virt_proj4_set_srcode_trav (geo_t *g, int srcode) +{ + g->geo_srcode = srcode; + if (g->geo_flags & (GEO_A_COMPOUND | GEO_A_RINGS | GEO_A_MULTI | GEO_A_ARRAY)) + { + int ctr, ct = g->_.parts.len; + for (ctr = 0; ctr < ct; ctr++) + virt_proj4_set_srcode_trav (g->_.parts.items[ctr], srcode); + } +} + +caddr_t +virt_proj4_geo_transform (projPJ orig_pj, projPJ dest_pj, geo_t *g, int orig_deg_to_rad, int dest_rad_to_deg, int orig_srcode, int dest_srcode) +{ + geo_flags_t flags = g->geo_flags; + int proj_errcode; +/* local macro defs */ +#define XY_PROJECT(x,y,z) do { \ + if (orig_deg_to_rad) { (x) *= DEG_TO_RAD; (y) *= DEG_TO_RAD; } \ + proj_errcode = pj_transform (orig_pj, dest_pj, 1, 1, &(x), &(y), ((flags & GEO_A_Z) ? &(z) : NULL)); \ + if (proj_errcode) goto ret_err; \ + if (dest_rad_to_deg) { (x) *= RAD_TO_DEG; (y) *= RAD_TO_DEG; } \ + } while (0) +#define XYBOX_PROJECT(xybox,zmbox) do { \ + geo_XYbox_t xmirr; \ + double vmin,vmax,v12,v34; \ + if (GEO_XYBOX_IS_EMPTY_OR_FARAWAY(xybox)) \ + return box_dv_short_string ("The shape is either empty or intentionally invalidated so it cannot be projected"); \ + if (orig_deg_to_rad) { xybox.Xmin *= DEG_TO_RAD; xybox.Xmax *= DEG_TO_RAD; xybox.Ymin *= DEG_TO_RAD; xybox.Ymax *= DEG_TO_RAD; } \ + xmirr.Xmin = xybox.Xmax; xmirr.Xmax = xybox.Xmin; xmirr.Ymin = xybox.Ymin; xmirr.Ymax = xybox.Ymax; \ + proj_errcode = pj_transform (orig_pj, dest_pj, 2, 1, &(xybox.Xmin), &(xybox.Ymin), ((flags & GEO_A_Z) ? &(zmbox.Zmin) : NULL)); \ + if (proj_errcode) goto ret_err; \ + proj_errcode = pj_transform (orig_pj, dest_pj, 2, 1, &(xmirr.Xmin), &(xmirr.Ymin), NULL); \ + if (proj_errcode) goto ret_err; \ + v12 = double_min (xybox.Xmin, xmirr.Xmin); v34 = double_min (xybox.Xmax, xmirr.Xmax); vmin = double_min (v12, v34); \ + v12 = double_max (xybox.Xmin, xmirr.Xmin); v34 = double_max (xybox.Xmax, xmirr.Xmax); vmax = double_max (v12, v34); \ + if (dest_rad_to_deg) { vmin *= RAD_TO_DEG; vmax *= RAD_TO_DEG; } \ + xybox.Xmin = vmin; xybox.Xmax = vmax; \ + v12 = double_min (xybox.Ymin, xmirr.Ymin); v34 = double_min (xybox.Ymax, xmirr.Ymax); vmin = double_min (v12, v34); \ + v12 = double_max (xybox.Ymin, xmirr.Ymin); v34 = double_max (xybox.Ymax, xmirr.Ymax); vmax = double_max (v12, v34); \ + if (dest_rad_to_deg) { vmin *= RAD_TO_DEG; vmax *= RAD_TO_DEG; } \ + xybox.Ymin = vmin; xybox.Ymax = vmax; \ + if ((flags & GEO_A_Z) && (zmbox.Zmin > zmbox.Zmax)) GEOC_SWAP(zmbox.Zmin, zmbox.Zmax); \ + } while (0) + if (orig_srcode != g->geo_srcode) + return box_dv_short_string ("The shape is in unexpected spatial reference system"); + g->geo_srcode = dest_srcode; + if (flags & (GEO_A_RINGS | GEO_A_COMPOUND | GEO_A_MULTI | GEO_A_ARRAY)) + { + int ctr; + if (0 == g->_.parts.len) + return NULL; + for (ctr = g->_.parts.len; ctr--; /* no step */) + virt_proj4_geo_transform (orig_pj, dest_pj, g->_.parts.items[ctr], orig_deg_to_rad, dest_rad_to_deg, orig_srcode, dest_srcode); + geo_calc_bounding (g, 0); + return NULL; + } + switch (GEO_TYPE_CORE (flags)) + { + case GEO_NULL_SHAPE: case GEO_BOX: + XYBOX_PROJECT(g->XYbox, g->_.point.point_ZMbox); + return NULL; + case GEO_POINT: + if (GEO_XYBOX_IS_EMPTY_OR_FARAWAY(g->XYbox)) + return box_dv_short_string ("The point is intentionally invalidated so it cannot be projected"); + XY_PROJECT(g->XYbox.Xmin, g->XYbox.Ymin, g->_.point.point_ZMbox.Zmin); + g->XYbox.Xmax = g->XYbox.Xmin; g->XYbox.Ymax = g->XYbox.Ymin; + if (flags & GEO_A_Z) g->_.point.point_ZMbox.Zmax = g->_.point.point_ZMbox.Zmin; + return NULL; + case GEO_GSOP: + return box_dv_short_string ("Spatial operator is not a true shape so it cannot be projected"); + case GEO_LINESTRING: case GEO_POINTLIST: case GEO_ARCSTRING: + { + int ctr; + if (orig_deg_to_rad) + { + for (ctr = g->_.pline.len; ctr--; /* no step */) + { g->_.pline.Xs[ctr] *= DEG_TO_RAD; g->_.pline.Ys[ctr] *= DEG_TO_RAD; } + } + proj_errcode = pj_transform (orig_pj, dest_pj, g->_.pline.len, 1, g->_.pline.Xs, g->_.pline.Ys, ((flags & GEO_A_Z) ? g->_.pline.Zs : NULL)); + if (proj_errcode) goto ret_err; + if (dest_rad_to_deg) + { + for (ctr = g->_.pline.len; ctr--; /* no step */) + { g->_.pline.Xs[ctr] *= RAD_TO_DEG; g->_.pline.Ys[ctr] *= RAD_TO_DEG; } + } + geo_calc_bounding (g, 0); + return NULL; + } + default: + return box_dv_short_string ("The geometry is either invalid or not supported by the loaded version of the proj4 plugin"); + } + return NULL; +#undef XY_PROJECT +#undef XYBOX_PROJECT +ret_err: + return box_dv_short_string (pj_strerrno (proj_errcode)); +} + + +static caddr_t +bif_st_transform (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + geo_t *orig = bif_geo_arg (qst,args, 0, "ST_Transform", GEO_ARG_ANY_NULLABLE); + geo_t *dest; + long dest_srid = bif_long_arg (qst, args, 1, "ST_Transform"); + int orig_srid; + caddr_t proj4_orig_string = NULL; + caddr_t proj4_dest_string = NULL; + caddr_t err_msg = NULL, err_text; + projPJ orig_pj, dest_pj; + int orig_deg_to_rad, dest_rad_to_deg; + if (2 < BOX_ELEMENTS (args)) + { + proj4_orig_string = bif_string_or_null_arg (qst, args, 2, "ST_Transform"); + proj4_dest_string = bif_string_or_null_arg (qst, args, 3, "ST_Transform"); + } + if (NULL == orig) + return NEW_DB_NULL; + orig_srid = GEO_SRID(orig->geo_srcode); + if ((orig_srid == dest_srid) && + (((NULL == proj4_orig_string) && (NULL == proj4_dest_string)) || + ((NULL != proj4_orig_string) && (NULL != proj4_dest_string) && !strcmp (proj4_orig_string, proj4_dest_string)) ) ) + return box_copy ((caddr_t) orig); + orig_pj = virt_proj4_find_pj_by_srid_or_string (qst, &err_msg, orig_srid, proj4_orig_string, "ST_Transform", "source"); + if (NULL != err_msg) + sqlr_resignal (err_msg); + dest_pj = virt_proj4_find_pj_by_srid_or_string (qst, &err_msg, dest_srid, proj4_dest_string, "ST_Transform", "destination"); + if (NULL != err_msg) + { + /*pj_free (orig_pj);*/ + sqlr_resignal (err_msg); + } + dest = geo_copy (orig); + if (orig_pj == dest_pj) + { + /*pj_free (orig_pj); + pj_free (dest_pj);*/ + if (GEO_SRCODE_OF_SRID (dest_srid) != orig->geo_srcode) + virt_proj4_set_srcode_trav (dest, GEO_SRCODE_OF_SRID (dest_srid)); + return (caddr_t)dest; + } + orig_deg_to_rad = pj_is_latlong (orig_pj) || pj_is_geocent (orig_pj); + dest_rad_to_deg = pj_is_latlong (dest_pj) || pj_is_geocent (dest_pj); + err_text = virt_proj4_geo_transform (orig_pj, dest_pj, dest, orig_deg_to_rad, dest_rad_to_deg, orig->geo_srcode, GEO_SRCODE_OF_SRID (dest_srid)); + if (NULL != err_text) + { + err_msg = srv_make_new_error ("22023", "PR402", "Transformation error: %s", err_text); + /*pj_free (orig_pj); + pj_free (dest_pj);*/ + dk_free_tree ((caddr_t)dest); + dk_free_box (err_text); + sqlr_resignal (err_msg); + } + return (caddr_t)dest; +} + +geo_t * +virt_proj4_srid_transform_cbk (caddr_t *qst, geo_t *orig, int dest_srid, caddr_t *err_ret) +{ + geo_t *dest; + int orig_srid = GEO_SRID(orig->geo_srcode); + projPJ orig_pj, dest_pj; + caddr_t err_text; + int orig_deg_to_rad, dest_rad_to_deg; + if (orig_srid == dest_srid) + return orig; + err_ret[0] = NULL; + orig_pj = virt_proj4_find_pj_by_srid_or_string (qst, err_ret, orig_srid, NULL, "implicit ST_Transform", "source"); + if (NULL != err_ret[0]) + return NULL; + dest_pj = virt_proj4_find_pj_by_srid_or_string (qst, err_ret, dest_srid, NULL, "implicit ST_Transform", "destination"); + if (NULL != err_ret[0]) + return NULL; + if (orig_pj == dest_pj) + { + if (GEO_SRCODE_OF_SRID (dest_srid) == orig->geo_srcode) + return orig; + dest = geo_copy (orig); + virt_proj4_set_srcode_trav (dest, GEO_SRCODE_OF_SRID (dest_srid)); + return dest; + } + dest = geo_copy (orig); + orig_deg_to_rad = pj_is_latlong (orig_pj) || pj_is_geocent (orig_pj); + dest_rad_to_deg = pj_is_latlong (dest_pj) || pj_is_geocent (dest_pj); + err_text = virt_proj4_geo_transform (orig_pj, dest_pj, dest, orig_deg_to_rad, dest_rad_to_deg, orig->geo_srcode, GEO_SRCODE_OF_SRID (dest_srid)); + if (NULL != err_text) + { + err_ret[0] = srv_make_new_error ("22023", "PR403", "Transformation error: %s", err_text); + dk_free_tree ((caddr_t)dest); + dk_free_box (err_text); + return NULL; + } + return dest; +} + +static caddr_t +bif_proj4_cache_reset (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + caddr_t *key_ptr; + projPJ *pj_ptr; + id_hash_iterator_t it; + dk_set_t all_pjs = NULL; + rwlock_wrlock (proj4_string_to_pj_htable->ht_rwlock); + id_hash_iterator (&it, proj4_string_to_pj_htable); + while (hit_next (&it, (char**)(&key_ptr), (char**)(&pj_ptr))) + { + dk_free_tree (key_ptr[0]); + dk_set_pushnew (&all_pjs, pj_ptr[0]); + } + id_hash_clear (proj4_string_to_pj_htable); + rwlock_unlock (proj4_string_to_pj_htable->ht_rwlock); + rwlock_wrlock (srid_to_pj_htable->ht_rwlock); + id_hash_iterator (&it, srid_to_pj_htable); + while (hit_next (&it, (char**)(&key_ptr), (char**)(&pj_ptr))) + { + dk_free_tree (key_ptr[0]); + dk_set_pushnew (&all_pjs, pj_ptr[0]); + } + id_hash_clear (srid_to_pj_htable); + while (NULL != all_pjs) pj_free (dk_set_pop (&all_pjs)); + rwlock_unlock (srid_to_pj_htable->ht_rwlock); + return NULL; +} + +static caddr_t +bif_postgis_proj_version (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + return box_dv_short_string (pj_get_release()); +} + +static caddr_t +bif_proj4_get_sr_iri_to_srid_dict (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + sec_check_dba ((query_instance_t *)qst, "Proj4 get_sr_iri_to_srid_dict"); + if (NULL == virt_proj4_sr_iri_to_srid_iter) + { + virt_proj4_sr_iri_to_srid = (id_hash_t *)box_dv_dict_hashtable (5000); + virt_proj4_sr_iri_to_srid->ht_dict_refctr++; + virt_proj4_sr_iri_to_srid->ht_rwlock = rwlock_allocate (); + virt_proj4_sr_iri_to_srid_iter = (id_hash_iterator_t *)box_dv_dict_iterator ((caddr_t)virt_proj4_sr_iri_to_srid); + get_sr_iri_to_srid_iter()[0] = virt_proj4_sr_iri_to_srid_iter; + } + return box_copy ((caddr_t)virt_proj4_sr_iri_to_srid_iter); +} + +static caddr_t +bif_proj4_get_sr_srid_to_iri_dict (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + sec_check_dba ((query_instance_t *)qst, "Proj4 get_sr_srid_to_iri_dict"); + if (NULL == virt_proj4_sr_srid_to_iri_iter) + { + virt_proj4_sr_srid_to_iri = (id_hash_t *)box_dv_dict_hashtable (5000); + virt_proj4_sr_srid_to_iri->ht_dict_refctr++; + virt_proj4_sr_srid_to_iri->ht_rwlock = rwlock_allocate (); + virt_proj4_sr_srid_to_iri_iter = (id_hash_iterator_t *)box_dv_dict_iterator ((caddr_t)virt_proj4_sr_srid_to_iri); + get_sr_srid_to_iri_iter()[0] = virt_proj4_sr_srid_to_iri_iter; + } + return box_copy ((caddr_t)virt_proj4_sr_srid_to_iri_iter); +} + +extern void sqls_define_proj4 (void); +extern void sqls_arfw_define_proj4 (void); + +void +virt_proj4_pre_log_action (char *mode) +{ + bif_define_ex ("ST_Transform", bif_st_transform, BMD_ALIAS, "st_transform", BMD_ALIAS, "Proj4 ST_Transform", BMD_IS_PURE, BMD_USES_INDEX, BMD_DONE); + /* bif_define_ex ("Proj4 find_string_by_srid", bif_proj4_find_string_by_srid, BMD_DONE); */ + bif_define_ex ("Proj4 cache_reset", bif_proj4_cache_reset, BMD_DONE); + bif_define_ex ("postgis_proj_version", bif_postgis_proj_version, BMD_ALIAS, "Proj4 version", BMD_IS_PURE, BMD_DONE); + bif_define_ex ("Proj4 get_sr_iri_to_srid_dict", bif_proj4_get_sr_iri_to_srid_dict, BMD_DONE); + bif_define_ex ("Proj4 get_sr_srid_to_iri_dict", bif_proj4_get_sr_srid_to_iri_dict, BMD_DONE); +} + +void +virt_proj4_postponed_action (char *mode) +{ + sqls_define_proj4 (); + sqls_arfw_define_proj4 (); + virt_proj4_compile_statics (); +} + +static void +virt_proj4_plugin_connect () +{ + proj4_string_to_pj_htable = (id_hash_t *)box_dv_dict_hashtable (31); + proj4_string_to_pj_htable->ht_rehash_threshold = 120; + proj4_string_to_pj_htable->ht_hash_func = strhash; + proj4_string_to_pj_htable->ht_cmp = strhashcmp; + proj4_string_to_pj_htable->ht_rwlock = rwlock_allocate (); + srid_to_pj_htable = (id_hash_t *)box_dv_dict_hashtable (31); + srid_to_pj_htable->ht_rehash_threshold = 120; + srid_to_pj_htable->ht_rwlock = rwlock_allocate (); + dk_set_push (get_srv_global_init_pre_log_actions_ptr(), virt_proj4_pre_log_action); + dk_set_push (get_srv_global_init_postponed_actions_ptr(), virt_proj4_postponed_action); + geo_set_default_srid_transform_cbk (virt_proj4_srid_transform_cbk); + geo_set_default_pj_by_srid_or_string_cbk (virt_proj4_find_pj_by_srid_or_string); + geo_set_default_pj_yn_cbks (pj_is_latlong, pj_is_geocent); +} + +static unit_version_t virt_proj4_version = { + PLAIN_PLUGIN_TYPE, /*!< Title of unit, filled by unit */ + PLUGIN_VERSION "." DBMS_SRV_GEN_MAJOR DBMS_SRV_GEN_MINOR, /*!< Version number, filled by unit */ + "OpenLink Software", /*!< Plugin's developer, filled by unit */ + "Cartographic Projections support based on Frank Warmerdam's proj4 library", /*!< Any additional info, filled by unit */ + 0, /*!< Error message, filled by unit loader */ + 0, /*!< Name of file with unit's code, filled by unit loader */ + virt_proj4_plugin_connect, /*!< Pointer to connection function, cannot be 0 */ + 0, /*!< Pointer to disconnection function, or 0 */ + 0, /*!< Pointer to activation function, or 0 */ + 0, /*!< Pointer to deactivation function, or 0 */ + &_gate +}; + + +unit_version_t *CALLBACK +proj4_check (unit_version_t * in, void *appdata) +{ + return &virt_proj4_version; +} diff --git a/binsrc/hosting/python/Makefile.am b/binsrc/hosting/python/Makefile.am index ad0af68b97..8ea9ff756a 100644 --- a/binsrc/hosting/python/Makefile.am +++ b/binsrc/hosting/python/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/python/build.py b/binsrc/hosting/python/build.py index a59940f389..b09093f9ca 100644 --- a/binsrc/hosting/python/build.py +++ b/binsrc/hosting/python/build.py @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/python/hosting_python.c b/binsrc/hosting/python/hosting_python.c index beba8c90b1..10c3763786 100644 --- a/binsrc/hosting/python/hosting_python.c +++ b/binsrc/hosting/python/hosting_python.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/python/py_to_c.awk b/binsrc/hosting/python/py_to_c.awk index 664994144e..78b69857dd 100644 --- a/binsrc/hosting/python/py_to_c.awk +++ b/binsrc/hosting/python/py_to_c.awk @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/python/virt_handler.py b/binsrc/hosting/python/virt_handler.py index 400be412a9..7b6278684e 100644 --- a/binsrc/hosting/python/virt_handler.py +++ b/binsrc/hosting/python/virt_handler.py @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/ruby/Makefile.am b/binsrc/hosting/ruby/Makefile.am index 257e1b2313..c4b557b335 100644 --- a/binsrc/hosting/ruby/Makefile.am +++ b/binsrc/hosting/ruby/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/ruby/hosting_ruby.c b/binsrc/hosting/ruby/hosting_ruby.c index e7419ff109..c4608b0b00 100644 --- a/binsrc/hosting/ruby/hosting_ruby.c +++ b/binsrc/hosting/ruby/hosting_ruby.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/ruby/hosting_ruby.h b/binsrc/hosting/ruby/hosting_ruby.h index 12845608ae..219b16cb97 100644 --- a/binsrc/hosting/ruby/hosting_ruby.h +++ b/binsrc/hosting/ruby/hosting_ruby.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/hosting/ruby/ruby_io.c b/binsrc/hosting/ruby/ruby_io.c index 3bdb97ff72..0142572b45 100644 --- a/binsrc/hosting/ruby/ruby_io.c +++ b/binsrc/hosting/ruby/ruby_io.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am b/binsrc/hosting/shapefileio/Makefile.am similarity index 51% rename from libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am rename to binsrc/hosting/shapefileio/Makefile.am index 4092770a91..4229c56576 100644 --- a/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am +++ b/binsrc/hosting/shapefileio/Makefile.am @@ -1,48 +1,50 @@ -# +# # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. -# -# Copyright (C) 1998-2018 OpenLink Software -# +# +# Copyright (C) 1998-2019 OpenLink Software +# # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the # Free Software Foundation; only version 2 of the License, dated June 1991. -# +# # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# +# +# -if WITH_JDK2 -TARGET = testsuite2.jar -JDK2 = @ac_jdk2_path@ -JAVA_FLAGS = -O -g:none -d . -JAVA_CLASS = -classpath .:../virtjdbc2.jar +if WITH_SHAPEFILEIO +hosting_LTLIBRARIES = shapefileio.la endif - -all: $(TARGET) - -testsuite2.jar: *.java - @echo ts2 java $(JAVA_FLAGS) - @$(JDK2)/javac $(JAVA_FLAGS) $(JAVA_CLASS) *.java - @$(JDK2)/jar cf testsuite2.jar ./testsuite/*.class - @rm -f ../testsuite2.jar - @cp testsuite2.jar ../testsuite2.jar - @echo "............. Test suite jar package built" - - -CLEANFILES = testsuite2.jar - -clean-local: - -rm -rf testsuite - +noinst_HEADERS = $(srcdir)/shapefil.h + +shapefileio_la_SOURCES = \ + shapefileio.c \ + dbfopen.c \ + safileio.c \ + shpopen.c \ + shptree.c \ + $(top_srcdir)/libsrc/plugin/import_gate_virtuoso.c + +shapefileio_la_CFLAGS = @VIRT_AM_CFLAGS@ +shapefileio_la_CFLAGS += -D_USRDLL +shapefileio_la_CFLAGS += -I$(top_srcdir)/libsrc +shapefileio_la_CFLAGS += -I$(top_srcdir)/libsrc/Dk +shapefileio_la_CFLAGS += -I$(top_srcdir)/libsrc/Wi +shapefileio_la_CFLAGS += -I$(top_srcdir)/libsrc/plugin +shapefileio_la_CFLAGS += -I$(top_srcdir)/libsrc/langfunc +shapefileio_la_CFLAGS += -I$(top_srcdir)/libsrc/odbcsdk/include + +shapefileio_la_LDFLAGS = -module -avoid-version -export-dynamic +shapefileio_la_LDFLAGS += -export-symbols shapefileio.exp +shapefileio_la_LIBADD = -lm # ---------------------------------------------------------------------- # @@ -50,5 +52,5 @@ clean-local: # # ---------------------------------------------------------------------- EXTRA_DIST = \ - *.java \ - *.sql + $(srcdir)/shapefileio.exp \ + $(srcdir)/license.html diff --git a/binsrc/hosting/shapefileio/dbfopen.c b/binsrc/hosting/shapefileio/dbfopen.c new file mode 100644 index 0000000000..514bd96054 --- /dev/null +++ b/binsrc/hosting/shapefileio/dbfopen.c @@ -0,0 +1,2117 @@ +/* $Id$ + * + * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) + * project. + * + * Copyright (C) 2011-2019 OpenLink Software + * + * The file is a modified version of source file of the Shapelib library. + * The original version was obtained via http://shapelib.maptools.org + * Authors of the original version are not responsible for possible errors + * in this modified version. + * The original copyright and licensing info is as follows: + */ + +/****************************************************************************** + * Original Id: dbfopen.c,v 1.89 2011-07-24 05:59:25 fwarmerdam Exp $ + * + * Project: Shapelib + * Purpose: Implementation of .dbf access API documented in dbf_api.html. + * Author: Frank Warmerdam, warmerdam@pobox.com + * + ****************************************************************************** + * Copyright (c) 1999, Frank Warmerdam + * + * This software is available under the following "MIT Style" license, + * or at the option of the licensee under the LGPL (see LICENSE.LGPL). This + * option is discussed in more detail in shapelib.html. + * + * -- + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ******************************************************************************/ + +#include "shapefil.h" + +#include +#include +#include +#include + +SHP_CVSID("$Id$") + +#ifndef FALSE +# define FALSE 0 +# define TRUE 1 +#endif + +/************************************************************************/ +/* SfRealloc() */ +/* */ +/* A realloc cover function that will access a NULL pointer as */ +/* a valid input. */ +/************************************************************************/ + +static void * SfRealloc( void * pMem, int nNewSize ) + +{ + if( pMem == NULL ) + return( (void *) dk_alloc (nNewSize) ); + else + { + dk_free (pMem, -1); + return( (void *) dk_alloc (nNewSize) ); + } +} + +/************************************************************************/ +/* DBFWriteHeader() */ +/* */ +/* This is called to write out the file header, and field */ +/* descriptions before writing any actual data records. This */ +/* also computes all the DBFDataSet field offset/size/decimals */ +/* and so forth values. */ +/************************************************************************/ + +static void DBFWriteHeader(DBFHandle psDBF) + +{ + unsigned char abyHeader[XBASE_FLDHDR_SZ]; + int i; + + if( !psDBF->bNoHeader ) + return; + + psDBF->bNoHeader = FALSE; + +/* -------------------------------------------------------------------- */ +/* Initialize the file header information. */ +/* -------------------------------------------------------------------- */ + for( i = 0; i < XBASE_FLDHDR_SZ; i++ ) + abyHeader[i] = 0; + + abyHeader[0] = 0x03; /* memo field? - just copying */ + + /* write out a dummy date */ + abyHeader[1] = 95; /* YY */ + abyHeader[2] = 7; /* MM */ + abyHeader[3] = 26; /* DD */ + + /* record count preset at zero */ + + abyHeader[8] = (unsigned char) (psDBF->nHeaderLength % 256); + abyHeader[9] = (unsigned char) (psDBF->nHeaderLength / 256); + + abyHeader[10] = (unsigned char) (psDBF->nRecordLength % 256); + abyHeader[11] = (unsigned char) (psDBF->nRecordLength / 256); + + abyHeader[29] = (unsigned char) (psDBF->iLanguageDriver); + +/* -------------------------------------------------------------------- */ +/* Write the initial 32 byte file header, and all the field */ +/* descriptions. */ +/* -------------------------------------------------------------------- */ + psDBF->sHooks.FSeek( psDBF->fp, 0, 0 ); + psDBF->sHooks.FWrite( abyHeader, XBASE_FLDHDR_SZ, 1, psDBF->fp ); + psDBF->sHooks.FWrite( psDBF->pszHeader, XBASE_FLDHDR_SZ, psDBF->nFields, + psDBF->fp ); + +/* -------------------------------------------------------------------- */ +/* Write out the newline character if there is room for it. */ +/* -------------------------------------------------------------------- */ + if( psDBF->nHeaderLength > 32*psDBF->nFields + 32 ) + { + char cNewline; + + cNewline = 0x0d; + psDBF->sHooks.FWrite( &cNewline, 1, 1, psDBF->fp ); + } +} + +/************************************************************************/ +/* DBFFlushRecord() */ +/* */ +/* Write out the current record if there is one. */ +/************************************************************************/ + +static int DBFFlushRecord( DBFHandle psDBF ) + +{ + SAOffset nRecordOffset; + + if( psDBF->bCurrentRecordModified && psDBF->nCurrentRecord > -1 ) + { + psDBF->bCurrentRecordModified = FALSE; + + nRecordOffset = + psDBF->nRecordLength * (SAOffset) psDBF->nCurrentRecord + + psDBF->nHeaderLength; + + if( psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ) != 0 + || psDBF->sHooks.FWrite( psDBF->pszCurrentRecord, + psDBF->nRecordLength, + 1, psDBF->fp ) != 1 ) + { + char szMessage[128]; + sprintf( szMessage, "Failure writing DBF record %d.", + psDBF->nCurrentRecord ); + psDBF->sHooks.Error( szMessage ); + return FALSE; + } + } + + return TRUE; +} + +/************************************************************************/ +/* DBFLoadRecord() */ +/************************************************************************/ + +static int DBFLoadRecord( DBFHandle psDBF, int iRecord ) + +{ + if( psDBF->nCurrentRecord != iRecord ) + { + SAOffset nRecordOffset; + + if( !DBFFlushRecord( psDBF ) ) + return FALSE; + + nRecordOffset = + psDBF->nRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength; + + if( psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, SEEK_SET ) != 0 ) + { + char szMessage[128]; + sprintf( szMessage, "fseek(%ld) failed on DBF file.\n", + (long) nRecordOffset ); + psDBF->sHooks.Error( szMessage ); + return FALSE; + } + + if( psDBF->sHooks.FRead( psDBF->pszCurrentRecord, + psDBF->nRecordLength, 1, psDBF->fp ) != 1 ) + { + char szMessage[128]; + sprintf( szMessage, "fread(%d) failed on DBF file.\n", + psDBF->nRecordLength ); + psDBF->sHooks.Error( szMessage ); + return FALSE; + } + + psDBF->nCurrentRecord = iRecord; + } + + return TRUE; +} + +/************************************************************************/ +/* DBFUpdateHeader() */ +/************************************************************************/ + +void SHPAPI_CALL +DBFUpdateHeader( DBFHandle psDBF ) + +{ + unsigned char abyFileHeader[32]; + + if( psDBF->bNoHeader ) + DBFWriteHeader( psDBF ); + + DBFFlushRecord( psDBF ); + + psDBF->sHooks.FSeek( psDBF->fp, 0, 0 ); + psDBF->sHooks.FRead( abyFileHeader, 32, 1, psDBF->fp ); + + abyFileHeader[4] = (unsigned char) (psDBF->nRecords % 256); + abyFileHeader[5] = (unsigned char) ((psDBF->nRecords/256) % 256); + abyFileHeader[6] = (unsigned char) ((psDBF->nRecords/(256*256)) % 256); + abyFileHeader[7] = (unsigned char) ((psDBF->nRecords/(256*256*256)) % 256); + + psDBF->sHooks.FSeek( psDBF->fp, 0, 0 ); + psDBF->sHooks.FWrite( abyFileHeader, 32, 1, psDBF->fp ); + + psDBF->sHooks.FFlush( psDBF->fp ); +} + +/************************************************************************/ +/* DBFOpen() */ +/* */ +/* Open a .dbf file. */ +/************************************************************************/ + +DBFHandle SHPAPI_CALL +DBFOpen( const char * pszFilename, const char * pszAccess ) + +{ + SAHooks sHooks; + + SASetupDefaultHooks( &sHooks ); + + return DBFOpenLL( pszFilename, pszAccess, &sHooks ); +} + +/************************************************************************/ +/* DBFOpen() */ +/* */ +/* Open a .dbf file. */ +/************************************************************************/ + +DBFHandle SHPAPI_CALL +DBFOpenLL( const char * pszFilename, const char * pszAccess, SAHooks *psHooks ) + +{ + DBFHandle psDBF; + SAFile pfCPG; + unsigned char *pabyBuf; + int nFields, nHeadLen, iField, i; + char *pszBasename, *pszFullname; + int nBufSize = 500; + +/* -------------------------------------------------------------------- */ +/* We only allow the access strings "rb" and "r+". */ +/* -------------------------------------------------------------------- */ + if( strcmp(pszAccess,"r") != 0 && strcmp(pszAccess,"r+") != 0 + && strcmp(pszAccess,"rb") != 0 && strcmp(pszAccess,"rb+") != 0 + && strcmp(pszAccess,"r+b") != 0 ) + return( NULL ); + + if( strcmp(pszAccess,"r") == 0 ) + pszAccess = "rb"; + + if( strcmp(pszAccess,"r+") == 0 ) + pszAccess = "rb+"; + +/* -------------------------------------------------------------------- */ +/* Compute the base (layer) name. If there is any extension */ +/* on the passed in filename we will strip it off. */ +/* -------------------------------------------------------------------- */ + pszBasename = (char *) dk_alloc(strlen(pszFilename)+5); + strcpy( pszBasename, pszFilename ); + for( i = strlen(pszBasename)-1; + i > 0 && pszBasename[i] != '.' && pszBasename[i] != '/' + && pszBasename[i] != '\\'; + i-- ) {} + + if( pszBasename[i] == '.' ) + pszBasename[i] = '\0'; + + pszFullname = (char *) dk_alloc(strlen(pszBasename) + 5); + sprintf( pszFullname, "%s.dbf", pszBasename ); + + psDBF = (DBFHandle) dk_alloc (sizeof(DBFInfo)); + memset (psDBF, 0, sizeof(DBFInfo)); + psDBF->fp = psHooks->FOpen( pszFullname, pszAccess ); + memcpy( &(psDBF->sHooks), psHooks, sizeof(SAHooks) ); + + if( psDBF->fp == NULL ) + { + sprintf( pszFullname, "%s.DBF", pszBasename ); + psDBF->fp = psDBF->sHooks.FOpen(pszFullname, pszAccess ); + } + + sprintf( pszFullname, "%s.cpg", pszBasename ); + pfCPG = psHooks->FOpen( pszFullname, "r" ); + if( pfCPG == NULL ) + { + sprintf( pszFullname, "%s.CPG", pszBasename ); + pfCPG = psHooks->FOpen( pszFullname, "r" ); + } + + dk_free ( pszBasename, -1 ); + dk_free ( pszFullname, -1 ); + + if( psDBF->fp == NULL ) + { + dk_free ( psDBF, -1 ); + if( pfCPG ) psHooks->FClose( pfCPG ); + return( NULL ); + } + + psDBF->bNoHeader = FALSE; + psDBF->nCurrentRecord = -1; + psDBF->bCurrentRecordModified = FALSE; + +/* -------------------------------------------------------------------- */ +/* Read Table Header info */ +/* -------------------------------------------------------------------- */ + pabyBuf = (unsigned char *) dk_alloc(nBufSize); + if( psDBF->sHooks.FRead( pabyBuf, 32, 1, psDBF->fp ) != 1 ) + { + psDBF->sHooks.FClose( psDBF->fp ); + if( pfCPG ) psDBF->sHooks.FClose( pfCPG ); + dk_free ( pabyBuf, -1 ); + dk_free ( psDBF, -1 ); + return NULL; + } + + psDBF->nRecords = + pabyBuf[4] + pabyBuf[5]*256 + pabyBuf[6]*256*256 + pabyBuf[7]*256*256*256; + + psDBF->nHeaderLength = nHeadLen = pabyBuf[8] + pabyBuf[9]*256; + psDBF->nRecordLength = pabyBuf[10] + pabyBuf[11]*256; + psDBF->iLanguageDriver = pabyBuf[29]; + + if (nHeadLen < 32) + { + psDBF->sHooks.FClose( psDBF->fp ); + if( pfCPG ) psDBF->sHooks.FClose( pfCPG ); + dk_free ( pabyBuf, -1 ); + dk_free ( psDBF, -1 ); + return NULL; + } + + psDBF->nFields = nFields = (nHeadLen - 32) / 32; + + psDBF->pszCurrentRecord = (char *) dk_alloc(psDBF->nRecordLength); + +/* -------------------------------------------------------------------- */ +/* Figure out the code page from the LDID and CPG */ +/* -------------------------------------------------------------------- */ + + psDBF->pszCodePage = NULL; + if( pfCPG ) + { + size_t n; + memset( pabyBuf, 0, nBufSize); + psDBF->sHooks.FRead( pabyBuf, nBufSize - 1, 1, pfCPG ); + n = strcspn( (char *) pabyBuf, "\n\r" ); + if( n > 0 ) + { + pabyBuf[n] = '\0'; + psDBF->pszCodePage = (char *) dk_alloc(n + 1); + memcpy( psDBF->pszCodePage, pabyBuf, n + 1 ); + } + psDBF->sHooks.FClose( pfCPG ); + } + if( psDBF->pszCodePage == NULL && pabyBuf[29] != 0 ) + { + sprintf( (char *) pabyBuf, "LDID/%d", psDBF->iLanguageDriver ); + psDBF->pszCodePage = (char *) dk_alloc(strlen((char*)pabyBuf) + 1); + strcpy( psDBF->pszCodePage, (char *) pabyBuf ); + } + +/* -------------------------------------------------------------------- */ +/* Read in Field Definitions */ +/* -------------------------------------------------------------------- */ + + pabyBuf = (unsigned char *) SfRealloc(pabyBuf,nHeadLen); + psDBF->pszHeader = (char *) pabyBuf; + + psDBF->sHooks.FSeek( psDBF->fp, 32, 0 ); + if( psDBF->sHooks.FRead( pabyBuf, nHeadLen-32, 1, psDBF->fp ) != 1 ) + { + psDBF->sHooks.FClose( psDBF->fp ); + dk_free ( pabyBuf, -1 ); + dk_free ( psDBF->pszCurrentRecord, -1 ); + dk_free ( psDBF, -1 ); + return NULL; + } + + psDBF->panFieldOffset = (int *) dk_alloc(sizeof(int) * nFields); + psDBF->panFieldSize = (int *) dk_alloc(sizeof(int) * nFields); + psDBF->panFieldDecimals = (int *) dk_alloc(sizeof(int) * nFields); + psDBF->pachFieldType = (char *) dk_alloc(sizeof(char) * nFields); + + for( iField = 0; iField < nFields; iField++ ) + { + unsigned char *pabyFInfo; + + pabyFInfo = pabyBuf+iField*32; + + if( pabyFInfo[11] == 'N' || pabyFInfo[11] == 'F' ) + { + psDBF->panFieldSize[iField] = pabyFInfo[16]; + psDBF->panFieldDecimals[iField] = pabyFInfo[17]; + } + else + { + psDBF->panFieldSize[iField] = pabyFInfo[16]; + psDBF->panFieldDecimals[iField] = 0; + +/* +** The following seemed to be used sometimes to handle files with long +** string fields, but in other cases (such as bug 1202) the decimals field +** just seems to indicate some sort of preferred formatting, not very +** wide fields. So I have disabled this code. FrankW. + psDBF->panFieldSize[iField] = pabyFInfo[16] + pabyFInfo[17]*256; + psDBF->panFieldDecimals[iField] = 0; +*/ + } + + psDBF->pachFieldType[iField] = (char) pabyFInfo[11]; + if( iField == 0 ) + psDBF->panFieldOffset[iField] = 1; + else + psDBF->panFieldOffset[iField] = + psDBF->panFieldOffset[iField-1] + psDBF->panFieldSize[iField-1]; + } + + return( psDBF ); +} + +/************************************************************************/ +/* DBFClose() */ +/************************************************************************/ + +void SHPAPI_CALL +DBFClose(DBFHandle psDBF) +{ + if( psDBF == NULL ) + return; + +/* -------------------------------------------------------------------- */ +/* Write out header if not already written. */ +/* -------------------------------------------------------------------- */ + if( psDBF->bNoHeader ) + DBFWriteHeader( psDBF ); + + DBFFlushRecord( psDBF ); + +/* -------------------------------------------------------------------- */ +/* Update last access date, and number of records if we have */ +/* write access. */ +/* -------------------------------------------------------------------- */ + if( psDBF->bUpdated ) + DBFUpdateHeader( psDBF ); + +/* -------------------------------------------------------------------- */ +/* Close, and dk_free resources. */ +/* -------------------------------------------------------------------- */ + psDBF->sHooks.FClose( psDBF->fp ); + + if( psDBF->panFieldOffset != NULL ) + { + dk_free ( psDBF->panFieldOffset, -1 ); + dk_free ( psDBF->panFieldSize, -1 ); + dk_free ( psDBF->panFieldDecimals, -1 ); + dk_free ( psDBF->pachFieldType, -1 ); + } + + if( psDBF->pszWorkField != NULL ) + dk_free ( psDBF->pszWorkField, -1 ); + + dk_free ( psDBF->pszHeader, -1 ); + dk_free ( psDBF->pszCurrentRecord, -1 ); + if (NULL != psDBF->pszCodePage) + dk_free ( psDBF->pszCodePage, -1 ); + + dk_free ( psDBF, -1 ); +} + +/************************************************************************/ +/* DBFCreate() */ +/* */ +/* Create a new .dbf file with default code page LDID/87 (0x57) */ +/************************************************************************/ + +DBFHandle SHPAPI_CALL +DBFCreate( const char * pszFilename ) + +{ + return DBFCreateEx( pszFilename, "LDID/87" ); // 0x57 +} + +/************************************************************************/ +/* DBFCreateEx() */ +/* */ +/* Create a new .dbf file. */ +/************************************************************************/ + +DBFHandle SHPAPI_CALL +DBFCreateEx( const char * pszFilename, const char* pszCodePage ) + +{ + SAHooks sHooks; + + SASetupDefaultHooks( &sHooks ); + + return DBFCreateLL( pszFilename, pszCodePage , &sHooks ); +} + +/************************************************************************/ +/* DBFCreate() */ +/* */ +/* Create a new .dbf file. */ +/************************************************************************/ + +DBFHandle SHPAPI_CALL +DBFCreateLL( const char * pszFilename, const char * pszCodePage, SAHooks *psHooks ) + +{ + DBFHandle psDBF; + SAFile fp; + char *pszFullname, *pszBasename; + int i, ldid = -1; + char chZero = '\0'; + +/* -------------------------------------------------------------------- */ +/* Compute the base (layer) name. If there is any extension */ +/* on the passed in filename we will strip it off. */ +/* -------------------------------------------------------------------- */ + pszBasename = (char *) dk_alloc(strlen(pszFilename)+5); + strcpy( pszBasename, pszFilename ); + for( i = strlen(pszBasename)-1; + i > 0 && pszBasename[i] != '.' && pszBasename[i] != '/' + && pszBasename[i] != '\\'; + i-- ) {} + + if( pszBasename[i] == '.' ) + pszBasename[i] = '\0'; + + pszFullname = (char *) dk_alloc(strlen(pszBasename) + 5); + sprintf( pszFullname, "%s.dbf", pszBasename ); + +/* -------------------------------------------------------------------- */ +/* Create the file. */ +/* -------------------------------------------------------------------- */ + fp = psHooks->FOpen( pszFullname, "wb" ); + if( fp == NULL ) + return( NULL ); + + psHooks->FWrite( &chZero, 1, 1, fp ); + psHooks->FClose( fp ); + + fp = psHooks->FOpen( pszFullname, "rb+" ); + if( fp == NULL ) + return( NULL ); + + + sprintf( pszFullname, "%s.cpg", pszBasename ); + if( pszCodePage != NULL ) + { + if( strncmp( pszCodePage, "LDID/", 5 ) == 0 ) + { + ldid = atoi( pszCodePage + 5 ); + if( ldid > 255 ) + ldid = -1; // don't use 0 to indicate out of range as LDID/0 is a valid one + } + if( ldid < 0 ) + { + SAFile fpCPG = psHooks->FOpen( pszFullname, "w" ); + psHooks->FWrite( (char*) pszCodePage, strlen(pszCodePage), 1, fpCPG ); + psHooks->FClose( fpCPG ); + } + } + if( pszCodePage == NULL || ldid >= 0 ) + { + psHooks->Remove( pszFullname ); + } + + dk_free ( pszBasename, -1 ); + dk_free ( pszFullname, -1 ); + +/* -------------------------------------------------------------------- */ +/* Create the info structure. */ +/* -------------------------------------------------------------------- */ + psDBF = (DBFHandle) dk_alloc (sizeof(DBFInfo)); + memset (psDBF, 0, sizeof(DBFInfo)); + memcpy( &(psDBF->sHooks), psHooks, sizeof(SAHooks) ); + psDBF->fp = fp; + psDBF->nRecords = 0; + psDBF->nFields = 0; + psDBF->nRecordLength = 1; + psDBF->nHeaderLength = 33; + + psDBF->panFieldOffset = NULL; + psDBF->panFieldSize = NULL; + psDBF->panFieldDecimals = NULL; + psDBF->pachFieldType = NULL; + psDBF->pszHeader = NULL; + + psDBF->nCurrentRecord = -1; + psDBF->bCurrentRecordModified = FALSE; + psDBF->pszCurrentRecord = NULL; + + psDBF->bNoHeader = TRUE; + + psDBF->iLanguageDriver = ldid > 0 ? ldid : 0; + psDBF->pszCodePage = NULL; + if( pszCodePage ) + { + psDBF->pszCodePage = (char * ) dk_alloc( strlen(pszCodePage) + 1 ); + strcpy( psDBF->pszCodePage, pszCodePage ); + } + + return( psDBF ); +} + +/************************************************************************/ +/* DBFAddField() */ +/* */ +/* Add a field to a newly created .dbf or to an existing one */ +/************************************************************************/ + +int SHPAPI_CALL +DBFAddField(DBFHandle psDBF, const char * pszFieldName, + DBFFieldType eType, int nWidth, int nDecimals ) + +{ + char chNativeType = 'C'; + + if( eType == FTLogical ) + chNativeType = 'L'; + else if( eType == FTString ) + chNativeType = 'C'; + else + chNativeType = 'N'; + + return DBFAddNativeFieldType( psDBF, pszFieldName, chNativeType, + nWidth, nDecimals ); +} + +/************************************************************************/ +/* DBFGetNullCharacter() */ +/************************************************************************/ + +static char DBFGetNullCharacter(char chType) +{ + switch (chType) + { + case 'N': + case 'F': + return '*'; + case 'D': + return '0'; + case 'L': + return '?'; + default: + return ' '; + } +} + +/************************************************************************/ +/* DBFAddField() */ +/* */ +/* Add a field to a newly created .dbf file before any records */ +/* are written. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFAddNativeFieldType(DBFHandle psDBF, const char * pszFieldName, + char chType, int nWidth, int nDecimals ) + +{ + char *pszFInfo; + int i; + int nOldRecordLength, nOldHeaderLength; + char *pszRecord; + char chFieldFill; + SAOffset nRecordOffset; + + /* make sure that everything is written in .dbf */ + if( !DBFFlushRecord( psDBF ) ) + return -1; + +/* -------------------------------------------------------------------- */ +/* Do some checking to ensure we can add records to this file. */ +/* -------------------------------------------------------------------- */ + if( nWidth < 1 ) + return -1; + + if( nWidth > 255 ) + nWidth = 255; + + nOldRecordLength = psDBF->nRecordLength; + nOldHeaderLength = psDBF->nHeaderLength; + +/* -------------------------------------------------------------------- */ +/* SfRealloc all the arrays larger to hold the additional field */ +/* information. */ +/* -------------------------------------------------------------------- */ + psDBF->nFields++; + + psDBF->panFieldOffset = (int *) + SfRealloc( psDBF->panFieldOffset, sizeof(int) * psDBF->nFields ); + + psDBF->panFieldSize = (int *) + SfRealloc( psDBF->panFieldSize, sizeof(int) * psDBF->nFields ); + + psDBF->panFieldDecimals = (int *) + SfRealloc( psDBF->panFieldDecimals, sizeof(int) * psDBF->nFields ); + + psDBF->pachFieldType = (char *) + SfRealloc( psDBF->pachFieldType, sizeof(char) * psDBF->nFields ); + +/* -------------------------------------------------------------------- */ +/* Assign the new field information fields. */ +/* -------------------------------------------------------------------- */ + psDBF->panFieldOffset[psDBF->nFields-1] = psDBF->nRecordLength; + psDBF->nRecordLength += nWidth; + psDBF->panFieldSize[psDBF->nFields-1] = nWidth; + psDBF->panFieldDecimals[psDBF->nFields-1] = nDecimals; + psDBF->pachFieldType[psDBF->nFields-1] = chType; + +/* -------------------------------------------------------------------- */ +/* Extend the required header information. */ +/* -------------------------------------------------------------------- */ + psDBF->nHeaderLength += 32; + psDBF->bUpdated = FALSE; + + psDBF->pszHeader = (char *) SfRealloc(psDBF->pszHeader,psDBF->nFields*32); + + pszFInfo = psDBF->pszHeader + 32 * (psDBF->nFields-1); + + for( i = 0; i < 32; i++ ) + pszFInfo[i] = '\0'; + + if( (int) strlen(pszFieldName) < 10 ) + strncpy( pszFInfo, pszFieldName, strlen(pszFieldName)); + else + strncpy( pszFInfo, pszFieldName, 10); + + pszFInfo[11] = psDBF->pachFieldType[psDBF->nFields-1]; + + if( chType == 'C' ) + { + pszFInfo[16] = (unsigned char) (nWidth % 256); + pszFInfo[17] = (unsigned char) (nWidth / 256); + } + else + { + pszFInfo[16] = (unsigned char) nWidth; + pszFInfo[17] = (unsigned char) nDecimals; + } + +/* -------------------------------------------------------------------- */ +/* Make the current record buffer appropriately larger. */ +/* -------------------------------------------------------------------- */ + psDBF->pszCurrentRecord = (char *) SfRealloc(psDBF->pszCurrentRecord, + psDBF->nRecordLength); + + /* we're done if dealing with new .dbf */ + if( psDBF->bNoHeader ) + return( psDBF->nFields - 1 ); + +/* -------------------------------------------------------------------- */ +/* For existing .dbf file, shift records */ +/* -------------------------------------------------------------------- */ + + /* alloc record */ + pszRecord = (char *) dk_alloc(sizeof(char) * psDBF->nRecordLength); + + chFieldFill = DBFGetNullCharacter(chType); + + for (i = psDBF->nRecords-1; i >= 0; --i) + { + nRecordOffset = nOldRecordLength * (SAOffset) i + nOldHeaderLength; + + /* load record */ + psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ); + psDBF->sHooks.FRead( pszRecord, nOldRecordLength, 1, psDBF->fp ); + + /* set new field's value to NULL */ + memset(pszRecord + nOldRecordLength, chFieldFill, nWidth); + + nRecordOffset = psDBF->nRecordLength * (SAOffset) i + psDBF->nHeaderLength; + + /* move record to the new place*/ + psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ); + psDBF->sHooks.FWrite( pszRecord, psDBF->nRecordLength, 1, psDBF->fp ); + } + + /* dk_free record */ + dk_free (pszRecord, -1); + + /* force update of header with new header, record length and new field */ + psDBF->bNoHeader = TRUE; + DBFUpdateHeader( psDBF ); + + psDBF->nCurrentRecord = -1; + psDBF->bCurrentRecordModified = FALSE; + + return( psDBF->nFields-1 ); +} + +/************************************************************************/ +/* DBFReadAttribute() */ +/* */ +/* Read one of the attribute fields of a record. */ +/************************************************************************/ + +static void *DBFReadAttribute(DBFHandle psDBF, int hEntity, int iField, + char chReqType ) + +{ + unsigned char *pabyRec; + void *pReturnField = NULL; + +/* -------------------------------------------------------------------- */ +/* Verify selection. */ +/* -------------------------------------------------------------------- */ + if( hEntity < 0 || hEntity >= psDBF->nRecords ) + return( NULL ); + + if( iField < 0 || iField >= psDBF->nFields ) + return( NULL ); + +/* -------------------------------------------------------------------- */ +/* Have we read the record? */ +/* -------------------------------------------------------------------- */ + if( !DBFLoadRecord( psDBF, hEntity ) ) + return NULL; + + pabyRec = (unsigned char *) psDBF->pszCurrentRecord; + +/* -------------------------------------------------------------------- */ +/* Ensure we have room to extract the target field. */ +/* -------------------------------------------------------------------- */ + if( psDBF->panFieldSize[iField] >= psDBF->nWorkFieldLength ) + { + psDBF->nWorkFieldLength = psDBF->panFieldSize[iField] + 100; + if( psDBF->pszWorkField == NULL ) + psDBF->pszWorkField = (char *) dk_alloc(psDBF->nWorkFieldLength); + else + psDBF->pszWorkField = (char *) SfRealloc(psDBF->pszWorkField, + psDBF->nWorkFieldLength); + } + +/* -------------------------------------------------------------------- */ +/* Extract the requested field. */ +/* -------------------------------------------------------------------- */ + strncpy( psDBF->pszWorkField, + ((const char *) pabyRec) + psDBF->panFieldOffset[iField], + psDBF->panFieldSize[iField] ); + psDBF->pszWorkField[psDBF->panFieldSize[iField]] = '\0'; + + pReturnField = psDBF->pszWorkField; + +/* -------------------------------------------------------------------- */ +/* Decode the field. */ +/* -------------------------------------------------------------------- */ + if( chReqType == 'N' ) + { + psDBF->dfDoubleField = psDBF->sHooks.Atof(psDBF->pszWorkField); + + pReturnField = &(psDBF->dfDoubleField); + } + +/* -------------------------------------------------------------------- */ +/* Should we trim white space off the string attribute value? */ +/* -------------------------------------------------------------------- */ +#ifdef TRIM_DBF_WHITESPACE + else + { + char *pchSrc, *pchDst; + + pchDst = pchSrc = psDBF->pszWorkField; + while( *pchSrc == ' ' ) + pchSrc++; + + while( *pchSrc != '\0' ) + *(pchDst++) = *(pchSrc++); + *pchDst = '\0'; + + while( pchDst != psDBF->pszWorkField && *(--pchDst) == ' ' ) + *pchDst = '\0'; + } +#endif + + return( pReturnField ); +} + +/************************************************************************/ +/* DBFReadIntAttribute() */ +/* */ +/* Read an integer attribute. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFReadIntegerAttribute( DBFHandle psDBF, int iRecord, int iField ) + +{ + double *pdValue; + + pdValue = (double *) DBFReadAttribute( psDBF, iRecord, iField, 'N' ); + + if( pdValue == NULL ) + return 0; + else + return( (int) *pdValue ); +} + +/************************************************************************/ +/* DBFReadDoubleAttribute() */ +/* */ +/* Read a double attribute. */ +/************************************************************************/ + +double SHPAPI_CALL +DBFReadDoubleAttribute( DBFHandle psDBF, int iRecord, int iField ) + +{ + double *pdValue; + + pdValue = (double *) DBFReadAttribute( psDBF, iRecord, iField, 'N' ); + + if( pdValue == NULL ) + return 0.0; + else + return( *pdValue ); +} + +/************************************************************************/ +/* DBFReadStringAttribute() */ +/* */ +/* Read a string attribute. */ +/************************************************************************/ + +const char SHPAPI_CALL1(*) +DBFReadStringAttribute( DBFHandle psDBF, int iRecord, int iField ) + +{ + return( (const char *) DBFReadAttribute( psDBF, iRecord, iField, 'C' ) ); +} + +/************************************************************************/ +/* DBFReadLogicalAttribute() */ +/* */ +/* Read a logical attribute. */ +/************************************************************************/ + +const char SHPAPI_CALL1(*) +DBFReadLogicalAttribute( DBFHandle psDBF, int iRecord, int iField ) + +{ + return( (const char *) DBFReadAttribute( psDBF, iRecord, iField, 'L' ) ); +} + + +/************************************************************************/ +/* DBFIsValueNULL() */ +/* */ +/* Return TRUE if the passed string is NULL. */ +/************************************************************************/ + +static int DBFIsValueNULL( char chType, const char* pszValue ) +{ + int i; + + if( pszValue == NULL ) + return TRUE; + + switch(chType) + { + case 'N': + case 'F': + /* + ** We accept all asterisks or all blanks as NULL + ** though according to the spec I think it should be all + ** asterisks. + */ + if( pszValue[0] == '*' ) + return TRUE; + + for( i = 0; pszValue[i] != '\0'; i++ ) + { + if( pszValue[i] != ' ' ) + return FALSE; + } + return TRUE; + + case 'D': + /* NULL date fields have value "00000000" */ + return strncmp(pszValue,"00000000",8) == 0; + + case 'L': + /* NULL boolean fields have value "?" */ + return pszValue[0] == '?'; + + default: + /* empty string fields are considered NULL */ + return strlen(pszValue) == 0; + } +} + +/************************************************************************/ +/* DBFIsAttributeNULL() */ +/* */ +/* Return TRUE if value for field is NULL. */ +/* */ +/* Contributed by Jim Matthews. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFIsAttributeNULL( DBFHandle psDBF, int iRecord, int iField ) + +{ + const char *pszValue; + + pszValue = DBFReadStringAttribute( psDBF, iRecord, iField ); + + if( pszValue == NULL ) + return TRUE; + + return DBFIsValueNULL( psDBF->pachFieldType[iField], pszValue ); +} + +/************************************************************************/ +/* DBFGetFieldCount() */ +/* */ +/* Return the number of fields in this table. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFGetFieldCount( DBFHandle psDBF ) + +{ + return( psDBF->nFields ); +} + +/************************************************************************/ +/* DBFGetRecordCount() */ +/* */ +/* Return the number of records in this table. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFGetRecordCount( DBFHandle psDBF ) + +{ + return( psDBF->nRecords ); +} + +/************************************************************************/ +/* DBFGetFieldInfo() */ +/* */ +/* Return any requested information about the field. */ +/************************************************************************/ + +DBFFieldType SHPAPI_CALL +DBFGetFieldInfo( DBFHandle psDBF, int iField, char * pszFieldName, + int * pnWidth, int * pnDecimals ) + +{ + if( iField < 0 || iField >= psDBF->nFields ) + return( FTInvalid ); + + if( pnWidth != NULL ) + *pnWidth = psDBF->panFieldSize[iField]; + + if( pnDecimals != NULL ) + *pnDecimals = psDBF->panFieldDecimals[iField]; + + if( pszFieldName != NULL ) + { + int i; + + strncpy( pszFieldName, (char *) psDBF->pszHeader+iField*32, 11 ); + pszFieldName[11] = '\0'; + for( i = 10; i > 0 && pszFieldName[i] == ' '; i-- ) + pszFieldName[i] = '\0'; + } + + if ( psDBF->pachFieldType[iField] == 'L' ) + return( FTLogical); + + else if( psDBF->pachFieldType[iField] == 'N' + || psDBF->pachFieldType[iField] == 'F' ) + { + if( psDBF->panFieldDecimals[iField] > 0 + || psDBF->panFieldSize[iField] > 10 ) + return( FTDouble ); + else + return( FTInteger ); + } + else + { + return( FTString ); + } +} + +/************************************************************************/ +/* DBFWriteAttribute() */ +/* */ +/* Write an attribute record to the file. */ +/************************************************************************/ + +static int DBFWriteAttribute(DBFHandle psDBF, int hEntity, int iField, + void * pValue ) + +{ + int i, j, nRetResult = TRUE; + unsigned char *pabyRec; + char szSField[400], szFormat[20]; + +/* -------------------------------------------------------------------- */ +/* Is this a valid record? */ +/* -------------------------------------------------------------------- */ + if( hEntity < 0 || hEntity > psDBF->nRecords ) + return( FALSE ); + + if( psDBF->bNoHeader ) + DBFWriteHeader(psDBF); + +/* -------------------------------------------------------------------- */ +/* Is this a brand new record? */ +/* -------------------------------------------------------------------- */ + if( hEntity == psDBF->nRecords ) + { + if( !DBFFlushRecord( psDBF ) ) + return FALSE; + + psDBF->nRecords++; + for( i = 0; i < psDBF->nRecordLength; i++ ) + psDBF->pszCurrentRecord[i] = ' '; + + psDBF->nCurrentRecord = hEntity; + } + +/* -------------------------------------------------------------------- */ +/* Is this an existing record, but different than the last one */ +/* we accessed? */ +/* -------------------------------------------------------------------- */ + if( !DBFLoadRecord( psDBF, hEntity ) ) + return FALSE; + + pabyRec = (unsigned char *) psDBF->pszCurrentRecord; + + psDBF->bCurrentRecordModified = TRUE; + psDBF->bUpdated = TRUE; + +/* -------------------------------------------------------------------- */ +/* Translate NULL value to valid DBF file representation. */ +/* */ +/* Contributed by Jim Matthews. */ +/* -------------------------------------------------------------------- */ + if( pValue == NULL ) + { + memset( (char *) (pabyRec+psDBF->panFieldOffset[iField]), + DBFGetNullCharacter(psDBF->pachFieldType[iField]), + psDBF->panFieldSize[iField] ); + return TRUE; + } + +/* -------------------------------------------------------------------- */ +/* Assign all the record fields. */ +/* -------------------------------------------------------------------- */ + switch( psDBF->pachFieldType[iField] ) + { + case 'D': + case 'N': + case 'F': + if( psDBF->panFieldDecimals[iField] == 0 ) + { + int nWidth = psDBF->panFieldSize[iField]; + + if( (int) sizeof(szSField)-2 < nWidth ) + nWidth = sizeof(szSField)-2; + + sprintf( szFormat, "%%%dd", nWidth ); + sprintf(szSField, szFormat, (int) *((double *) pValue) ); + if( (int)strlen(szSField) > psDBF->panFieldSize[iField] ) + { + szSField[psDBF->panFieldSize[iField]] = '\0'; + nRetResult = FALSE; + } + + strncpy((char *) (pabyRec+psDBF->panFieldOffset[iField]), + szSField, strlen(szSField) ); + } + else + { + int nWidth = psDBF->panFieldSize[iField]; + + if( (int) sizeof(szSField)-2 < nWidth ) + nWidth = sizeof(szSField)-2; + + sprintf( szFormat, "%%%d.%df", + nWidth, psDBF->panFieldDecimals[iField] ); + sprintf(szSField, szFormat, *((double *) pValue) ); + if( (int) strlen(szSField) > psDBF->panFieldSize[iField] ) + { + szSField[psDBF->panFieldSize[iField]] = '\0'; + nRetResult = FALSE; + } + strncpy((char *) (pabyRec+psDBF->panFieldOffset[iField]), + szSField, strlen(szSField) ); + } + break; + + case 'L': + if (psDBF->panFieldSize[iField] >= 1 && + (*(char*)pValue == 'F' || *(char*)pValue == 'T')) + *(pabyRec+psDBF->panFieldOffset[iField]) = *(char*)pValue; + break; + + default: + if( (int) strlen((char *) pValue) > psDBF->panFieldSize[iField] ) + { + j = psDBF->panFieldSize[iField]; + nRetResult = FALSE; + } + else + { + memset( pabyRec+psDBF->panFieldOffset[iField], ' ', + psDBF->panFieldSize[iField] ); + j = strlen((char *) pValue); + } + + strncpy((char *) (pabyRec+psDBF->panFieldOffset[iField]), + (char *) pValue, j ); + break; + } + + return( nRetResult ); +} + +/************************************************************************/ +/* DBFWriteAttributeDirectly() */ +/* */ +/* Write an attribute record to the file, but without any */ +/* reformatting based on type. The provided buffer is written */ +/* as is to the field position in the record. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFWriteAttributeDirectly(DBFHandle psDBF, int hEntity, int iField, + void * pValue ) + +{ + int i, j; + unsigned char *pabyRec; + +/* -------------------------------------------------------------------- */ +/* Is this a valid record? */ +/* -------------------------------------------------------------------- */ + if( hEntity < 0 || hEntity > psDBF->nRecords ) + return( FALSE ); + + if( psDBF->bNoHeader ) + DBFWriteHeader(psDBF); + +/* -------------------------------------------------------------------- */ +/* Is this a brand new record? */ +/* -------------------------------------------------------------------- */ + if( hEntity == psDBF->nRecords ) + { + if( !DBFFlushRecord( psDBF ) ) + return FALSE; + + psDBF->nRecords++; + for( i = 0; i < psDBF->nRecordLength; i++ ) + psDBF->pszCurrentRecord[i] = ' '; + + psDBF->nCurrentRecord = hEntity; + } + +/* -------------------------------------------------------------------- */ +/* Is this an existing record, but different than the last one */ +/* we accessed? */ +/* -------------------------------------------------------------------- */ + if( !DBFLoadRecord( psDBF, hEntity ) ) + return FALSE; + + pabyRec = (unsigned char *) psDBF->pszCurrentRecord; + +/* -------------------------------------------------------------------- */ +/* Assign all the record fields. */ +/* -------------------------------------------------------------------- */ + if( (int)strlen((char *) pValue) > psDBF->panFieldSize[iField] ) + j = psDBF->panFieldSize[iField]; + else + { + memset( pabyRec+psDBF->panFieldOffset[iField], ' ', + psDBF->panFieldSize[iField] ); + j = strlen((char *) pValue); + } + + strncpy((char *) (pabyRec+psDBF->panFieldOffset[iField]), + (char *) pValue, j ); + + psDBF->bCurrentRecordModified = TRUE; + psDBF->bUpdated = TRUE; + + return( TRUE ); +} + +/************************************************************************/ +/* DBFWriteDoubleAttribute() */ +/* */ +/* Write a double attribute. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFWriteDoubleAttribute( DBFHandle psDBF, int iRecord, int iField, + double dValue ) + +{ + return( DBFWriteAttribute( psDBF, iRecord, iField, (void *) &dValue ) ); +} + +/************************************************************************/ +/* DBFWriteIntegerAttribute() */ +/* */ +/* Write a integer attribute. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFWriteIntegerAttribute( DBFHandle psDBF, int iRecord, int iField, + int nValue ) + +{ + double dValue = nValue; + + return( DBFWriteAttribute( psDBF, iRecord, iField, (void *) &dValue ) ); +} + +/************************************************************************/ +/* DBFWriteStringAttribute() */ +/* */ +/* Write a string attribute. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFWriteStringAttribute( DBFHandle psDBF, int iRecord, int iField, + const char * pszValue ) + +{ + return( DBFWriteAttribute( psDBF, iRecord, iField, (void *) pszValue ) ); +} + +/************************************************************************/ +/* DBFWriteNULLAttribute() */ +/* */ +/* Write a string attribute. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFWriteNULLAttribute( DBFHandle psDBF, int iRecord, int iField ) + +{ + return( DBFWriteAttribute( psDBF, iRecord, iField, NULL ) ); +} + +/************************************************************************/ +/* DBFWriteLogicalAttribute() */ +/* */ +/* Write a logical attribute. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFWriteLogicalAttribute( DBFHandle psDBF, int iRecord, int iField, + const char lValue) + +{ + return( DBFWriteAttribute( psDBF, iRecord, iField, (void *) (&lValue) ) ); +} + +/************************************************************************/ +/* DBFWriteTuple() */ +/* */ +/* Write an attribute record to the file. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFWriteTuple(DBFHandle psDBF, int hEntity, void * pRawTuple ) + +{ + int i; + unsigned char *pabyRec; + +/* -------------------------------------------------------------------- */ +/* Is this a valid record? */ +/* -------------------------------------------------------------------- */ + if( hEntity < 0 || hEntity > psDBF->nRecords ) + return( FALSE ); + + if( psDBF->bNoHeader ) + DBFWriteHeader(psDBF); + +/* -------------------------------------------------------------------- */ +/* Is this a brand new record? */ +/* -------------------------------------------------------------------- */ + if( hEntity == psDBF->nRecords ) + { + if( !DBFFlushRecord( psDBF ) ) + return FALSE; + + psDBF->nRecords++; + for( i = 0; i < psDBF->nRecordLength; i++ ) + psDBF->pszCurrentRecord[i] = ' '; + + psDBF->nCurrentRecord = hEntity; + } + +/* -------------------------------------------------------------------- */ +/* Is this an existing record, but different than the last one */ +/* we accessed? */ +/* -------------------------------------------------------------------- */ + if( !DBFLoadRecord( psDBF, hEntity ) ) + return FALSE; + + pabyRec = (unsigned char *) psDBF->pszCurrentRecord; + + memcpy ( pabyRec, pRawTuple, psDBF->nRecordLength ); + + psDBF->bCurrentRecordModified = TRUE; + psDBF->bUpdated = TRUE; + + return( TRUE ); +} + +/************************************************************************/ +/* DBFReadTuple() */ +/* */ +/* Read a complete record. Note that the result is only valid */ +/* till the next record read for any reason. */ +/************************************************************************/ + +const char SHPAPI_CALL1(*) +DBFReadTuple(DBFHandle psDBF, int hEntity ) + +{ + if( hEntity < 0 || hEntity >= psDBF->nRecords ) + return( NULL ); + + if( !DBFLoadRecord( psDBF, hEntity ) ) + return NULL; + + return (const char *) psDBF->pszCurrentRecord; +} + +/************************************************************************/ +/* DBFCloneEmpty() */ +/* */ +/* Read one of the attribute fields of a record. */ +/************************************************************************/ + +DBFHandle SHPAPI_CALL +DBFCloneEmpty(DBFHandle psDBF, const char * pszFilename ) +{ + DBFHandle newDBF; + + newDBF = DBFCreateEx ( pszFilename, psDBF->pszCodePage ); + if ( newDBF == NULL ) return ( NULL ); + + newDBF->nFields = psDBF->nFields; + newDBF->nRecordLength = psDBF->nRecordLength; + newDBF->nHeaderLength = psDBF->nHeaderLength; + + newDBF->pszHeader = (char *) dk_alloc ( newDBF->nHeaderLength ); + memcpy ( newDBF->pszHeader, psDBF->pszHeader, newDBF->nHeaderLength ); + + newDBF->panFieldOffset = (int *) dk_alloc ( sizeof(int) * psDBF->nFields ); + memcpy ( newDBF->panFieldOffset, psDBF->panFieldOffset, sizeof(int) * psDBF->nFields ); + newDBF->panFieldSize = (int *) dk_alloc ( sizeof(int) * psDBF->nFields ); + memcpy ( newDBF->panFieldSize, psDBF->panFieldSize, sizeof(int) * psDBF->nFields ); + newDBF->panFieldDecimals = (int *) dk_alloc ( sizeof(int) * psDBF->nFields ); + memcpy ( newDBF->panFieldDecimals, psDBF->panFieldDecimals, sizeof(int) * psDBF->nFields ); + newDBF->pachFieldType = (char *) dk_alloc ( sizeof(char) * psDBF->nFields ); + memcpy ( newDBF->pachFieldType, psDBF->pachFieldType, sizeof(char)*psDBF->nFields ); + + newDBF->bNoHeader = TRUE; + newDBF->bUpdated = TRUE; + + DBFWriteHeader ( newDBF ); + DBFClose ( newDBF ); + + newDBF = DBFOpen ( pszFilename, "rb+" ); + + return ( newDBF ); +} + +/************************************************************************/ +/* DBFGetNativeFieldType() */ +/* */ +/* Return the DBase field type for the specified field. */ +/* */ +/* Value can be one of: 'C' (String), 'D' (Date), 'F' (Float), */ +/* 'N' (Numeric, with or without decimal), */ +/* 'L' (Logical), */ +/* 'M' (Memo: 10 digits .DBT block ptr) */ +/************************************************************************/ + +char SHPAPI_CALL +DBFGetNativeFieldType( DBFHandle psDBF, int iField ) + +{ + if( iField >=0 && iField < psDBF->nFields ) + return psDBF->pachFieldType[iField]; + + return ' '; +} + +/************************************************************************/ +/* str_to_upper() */ +/************************************************************************/ + +static void str_to_upper (char *string) +{ + int len; + short i = -1; + + len = strlen (string); + + while (++i < len) + if (isalpha(string[i]) && islower(string[i])) + string[i] = (char) toupper ((int)string[i]); +} + +/************************************************************************/ +/* DBFGetFieldIndex() */ +/* */ +/* Get the index number for a field in a .dbf file. */ +/* */ +/* Contributed by Jim Matthews. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFGetFieldIndex(DBFHandle psDBF, const char *pszFieldName) + +{ + char name[12], name1[12], name2[12]; + int i; + + strncpy(name1, pszFieldName,11); + name1[11] = '\0'; + str_to_upper(name1); + + for( i = 0; i < DBFGetFieldCount(psDBF); i++ ) + { + DBFGetFieldInfo( psDBF, i, name, NULL, NULL ); + strncpy(name2,name,11); + str_to_upper(name2); + + if(!strncmp(name1,name2,10)) + return(i); + } + return(-1); +} + +/************************************************************************/ +/* DBFIsRecordDeleted() */ +/* */ +/* Returns TRUE if the indicated record is deleted, otherwise */ +/* it returns FALSE. */ +/************************************************************************/ + +int SHPAPI_CALL DBFIsRecordDeleted( DBFHandle psDBF, int iShape ) + +{ +/* -------------------------------------------------------------------- */ +/* Verify selection. */ +/* -------------------------------------------------------------------- */ + if( iShape < 0 || iShape >= psDBF->nRecords ) + return TRUE; + +/* -------------------------------------------------------------------- */ +/* Have we read the record? */ +/* -------------------------------------------------------------------- */ + if( !DBFLoadRecord( psDBF, iShape ) ) + return FALSE; + +/* -------------------------------------------------------------------- */ +/* '*' means deleted. */ +/* -------------------------------------------------------------------- */ + return psDBF->pszCurrentRecord[0] == '*'; +} + +/************************************************************************/ +/* DBFMarkRecordDeleted() */ +/************************************************************************/ + +int SHPAPI_CALL DBFMarkRecordDeleted( DBFHandle psDBF, int iShape, + int bIsDeleted ) + +{ + char chNewFlag; + +/* -------------------------------------------------------------------- */ +/* Verify selection. */ +/* -------------------------------------------------------------------- */ + if( iShape < 0 || iShape >= psDBF->nRecords ) + return FALSE; + +/* -------------------------------------------------------------------- */ +/* Is this an existing record, but different than the last one */ +/* we accessed? */ +/* -------------------------------------------------------------------- */ + if( !DBFLoadRecord( psDBF, iShape ) ) + return FALSE; + +/* -------------------------------------------------------------------- */ +/* Assign value, marking record as dirty if it changes. */ +/* -------------------------------------------------------------------- */ + if( bIsDeleted ) + chNewFlag = '*'; + else + chNewFlag = ' '; + + if( psDBF->pszCurrentRecord[0] != chNewFlag ) + { + psDBF->bCurrentRecordModified = TRUE; + psDBF->bUpdated = TRUE; + psDBF->pszCurrentRecord[0] = chNewFlag; + } + + return TRUE; +} + +/************************************************************************/ +/* DBFGetCodePage */ +/************************************************************************/ + +const char SHPAPI_CALL1(*) +DBFGetCodePage(DBFHandle psDBF ) +{ + if( psDBF == NULL ) + return NULL; + return psDBF->pszCodePage; +} + +/************************************************************************/ +/* DBFDeleteField() */ +/* */ +/* Remove a field from a .dbf file */ +/************************************************************************/ + +int SHPAPI_CALL +DBFDeleteField(DBFHandle psDBF, int iField) +{ + int nOldRecordLength, nOldHeaderLength; + int nDeletedFieldOffset, nDeletedFieldSize; + SAOffset nRecordOffset; + char* pszRecord; + int i, iRecord; + + if (iField < 0 || iField >= psDBF->nFields) + return FALSE; + + /* make sure that everything is written in .dbf */ + if( !DBFFlushRecord( psDBF ) ) + return FALSE; + + /* get information about field to be deleted */ + nOldRecordLength = psDBF->nRecordLength; + nOldHeaderLength = psDBF->nHeaderLength; + nDeletedFieldOffset = psDBF->panFieldOffset[iField]; + nDeletedFieldSize = psDBF->panFieldSize[iField]; + + /* update fields info */ + for (i = iField + 1; i < psDBF->nFields; i++) + { + psDBF->panFieldOffset[i-1] = psDBF->panFieldOffset[i] - nDeletedFieldSize; + psDBF->panFieldSize[i-1] = psDBF->panFieldSize[i]; + psDBF->panFieldDecimals[i-1] = psDBF->panFieldDecimals[i]; + psDBF->pachFieldType[i-1] = psDBF->pachFieldType[i]; + } + + /* resize fields arrays */ + psDBF->nFields--; + + psDBF->panFieldOffset = (int *) + SfRealloc( psDBF->panFieldOffset, sizeof(int) * psDBF->nFields ); + + psDBF->panFieldSize = (int *) + SfRealloc( psDBF->panFieldSize, sizeof(int) * psDBF->nFields ); + + psDBF->panFieldDecimals = (int *) + SfRealloc( psDBF->panFieldDecimals, sizeof(int) * psDBF->nFields ); + + psDBF->pachFieldType = (char *) + SfRealloc( psDBF->pachFieldType, sizeof(char) * psDBF->nFields ); + + /* update header information */ + psDBF->nHeaderLength -= 32; + psDBF->nRecordLength -= nDeletedFieldSize; + + /* overwrite field information in header */ + memmove(psDBF->pszHeader + iField*32, + psDBF->pszHeader + (iField+1)*32, + sizeof(char) * (psDBF->nFields - iField)*32); + + psDBF->pszHeader = (char *) SfRealloc(psDBF->pszHeader,psDBF->nFields*32); + + /* update size of current record appropriately */ + psDBF->pszCurrentRecord = (char *) SfRealloc(psDBF->pszCurrentRecord, + psDBF->nRecordLength); + + /* we're done if we're dealing with not yet created .dbf */ + if ( psDBF->bNoHeader && psDBF->nRecords == 0 ) + return TRUE; + + /* force update of header with new header and record length */ + psDBF->bNoHeader = TRUE; + DBFUpdateHeader( psDBF ); + + /* alloc record */ + pszRecord = (char *) dk_alloc(sizeof(char) * nOldRecordLength); + + /* shift records to their new positions */ + for (iRecord = 0; iRecord < psDBF->nRecords; iRecord++) + { + nRecordOffset = + nOldRecordLength * (SAOffset) iRecord + nOldHeaderLength; + + /* load record */ + psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ); + psDBF->sHooks.FRead( pszRecord, nOldRecordLength, 1, psDBF->fp ); + + nRecordOffset = + psDBF->nRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength; + + /* move record in two steps */ + psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ); + psDBF->sHooks.FWrite( pszRecord, nDeletedFieldOffset, 1, psDBF->fp ); + psDBF->sHooks.FWrite( pszRecord + nDeletedFieldOffset + nDeletedFieldSize, + nOldRecordLength - nDeletedFieldOffset - nDeletedFieldSize, + 1, psDBF->fp ); + + } + + /* TODO: truncate file */ + + /* dk_free record */ + dk_free (pszRecord, -1); + + psDBF->nCurrentRecord = -1; + psDBF->bCurrentRecordModified = FALSE; + + return TRUE; +} + +/************************************************************************/ +/* DBFReorderFields() */ +/* */ +/* Reorder the fields of a .dbf file */ +/* */ +/* panMap must be exactly psDBF->nFields long and be a permutation */ +/* of [0, psDBF->nFields-1]. This assumption will not be asserted in the*/ +/* code of DBFReorderFields. */ +/************************************************************************/ + +int SHPAPI_CALL +DBFReorderFields( DBFHandle psDBF, int* panMap ) +{ + SAOffset nRecordOffset; + int i, iRecord; + int *panFieldOffsetNew; + int *panFieldSizeNew; + int *panFieldDecimalsNew; + char *pachFieldTypeNew; + char *pszHeaderNew; + char *pszRecord; + char *pszRecordNew; + + if ( psDBF->nFields == 0 ) + return TRUE; + + /* make sure that everything is written in .dbf */ + if( !DBFFlushRecord( psDBF ) ) + return FALSE; + + panFieldOffsetNew = (int *) dk_alloc(sizeof(int) * psDBF->nFields); + panFieldSizeNew = (int *) dk_alloc(sizeof(int) * psDBF->nFields); + panFieldDecimalsNew = (int *) dk_alloc(sizeof(int) * psDBF->nFields); + pachFieldTypeNew = (char *) dk_alloc(sizeof(char) * psDBF->nFields); + pszHeaderNew = (char*) dk_alloc(sizeof(char) * 32 * psDBF->nFields); + + /* shuffle fields definitions */ + for(i=0; i < psDBF->nFields; i++) + { + panFieldSizeNew[i] = psDBF->panFieldSize[panMap[i]]; + panFieldDecimalsNew[i] = psDBF->panFieldDecimals[panMap[i]]; + pachFieldTypeNew[i] = psDBF->pachFieldType[panMap[i]]; + memcpy(pszHeaderNew + i * 32, + psDBF->pszHeader + panMap[i] * 32, 32); + } + panFieldOffsetNew[0] = 1; + for(i=1; i < psDBF->nFields; i++) + { + panFieldOffsetNew[i] = panFieldOffsetNew[i - 1] + panFieldSizeNew[i - 1]; + } + + dk_free (psDBF->pszHeader, -1); + psDBF->pszHeader = pszHeaderNew; + + /* we're done if we're dealing with not yet created .dbf */ + if ( !(psDBF->bNoHeader && psDBF->nRecords == 0) ) + { + /* force update of header with new header and record length */ + psDBF->bNoHeader = TRUE; + DBFUpdateHeader( psDBF ); + + /* alloc record */ + pszRecord = (char *) dk_alloc(sizeof(char) * psDBF->nRecordLength); + pszRecordNew = (char *) dk_alloc(sizeof(char) * psDBF->nRecordLength); + + /* shuffle fields in records */ + for (iRecord = 0; iRecord < psDBF->nRecords; iRecord++) + { + nRecordOffset = + psDBF->nRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength; + + /* load record */ + psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ); + psDBF->sHooks.FRead( pszRecord, psDBF->nRecordLength, 1, psDBF->fp ); + + pszRecordNew[0] = pszRecord[0]; + + for(i=0; i < psDBF->nFields; i++) + { + memcpy(pszRecordNew + panFieldOffsetNew[i], + pszRecord + psDBF->panFieldOffset[panMap[i]], + psDBF->panFieldSize[panMap[i]]); + } + + /* write record */ + psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ); + psDBF->sHooks.FWrite( pszRecordNew, psDBF->nRecordLength, 1, psDBF->fp ); + } + + /* dk_free record */ + dk_free (pszRecord, -1); + dk_free (pszRecordNew, -1); + } + + dk_free (psDBF->panFieldOffset, -1); + dk_free (psDBF->panFieldSize, -1); + dk_free (psDBF->panFieldDecimals, -1); + dk_free (psDBF->pachFieldType, -1); + + psDBF->panFieldOffset = panFieldOffsetNew; + psDBF->panFieldSize = panFieldSizeNew; + psDBF->panFieldDecimals =panFieldDecimalsNew; + psDBF->pachFieldType = pachFieldTypeNew; + + psDBF->nCurrentRecord = -1; + psDBF->bCurrentRecordModified = FALSE; + + return TRUE; +} + + +/************************************************************************/ +/* DBFAlterFieldDefn() */ +/* */ +/* Alter a field definition in a .dbf file */ +/************************************************************************/ + +int SHPAPI_CALL +DBFAlterFieldDefn( DBFHandle psDBF, int iField, const char * pszFieldName, + char chType, int nWidth, int nDecimals ) +{ + int i; + int iRecord; + int nOffset; + int nOldWidth; + int nOldRecordLength; + int nRecordOffset; + char* pszFInfo; + char chOldType; + int bIsNULL; + char chFieldFill; + + if (iField < 0 || iField >= psDBF->nFields) + return FALSE; + + /* make sure that everything is written in .dbf */ + if( !DBFFlushRecord( psDBF ) ) + return FALSE; + + chFieldFill = DBFGetNullCharacter(chType); + + chOldType = psDBF->pachFieldType[iField]; + nOffset = psDBF->panFieldOffset[iField]; + nOldWidth = psDBF->panFieldSize[iField]; + nOldRecordLength = psDBF->nRecordLength; + +/* -------------------------------------------------------------------- */ +/* Do some checking to ensure we can add records to this file. */ +/* -------------------------------------------------------------------- */ + if( nWidth < 1 ) + return -1; + + if( nWidth > 255 ) + nWidth = 255; + +/* -------------------------------------------------------------------- */ +/* Assign the new field information fields. */ +/* -------------------------------------------------------------------- */ + psDBF->panFieldSize[iField] = nWidth; + psDBF->panFieldDecimals[iField] = nDecimals; + psDBF->pachFieldType[iField] = chType; + +/* -------------------------------------------------------------------- */ +/* Update the header information. */ +/* -------------------------------------------------------------------- */ + pszFInfo = psDBF->pszHeader + 32 * iField; + + for( i = 0; i < 32; i++ ) + pszFInfo[i] = '\0'; + + if( (int) strlen(pszFieldName) < 10 ) + strncpy( pszFInfo, pszFieldName, strlen(pszFieldName)); + else + strncpy( pszFInfo, pszFieldName, 10); + + pszFInfo[11] = psDBF->pachFieldType[iField]; + + if( chType == 'C' ) + { + pszFInfo[16] = (unsigned char) (nWidth % 256); + pszFInfo[17] = (unsigned char) (nWidth / 256); + } + else + { + pszFInfo[16] = (unsigned char) nWidth; + pszFInfo[17] = (unsigned char) nDecimals; + } + +/* -------------------------------------------------------------------- */ +/* Update offsets */ +/* -------------------------------------------------------------------- */ + if (nWidth != nOldWidth) + { + for (i = iField + 1; i < psDBF->nFields; i++) + psDBF->panFieldOffset[i] += nWidth - nOldWidth; + psDBF->nRecordLength += nWidth - nOldWidth; + + psDBF->pszCurrentRecord = (char *) SfRealloc(psDBF->pszCurrentRecord, + psDBF->nRecordLength); + } + + /* we're done if we're dealing with not yet created .dbf */ + if ( psDBF->bNoHeader && psDBF->nRecords == 0 ) + return TRUE; + + /* force update of header with new header and record length */ + psDBF->bNoHeader = TRUE; + DBFUpdateHeader( psDBF ); + + if (nWidth < nOldWidth || (nWidth == nOldWidth && chType != chOldType)) + { + char* pszRecord = (char *) dk_alloc(sizeof(char) * nOldRecordLength); + char* pszOldField = (char *) dk_alloc(sizeof(char) * (nOldWidth + 1)); + + pszOldField[nOldWidth] = 0; + + /* move records to their new positions */ + for (iRecord = 0; iRecord < psDBF->nRecords; iRecord++) + { + nRecordOffset = + nOldRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength; + + /* load record */ + psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ); + psDBF->sHooks.FRead( pszRecord, nOldRecordLength, 1, psDBF->fp ); + + memcpy(pszOldField, pszRecord + nOffset, nOldWidth); + bIsNULL = DBFIsValueNULL( chOldType, pszOldField ); + + if (nWidth != nOldWidth) + { + if ((chOldType == 'N' || chOldType == 'F') && pszOldField[0] == ' ') + { + /* Strip leading spaces when truncating a numeric field */ + memmove( pszRecord + nOffset, + pszRecord + nOffset + nOldWidth - nWidth, + nWidth ); + } + if (nOffset + nOldWidth < nOldRecordLength) + { + memmove( pszRecord + nOffset + nWidth, + pszRecord + nOffset + nOldWidth, + nOldRecordLength - (nOffset + nOldWidth)); + } + } + + /* Convert null value to the appropriate value of the new type */ + if (bIsNULL) + { + memset( pszRecord + nOffset, chFieldFill, nWidth); + } + + nRecordOffset = + psDBF->nRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength; + + /* write record */ + psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ); + psDBF->sHooks.FWrite( pszRecord, psDBF->nRecordLength, 1, psDBF->fp ); + } + + dk_free (pszRecord, -1); + dk_free (pszOldField, -1); + } + else if (nWidth > nOldWidth) + { + char* pszRecord = (char *) dk_alloc(sizeof(char) * psDBF->nRecordLength); + char* pszOldField = (char *) dk_alloc(sizeof(char) * (nOldWidth + 1)); + + pszOldField[nOldWidth] = 0; + + /* move records to their new positions */ + for (iRecord = psDBF->nRecords - 1; iRecord >= 0; iRecord--) + { + nRecordOffset = + nOldRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength; + + /* load record */ + psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ); + psDBF->sHooks.FRead( pszRecord, nOldRecordLength, 1, psDBF->fp ); + + memcpy(pszOldField, pszRecord + nOffset, nOldWidth); + bIsNULL = DBFIsValueNULL( chOldType, pszOldField ); + + if (nOffset + nOldWidth < nOldRecordLength) + { + memmove( pszRecord + nOffset + nWidth, + pszRecord + nOffset + nOldWidth, + nOldRecordLength - (nOffset + nOldWidth)); + } + + /* Convert null value to the appropriate value of the new type */ + if (bIsNULL) + { + memset( pszRecord + nOffset, chFieldFill, nWidth); + } + else + { + if ((chOldType == 'N' || chOldType == 'F')) + { + /* Add leading spaces when expanding a numeric field */ + memmove( pszRecord + nOffset + nWidth - nOldWidth, + pszRecord + nOffset, nOldWidth ); + memset( pszRecord + nOffset, ' ', nWidth - nOldWidth ); + } + else + { + /* Add trailing spaces */ + memset(pszRecord + nOffset + nOldWidth, ' ', nWidth - nOldWidth); + } + } + + nRecordOffset = + psDBF->nRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength; + + /* write record */ + psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ); + psDBF->sHooks.FWrite( pszRecord, psDBF->nRecordLength, 1, psDBF->fp ); + } + + dk_free (pszRecord, -1); + dk_free (pszOldField, -1); + } + + psDBF->nCurrentRecord = -1; + psDBF->bCurrentRecordModified = FALSE; + + return TRUE; +} diff --git a/binsrc/hosting/shapefileio/license.html b/binsrc/hosting/shapefileio/license.html new file mode 100644 index 0000000000..8580972d9a --- /dev/null +++ b/binsrc/hosting/shapefileio/license.html @@ -0,0 +1,78 @@ + + +Shapelib License + + + + +

    License

    + +The source for the Shapefile C Library is (c) 1998 Frank Warmerdam, +and released under the following conditions. The intent is that anyone +can do anything with the code, but that I do not assume any liability, nor +express any warranty for this code.

    + +As of Shapelib 1.2.6 the core portions of the library are made available +under two possible licenses. The licensee can choose to use the code +under either the Library GNU Public License (LGPL) described in +LICENSE.LGPL or under the following MIT style license. Any files in +the Shapelib distribution without explicit copyright license terms +(such as this documentation, the Makefile and so forth) should be +considered to have the following licensing terms. Some auxilary portions +of Shapelib, notably some of the components in the contrib directory +come under slightly different license restrictions. Check the source +files that you are actually using for conditions.

    + +

    Default License Terms

    + + +Copyright (c) 1999, Frank Warmerdam

    + +This software is available under the following "MIT Style" license, +or at the option of the licensee under the LGPL (see LICENSE.LGPL). This +option is discussed in more detail in shapelib.html.

    + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions:

    + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software.

    + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE.

    + + +

    Shapelib Modifications

    + +I am pleased to receive bug fixes, and improvements for Shapelib. Unless +the submissions indicate otherwise I will assume that changes submitted to +me remain under the the above "dual license" terms. If changes are made +to the library with the intention that those changes should be protected by +the LGPL then I should be informed upon submission. Note that I will not +generally incorporate changes into the core of Shapelib that are protected +under the LGPL as this would effectively limit the whole file and +distribution to LGPL terms.

    + +

    Opting for LGPL

    + +For licensee's opting to use Shapelib under LGPL as opposed to the MIT +Style license above, and wishing to redistribute the software based on +Shapelib, I would ask that all "dual license" modules be updated to +indicate that only the LGPL (and not the MIT Style license) applies. This +action represents opting for the LGPL, and thereafter LGPL terms apply to +any redistribution and modification of the affected modules.

    + + + + + + diff --git a/binsrc/hosting/shapefileio/safileio.c b/binsrc/hosting/shapefileio/safileio.c new file mode 100644 index 0000000000..3ded0afd3d --- /dev/null +++ b/binsrc/hosting/shapefileio/safileio.c @@ -0,0 +1,279 @@ +/* $Id$ + * + * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) + * project. + * + * Copyright (C) 2011-2019 OpenLink Software + * + * The file is a modified version of source file of the Shapelib library. + * The original version was obtained via http://shapelib.maptools.org + * Authors of the original version are not responsible for possible errors + * in this modified version. + * The original copyright and licensing info is as follows: + */ + +/****************************************************************************** + * Original Id: safileio.c,v 1.4 2008-01-16 20:05:14 bram Exp $ + * + * Project: Shapelib + * Purpose: Default implementation of file io based on stdio. + * Author: Frank Warmerdam, warmerdam@pobox.com + * + ****************************************************************************** + * Copyright (c) 2007, Frank Warmerdam + * + * This software is available under the following "MIT Style" license, + * or at the option of the licensee under the LGPL (see LICENSE.LGPL). This + * option is discussed in more detail in shapelib.html. + * + * -- + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ******************************************************************************/ + +#include "shapefil.h" + +#include +#include +#include +#include +#include +#include + +SHP_CVSID("$Id$"); + +#ifdef SHPAPI_UTF8_HOOKS +# ifdef SHPAPI_WINDOWS +# define WIN32_LEAN_AND_MEAN +# define NOMINMAX +# include +# pragma comment(lib, "kernel32.lib") +# endif +#endif + +/************************************************************************/ +/* SADFOpen() */ +/************************************************************************/ + +SAFile SADFOpen( const char *pszFilename, const char *pszAccess ) + +{ + return (SAFile) fopen( pszFilename, pszAccess ); +} + +/************************************************************************/ +/* SADFRead() */ +/************************************************************************/ + +SAOffset SADFRead( void *p, SAOffset size, SAOffset nmemb, SAFile file ) + +{ + return (SAOffset) fread( p, (size_t) size, (size_t) nmemb, + (FILE *) file ); +} + +/************************************************************************/ +/* SADFWrite() */ +/************************************************************************/ + +SAOffset SADFWrite( void *p, SAOffset size, SAOffset nmemb, SAFile file ) + +{ + return (SAOffset) fwrite( p, (size_t) size, (size_t) nmemb, + (FILE *) file ); +} + +/************************************************************************/ +/* SADFSeek() */ +/************************************************************************/ + +SAOffset SADFSeek( SAFile file, SAOffset offset, int whence ) + +{ + return (SAOffset) fseek( (FILE *) file, (long) offset, whence ); +} + +/************************************************************************/ +/* SADFTell() */ +/************************************************************************/ + +SAOffset SADFTell( SAFile file ) + +{ + return (SAOffset) ftell( (FILE *) file ); +} + +/************************************************************************/ +/* SADFFlush() */ +/************************************************************************/ + +int SADFFlush( SAFile file ) + +{ + return fflush( (FILE *) file ); +} + +/************************************************************************/ +/* SADFClose() */ +/************************************************************************/ + +int SADFClose( SAFile file ) + +{ + if (NULL == file) + return 0; + return fclose( (FILE *) file ); +} + +/************************************************************************/ +/* SADRemove() */ +/************************************************************************/ + +int SADRemove( const char *filename ) + +{ + return remove( filename ); +} + +/************************************************************************/ +/* SADError() */ +/************************************************************************/ + +void SADError( const char *message ) + +{ + fprintf( stderr, "%s\n", message ); +} + +/************************************************************************/ +/* SASetupDefaultHooks() */ +/************************************************************************/ + +void SASetupDefaultHooks( SAHooks *psHooks ) + +{ + psHooks->FOpen = SADFOpen; + psHooks->FRead = SADFRead; + psHooks->FWrite = SADFWrite; + psHooks->FSeek = SADFSeek; + psHooks->FTell = SADFTell; + psHooks->FFlush = SADFFlush; + psHooks->FClose = SADFClose; + psHooks->Remove = SADRemove; + + psHooks->Error = SADError; + psHooks->Atof = atof; +} + + + + +#ifdef SHPAPI_WINDOWS + +/************************************************************************/ +/* Utf8ToWideChar */ +/************************************************************************/ + +const wchar_t* Utf8ToWideChar( const char *pszFilename ) +{ + int nMulti, nWide; + wchar_t *pwszFileName; + + nMulti = strlen(pszFilename) + 1; + nWide = MultiByteToWideChar( CP_UTF8, 0, pszFilename, nMulti, 0, 0); + if( nWide == 0 ) + { + return NULL; + } + pwszFileName = (wchar_t*) malloc(nWide * sizeof(wchar_t)); + if ( pwszFileName == NULL ) + { + return NULL; + } + if( MultiByteToWideChar( CP_UTF8, 0, pszFilename, nMulti, pwszFileName, nWide ) == 0 ) + { + free( pwszFileName ); + return NULL; + } + return pwszFileName; +} + +/************************************************************************/ +/* SAUtf8WFOpen */ +/************************************************************************/ + +SAFile SAUtf8WFOpen( const char *pszFilename, const char *pszAccess ) +{ + SAFile file = NULL; + const wchar_t *pwszFileName, *pwszAccess; + pwszFileName = Utf8ToWideChar( pszFilename ); + pwszAccess = Utf8ToWideChar( pszAccess ); + if( pwszFileName != NULL && pwszFileName != NULL) + { + file = (SAFile) _wfopen( pwszFileName, pwszAccess ); + } + free ((wchar_t*) pwszFileName); + free ((wchar_t*) pwszAccess); + return file; +} + +/************************************************************************/ +/* SAUtf8WRemove() */ +/************************************************************************/ + +int SAUtf8WRemove( const char *pszFilename ) +{ + const wchar_t *pwszFileName = Utf8ToWideChar( pszFilename ); + int rc = -1; + if( pwszFileName != NULL ) + { + rc = _wremove( pwszFileName ); + } + free ((wchar_t*) pwszFileName); + return rc; +} + +#endif + +#ifdef SHPAPI_UTF8_HOOKS + +/************************************************************************/ +/* SASetupUtf8Hooks() */ +/************************************************************************/ + +void SASetupUtf8Hooks( SAHooks *psHooks ) +{ +#ifdef SHPAPI_WINDOWS + psHooks->FOpen = SAUtf8WFOpen; + psHooks->Remove = SAUtf8WRemove; +#else +# error "no implementations of UTF-8 hooks available for this platform" +#endif + psHooks->FRead = SADFRead; + psHooks->FWrite = SADFWrite; + psHooks->FSeek = SADFSeek; + psHooks->FTell = SADFTell; + psHooks->FFlush = SADFFlush; + psHooks->FClose = SADFClose; + + psHooks->Error = SADError; + psHooks->Atof = atof; +} + +#endif diff --git a/binsrc/hosting/shapefileio/shapefil.h b/binsrc/hosting/shapefileio/shapefil.h new file mode 100644 index 0000000000..cd75cb38f0 --- /dev/null +++ b/binsrc/hosting/shapefileio/shapefil.h @@ -0,0 +1,566 @@ +#ifndef SHAPEFILE_H_INCLUDED +#define SHAPEFILE_H_INCLUDED + +/* $Id$ + * + * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) + * project. + * + * Copyright (C) 2011-2019 OpenLink Software + * + * The file is a modified version of source file of the Shapelib library. + * The original version was obtained via http://shapelib.maptools.org + * Authors of the original version are not responsible for possible errors + * in this modified version. + * The original copyright and licensing info is as follows: + */ + +/****************************************************************************** + * Original Id: shapefil.h,v 1.51 2011-07-24 05:59:25 fwarmerdam Exp $ + * + * Project: Shapelib + * Purpose: Primary include file for Shapelib. + * Author: Frank Warmerdam, warmerdam@pobox.com + * + ****************************************************************************** + * Copyright (c) 1999, Frank Warmerdam + * + * This software is available under the following "MIT Style" license, + * or at the option of the licensee under the LGPL (see LICENSE.LGPL). This + * option is discussed in more detail in shapelib.html. + * + * -- + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + *******************************************************************************/ +#include +#include +#include +#include +#include +#include +#include +#ifdef USE_DBMALLOC +#include +#endif + +#ifdef _USRDLL +#include "plugin.h" +#include "import_gate_virtuoso.h" +#define wi_inst (wi_instance_get()[0]) +#else +#include "Dk.h" +#include "geo.h" +#include "sqlnode.h" +#include "sqlbif.h" +#include "wi.h" +#endif + +#if 0 +#define mlex_dbg_printf(x) printf x +#else +#define mlex_dbg_printf(x) +#endif + +#define SHAPEFILEIO_VERSION "0.1virt71" + + +#ifdef __cplusplus +extern "C" { +#endif + +/************************************************************************/ +/* Configuration options. */ +/************************************************************************/ + +/* -------------------------------------------------------------------- */ +/* Should the DBFReadStringAttribute() strip leading and */ +/* trailing white space? */ +/* -------------------------------------------------------------------- */ +#define TRIM_DBF_WHITESPACE + +/* -------------------------------------------------------------------- */ +/* Should we write measure values to the Multipatch object? */ +/* Reportedly ArcView crashes if we do write it, so for now it */ +/* is disabled. */ +/* -------------------------------------------------------------------- */ +#define DISABLE_MULTIPATCH_MEASURE + +/* -------------------------------------------------------------------- */ +/* SHPAPI_CALL */ +/* */ +/* The following two macros are present to allow forcing */ +/* various calling conventions on the Shapelib API. */ +/* */ +/* To force __stdcall conventions (needed to call Shapelib */ +/* from Visual Basic and/or Dephi I believe) the makefile could */ +/* be modified to define: */ +/* */ +/* /DSHPAPI_CALL=__stdcall */ +/* */ +/* If it is desired to force export of the Shapelib API without */ +/* using the shapelib.def file, use the following definition. */ +/* */ +/* /DSHAPELIB_DLLEXPORT */ +/* */ +/* To get both at once it will be necessary to hack this */ +/* include file to define: */ +/* */ +/* #define SHPAPI_CALL __declspec(dllexport) __stdcall */ +/* #define SHPAPI_CALL1 __declspec(dllexport) * __stdcall */ +/* */ +/* The complexity of the situtation is partly caused by the */ +/* peculiar requirement of Visual C++ that __stdcall appear */ +/* after any "*"'s in the return value of a function while the */ +/* __declspec(dllexport) must appear before them. */ +/* -------------------------------------------------------------------- */ + +#ifdef SHAPELIB_DLLEXPORT +# define SHPAPI_CALL __declspec(dllexport) +# define SHPAPI_CALL1(x) __declspec(dllexport) x +#endif + +#ifndef SHPAPI_CALL +# if defined(USE_GCC_VISIBILITY_FLAG) +# define SHPAPI_CALL __attribute__ ((visibility("default"))) +# define SHPAPI_CALL1(x) __attribute__ ((visibility("default"))) x +# else +# define SHPAPI_CALL +# endif +#endif + +#ifndef SHPAPI_CALL1 +# define SHPAPI_CALL1(x) x SHPAPI_CALL +#endif + +/* -------------------------------------------------------------------- */ +/* Macros for controlling CVSID and ensuring they don't appear */ +/* as unreferenced variables resulting in lots of warnings. */ +/* -------------------------------------------------------------------- */ +#ifndef DISABLE_CVSID +# if defined(__GNUC__) && __GNUC__ >= 4 +# define SHP_CVSID(string) static char cpl_cvsid[] __attribute__((used)) = string; +# else +# define SHP_CVSID(string) static char cpl_cvsid[] = string; \ +static char *cvsid_aw() { return( cvsid_aw() ? ((char *) NULL) : cpl_cvsid ); } +# endif +#else +# define SHP_CVSID(string) +#endif + +/* -------------------------------------------------------------------- */ +/* On some platforms, additional file IO hooks are defined that */ +/* UTF-8 encoded filenames Unicode filenames */ +/* -------------------------------------------------------------------- */ +#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32) +# define SHPAPI_WINDOWS +# define SHPAPI_UTF8_HOOKS +#endif + +/* -------------------------------------------------------------------- */ +/* IO/Error hook functions. */ +/* -------------------------------------------------------------------- */ +typedef int *SAFile; + +#ifndef SAOffset +typedef unsigned long SAOffset; +#endif + +typedef struct { + SAFile (*FOpen) ( const char *filename, const char *access); + SAOffset (*FRead) ( void *p, SAOffset size, SAOffset nmemb, SAFile file); + SAOffset (*FWrite)( void *p, SAOffset size, SAOffset nmemb, SAFile file); + SAOffset (*FSeek) ( SAFile file, SAOffset offset, int whence ); + SAOffset (*FTell) ( SAFile file ); + int (*FFlush)( SAFile file ); + int (*FClose)( SAFile file ); + int (*Remove) ( const char *filename ); + + void (*Error) ( const char *message ); + double (*Atof) ( const char *str ); +} SAHooks; + +void SHPAPI_CALL SASetupDefaultHooks( SAHooks *psHooks ); +#ifdef SHPAPI_UTF8_HOOKS +void SHPAPI_CALL SASetupUtf8Hooks( SAHooks *psHooks ); +#endif + +/************************************************************************/ +/* SHP Support. */ +/************************************************************************/ +typedef struct +{ + SAHooks sHooks; + + SAFile fpSHP; + SAFile fpSHX; + + int nShapeType; /* SHPT_* */ + + unsigned int nFileSize; /* SHP file */ + + int nRecords; + int nMaxRecords; + unsigned int *panRecOffset; + unsigned int *panRecSize; + + double adBoundsMin[4]; + double adBoundsMax[4]; + + int bUpdated; + + unsigned char *pabyRec; + int nBufSize; +} SHPInfo; + +typedef SHPInfo * SHPHandle; + +/* -------------------------------------------------------------------- */ +/* Shape types (nSHPType) */ +/* -------------------------------------------------------------------- */ +#define SHPT_NULL 0 +#define SHPT_POINT 1 +#define SHPT_ARC 3 +#define SHPT_POLYGON 5 +#define SHPT_MULTIPOINT 8 +#define SHPT_POINTZ 11 +#define SHPT_ARCZ 13 +#define SHPT_POLYGONZ 15 +#define SHPT_MULTIPOINTZ 18 +#define SHPT_POINTM 21 +#define SHPT_ARCM 23 +#define SHPT_POLYGONM 25 +#define SHPT_MULTIPOINTM 28 +#define SHPT_MULTIPATCH 31 + + +/* -------------------------------------------------------------------- */ +/* Part types - everything but SHPT_MULTIPATCH just uses */ +/* SHPP_RING. */ +/* -------------------------------------------------------------------- */ + +#define SHPP_TRISTRIP 0 +#define SHPP_TRIFAN 1 +#define SHPP_OUTERRING 2 +#define SHPP_INNERRING 3 +#define SHPP_FIRSTRING 4 +#define SHPP_RING 5 + +/* -------------------------------------------------------------------- */ +/* SHPObject - represents on shape (without attributes) read */ +/* from the .shp file. */ +/* -------------------------------------------------------------------- */ +typedef struct +{ + int nSHPType; + + int nShapeId; /* -1 is unknown/unassigned */ + + int nParts; + int *panPartStart; + int *panPartType; + + int nVertices; + double *padfX; + double *padfY; + double *padfZ; + double *padfM; + + double dfXMin; + double dfYMin; + double dfZMin; + double dfMMin; + + double dfXMax; + double dfYMax; + double dfZMax; + double dfMMax; + + int bMeasureIsUsed; +} SHPObject; + +/* -------------------------------------------------------------------- */ +/* SHP API Prototypes */ +/* -------------------------------------------------------------------- */ + +/* If pszAccess is read-only, the fpSHX field of the returned structure */ +/* will be NULL as it is not necessary to keep the SHX file open */ +SHPHandle SHPAPI_CALL + SHPOpen( const char * pszShapeFile, const char * pszAccess ); +SHPHandle SHPAPI_CALL + SHPOpenLL( const char *pszShapeFile, const char *pszAccess, + SAHooks *psHooks ); +SHPHandle SHPAPI_CALL + SHPCreate( const char * pszShapeFile, int nShapeType ); +SHPHandle SHPAPI_CALL + SHPCreateLL( const char * pszShapeFile, int nShapeType, + SAHooks *psHooks ); +void SHPAPI_CALL + SHPGetInfo( SHPHandle hSHP, int * pnEntities, int * pnShapeType, + double * padfMinBound, double * padfMaxBound ); + +SHPObject SHPAPI_CALL1(*) + SHPReadObject( SHPHandle hSHP, int iShape ); +int SHPAPI_CALL + SHPWriteObject( SHPHandle hSHP, int iShape, SHPObject * psObject ); + +void SHPAPI_CALL + SHPDestroyObject( SHPObject * psObject ); +void SHPAPI_CALL + SHPComputeExtents( SHPObject * psObject ); +SHPObject SHPAPI_CALL1(*) + SHPCreateObject( int nSHPType, int nShapeId, int nParts, + const int * panPartStart, const int * panPartType, + int nVertices, + const double * padfX, const double * padfY, + const double * padfZ, const double * padfM ); +SHPObject SHPAPI_CALL1(*) + SHPCreateSimpleObject( int nSHPType, int nVertices, + const double * padfX, + const double * padfY, + const double * padfZ ); + +int SHPAPI_CALL + SHPRewindObject( SHPHandle hSHP, SHPObject * psObject ); + +void SHPAPI_CALL SHPClose( SHPHandle hSHP ); +void SHPAPI_CALL SHPWriteHeader( SHPHandle hSHP ); + +const char SHPAPI_CALL1(*) + SHPTypeName( int nSHPType ); +const char SHPAPI_CALL1(*) + SHPPartTypeName( int nPartType ); + +/* -------------------------------------------------------------------- */ +/* Shape quadtree indexing API. */ +/* -------------------------------------------------------------------- */ + +/* this can be two or four for binary or quad tree */ +#define MAX_SUBNODE 4 + +/* upper limit of tree levels for automatic estimation */ +#define MAX_DEFAULT_TREE_DEPTH 12 + +typedef struct shape_tree_node +{ + /* region covered by this node */ + double adfBoundsMin[4]; + double adfBoundsMax[4]; + + /* list of shapes stored at this node. The papsShapeObj pointers + or the whole list can be NULL */ + int nShapeCount; + int *panShapeIds; + SHPObject **papsShapeObj; + + int nSubNodes; + struct shape_tree_node *apsSubNode[MAX_SUBNODE]; + +} SHPTreeNode; + +typedef struct +{ + SHPHandle hSHP; + + int nMaxDepth; + int nDimension; + int nTotalCount; + + SHPTreeNode *psRoot; +} SHPTree; + +SHPTree SHPAPI_CALL1(*) + SHPCreateTree( SHPHandle hSHP, int nDimension, int nMaxDepth, + double *padfBoundsMin, double *padfBoundsMax ); +void SHPAPI_CALL + SHPDestroyTree( SHPTree * hTree ); + +int SHPAPI_CALL + SHPWriteTree( SHPTree *hTree, const char * pszFilename ); + +int SHPAPI_CALL + SHPTreeAddObject( SHPTree * hTree, SHPObject * psObject ); +int SHPAPI_CALL + SHPTreeAddShapeId( SHPTree * hTree, SHPObject * psObject ); +int SHPAPI_CALL + SHPTreeRemoveShapeId( SHPTree * hTree, int nShapeId ); + +void SHPAPI_CALL + SHPTreeTrimExtraNodes( SHPTree * hTree ); + +int SHPAPI_CALL1(*) + SHPTreeFindLikelyShapes( SHPTree * hTree, + double * padfBoundsMin, + double * padfBoundsMax, + int * ); +int SHPAPI_CALL + SHPCheckBoundsOverlap( double *, double *, double *, double *, int ); + +int SHPAPI_CALL1(*) +SHPSearchDiskTree( FILE *fp, + double *padfBoundsMin, double *padfBoundsMax, + int *pnShapeCount ); + +/************************************************************************/ +/* DBF Support. */ +/************************************************************************/ +typedef struct +{ + SAHooks sHooks; + + SAFile fp; + + int nRecords; + + int nRecordLength; + int nHeaderLength; + int nFields; + int *panFieldOffset; + int *panFieldSize; + int *panFieldDecimals; + char *pachFieldType; + + char *pszHeader; + + int nCurrentRecord; + int bCurrentRecordModified; + char *pszCurrentRecord; + + int nWorkFieldLength; + char *pszWorkField; + + int bNoHeader; + int bUpdated; + + double dfDoubleField; + + int iLanguageDriver; + char *pszCodePage; +} DBFInfo; + +typedef DBFInfo * DBFHandle; + +typedef enum { + FTString, + FTInteger, + FTDouble, + FTLogical, + FTInvalid +} DBFFieldType; + +#define XBASE_FLDHDR_SZ 32 + + +DBFHandle SHPAPI_CALL + DBFOpen( const char * pszDBFFile, const char * pszAccess ); +DBFHandle SHPAPI_CALL + DBFOpenLL( const char * pszDBFFile, const char * pszAccess, + SAHooks *psHooks ); +DBFHandle SHPAPI_CALL + DBFCreate( const char * pszDBFFile ); +DBFHandle SHPAPI_CALL + DBFCreateEx( const char * pszDBFFile, const char * pszCodePage ); +DBFHandle SHPAPI_CALL + DBFCreateLL( const char * pszDBFFile, const char * pszCodePage, SAHooks *psHooks ); + +int SHPAPI_CALL + DBFGetFieldCount( DBFHandle psDBF ); +int SHPAPI_CALL + DBFGetRecordCount( DBFHandle psDBF ); +int SHPAPI_CALL + DBFAddField( DBFHandle hDBF, const char * pszFieldName, + DBFFieldType eType, int nWidth, int nDecimals ); + +int SHPAPI_CALL + DBFAddNativeFieldType( DBFHandle hDBF, const char * pszFieldName, + char chType, int nWidth, int nDecimals ); + +int SHPAPI_CALL + DBFDeleteField( DBFHandle hDBF, int iField ); + +int SHPAPI_CALL + DBFReorderFields( DBFHandle psDBF, int* panMap ); + +int SHPAPI_CALL + DBFAlterFieldDefn( DBFHandle psDBF, int iField, const char * pszFieldName, + char chType, int nWidth, int nDecimals ); + +DBFFieldType SHPAPI_CALL + DBFGetFieldInfo( DBFHandle psDBF, int iField, + char * pszFieldName, int * pnWidth, int * pnDecimals ); + +int SHPAPI_CALL + DBFGetFieldIndex(DBFHandle psDBF, const char *pszFieldName); + +int SHPAPI_CALL + DBFReadIntegerAttribute( DBFHandle hDBF, int iShape, int iField ); +double SHPAPI_CALL + DBFReadDoubleAttribute( DBFHandle hDBF, int iShape, int iField ); +const char SHPAPI_CALL1(*) + DBFReadStringAttribute( DBFHandle hDBF, int iShape, int iField ); +const char SHPAPI_CALL1(*) + DBFReadLogicalAttribute( DBFHandle hDBF, int iShape, int iField ); +int SHPAPI_CALL + DBFIsAttributeNULL( DBFHandle hDBF, int iShape, int iField ); + +int SHPAPI_CALL + DBFWriteIntegerAttribute( DBFHandle hDBF, int iShape, int iField, + int nFieldValue ); +int SHPAPI_CALL + DBFWriteDoubleAttribute( DBFHandle hDBF, int iShape, int iField, + double dFieldValue ); +int SHPAPI_CALL + DBFWriteStringAttribute( DBFHandle hDBF, int iShape, int iField, + const char * pszFieldValue ); +int SHPAPI_CALL + DBFWriteNULLAttribute( DBFHandle hDBF, int iShape, int iField ); + +int SHPAPI_CALL + DBFWriteLogicalAttribute( DBFHandle hDBF, int iShape, int iField, + const char lFieldValue); +int SHPAPI_CALL + DBFWriteAttributeDirectly(DBFHandle psDBF, int hEntity, int iField, + void * pValue ); +const char SHPAPI_CALL1(*) + DBFReadTuple(DBFHandle psDBF, int hEntity ); +int SHPAPI_CALL + DBFWriteTuple(DBFHandle psDBF, int hEntity, void * pRawTuple ); + +int SHPAPI_CALL DBFIsRecordDeleted( DBFHandle psDBF, int iShape ); +int SHPAPI_CALL DBFMarkRecordDeleted( DBFHandle psDBF, int iShape, + int bIsDeleted ); + +DBFHandle SHPAPI_CALL + DBFCloneEmpty(DBFHandle psDBF, const char * pszFilename ); + +void SHPAPI_CALL + DBFClose( DBFHandle hDBF ); +void SHPAPI_CALL + DBFUpdateHeader( DBFHandle hDBF ); +char SHPAPI_CALL + DBFGetNativeFieldType( DBFHandle hDBF, int iField ); + +const char SHPAPI_CALL1(*) + DBFGetCodePage(DBFHandle psDBF ); + +#ifdef __cplusplus +} +#endif + +#endif /* ndef SHAPEFILE_H_INCLUDED */ diff --git a/binsrc/hosting/shapefileio/shapefileio.c b/binsrc/hosting/shapefileio/shapefileio.c new file mode 100644 index 0000000000..eb7a738842 --- /dev/null +++ b/binsrc/hosting/shapefileio/shapefileio.c @@ -0,0 +1,722 @@ +#include "shapefil.h" + +#define READ_ALL_SHAPES_SKIP_NULLS 0x01 +#define READ_ALL_SHAPES_SKIP_UNSUPPORTED 0x02 + +typedef struct dbf_fld_s { + char df_name[12]; + char df_native_type; + int df_fetch_type; + int df_dtp; + int df_width; + int df_decimals; +} dbf_fld_t; + +typedef struct shapefileio_ctx_s { + struct query_instance_s *shpio_qi; + int shpio_srid; + int shpio_srcode; + int shpio_flags; + int shpio_calc_bounding_flags; + ccaddr_t shpio_cbk_name_mdata; + ccaddr_t shpio_cbk_name_plain; + ccaddr_t shpio_cbk_name_null; + ccaddr_t shpio_cbk_name_bad; + query_t *shpio_cbk_fn_mdata; + query_t *shpio_cbk_fn_plain; + query_t *shpio_cbk_fn_null; + query_t *shpio_cbk_fn_bad; + SHPHandle shpio_shph; + DBFHandle shpio_dbfh; + int shpio_dbf_field_count; + dbf_fld_t *shpio_dbf_fields; + caddr_t *shpio_dbf_cbk_mdata; +} shapefileio_ctx_t; + +geo_t * +geo_construct_from_SHPObject_point (shapefileio_ctx_t *ctx, SHPObject *obj, caddr_t *err_ret) +{ + int flags; + geo_t *res; + switch (obj->nSHPType) + { + case SHPT_POINT: flags = GEO_POINT; break; + case SHPT_POINTZ: flags = GEO_POINT_Z; break; + case SHPT_POINTM: flags = GEO_POINT_M; break; + default: GPF_T; + } + res = geo_alloc (flags, 0, ctx->shpio_srcode); + res->XYbox.Xmin = res->XYbox.Xmax = obj->padfX[0]; + res->XYbox.Ymin = res->XYbox.Ymax = obj->padfY[0]; + if (flags & GEO_A_Z) + res->_.point.point_ZMbox.Zmin = res->_.point.point_ZMbox.Zmax = obj->padfZ[0]; + if (flags & GEO_A_M) + res->_.point.point_ZMbox.Mmin = res->_.point.point_ZMbox.Mmax = obj->padfM[0]; + return res; +} + +geo_t * +geo_construct_from_SHPObject_pline (shapefileio_ctx_t *ctx, SHPObject *obj, int flags, int start_vertex, int len) +{ + int ctr; + geo_t *res = geo_alloc (flags, len, ctx->shpio_srcode); + if (sizeof (geoc) != sizeof (double)) + { + for (ctr = len; ctr--; /* no step */) + { + res->_.pline.Xs[ctr] = obj->padfX [ctr + start_vertex]; + res->_.pline.Ys[ctr] = obj->padfY [ctr + start_vertex]; + } + if (flags & GEO_A_Z) + for (ctr = obj->nVertices; ctr--; /* no step */) res->_.pline.Zs[ctr] = obj->padfZ[ctr + start_vertex]; + if (flags & GEO_A_M) + for (ctr = obj->nVertices; ctr--; /* no step */) res->_.pline.Ms[ctr] = obj->padfM[ctr + start_vertex]; + } + else + { + memcpy (res->_.pline.Xs, obj->padfX + start_vertex, len * sizeof (double)); + memcpy (res->_.pline.Ys, obj->padfY + start_vertex, len * sizeof (double)); + if (flags & GEO_A_Z) + memcpy (res->_.pline.Zs, obj->padfZ + start_vertex, len * sizeof (double)); + if (flags & GEO_A_M) + memcpy (res->_.pline.Ms, obj->padfM + start_vertex, len * sizeof (double)); + } + return res; +} + +geo_t * +geo_construct_from_SHPObject_plines (shapefileio_ctx_t *ctx, SHPObject *obj, int base_flags, int partlist_flags, caddr_t *err_ret) +{ + int ctr, parts_count = obj->nParts; + int v_pastend; + geo_t *res; + if (2 > parts_count) + return geo_construct_from_SHPObject_pline (ctx, obj, base_flags, 0, obj->nVertices); + v_pastend = obj->nVertices; + res = geo_alloc (partlist_flags, parts_count, ctx->shpio_srcode); + for (ctr = parts_count; ctr--; /* no step */) + { + int v_begin = obj->panPartStart[ctr]; + if ((v_begin < 0) || (v_begin >= v_pastend)) + { + err_ret[0] = srv_make_new_error ("22023", "SHP04", "Part %d/%d of shape (ShapeId=%d) has invalid offsets of starting and ending vertexes (%d and %d), bad shapefile?", ctr+1, parts_count, obj->nShapeId, v_begin, v_pastend); + dk_free_box (res); + return NULL; + } + geo_t *part = geo_construct_from_SHPObject_pline (ctx, obj, base_flags, v_begin, v_pastend - v_begin); + res->_.parts.items[ctr] = part; + v_pastend = v_begin; + } + return res; +} + +geo_t * +geo_construct_from_SHPObject (shapefileio_ctx_t *ctx, SHPObject *obj, caddr_t *err_ret) +{ + int base_flags = 0, partlist_flags = 0, multi_flags = 0; + geo_t *res; + switch (obj->nSHPType) + { + case SHPT_POINT: case SHPT_POINTZ: case SHPT_POINTM: + return geo_construct_from_SHPObject_point (ctx, obj, err_ret); + case SHPT_MULTIPOINT: return geo_construct_from_SHPObject_pline (ctx, obj, GEO_POINTLIST, 0, obj->nVertices); + case SHPT_MULTIPOINTZ: return geo_construct_from_SHPObject_pline (ctx, obj, GEO_POINTLIST_Z, 0, obj->nVertices); + case SHPT_MULTIPOINTM: return geo_construct_from_SHPObject_pline (ctx, obj, GEO_POINTLIST_M, 0, obj->nVertices); + case SHPT_ARC: partlist_flags = GEO_LINESTRING; multi_flags = GEO_MULTI_LINESTRING; goto mk_linestrings; + case SHPT_ARCZ: partlist_flags = GEO_LINESTRING_Z; multi_flags = GEO_MULTI_LINESTRING_Z; goto mk_linestrings; + case SHPT_ARCM: partlist_flags = GEO_LINESTRING_M; multi_flags = GEO_MULTI_LINESTRING_M; goto mk_linestrings; + case SHPT_POLYGON: base_flags = GEO_RING; partlist_flags = GEO_POLYGON; multi_flags = GEO_MULTI_POLYGON; goto mk_polygons; + case SHPT_POLYGONZ: base_flags = GEO_RING_Z; partlist_flags = GEO_POLYGON_Z; multi_flags = GEO_MULTI_POLYGON_Z; goto mk_polygons; + case SHPT_POLYGONM: base_flags = GEO_RING_M; partlist_flags = GEO_POLYGON_M; multi_flags = GEO_MULTI_POLYGON_M; goto mk_polygons; + default: GPF_T; + } + +mk_linestrings: + res = geo_construct_from_SHPObject_plines (ctx, obj, partlist_flags, multi_flags, err_ret); + if (NULL == res) + return NULL; + geo_calc_bounding (res, ctx->shpio_calc_bounding_flags); + return res; + +mk_polygons: + res = geo_construct_from_SHPObject_plines (ctx, obj, base_flags, partlist_flags, err_ret); + if (NULL == res) + return NULL; + if (GEO_TYPE(res->geo_flags) == GEO_TYPE (base_flags)) + { + geo_t *poly = geo_alloc (partlist_flags, 1, ctx->shpio_srcode); + if (geo_ccw_flat_area (res) < 0) + geo_inverse_point_order (res); + geo_calc_bounding (res, ctx->shpio_calc_bounding_flags); + poly->_.parts.items[0] = res; + geo_calc_bounding (poly, 0); + res = poly; + } + else if (2 > res->_.parts.len) /* weird */ + { + GPF_T; + } + else + { + /* There's a severe problem with complicated shapefile polygons. +In shapefile, polygon can have many outer rings (clockwised) and many inner rings (CCWised). +In postgis, polygon can have only one outer ring (first) and many inner rings (CCWised). +So we may hade to split one source polygon into one or more members of a multipolygon. +To do so, we should +--- separate outers from inners by sorting on CCW area ascending; +as a result, the list will begin with large outers, then small outers, then small inners, then large inners +--- Starting from largest inners, find the smallest outer that contains the inner. +--- Make a multipolygon. + */ + geo_t *mpoly = NULL; + geo_t **all_rings = res->_.parts.items; + int all_rings_count = res->_.parts.len; + int outer_rings_count = 0, inner_rings_count = 0, ctr, ctr2; +#define AUTO_POLY_LEN 16 + double ccw_areas_auto[AUTO_POLY_LEN]; + int orig_ring_ids_auto[AUTO_POLY_LEN]; + int counts_of_inners_in_outers_auto[AUTO_POLY_LEN]; + int envs_of_inners_auto[AUTO_POLY_LEN]; + double *ccw_areas = ccw_areas_auto; + int *orig_ring_ids = orig_ring_ids_auto; + int *counts_of_inners_in_outers = counts_of_inners_in_outers_auto; + int *envs_of_inners = envs_of_inners_auto; + if (AUTO_POLY_LEN < all_rings_count) + ccw_areas = (double *)dk_alloc (all_rings_count * sizeof (double)); + for (ctr = all_rings_count; ctr--; /* no step */) + { + geo_t *ring = all_rings[ctr]; + double a = ccw_areas[ctr] = geo_ccw_flat_area (ring); +#ifndef NDEBUG + if (ctx->shpio_calc_bounding_flags & GEO_CALC_BOUNDING_TRANSITIVE) + geo_calc_bounding (ring, ctx->shpio_calc_bounding_flags); +#endif + geo_dbg_printf(("\n ring %d/%d, lat %lf--%lf, long %lf--%lf, is %s, ccw area %lf", ctr, all_rings_count, + (double)(ring->XYbox.Xmin), (double)(ring->XYbox.Xmax), + (double)(ring->XYbox.Ymin), (double)(ring->XYbox.Ymax), + ((a <= 0) ? "OUTER" : "inner"), a )); + if (a <= 0) /* outer */ + { + outer_rings_count++; + geo_inverse_point_order (ring); + } + else + inner_rings_count++; + } + geo_calc_bounding (res, ctx->shpio_calc_bounding_flags); + if ((1 == outer_rings_count) && (ccw_areas[0] <= 0)) + { /* The outer ring is alone and at the first place and inverted, so the whole polygon is OK. */ + if (AUTO_POLY_LEN < all_rings_count) + dk_free (ccw_areas, all_rings_count * sizeof (double)); + return res; + } + if (0 == inner_rings_count) + { /* No inner rings at all, so the result should be a MULTIPOLYGON with one ring per polygon, no sorting and no reallocations. */ + res->geo_flags = multi_flags; + for (ctr = all_rings_count; ctr--; /* no step */) + { + geo_t *subpoly = geo_alloc (partlist_flags, 1, ctx->shpio_srcode); + subpoly->_.parts.items[0] = all_rings[ctr]; + geo_calc_bounding (subpoly, 0); + res->_.parts.items[ctr] = subpoly; + } + geo_calc_bounding (res, 0); + if (AUTO_POLY_LEN < all_rings_count) + dk_free (ccw_areas, all_rings_count * sizeof (double)); + return res; + } + if (0 == outer_rings_count) + { + err_ret[0] = srv_make_new_error ("22023", "SHP01", "The polygon (ShapeId %d) consists of inner rings only, no outer", obj->nShapeId); + goto mpoly_done; /* see below */ + } + if (AUTO_POLY_LEN < all_rings_count) + { + orig_ring_ids = (int *)dk_alloc (all_rings_count * sizeof (int)); + counts_of_inners_in_outers = (int *)dk_alloc (outer_rings_count * sizeof (int)); + envs_of_inners = (int *)dk_alloc (inner_rings_count * sizeof (int)); + } + for (ctr = all_rings_count; ctr--; /* no step */) + orig_ring_ids[ctr] = ctr; + memset (counts_of_inners_in_outers, 0, outer_rings_count * sizeof (int)); + memset (envs_of_inners, 0, inner_rings_count * sizeof (int)); + /* Bubble sort */ + for (ctr2 = all_rings_count; --ctr2; /* no step */) + for (ctr = all_rings_count; --ctr; /* no step */) + { + double a0 = ccw_areas[ctr-1], a1 = ccw_areas[ctr]; + if (a0 > a1) + { + int orig_id_swap; + geo_t *swap = all_rings[ctr]; all_rings[ctr] = all_rings[ctr-1]; all_rings[ctr-1] = swap; + orig_id_swap = orig_ring_ids[ctr]; orig_ring_ids[ctr] = orig_ring_ids[ctr-1]; orig_ring_ids[ctr-1] = orig_id_swap; + ccw_areas[ctr] = a0; ccw_areas[ctr-1] = a1; + } + } + for (ctr = all_rings_count; --ctr >= outer_rings_count; /* no step */) + { + geo_t *inner = all_rings[ctr]; + geo_t *outer; + for (ctr2 = outer_rings_count; ctr2--; /* no step */) + { + int vertex_idx; + outer = all_rings[ctr2]; + if (!geo_XYbbox_inside (&(inner->XYbox), &(outer->XYbox))) + continue; + /* There may be "fair" de9im_inside (inner, outer) here, +but it's overkill because any vertex strictly outside means "continue" and some vertex inside means "goto match_found" */ +#if 0 + if (de9im_inside (inner, outer, NULL)) + goto match_found; /* see below */ +#else + for (vertex_idx = inner->_.pline.len - 1 /* last one is closing */; vertex_idx >= 0; vertex_idx--) + { + int inoutside = geo_XY_inoutside_ring (inner->_.pline.Xs[vertex_idx], inner->_.pline.Ys[vertex_idx], outer); + if (inoutside & GEO_INOUTSIDE_CLOCKWISE) /* weird ring */ + { + err_ret[0] = srv_make_new_error ("22023", "SHP03", "The ring #%d/%d of a polygon (ShapeId %d) should be \"couterclockwised\"", orig_ring_ids[ctr2] + 1, all_rings_count, obj->nShapeId); + goto mpoly_done; /* see below */ + } + if (inoutside & GEO_INOUTSIDE_ERROR) /* weird ring */ + { + err_ret[0] = srv_make_new_error ("22023", "SHP07", "The ring #%d/%d of a polygon (ShapeId %d) should not be self-intersecting", orig_ring_ids[ctr2] + 1, all_rings_count, obj->nShapeId); + goto mpoly_done; /* see below */ + } + if (inoutside & GEO_INOUTSIDE_IN) /* The point is inside, so in case of proper nesting the whole ring is inside */ + goto match_found; /* see below */ + if (inoutside & GEO_INOUTSIDE_OUT) /* The point is outside so the ring is not inside outer */ + break; /* see below */ + } + /* If we're here then inner equal to outer (weird) or inner is actually ouside (more probable) */ +#endif + } + err_ret[0] = srv_make_new_error ("22023", "SHP02", "The inner ring #%d/%d of a polygon (ShapeId %d) is not inside any of its outer rings", orig_ring_ids[ctr2] + 1, all_rings_count, obj->nShapeId); + goto mpoly_done; /* see below */ +match_found: + envs_of_inners [ctr-outer_rings_count] = ctr2; + counts_of_inners_in_outers[ctr2]++; + } + mpoly = geo_alloc (multi_flags, outer_rings_count, ctx->shpio_srcode); + for (ctr2 = outer_rings_count; ctr2--; /* no step */) + { + geo_t *subpoly = geo_alloc (partlist_flags, 1 + counts_of_inners_in_outers[ctr2], ctx->shpio_srcode); + subpoly->_.parts.items[0] = all_rings[ctr2]; + mpoly->_.parts.items[ctr2] = subpoly; + } + for (ctr = outer_rings_count; ctr < all_rings_count; ctr++) + { + int o_inx = envs_of_inners[ctr-outer_rings_count]; + geo_t *subpoly = mpoly->_.parts.items[o_inx]; + subpoly->_.parts.items[(counts_of_inners_in_outers[o_inx])--] = all_rings[ctr]; + } + for (ctr2 = outer_rings_count; ctr2--; /* no step */) + geo_calc_bounding (mpoly->_.parts.items[ctr2], 0); + geo_calc_bounding (mpoly, 0); + memset (all_rings, 0, all_rings_count * sizeof (geo_t *)); + +mpoly_done: + if (AUTO_POLY_LEN < all_rings_count) + { + dk_free (ccw_areas, all_rings_count * sizeof (double)); + dk_free (orig_ring_ids, all_rings_count * sizeof (int)); + dk_free (counts_of_inners_in_outers, outer_rings_count * sizeof (int)); + dk_free (envs_of_inners, inner_rings_count * sizeof (int)); + } + dk_free_box (res); + return mpoly; + } + return res; +} + +void +shapefileio_read_dbf_fld_mdata (shapefileio_ctx_t *ctx, int fldctr) +{ + int arg_dtp, arg_width, arg_prec; + caddr_t *mdta; + dbf_fld_t *df = ctx->shpio_dbf_fields + fldctr; + df->df_fetch_type = DBFGetFieldInfo (ctx->shpio_dbfh, fldctr, df->df_name, &(df->df_width), &(df->df_decimals)); + df->df_native_type = DBFGetNativeFieldType (ctx->shpio_dbfh, fldctr); + switch (df->df_native_type) + { + case 'C': arg_dtp = DV_STRING; arg_width = df->df_width; arg_prec = 0; break; + case 'D': arg_dtp = DV_DATETIME; arg_width = df->df_width; arg_prec = 0; break; + case 'F': arg_dtp = DV_DOUBLE_FLOAT; arg_width = df->df_width; arg_prec = 0; break; + case 'N': + if ((18 >= df->df_width) && (0 == df->df_decimals)) + { arg_dtp = DV_LONG_INT; arg_width = df->df_width; arg_prec = 0; } + else if (9 >= df->df_width) + { arg_dtp = DV_DOUBLE_FLOAT; arg_width = df->df_width; arg_prec = 0; } + else + { arg_dtp = DV_NUMERIC; arg_width = df->df_width; arg_prec = 0; } + break; + case 'L': arg_dtp = DV_LONG_INT; arg_width = 1; arg_prec = 0; break; + case 'M': arg_dtp = DV_STRING; arg_width = -1; arg_prec = 0; break; + default: arg_dtp = DV_STRING; arg_width = -1; arg_prec = 0; break; + } + df->df_dtp = arg_dtp; + mdta = NEW_LIST (7); + mdta[0] = box_dv_short_string (df->df_name); + mdta[1] = arg_dtp; + mdta[2] = arg_width; + mdta[3] = arg_prec; + mdta[4] = 1; + mdta[5] = 0; + mdta[6] = 0; + ctx->shpio_dbf_cbk_mdata [fldctr] = mdta; +} + +caddr_t +shapefileio_read_dbf_fld_value (shapefileio_ctx_t *ctx, int entity_id, int fldctr) +{ + dbf_fld_t *df; + DBFHandle dbfh = ctx->shpio_dbfh; + if (DBFIsAttributeNULL (dbfh, entity_id, fldctr)) + return NEW_DB_NULL; + df = ctx->shpio_dbf_fields + fldctr; + switch (df->df_native_type) + { + case 'C': return box_dv_short_string (DBFReadStringAttribute (dbfh, entity_id, fldctr)); + case 'D': + { + const char *strval = DBFReadStringAttribute (dbfh, entity_id, fldctr); + return box_dv_short_string (strval); /*!!!TBD cast to date */ + } + case 'F': return box_double (DBFReadDoubleAttribute (dbfh, entity_id, fldctr)); + case 'N': + { + switch (df->df_dtp) + { + case DV_LONG_INT: return box_num (DBFReadIntegerAttribute (dbfh, entity_id, fldctr)); + case DV_DOUBLE_FLOAT: return box_double (DBFReadDoubleAttribute (dbfh, entity_id, fldctr)); + case DV_NUMERIC: + { + const char *strval = DBFReadStringAttribute (dbfh, entity_id, fldctr); + return box_dv_short_string (strval); /*!!!TBD cast to date */ + } + default: GPF_T; + } + } + case 'L': return box_num (DBFReadIntegerAttribute (dbfh, entity_id, fldctr)); /*!!!TBD label as bool */ + case 'M': /* no break */ + default: + return box_dv_short_string (DBFReadStringAttribute (dbfh, entity_id, fldctr)); + } +} + + +void +shapefileio_read_one_shape ( + shapefileio_ctx_t *ctx, + int entity_id, + caddr_t *app_env, + caddr_t *err_ret ) +{ + SHPObject *obj = SHPReadObject (ctx->shpio_shph, entity_id); + geo_t *geo_obj; + caddr_t boxed_entity_id = NULL; + caddr_t *boxed_attrs = NULL; + caddr_t *params; + switch (obj->nSHPType) + { + case SHPT_NULL: + SHPDestroyObject (obj); + if (ctx->shpio_flags & READ_ALL_SHAPES_SKIP_NULLS) + return; + /* !!! TBD: handle NULLs */ + return; + case SHPT_POINT: + case SHPT_POINTZ: + case SHPT_POINTM: + geo_obj = geo_construct_from_SHPObject_point (ctx, obj, err_ret); + break; + case SHPT_ARC: case SHPT_POLYGON: case SHPT_MULTIPOINT: + case SHPT_ARCZ: case SHPT_POLYGONZ: case SHPT_MULTIPOINTZ: + case SHPT_ARCM: case SHPT_POLYGONM: case SHPT_MULTIPOINTM: + geo_obj = geo_construct_from_SHPObject (ctx, obj, err_ret); + break; + default: + if (!(ctx->shpio_flags & READ_ALL_SHAPES_SKIP_UNSUPPORTED)) + { + /* !!! TBD: handle unsupported, with NULL err */ + ; + } + SHPDestroyObject (obj); + return; + } + if (NULL != err_ret[0]) + { + if (ctx->shpio_flags & READ_ALL_SHAPES_SKIP_UNSUPPORTED) + { + SHPDestroyObject (obj); + return; + } + SHPDestroyObject (obj); + return; + } + if (NULL != ctx->shpio_dbfh) + { + int fldctr, fldcount = ctx->shpio_dbf_field_count; + boxed_attrs = dk_alloc_box_zero (ctx->shpio_dbf_field_count * sizeof (caddr_t), DV_ARRAY_OF_POINTER); + for (fldctr = 0; fldctr < fldcount; fldctr++) + boxed_attrs[fldctr] = shapefileio_read_dbf_fld_value (ctx, entity_id, fldctr); + } + boxed_entity_id = box_num (entity_id); + params = NEW_LIST (5); + params[0] = &boxed_entity_id; + params[1] = &geo_obj; + params[2] = &(ctx->shpio_dbf_cbk_mdata); + params[3] = &boxed_attrs; + params[4] = app_env; + err_ret[0] = qr_exec (ctx->shpio_qi->qi_client, ctx->shpio_cbk_fn_plain, ctx->shpio_qi, NULL, NULL, NULL, params, NULL, 0); + dk_free_box (boxed_entity_id); + dk_free_box (geo_obj); + dk_free_box (boxed_attrs); + dk_free_box (params); + SHPDestroyObject (obj); +} + +caddr_t +shapefileio_read_all_shapes (caddr_t text_or_filename, int arg1_is_filename, caddr_t *ids_arg, int srid, long flags, + ccaddr_t *cbk_names, caddr_t *app_env, + struct query_instance_s *qi, const char *fname, caddr_t *err_ret ) +{ + shapefileio_ctx_t ctx; + int entities_count = 0, entity_ctr, shape_type; + caddr_t err = NULL; + memset (&ctx, 0, sizeof (shapefileio_ctx_t)); + ctx.shpio_qi = qi; + ctx.shpio_srid = srid; + ctx.shpio_srcode = GEO_SRCODE_OF_SRID(srid); + ctx.shpio_flags = flags; + ctx.shpio_calc_bounding_flags = GEO_CALC_BOUNDING_DO_ALL; + ctx.shpio_cbk_name_mdata = cbk_names[0]; + ctx.shpio_cbk_name_plain = cbk_names[1]; + ctx.shpio_cbk_name_null = cbk_names[2]; + ctx.shpio_cbk_name_bad = cbk_names[3]; + ctx.shpio_cbk_fn_mdata = NULL; + ctx.shpio_cbk_fn_plain = NULL; + ctx.shpio_cbk_fn_null = NULL; + ctx.shpio_cbk_fn_bad = NULL; + sqlr_set_cbk_name_and_proc (qi->qi_client, ctx.shpio_cbk_name_mdata, "RRR", fname, NULL, &(ctx.shpio_cbk_fn_mdata), &err); + if (NULL != err) + goto fatal_err; + sqlr_set_cbk_name_and_proc (qi->qi_client, ctx.shpio_cbk_name_plain, "RRRRR", fname, NULL, &(ctx.shpio_cbk_fn_plain), &err); + if (NULL != err) + goto fatal_err; + sqlr_set_cbk_name_and_proc (qi->qi_client, ctx.shpio_cbk_name_null, "RRRRR", fname, NULL, &(ctx.shpio_cbk_fn_null), &err); + if (NULL != err) + goto fatal_err; + sqlr_set_cbk_name_and_proc (qi->qi_client, ctx.shpio_cbk_name_bad, "RRRRR", fname, NULL, &(ctx.shpio_cbk_fn_bad), &err); + if (NULL != err) + goto fatal_err; + if (arg1_is_filename) + { + caddr_t raw_metas = NULL; + caddr_t cbk_metas = NULL; + ctx.shpio_shph = SHPOpen (text_or_filename, "rb"); + if (NULL == ctx.shpio_shph) + { + err = srv_make_new_error ("22023", "SHP08", "Unable to open shapefile '%.200s' for reading", text_or_filename); + goto fatal_err; + } + SHPGetInfo (ctx.shpio_shph, &entities_count, &shape_type, NULL, NULL); + ctx.shpio_dbfh = DBFOpen (text_or_filename, "rb"); + if (NULL != ctx.shpio_dbfh) + { + int fldctr, fldcount; + ctx.shpio_dbf_field_count = fldcount = DBFGetFieldCount (ctx.shpio_dbfh); + ctx.shpio_dbf_fields = (dbf_fld_t *)dk_alloc (fldcount * sizeof (dbf_fld_t)); + ctx.shpio_dbf_cbk_mdata = dk_alloc_box_zero (fldcount * sizeof (caddr_t), DV_ARRAY_OF_POINTER); + for (fldctr = 0; fldctr < fldcount; fldctr++) + { + shapefileio_read_dbf_fld_mdata (&ctx, fldctr); + } + if (NULL != ctx.shpio_cbk_fn_mdata) + { + caddr_t *params = NEW_LIST (3); + params[0] = &raw_metas; + params[1] = &(ctx.shpio_dbf_cbk_mdata); + params[2] = app_env; + err = qr_exec (ctx.shpio_qi->qi_client, ctx.shpio_cbk_fn_mdata, ctx.shpio_qi, NULL, NULL, NULL, params, NULL, 0); + dk_free_box (params); + } + } + else + { + caddr_t *params = NEW_LIST (3); + params[0] = &raw_metas; + params[1] = &cbk_metas; + params[2] = app_env; + err = qr_exec (ctx.shpio_qi->qi_client, ctx.shpio_cbk_fn_mdata, ctx.shpio_qi, NULL, NULL, NULL, params, NULL, 0); + dk_free_box (params); + } + dk_free_box (raw_metas); + dk_free_box (cbk_metas); + } + if (DV_ARRAY_OF_POINTER == DV_TYPE_OF (ids_arg)) + { + int idctr, idcount = BOX_ELEMENTS (ids_arg); + for (idctr = 0; idctr < idcount; idctr++) + { + caddr_t idbox = ids_arg[idctr]; + boxint entity_id; + if (DV_LONG_INT != DV_TYPE_OF (idbox)) + continue; + entity_id = unbox (idbox); + if ((0 > entity_id) || (entity_id >= entities_count)) + continue; + shapefileio_read_one_shape (&ctx, entity_id, app_env, &err); + if (NULL != err) + break; + } + } + else + { + for (entity_ctr = 0; entity_ctr < entities_count; entity_ctr++) + { + shapefileio_read_one_shape (&ctx, entity_ctr, app_env, &err); + if (NULL != err) + break; + } + } +fatal_err: + if (NULL != ctx.shpio_shph) + SHPClose (ctx.shpio_shph); + if (NULL != ctx.shpio_dbfh) + DBFClose (ctx.shpio_dbfh); + if (NULL != err) + sqlr_resignal (err); + return box_num (entities_count); +} + +caddr_t +bif_shapefileio_read_all_shapes_local_file (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ + static const char fname[] = "ShapefileIO read_all_shapes_local_file"; + caddr_t str; + caddr_t *ids_arg; + ccaddr_t *cbk_names; + caddr_t *app_env; + caddr_t res, err = NULL; + int mode_bits = 0; + /* int n_args = BOX_ELEMENTS (args); */ + str = bif_string_arg (qst, args, 0, fname); + ids_arg = (caddr_t *)bif_arg (qst, args, 1, fname); + mode_bits = bif_long_arg (qst, args, 2, fname); + cbk_names = (ccaddr_t *)bif_strict_type_array_arg (DV_STRING, qst, args, 3, fname); + bif_arg (qst, args, 4, fname); + app_env = QST_GET_ADDR(qst, args[4]); + if (4 != BOX_ELEMENTS (cbk_names)) + sqlr_new_error ("22023", "SHP06", + "The argument #4 of %s() should be a vector of 4 names of stored procedures", fname ); + file_path_assert (str, NULL, 0); + res = shapefileio_read_all_shapes (str, 1, ids_arg, SRID_DEFAULT, mode_bits, cbk_names, app_env, + (struct query_instance_s *)qst, fname, &err ); + if (NULL != err) + { + dk_free_tree (res); + sqlr_resignal (err); + } + return res; +} + +caddr_t +bif_shapefileio_xy_inoutside_polygon (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ + static const char fname[] = "ShapefileIO xy_inoutside_polygon"; + double pX = bif_double_arg (qst, args, 0, fname); + double pY = bif_double_arg (qst, args, 1, fname); + geo_t *g = bif_geo_arg (qst, args, 2, fname, GEO_ARG_ANY_NONNULL); + int ctr, inoutside; + if ((pX < g->XYbox.Xmin) || (pX > g->XYbox.Xmax) || (pY < g->XYbox.Ymin) || (pY > g->XYbox.Ymax)) + return box_num (GEO_INOUTSIDE_OUT); + switch (GEO_TYPE_NO_ZM (g->geo_flags)) + { + case GEO_RING: + inoutside = geo_XY_inoutside_ring (pX, pY, g); + if (GEO_INOUTSIDE_ERROR & inoutside) /* weird ring */ + sqlr_new_error ("22023", "SHP06", "The ring should be not self-intersecting"); + if (GEO_INOUTSIDE_CLOCKWISE & inoutside) /* weird ring */ + sqlr_new_error ("22023", "SHP06", "The ring should be \"couterclockwised\""); + return box_num (inoutside); + case GEO_POLYGON: + { + geo_t *ring = g->_.parts.items[0]; + if (GEO_RING != GEO_TYPE_NO_ZM (ring->geo_flags)) + return 0; + inoutside = geo_XY_inoutside_ring (pX, pY, ring); + if (GEO_INOUTSIDE_ERROR & inoutside) /* weird ring */ + sqlr_new_error ("22023", "SHP06", "The ring 0 of polygon should be not self-intersecting"); + if (GEO_INOUTSIDE_CLOCKWISE & inoutside) /* weird ring */ + sqlr_new_error ("22023", "SHP06", "The ring 0 of polygon should be \"couterclockwised\""); + if ((GEO_INOUTSIDE_OUT | GEO_INOUTSIDE_BORDER) & inoutside) + return box_num (inoutside); + for (ctr = g->_.parts.len; --ctr; /* no step */) + { + ring = g->_.parts.items[ctr]; + if (GEO_RING != GEO_TYPE_NO_ZM (ring->geo_flags)) + continue; + inoutside = geo_XY_inoutside_ring (pX, pY, ring); + if (GEO_INOUTSIDE_ERROR & inoutside) /* weird ring */ + sqlr_new_error ("22023", "SHP06", "The ring %d of polygon should be not self-intersecting", ctr); + if (GEO_INOUTSIDE_CLOCKWISE & inoutside) /* weird ring */ + sqlr_new_error ("22023", "SHP06", "The ring %d of polygon should be \"couterclockwised\"", ctr); + if (GEO_INOUTSIDE_IN & inoutside) + return box_num (GEO_INOUTSIDE_OUT); + if (GEO_INOUTSIDE_BORDER & inoutside) + return box_num (GEO_INOUTSIDE_BORDER); + } + return box_num (GEO_INOUTSIDE_IN); + } + case GEO_MULTI_POLYGON: + for (ctr = 0; ctr < g->_.parts.len; ctr++) + { + geo_t *poly = g->_.parts.items[ctr]; + if (GEO_POLYGON != GEO_TYPE_NO_ZM (poly->geo_flags)) + continue; + inoutside = geo_XY_inoutside_polygon (pX, pY, poly); + if (GEO_INOUTSIDE_ERROR & inoutside) /* weird poly */ + sqlr_new_error ("22023", "SHP06", "The polygon %d of multipolygon should be not self-intersecting or wrong in some other way", ctr); + if (GEO_INOUTSIDE_CLOCKWISE & inoutside) /* weird ring */ + sqlr_new_error ("22023", "SHP06", "The polygon %d of multipolygon should consist of \"couterclockwised\" rings", ctr); + if ((GEO_INOUTSIDE_IN | GEO_INOUTSIDE_BORDER) & inoutside) + return box_num (inoutside); + } + return box_num (GEO_INOUTSIDE_OUT); + default: + sqlr_new_error ("22023", "SHP06", + "The argument #3 of %s() should be RING* or POLYGON*", fname ); + } + return NULL; /* never reached */ +} + +#ifdef _USRDLL +caddr_t shapefileio_version_no = NULL; +void shapefileio_connect (void *appdata) +{ + shapefileio_version_no = box_dv_short_string (SHAPEFILEIO_VERSION); + bif_define ("ShapefileIO read_all_shapes_local_file", bif_shapefileio_read_all_shapes_local_file); + bif_define ("ShapefileIO xy_inoutside_polygon", bif_shapefileio_xy_inoutside_polygon); +} + +static unit_version_t +shapefileio_version = { + "ShapefileIO", /*!< Title of unit, filled by unit */ + SHAPEFILEIO_VERSION, /*!< Version number, filled by unit */ + "OpenLink Software", /*!< Plugin's developer, filled by unit */ + "Shapefile support based on Frank Warmerdam's Shapelib", /*!< Any additional info, filled by unit */ + 0, /*!< Error message, filled by unit loader */ + 0, /*!< Name of file with unit's code, filled by unit loader */ + shapefileio_connect, /*!< Pointer to connection function, cannot be 0 */ + 0, /*!< Pointer to disconnection function, or 0 */ + 0, /*!< Pointer to activation function, or 0 */ + 0, /*!< Pointer to deactivation function, or 0 */ + &_gate +}; + +unit_version_t * +CALLBACK shapefileio_check (unit_version_t *in, void *appdata) +{ + return &shapefileio_version; +} +#endif diff --git a/binsrc/hosting/shapefileio/shapefileio.exp b/binsrc/hosting/shapefileio/shapefileio.exp new file mode 100644 index 0000000000..80d52e6606 --- /dev/null +++ b/binsrc/hosting/shapefileio/shapefileio.exp @@ -0,0 +1 @@ +shapefileio_check diff --git a/binsrc/hosting/shapefileio/shpopen.c b/binsrc/hosting/shapefileio/shpopen.c new file mode 100644 index 0000000000..9a45736b72 --- /dev/null +++ b/binsrc/hosting/shapefileio/shpopen.c @@ -0,0 +1,2167 @@ +/* $Id$ + * + * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) + * project. + * + * Copyright (C) 2011-2019 OpenLink Software + * + * The file is a modified version of source file of the Shapelib library. + * The original version was obtained via http://shapelib.maptools.org + * Authors of the original version are not responsible for possible errors + * in this modified version. + * The original copyright and licensing info is as follows: + */ + +/****************************************************************************** + * Original Id: shpopen.c,v 1.70 2011-07-24 05:59:25 fwarmerdam Exp $ + * + * Project: Shapelib + * Purpose: Implementation of core Shapefile read/write functions. + * Author: Frank Warmerdam, warmerdam@pobox.com + * + ****************************************************************************** + * Copyright (c) 1999, 2001, Frank Warmerdam + * + * This software is available under the following "MIT Style" license, + * or at the option of the licensee under the LGPL (see LICENSE.LGPL). This + * option is discussed in more detail in shapelib.html. + * + * -- + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ******************************************************************************/ + +#include "shapefil.h" + +SHP_CVSID("$Id$") + +typedef unsigned char uchar; + +#if 0 +#if UINT_MAX == 65535 +typedef unsigned long int32; +#else +typedef unsigned int int32; +#endif +#endif + +#ifndef FALSE +# define FALSE 0 +# define TRUE 1 +#endif + +#define ByteCopy( a, b, c ) memcpy( b, a, c ) +#ifndef MAX +# define MIN(a,b) ((ab) ? a : b) +#endif + +#if defined(WIN32) || defined(_WIN32) +# ifndef snprintf +# define snprintf _snprintf +# endif +#endif + +static int bBigEndian; + + +/************************************************************************/ +/* SwapWord() */ +/* */ +/* Swap a 2, 4 or 8 byte word. */ +/************************************************************************/ + +static void SwapWord( int length, void * wordP ) + +{ + int i; + uchar temp; + + for( i=0; i < length/2; i++ ) + { + temp = ((uchar *) wordP)[i]; + ((uchar *)wordP)[i] = ((uchar *) wordP)[length-i-1]; + ((uchar *) wordP)[length-i-1] = temp; + } +} + +/************************************************************************/ +/* SfRealloc() */ +/* */ +/* A realloc cover function that will access a NULL pointer as */ +/* a valid input. */ +/************************************************************************/ + +static void * SfRealloc( void * pMem, int nNewSize ) + +{ + if( pMem == NULL ) + return( (void *) dk_alloc (nNewSize) ); + else + { + dk_free (pMem, -1); + return( (void *) dk_alloc (nNewSize) ); + } +} + +/************************************************************************/ +/* SHPWriteHeader() */ +/* */ +/* Write out a header for the .shp and .shx files as well as the */ +/* contents of the index (.shx) file. */ +/************************************************************************/ + +void SHPAPI_CALL SHPWriteHeader( SHPHandle psSHP ) + +{ + uchar abyHeader[100]; + int i; + int32 i32; + double dValue; + int32 *panSHX; + + if (psSHP->fpSHX == NULL) + { + psSHP->sHooks.Error( "SHPWriteHeader failed : SHX file is closed"); + return; + } + +/* -------------------------------------------------------------------- */ +/* Prepare header block for .shp file. */ +/* -------------------------------------------------------------------- */ + for( i = 0; i < 100; i++ ) + abyHeader[i] = 0; + + abyHeader[2] = 0x27; /* magic cookie */ + abyHeader[3] = 0x0a; + + i32 = psSHP->nFileSize/2; /* file size */ + ByteCopy( &i32, abyHeader+24, 4 ); + if( !bBigEndian ) SwapWord( 4, abyHeader+24 ); + + i32 = 1000; /* version */ + ByteCopy( &i32, abyHeader+28, 4 ); + if( bBigEndian ) SwapWord( 4, abyHeader+28 ); + + i32 = psSHP->nShapeType; /* shape type */ + ByteCopy( &i32, abyHeader+32, 4 ); + if( bBigEndian ) SwapWord( 4, abyHeader+32 ); + + dValue = psSHP->adBoundsMin[0]; /* set bounds */ + ByteCopy( &dValue, abyHeader+36, 8 ); + if( bBigEndian ) SwapWord( 8, abyHeader+36 ); + + dValue = psSHP->adBoundsMin[1]; + ByteCopy( &dValue, abyHeader+44, 8 ); + if( bBigEndian ) SwapWord( 8, abyHeader+44 ); + + dValue = psSHP->adBoundsMax[0]; + ByteCopy( &dValue, abyHeader+52, 8 ); + if( bBigEndian ) SwapWord( 8, abyHeader+52 ); + + dValue = psSHP->adBoundsMax[1]; + ByteCopy( &dValue, abyHeader+60, 8 ); + if( bBigEndian ) SwapWord( 8, abyHeader+60 ); + + dValue = psSHP->adBoundsMin[2]; /* z */ + ByteCopy( &dValue, abyHeader+68, 8 ); + if( bBigEndian ) SwapWord( 8, abyHeader+68 ); + + dValue = psSHP->adBoundsMax[2]; + ByteCopy( &dValue, abyHeader+76, 8 ); + if( bBigEndian ) SwapWord( 8, abyHeader+76 ); + + dValue = psSHP->adBoundsMin[3]; /* m */ + ByteCopy( &dValue, abyHeader+84, 8 ); + if( bBigEndian ) SwapWord( 8, abyHeader+84 ); + + dValue = psSHP->adBoundsMax[3]; + ByteCopy( &dValue, abyHeader+92, 8 ); + if( bBigEndian ) SwapWord( 8, abyHeader+92 ); + +/* -------------------------------------------------------------------- */ +/* Write .shp file header. */ +/* -------------------------------------------------------------------- */ + if( psSHP->sHooks.FSeek( psSHP->fpSHP, 0, 0 ) != 0 + || psSHP->sHooks.FWrite( abyHeader, 100, 1, psSHP->fpSHP ) != 1 ) + { + psSHP->sHooks.Error( "Failure writing .shp header" ); + return; + } + +/* -------------------------------------------------------------------- */ +/* Prepare, and write .shx file header. */ +/* -------------------------------------------------------------------- */ + i32 = (psSHP->nRecords * 2 * sizeof(int32) + 100)/2; /* file size */ + ByteCopy( &i32, abyHeader+24, 4 ); + if( !bBigEndian ) SwapWord( 4, abyHeader+24 ); + + if( psSHP->sHooks.FSeek( psSHP->fpSHX, 0, 0 ) != 0 + || psSHP->sHooks.FWrite( abyHeader, 100, 1, psSHP->fpSHX ) != 1 ) + { + psSHP->sHooks.Error( "Failure writing .shx header" ); + return; + } + +/* -------------------------------------------------------------------- */ +/* Write out the .shx contents. */ +/* -------------------------------------------------------------------- */ + panSHX = (int32 *) dk_alloc (sizeof(int32) * 2 * psSHP->nRecords); + + for( i = 0; i < psSHP->nRecords; i++ ) + { + panSHX[i*2 ] = psSHP->panRecOffset[i]/2; + panSHX[i*2+1] = psSHP->panRecSize[i]/2; + if( !bBigEndian ) SwapWord( 4, panSHX+i*2 ); + if( !bBigEndian ) SwapWord( 4, panSHX+i*2+1 ); + } + + if( (int)psSHP->sHooks.FWrite( panSHX, sizeof(int32)*2, psSHP->nRecords, psSHP->fpSHX ) + != psSHP->nRecords ) + { + psSHP->sHooks.Error( "Failure writing .shx contents" ); + } + + dk_free( panSHX, -1 ); + +/* -------------------------------------------------------------------- */ +/* Flush to disk. */ +/* -------------------------------------------------------------------- */ + psSHP->sHooks.FFlush( psSHP->fpSHP ); + psSHP->sHooks.FFlush( psSHP->fpSHX ); +} + +/************************************************************************/ +/* SHPOpen() */ +/************************************************************************/ + +SHPHandle SHPAPI_CALL +SHPOpen( const char * pszLayer, const char * pszAccess ) + +{ + SAHooks sHooks; + + SASetupDefaultHooks( &sHooks ); + + return SHPOpenLL( pszLayer, pszAccess, &sHooks ); +} + +/************************************************************************/ +/* SHPOpen() */ +/* */ +/* Open the .shp and .shx files based on the basename of the */ +/* files or either file name. */ +/************************************************************************/ + +SHPHandle SHPAPI_CALL +SHPOpenLL( const char * pszLayer, const char * pszAccess, SAHooks *psHooks ) + +{ + char *pszFullname, *pszBasename; + SHPHandle psSHP; + + uchar *pabyBuf; + int i; + double dValue; + +/* -------------------------------------------------------------------- */ +/* Ensure the access string is one of the legal ones. We */ +/* ensure the result string indicates binary to avoid common */ +/* problems on Windows. */ +/* -------------------------------------------------------------------- */ + if( strcmp(pszAccess,"rb+") == 0 || strcmp(pszAccess,"r+b") == 0 + || strcmp(pszAccess,"r+") == 0 ) + pszAccess = "r+b"; + else + pszAccess = "rb"; + +/* -------------------------------------------------------------------- */ +/* Establish the byte order on this machine. */ +/* -------------------------------------------------------------------- */ + i = 1; + if( *((uchar *) &i) == 1 ) + bBigEndian = FALSE; + else + bBigEndian = TRUE; + +/* -------------------------------------------------------------------- */ +/* Initialize the info structure. */ +/* -------------------------------------------------------------------- */ + psSHP = (SHPHandle) dk_alloc (sizeof(SHPInfo)); + memset (psSHP, 0, sizeof(SHPInfo)); + psSHP->bUpdated = FALSE; + memcpy( &(psSHP->sHooks), psHooks, sizeof(SAHooks) ); + +/* -------------------------------------------------------------------- */ +/* Compute the base (layer) name. If there is any extension */ +/* on the passed in filename we will strip it off. */ +/* -------------------------------------------------------------------- */ + pszBasename = (char *) dk_alloc (strlen(pszLayer)+5); + strcpy( pszBasename, pszLayer ); + for( i = strlen(pszBasename)-1; + i > 0 && pszBasename[i] != '.' && pszBasename[i] != '/' + && pszBasename[i] != '\\'; + i-- ) {} + + if( pszBasename[i] == '.' ) + pszBasename[i] = '\0'; + +/* -------------------------------------------------------------------- */ +/* Open the .shp and .shx files. Note that files pulled from */ +/* a PC to Unix with upper case filenames won't work! */ +/* -------------------------------------------------------------------- */ + pszFullname = (char *) dk_alloc (strlen(pszBasename) + 5); + sprintf( pszFullname, "%s.shp", pszBasename ) ; + psSHP->fpSHP = psSHP->sHooks.FOpen(pszFullname, pszAccess ); + if( psSHP->fpSHP == NULL ) + { + sprintf( pszFullname, "%s.SHP", pszBasename ); + psSHP->fpSHP = psSHP->sHooks.FOpen(pszFullname, pszAccess ); + } + + if( psSHP->fpSHP == NULL ) + { + char *pszMessage = (char *) dk_alloc (strlen(pszBasename)*2+256); + sprintf( pszMessage, "Unable to open %s.shp or %s.SHP.", + pszBasename, pszBasename ); + psHooks->Error( pszMessage ); + dk_free( pszMessage, -1 ); + } + + sprintf( pszFullname, "%s.shx", pszBasename ); + psSHP->fpSHX = psSHP->sHooks.FOpen(pszFullname, pszAccess ); + if( psSHP->fpSHX == NULL ) + { + sprintf( pszFullname, "%s.SHX", pszBasename ); + psSHP->fpSHX = psSHP->sHooks.FOpen(pszFullname, pszAccess ); + } + + if( psSHP->fpSHX == NULL ) + { + char *pszMessage = (char *) dk_alloc (strlen(pszBasename)*2+256); + sprintf( pszMessage, "Unable to open %s.shx or %s.SHX.", + pszBasename, pszBasename ); + psHooks->Error( pszMessage ); + dk_free( pszMessage, -1 ); + + psSHP->sHooks.FClose( psSHP->fpSHP ); + dk_free( psSHP, -1 ); + dk_free( pszBasename, -1 ); + dk_free( pszFullname, -1 ); + return( NULL ); + } + + dk_free( pszFullname, -1 ); + dk_free( pszBasename, -1 ); + +/* -------------------------------------------------------------------- */ +/* Read the file size from the SHP file. */ +/* -------------------------------------------------------------------- */ + pabyBuf = (uchar *) dk_alloc (100); + psSHP->sHooks.FRead( pabyBuf, 100, 1, psSHP->fpSHP ); + + psSHP->nFileSize = ((unsigned int)pabyBuf[24] * 256 * 256 * 256 + + (unsigned int)pabyBuf[25] * 256 * 256 + + (unsigned int)pabyBuf[26] * 256 + + (unsigned int)pabyBuf[27]) * 2; + +/* -------------------------------------------------------------------- */ +/* Read SHX file Header info */ +/* -------------------------------------------------------------------- */ + if( psSHP->sHooks.FRead( pabyBuf, 100, 1, psSHP->fpSHX ) != 1 + || pabyBuf[0] != 0 + || pabyBuf[1] != 0 + || pabyBuf[2] != 0x27 + || (pabyBuf[3] != 0x0a && pabyBuf[3] != 0x0d) ) + { + psSHP->sHooks.Error( ".shx file is unreadable, or corrupt." ); + psSHP->sHooks.FClose( psSHP->fpSHP ); + psSHP->sHooks.FClose( psSHP->fpSHX ); + dk_free( psSHP, -1 ); + + return( NULL ); + } + + psSHP->nRecords = pabyBuf[27] + pabyBuf[26] * 256 + + pabyBuf[25] * 256 * 256 + pabyBuf[24] * 256 * 256 * 256; + psSHP->nRecords = (psSHP->nRecords*2 - 100) / 8; + + psSHP->nShapeType = pabyBuf[32]; + + if( psSHP->nRecords < 0 || psSHP->nRecords > 256000000 ) + { + char szError[200]; + + sprintf( szError, + "Record count in .shp header is %d, which seems\n" + "unreasonable. Assuming header is corrupt.", + psSHP->nRecords ); + psSHP->sHooks.Error( szError ); + psSHP->sHooks.FClose( psSHP->fpSHP ); + psSHP->sHooks.FClose( psSHP->fpSHX ); + dk_free( psSHP, -1 ); + dk_free(pabyBuf, -1); + + return( NULL ); + } + +/* -------------------------------------------------------------------- */ +/* Read the bounds. */ +/* -------------------------------------------------------------------- */ + if( bBigEndian ) SwapWord( 8, pabyBuf+36 ); + memcpy( &dValue, pabyBuf+36, 8 ); + psSHP->adBoundsMin[0] = dValue; + + if( bBigEndian ) SwapWord( 8, pabyBuf+44 ); + memcpy( &dValue, pabyBuf+44, 8 ); + psSHP->adBoundsMin[1] = dValue; + + if( bBigEndian ) SwapWord( 8, pabyBuf+52 ); + memcpy( &dValue, pabyBuf+52, 8 ); + psSHP->adBoundsMax[0] = dValue; + + if( bBigEndian ) SwapWord( 8, pabyBuf+60 ); + memcpy( &dValue, pabyBuf+60, 8 ); + psSHP->adBoundsMax[1] = dValue; + + if( bBigEndian ) SwapWord( 8, pabyBuf+68 ); /* z */ + memcpy( &dValue, pabyBuf+68, 8 ); + psSHP->adBoundsMin[2] = dValue; + + if( bBigEndian ) SwapWord( 8, pabyBuf+76 ); + memcpy( &dValue, pabyBuf+76, 8 ); + psSHP->adBoundsMax[2] = dValue; + + if( bBigEndian ) SwapWord( 8, pabyBuf+84 ); /* z */ + memcpy( &dValue, pabyBuf+84, 8 ); + psSHP->adBoundsMin[3] = dValue; + + if( bBigEndian ) SwapWord( 8, pabyBuf+92 ); + memcpy( &dValue, pabyBuf+92, 8 ); + psSHP->adBoundsMax[3] = dValue; + + dk_free( pabyBuf, -1 ); + +/* -------------------------------------------------------------------- */ +/* Read the .shx file to get the offsets to each record in */ +/* the .shp file. */ +/* -------------------------------------------------------------------- */ + psSHP->nMaxRecords = psSHP->nRecords; + + psSHP->panRecOffset = (unsigned int *) + dk_alloc (sizeof(unsigned int) * MAX(1,psSHP->nMaxRecords) ); + psSHP->panRecSize = (unsigned int *) + dk_alloc (sizeof(unsigned int) * MAX(1,psSHP->nMaxRecords) ); + pabyBuf = (uchar *) dk_alloc (8 * MAX(1,psSHP->nRecords) ); + + if (psSHP->panRecOffset == NULL || + psSHP->panRecSize == NULL || + pabyBuf == NULL) + { + char szError[200]; + + sprintf(szError, + "Not enough memory to allocate requested memory (nRecords=%d).\n" + "Probably broken SHP file", + psSHP->nRecords ); + psSHP->sHooks.Error( szError ); + psSHP->sHooks.FClose( psSHP->fpSHP ); + psSHP->sHooks.FClose( psSHP->fpSHX ); + if (psSHP->panRecOffset) dk_free( psSHP->panRecOffset, -1 ); + if (psSHP->panRecSize) dk_free( psSHP->panRecSize, -1 ); + if (pabyBuf) dk_free( pabyBuf, -1 ); + dk_free( psSHP, -1 ); + return( NULL ); + } + + if( (int) psSHP->sHooks.FRead( pabyBuf, 8, psSHP->nRecords, psSHP->fpSHX ) + != psSHP->nRecords ) + { + char szError[200]; + + sprintf( szError, + "Failed to read all values for %d records in .shx file.", + psSHP->nRecords ); + psSHP->sHooks.Error( szError ); + + /* SHX is short or unreadable for some reason. */ + psSHP->sHooks.FClose( psSHP->fpSHP ); + psSHP->sHooks.FClose( psSHP->fpSHX ); + dk_free( psSHP->panRecOffset, -1 ); + dk_free( psSHP->panRecSize, -1 ); + dk_free( pabyBuf, -1 ); + dk_free( psSHP, -1 ); + + return( NULL ); + } + + /* In read-only mode, we can close the SHX now */ + if (strcmp(pszAccess, "rb") == 0) + { + psSHP->sHooks.FClose( psSHP->fpSHX ); + psSHP->fpSHX = NULL; + } + + for( i = 0; i < psSHP->nRecords; i++ ) + { + int32 nOffset, nLength; + + memcpy( &nOffset, pabyBuf + i * 8, 4 ); + if( !bBigEndian ) SwapWord( 4, &nOffset ); + + memcpy( &nLength, pabyBuf + i * 8 + 4, 4 ); + if( !bBigEndian ) SwapWord( 4, &nLength ); + + psSHP->panRecOffset[i] = nOffset*2; + psSHP->panRecSize[i] = nLength*2; + } + dk_free( pabyBuf, -1 ); + + return( psSHP ); +} + +/************************************************************************/ +/* SHPClose() */ +/* */ +/* Close the .shp and .shx files. */ +/************************************************************************/ + +void SHPAPI_CALL +SHPClose(SHPHandle psSHP ) + +{ + if( psSHP == NULL ) + return; + +/* -------------------------------------------------------------------- */ +/* Update the header if we have modified anything. */ +/* -------------------------------------------------------------------- */ + if( psSHP->bUpdated ) + SHPWriteHeader( psSHP ); + +/* -------------------------------------------------------------------- */ +/* Free all resources, and close files. */ +/* -------------------------------------------------------------------- */ + dk_free( psSHP->panRecOffset, -1 ); + dk_free( psSHP->panRecSize, -1 ); + + if ( psSHP->fpSHX != NULL) + psSHP->sHooks.FClose( psSHP->fpSHX ); + psSHP->sHooks.FClose( psSHP->fpSHP ); + + if( psSHP->pabyRec != NULL ) + { + dk_free( psSHP->pabyRec, -1 ); + } + + dk_free( psSHP, -1 ); +} + +/************************************************************************/ +/* SHPGetInfo() */ +/* */ +/* Fetch general information about the shape file. */ +/************************************************************************/ + +void SHPAPI_CALL +SHPGetInfo(SHPHandle psSHP, int * pnEntities, int * pnShapeType, + double * padfMinBound, double * padfMaxBound ) + +{ + int i; + + if( psSHP == NULL ) + return; + + if( pnEntities != NULL ) + *pnEntities = psSHP->nRecords; + + if( pnShapeType != NULL ) + *pnShapeType = psSHP->nShapeType; + + for( i = 0; i < 4; i++ ) + { + if( padfMinBound != NULL ) + padfMinBound[i] = psSHP->adBoundsMin[i]; + if( padfMaxBound != NULL ) + padfMaxBound[i] = psSHP->adBoundsMax[i]; + } +} + +/************************************************************************/ +/* SHPCreate() */ +/* */ +/* Create a new shape file and return a handle to the open */ +/* shape file with read/write access. */ +/************************************************************************/ + +SHPHandle SHPAPI_CALL +SHPCreate( const char * pszLayer, int nShapeType ) + +{ + SAHooks sHooks; + + SASetupDefaultHooks( &sHooks ); + + return SHPCreateLL( pszLayer, nShapeType, &sHooks ); +} + +/************************************************************************/ +/* SHPCreate() */ +/* */ +/* Create a new shape file and return a handle to the open */ +/* shape file with read/write access. */ +/************************************************************************/ + +SHPHandle SHPAPI_CALL +SHPCreateLL( const char * pszLayer, int nShapeType, SAHooks *psHooks ) + +{ + char *pszBasename = NULL, *pszFullname = NULL; + int i; + SAFile fpSHP = NULL, fpSHX = NULL; + uchar abyHeader[100]; + int32 i32; + double dValue; + +/* -------------------------------------------------------------------- */ +/* Establish the byte order on this system. */ +/* -------------------------------------------------------------------- */ + i = 1; + if( *((uchar *) &i) == 1 ) + bBigEndian = FALSE; + else + bBigEndian = TRUE; + +/* -------------------------------------------------------------------- */ +/* Compute the base (layer) name. If there is any extension */ +/* on the passed in filename we will strip it off. */ +/* -------------------------------------------------------------------- */ + pszBasename = (char *) dk_alloc (strlen(pszLayer)+5); + strcpy( pszBasename, pszLayer ); + for( i = strlen(pszBasename)-1; + i > 0 && pszBasename[i] != '.' && pszBasename[i] != '/' + && pszBasename[i] != '\\'; + i-- ) {} + + if( pszBasename[i] == '.' ) + pszBasename[i] = '\0'; + +/* -------------------------------------------------------------------- */ +/* Open the two files so we can write their headers. */ +/* -------------------------------------------------------------------- */ + pszFullname = (char *) dk_alloc (strlen(pszBasename) + 5); + sprintf( pszFullname, "%s.shp", pszBasename ); + fpSHP = psHooks->FOpen(pszFullname, "wb" ); + if( fpSHP == NULL ) + { + psHooks->Error( "Failed to create file .shp file." ); + goto error; + } + + sprintf( pszFullname, "%s.shx", pszBasename ); + fpSHX = psHooks->FOpen(pszFullname, "wb" ); + if( fpSHX == NULL ) + { + psHooks->Error( "Failed to create file .shx file." ); + goto error; + } + + dk_free( pszFullname, -1 ); pszFullname = NULL; + dk_free( pszBasename, -1 ); pszBasename = NULL; + +/* -------------------------------------------------------------------- */ +/* Prepare header block for .shp file. */ +/* -------------------------------------------------------------------- */ + for( i = 0; i < 100; i++ ) + abyHeader[i] = 0; + + abyHeader[2] = 0x27; /* magic cookie */ + abyHeader[3] = 0x0a; + + i32 = 50; /* file size */ + ByteCopy( &i32, abyHeader+24, 4 ); + if( !bBigEndian ) SwapWord( 4, abyHeader+24 ); + + i32 = 1000; /* version */ + ByteCopy( &i32, abyHeader+28, 4 ); + if( bBigEndian ) SwapWord( 4, abyHeader+28 ); + + i32 = nShapeType; /* shape type */ + ByteCopy( &i32, abyHeader+32, 4 ); + if( bBigEndian ) SwapWord( 4, abyHeader+32 ); + + dValue = 0.0; /* set bounds */ + ByteCopy( &dValue, abyHeader+36, 8 ); + ByteCopy( &dValue, abyHeader+44, 8 ); + ByteCopy( &dValue, abyHeader+52, 8 ); + ByteCopy( &dValue, abyHeader+60, 8 ); + +/* -------------------------------------------------------------------- */ +/* Write .shp file header. */ +/* -------------------------------------------------------------------- */ + if( psHooks->FWrite( abyHeader, 100, 1, fpSHP ) != 1 ) + { + psHooks->Error( "Failed to write .shp header." ); + goto error; + } + +/* -------------------------------------------------------------------- */ +/* Prepare, and write .shx file header. */ +/* -------------------------------------------------------------------- */ + i32 = 50; /* file size */ + ByteCopy( &i32, abyHeader+24, 4 ); + if( !bBigEndian ) SwapWord( 4, abyHeader+24 ); + + if( psHooks->FWrite( abyHeader, 100, 1, fpSHX ) != 1 ) + { + psHooks->Error( "Failed to write .shx header." ); + goto error; + } + +/* -------------------------------------------------------------------- */ +/* Close the files, and then open them as regular existing files. */ +/* -------------------------------------------------------------------- */ + psHooks->FClose( fpSHP ); + psHooks->FClose( fpSHX ); + + return( SHPOpenLL( pszLayer, "r+b", psHooks ) ); + +error: + if (pszFullname) dk_free(pszFullname, -1); + if (pszBasename) dk_free(pszBasename, -1); + if (fpSHP) psHooks->FClose( fpSHP ); + if (fpSHX) psHooks->FClose( fpSHX ); + return NULL; +} + +/************************************************************************/ +/* _SHPSetBounds() */ +/* */ +/* Compute a bounds rectangle for a shape, and set it into the */ +/* indicated location in the record. */ +/************************************************************************/ + +static void _SHPSetBounds( uchar * pabyRec, SHPObject * psShape ) + +{ + ByteCopy( &(psShape->dfXMin), pabyRec + 0, 8 ); + ByteCopy( &(psShape->dfYMin), pabyRec + 8, 8 ); + ByteCopy( &(psShape->dfXMax), pabyRec + 16, 8 ); + ByteCopy( &(psShape->dfYMax), pabyRec + 24, 8 ); + + if( bBigEndian ) + { + SwapWord( 8, pabyRec + 0 ); + SwapWord( 8, pabyRec + 8 ); + SwapWord( 8, pabyRec + 16 ); + SwapWord( 8, pabyRec + 24 ); + } +} + +/************************************************************************/ +/* SHPComputeExtents() */ +/* */ +/* Recompute the extents of a shape. Automatically done by */ +/* SHPCreateObject(). */ +/************************************************************************/ + +void SHPAPI_CALL +SHPComputeExtents( SHPObject * psObject ) + +{ + int i; + +/* -------------------------------------------------------------------- */ +/* Build extents for this object. */ +/* -------------------------------------------------------------------- */ + if( psObject->nVertices > 0 ) + { + psObject->dfXMin = psObject->dfXMax = psObject->padfX[0]; + psObject->dfYMin = psObject->dfYMax = psObject->padfY[0]; + psObject->dfZMin = psObject->dfZMax = psObject->padfZ[0]; + psObject->dfMMin = psObject->dfMMax = psObject->padfM[0]; + } + + for( i = 0; i < psObject->nVertices; i++ ) + { + psObject->dfXMin = MIN(psObject->dfXMin, psObject->padfX[i]); + psObject->dfYMin = MIN(psObject->dfYMin, psObject->padfY[i]); + psObject->dfZMin = MIN(psObject->dfZMin, psObject->padfZ[i]); + psObject->dfMMin = MIN(psObject->dfMMin, psObject->padfM[i]); + + psObject->dfXMax = MAX(psObject->dfXMax, psObject->padfX[i]); + psObject->dfYMax = MAX(psObject->dfYMax, psObject->padfY[i]); + psObject->dfZMax = MAX(psObject->dfZMax, psObject->padfZ[i]); + psObject->dfMMax = MAX(psObject->dfMMax, psObject->padfM[i]); + } +} + +/************************************************************************/ +/* SHPCreateObject() */ +/* */ +/* Create a shape object. It should be freed with */ +/* SHPDestroyObject(). */ +/************************************************************************/ + +SHPObject SHPAPI_CALL1(*) +SHPCreateObject( int nSHPType, int nShapeId, int nParts, + const int * panPartStart, const int * panPartType, + int nVertices, const double *padfX, const double *padfY, + const double * padfZ, const double * padfM ) + +{ + SHPObject *psObject; + int i, bHasM, bHasZ; + + psObject = (SHPObject *) dk_alloc (sizeof(SHPObject)); + memset (psObject, 0, sizeof(SHPObject)); + psObject->nSHPType = nSHPType; + psObject->nShapeId = nShapeId; + psObject->bMeasureIsUsed = FALSE; + +/* -------------------------------------------------------------------- */ +/* Establish whether this shape type has M, and Z values. */ +/* -------------------------------------------------------------------- */ + if( nSHPType == SHPT_ARCM + || nSHPType == SHPT_POINTM + || nSHPType == SHPT_POLYGONM + || nSHPType == SHPT_MULTIPOINTM ) + { + bHasM = TRUE; + bHasZ = FALSE; + } + else if( nSHPType == SHPT_ARCZ + || nSHPType == SHPT_POINTZ + || nSHPType == SHPT_POLYGONZ + || nSHPType == SHPT_MULTIPOINTZ + || nSHPType == SHPT_MULTIPATCH ) + { + bHasM = TRUE; + bHasZ = TRUE; + } + else + { + bHasM = FALSE; + bHasZ = FALSE; + } + +/* -------------------------------------------------------------------- */ +/* Capture parts. Note that part type is optional, and */ +/* defaults to ring. */ +/* -------------------------------------------------------------------- */ + if( nSHPType == SHPT_ARC || nSHPType == SHPT_POLYGON + || nSHPType == SHPT_ARCM || nSHPType == SHPT_POLYGONM + || nSHPType == SHPT_ARCZ || nSHPType == SHPT_POLYGONZ + || nSHPType == SHPT_MULTIPATCH ) + { + psObject->nParts = MAX(1,nParts); + + psObject->panPartStart = (int *) dk_alloc (sizeof(int) * psObject->nParts); + memset (psObject->panPartStart, 0, sizeof(int) * psObject->nParts); + psObject->panPartType = (int *) + dk_alloc (sizeof(int) * psObject->nParts); + psObject->panPartType[0] = SHPP_RING; + + for( i = 0; i < nParts; i++ ) + { + if( psObject->panPartStart != NULL ) + psObject->panPartStart[i] = panPartStart[i]; + + if( panPartType != NULL ) + psObject->panPartType[i] = panPartType[i]; + else + psObject->panPartType[i] = SHPP_RING; + } + + if( psObject->panPartStart[0] != 0 ) + psObject->panPartStart[0] = 0; + } + +/* -------------------------------------------------------------------- */ +/* Capture vertices. Note that X, Y, Z and M are optional. */ +/* -------------------------------------------------------------------- */ + if( nVertices > 0 ) + { + size_t padf_len = sizeof(double) * nVertices; + psObject->padfX = (double *) dk_alloc (padf_len); memset (psObject->padfX, 0, padf_len); + psObject->padfY = (double *) dk_alloc (padf_len); memset (psObject->padfY, 0, padf_len); + psObject->padfZ = (double *) dk_alloc (padf_len); memset (psObject->padfZ, 0, padf_len); + psObject->padfM = (double *) dk_alloc (padf_len); memset (psObject->padfM, 0, padf_len); + for( i = 0; i < nVertices; i++ ) + { + if( padfX != NULL ) + psObject->padfX[i] = padfX[i]; + if( padfY != NULL ) + psObject->padfY[i] = padfY[i]; + if( padfZ != NULL && bHasZ ) + psObject->padfZ[i] = padfZ[i]; + if( padfM != NULL && bHasM ) + psObject->padfM[i] = padfM[i]; + } + if( padfM != NULL && bHasM ) + psObject->bMeasureIsUsed = TRUE; + } + +/* -------------------------------------------------------------------- */ +/* Compute the extents. */ +/* -------------------------------------------------------------------- */ + psObject->nVertices = nVertices; + SHPComputeExtents( psObject ); + + return( psObject ); +} + +/************************************************************************/ +/* SHPCreateSimpleObject() */ +/* */ +/* Create a simple (common) shape object. Destroy with */ +/* SHPDestroyObject(). */ +/************************************************************************/ + +SHPObject SHPAPI_CALL1(*) +SHPCreateSimpleObject( int nSHPType, int nVertices, + const double * padfX, const double * padfY, + const double * padfZ ) + +{ + return( SHPCreateObject( nSHPType, -1, 0, NULL, NULL, + nVertices, padfX, padfY, padfZ, NULL ) ); +} + +/************************************************************************/ +/* SHPWriteObject() */ +/* */ +/* Write out the vertices of a new structure. Note that it is */ +/* only possible to write vertices at the end of the file. */ +/************************************************************************/ + +int SHPAPI_CALL +SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject ) + +{ + unsigned int nRecordOffset, nRecordSize=0; + int i; + uchar *pabyRec; + int32 i32; + + psSHP->bUpdated = TRUE; + +/* -------------------------------------------------------------------- */ +/* Ensure that shape object matches the type of the file it is */ +/* being written to. */ +/* -------------------------------------------------------------------- */ + assert( psObject->nSHPType == psSHP->nShapeType + || psObject->nSHPType == SHPT_NULL ); + +/* -------------------------------------------------------------------- */ +/* Ensure that -1 is used for appends. Either blow an */ +/* assertion, or if they are disabled, set the shapeid to -1 */ +/* for appends. */ +/* -------------------------------------------------------------------- */ + assert( nShapeId == -1 + || (nShapeId >= 0 && nShapeId < psSHP->nRecords) ); + + if( nShapeId != -1 && nShapeId >= psSHP->nRecords ) + nShapeId = -1; + +/* -------------------------------------------------------------------- */ +/* Add the new entity to the in memory index. */ +/* -------------------------------------------------------------------- */ + if( nShapeId == -1 && psSHP->nRecords+1 > psSHP->nMaxRecords ) + { + psSHP->nMaxRecords =(int) ( psSHP->nMaxRecords * 1.3 + 100); + + psSHP->panRecOffset = (unsigned int *) + SfRealloc(psSHP->panRecOffset,sizeof(unsigned int) * psSHP->nMaxRecords ); + psSHP->panRecSize = (unsigned int *) + SfRealloc(psSHP->panRecSize,sizeof(unsigned int) * psSHP->nMaxRecords ); + } + +/* -------------------------------------------------------------------- */ +/* Initialize record. */ +/* -------------------------------------------------------------------- */ + pabyRec = (uchar *) dk_alloc (psObject->nVertices * 4 * sizeof(double) + + psObject->nParts * 8 + 128); + +/* -------------------------------------------------------------------- */ +/* Extract vertices for a Polygon or Arc. */ +/* -------------------------------------------------------------------- */ + if( psObject->nSHPType == SHPT_POLYGON + || psObject->nSHPType == SHPT_POLYGONZ + || psObject->nSHPType == SHPT_POLYGONM + || psObject->nSHPType == SHPT_ARC + || psObject->nSHPType == SHPT_ARCZ + || psObject->nSHPType == SHPT_ARCM + || psObject->nSHPType == SHPT_MULTIPATCH ) + { + int32 nPoints, nParts; + int i; + + nPoints = psObject->nVertices; + nParts = psObject->nParts; + + _SHPSetBounds( pabyRec + 12, psObject ); + + if( bBigEndian ) SwapWord( 4, &nPoints ); + if( bBigEndian ) SwapWord( 4, &nParts ); + + ByteCopy( &nPoints, pabyRec + 40 + 8, 4 ); + ByteCopy( &nParts, pabyRec + 36 + 8, 4 ); + + nRecordSize = 52; + + /* + * Write part start positions. + */ + ByteCopy( psObject->panPartStart, pabyRec + 44 + 8, + 4 * psObject->nParts ); + for( i = 0; i < psObject->nParts; i++ ) + { + if( bBigEndian ) SwapWord( 4, pabyRec + 44 + 8 + 4*i ); + nRecordSize += 4; + } + + /* + * Write multipatch part types if needed. + */ + if( psObject->nSHPType == SHPT_MULTIPATCH ) + { + memcpy( pabyRec + nRecordSize, psObject->panPartType, + 4*psObject->nParts ); + for( i = 0; i < psObject->nParts; i++ ) + { + if( bBigEndian ) SwapWord( 4, pabyRec + nRecordSize ); + nRecordSize += 4; + } + } + + /* + * Write the (x,y) vertex values. + */ + for( i = 0; i < psObject->nVertices; i++ ) + { + ByteCopy( psObject->padfX + i, pabyRec + nRecordSize, 8 ); + ByteCopy( psObject->padfY + i, pabyRec + nRecordSize + 8, 8 ); + + if( bBigEndian ) + SwapWord( 8, pabyRec + nRecordSize ); + + if( bBigEndian ) + SwapWord( 8, pabyRec + nRecordSize + 8 ); + + nRecordSize += 2 * 8; + } + + /* + * Write the Z coordinates (if any). + */ + if( psObject->nSHPType == SHPT_POLYGONZ + || psObject->nSHPType == SHPT_ARCZ + || psObject->nSHPType == SHPT_MULTIPATCH ) + { + ByteCopy( &(psObject->dfZMin), pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + + ByteCopy( &(psObject->dfZMax), pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + + for( i = 0; i < psObject->nVertices; i++ ) + { + ByteCopy( psObject->padfZ + i, pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + } + } + + /* + * Write the M values, if any. + */ + if( psObject->bMeasureIsUsed + && (psObject->nSHPType == SHPT_POLYGONM + || psObject->nSHPType == SHPT_ARCM +#ifndef DISABLE_MULTIPATCH_MEASURE + || psObject->nSHPType == SHPT_MULTIPATCH +#endif + || psObject->nSHPType == SHPT_POLYGONZ + || psObject->nSHPType == SHPT_ARCZ) ) + { + ByteCopy( &(psObject->dfMMin), pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + + ByteCopy( &(psObject->dfMMax), pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + + for( i = 0; i < psObject->nVertices; i++ ) + { + ByteCopy( psObject->padfM + i, pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + } + } + } + +/* -------------------------------------------------------------------- */ +/* Extract vertices for a MultiPoint. */ +/* -------------------------------------------------------------------- */ + else if( psObject->nSHPType == SHPT_MULTIPOINT + || psObject->nSHPType == SHPT_MULTIPOINTZ + || psObject->nSHPType == SHPT_MULTIPOINTM ) + { + int32 nPoints; + int i; + + nPoints = psObject->nVertices; + + _SHPSetBounds( pabyRec + 12, psObject ); + + if( bBigEndian ) SwapWord( 4, &nPoints ); + ByteCopy( &nPoints, pabyRec + 44, 4 ); + + for( i = 0; i < psObject->nVertices; i++ ) + { + ByteCopy( psObject->padfX + i, pabyRec + 48 + i*16, 8 ); + ByteCopy( psObject->padfY + i, pabyRec + 48 + i*16 + 8, 8 ); + + if( bBigEndian ) SwapWord( 8, pabyRec + 48 + i*16 ); + if( bBigEndian ) SwapWord( 8, pabyRec + 48 + i*16 + 8 ); + } + + nRecordSize = 48 + 16 * psObject->nVertices; + + if( psObject->nSHPType == SHPT_MULTIPOINTZ ) + { + ByteCopy( &(psObject->dfZMin), pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + + ByteCopy( &(psObject->dfZMax), pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + + for( i = 0; i < psObject->nVertices; i++ ) + { + ByteCopy( psObject->padfZ + i, pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + } + } + + if( psObject->bMeasureIsUsed + && (psObject->nSHPType == SHPT_MULTIPOINTZ + || psObject->nSHPType == SHPT_MULTIPOINTM) ) + { + ByteCopy( &(psObject->dfMMin), pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + + ByteCopy( &(psObject->dfMMax), pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + + for( i = 0; i < psObject->nVertices; i++ ) + { + ByteCopy( psObject->padfM + i, pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + } + } + } + +/* -------------------------------------------------------------------- */ +/* Write point. */ +/* -------------------------------------------------------------------- */ + else if( psObject->nSHPType == SHPT_POINT + || psObject->nSHPType == SHPT_POINTZ + || psObject->nSHPType == SHPT_POINTM ) + { + ByteCopy( psObject->padfX, pabyRec + 12, 8 ); + ByteCopy( psObject->padfY, pabyRec + 20, 8 ); + + if( bBigEndian ) SwapWord( 8, pabyRec + 12 ); + if( bBigEndian ) SwapWord( 8, pabyRec + 20 ); + + nRecordSize = 28; + + if( psObject->nSHPType == SHPT_POINTZ ) + { + ByteCopy( psObject->padfZ, pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + } + + if( psObject->bMeasureIsUsed + && (psObject->nSHPType == SHPT_POINTZ + || psObject->nSHPType == SHPT_POINTM) ) + { + ByteCopy( psObject->padfM, pabyRec + nRecordSize, 8 ); + if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize ); + nRecordSize += 8; + } + } + +/* -------------------------------------------------------------------- */ +/* Not much to do for null geometries. */ +/* -------------------------------------------------------------------- */ + else if( psObject->nSHPType == SHPT_NULL ) + { + nRecordSize = 12; + } + + else + { + /* unknown type */ + assert( FALSE ); + } + +/* -------------------------------------------------------------------- */ +/* Establish where we are going to put this record. If we are */ +/* rewriting and existing record, and it will fit, then put it */ +/* back where the original came from. Otherwise write at the end. */ +/* -------------------------------------------------------------------- */ + if( nShapeId == -1 || psSHP->panRecSize[nShapeId] < nRecordSize-8 ) + { + unsigned int nExpectedSize = psSHP->nFileSize + nRecordSize; + if( nExpectedSize < psSHP->nFileSize ) // due to unsigned int overflow + { + char str[128]; + sprintf( str, "Failed to write shape object. " + "File size cannot reach %u + %u.", + psSHP->nFileSize, nRecordSize ); + psSHP->sHooks.Error( str ); + dk_free( pabyRec, -1 ); + return -1; + } + + if( nShapeId == -1 ) + nShapeId = psSHP->nRecords++; + + psSHP->panRecOffset[nShapeId] = nRecordOffset = psSHP->nFileSize; + psSHP->panRecSize[nShapeId] = nRecordSize-8; + psSHP->nFileSize += nRecordSize; + } + else + { + nRecordOffset = psSHP->panRecOffset[nShapeId]; + psSHP->panRecSize[nShapeId] = nRecordSize-8; + } + +/* -------------------------------------------------------------------- */ +/* Set the shape type, record number, and record size. */ +/* -------------------------------------------------------------------- */ + i32 = nShapeId+1; /* record # */ + if( !bBigEndian ) SwapWord( 4, &i32 ); + ByteCopy( &i32, pabyRec, 4 ); + + i32 = (nRecordSize-8)/2; /* record size */ + if( !bBigEndian ) SwapWord( 4, &i32 ); + ByteCopy( &i32, pabyRec + 4, 4 ); + + i32 = psObject->nSHPType; /* shape type */ + if( bBigEndian ) SwapWord( 4, &i32 ); + ByteCopy( &i32, pabyRec + 8, 4 ); + +/* -------------------------------------------------------------------- */ +/* Write out record. */ +/* -------------------------------------------------------------------- */ + if( psSHP->sHooks.FSeek( psSHP->fpSHP, nRecordOffset, 0 ) != 0 ) + { + psSHP->sHooks.Error( "Error in psSHP->sHooks.FSeek() while writing object to .shp file." ); + dk_free( pabyRec, -1 ); + return -1; + } + if( psSHP->sHooks.FWrite( pabyRec, nRecordSize, 1, psSHP->fpSHP ) < 1 ) + { + psSHP->sHooks.Error( "Error in psSHP->sHooks.Fwrite() while writing object to .shp file." ); + dk_free( pabyRec, -1 ); + return -1; + } + + dk_free( pabyRec, -1 ); + +/* -------------------------------------------------------------------- */ +/* Expand file wide bounds based on this shape. */ +/* -------------------------------------------------------------------- */ + if( psSHP->adBoundsMin[0] == 0.0 + && psSHP->adBoundsMax[0] == 0.0 + && psSHP->adBoundsMin[1] == 0.0 + && psSHP->adBoundsMax[1] == 0.0 ) + { + if( psObject->nSHPType == SHPT_NULL || psObject->nVertices == 0 ) + { + psSHP->adBoundsMin[0] = psSHP->adBoundsMax[0] = 0.0; + psSHP->adBoundsMin[1] = psSHP->adBoundsMax[1] = 0.0; + psSHP->adBoundsMin[2] = psSHP->adBoundsMax[2] = 0.0; + psSHP->adBoundsMin[3] = psSHP->adBoundsMax[3] = 0.0; + } + else + { + psSHP->adBoundsMin[0] = psSHP->adBoundsMax[0] = psObject->padfX[0]; + psSHP->adBoundsMin[1] = psSHP->adBoundsMax[1] = psObject->padfY[0]; + psSHP->adBoundsMin[2] = psSHP->adBoundsMax[2] = psObject->padfZ[0]; + psSHP->adBoundsMin[3] = psSHP->adBoundsMax[3] = psObject->padfM[0]; + } + } + + for( i = 0; i < psObject->nVertices; i++ ) + { + psSHP->adBoundsMin[0] = MIN(psSHP->adBoundsMin[0],psObject->padfX[i]); + psSHP->adBoundsMin[1] = MIN(psSHP->adBoundsMin[1],psObject->padfY[i]); + psSHP->adBoundsMin[2] = MIN(psSHP->adBoundsMin[2],psObject->padfZ[i]); + psSHP->adBoundsMin[3] = MIN(psSHP->adBoundsMin[3],psObject->padfM[i]); + psSHP->adBoundsMax[0] = MAX(psSHP->adBoundsMax[0],psObject->padfX[i]); + psSHP->adBoundsMax[1] = MAX(psSHP->adBoundsMax[1],psObject->padfY[i]); + psSHP->adBoundsMax[2] = MAX(psSHP->adBoundsMax[2],psObject->padfZ[i]); + psSHP->adBoundsMax[3] = MAX(psSHP->adBoundsMax[3],psObject->padfM[i]); + } + + return( nShapeId ); +} + +/************************************************************************/ +/* SHPReadObject() */ +/* */ +/* Read the vertices, parts, and other non-attribute information */ +/* for one shape. */ +/************************************************************************/ + +SHPObject SHPAPI_CALL1(*) +SHPReadObject( SHPHandle psSHP, int hEntity ) + +{ + int nEntitySize, nRequiredSize; + SHPObject *psShape; + char szErrorMsg[128]; + +/* -------------------------------------------------------------------- */ +/* Validate the record/entity number. */ +/* -------------------------------------------------------------------- */ + if( hEntity < 0 || hEntity >= psSHP->nRecords ) + return( NULL ); + +/* -------------------------------------------------------------------- */ +/* Ensure our record buffer is large enough. */ +/* -------------------------------------------------------------------- */ + nEntitySize = psSHP->panRecSize[hEntity]+8; + if( nEntitySize > psSHP->nBufSize ) + { + psSHP->pabyRec = (uchar *) SfRealloc(psSHP->pabyRec,nEntitySize); + if (psSHP->pabyRec == NULL) + { + char szError[200]; + + /* Reallocate previous successfull size for following features */ + psSHP->pabyRec = dk_alloc (psSHP->nBufSize); + + sprintf( szError, + "Not enough memory to allocate requested memory (nBufSize=%d). " + "Probably broken SHP file", psSHP->nBufSize ); + psSHP->sHooks.Error( szError ); + return NULL; + } + + /* Only set new buffer size after successfull alloc */ + psSHP->nBufSize = nEntitySize; + } + + /* In case we were not able to reallocate the buffer on a previous step */ + if (psSHP->pabyRec == NULL) + { + return NULL; + } + +/* -------------------------------------------------------------------- */ +/* Read the record. */ +/* -------------------------------------------------------------------- */ + if( psSHP->sHooks.FSeek( psSHP->fpSHP, psSHP->panRecOffset[hEntity], 0 ) != 0 ) + { + /* + * TODO - mloskot: Consider detailed diagnostics of shape file, + * for example to detect if file is truncated. + */ + char str[128]; + sprintf( str, + "Error in fseek() reading object from .shp file at offset %u", + psSHP->panRecOffset[hEntity]); + + psSHP->sHooks.Error( str ); + return NULL; + } + + if( psSHP->sHooks.FRead( psSHP->pabyRec, nEntitySize, 1, psSHP->fpSHP ) != 1 ) + { + /* + * TODO - mloskot: Consider detailed diagnostics of shape file, + * for example to detect if file is truncated. + */ + char str[128]; + sprintf( str, + "Error in fread() reading object of size %u at offset %u from .shp file", + nEntitySize, psSHP->panRecOffset[hEntity] ); + + psSHP->sHooks.Error( str ); + return NULL; + } + +/* -------------------------------------------------------------------- */ +/* Allocate and minimally initialize the object. */ +/* -------------------------------------------------------------------- */ + psShape = (SHPObject *) dk_alloc (sizeof(SHPObject)); + memset (psShape, 0, sizeof(SHPObject)); + psShape->nShapeId = hEntity; + psShape->bMeasureIsUsed = FALSE; + + if ( 8 + 4 > nEntitySize ) + { + snprintf(szErrorMsg, sizeof(szErrorMsg), + "Corrupted .shp file : shape %d : nEntitySize = %d", + hEntity, nEntitySize); + psSHP->sHooks.Error( szErrorMsg ); + SHPDestroyObject(psShape); + return NULL; + } + memcpy( &psShape->nSHPType, psSHP->pabyRec + 8, 4 ); + + if( bBigEndian ) SwapWord( 4, &(psShape->nSHPType) ); + +/* ==================================================================== */ +/* Extract vertices for a Polygon or Arc. */ +/* ==================================================================== */ + if( psShape->nSHPType == SHPT_POLYGON || psShape->nSHPType == SHPT_ARC + || psShape->nSHPType == SHPT_POLYGONZ + || psShape->nSHPType == SHPT_POLYGONM + || psShape->nSHPType == SHPT_ARCZ + || psShape->nSHPType == SHPT_ARCM + || psShape->nSHPType == SHPT_MULTIPATCH ) + { + int32 nPoints, nParts; + int i, nOffset; + size_t padf_boxlen; + + if ( 40 + 8 + 4 > nEntitySize ) + { + snprintf(szErrorMsg, sizeof(szErrorMsg), + "Corrupted .shp file : shape %d : nEntitySize = %d", + hEntity, nEntitySize); + psSHP->sHooks.Error( szErrorMsg ); + SHPDestroyObject(psShape); + return NULL; + } +/* -------------------------------------------------------------------- */ +/* Get the X/Y bounds. */ +/* -------------------------------------------------------------------- */ + memcpy( &(psShape->dfXMin), psSHP->pabyRec + 8 + 4, 8 ); + memcpy( &(psShape->dfYMin), psSHP->pabyRec + 8 + 12, 8 ); + memcpy( &(psShape->dfXMax), psSHP->pabyRec + 8 + 20, 8 ); + memcpy( &(psShape->dfYMax), psSHP->pabyRec + 8 + 28, 8 ); + + if( bBigEndian ) SwapWord( 8, &(psShape->dfXMin) ); + if( bBigEndian ) SwapWord( 8, &(psShape->dfYMin) ); + if( bBigEndian ) SwapWord( 8, &(psShape->dfXMax) ); + if( bBigEndian ) SwapWord( 8, &(psShape->dfYMax) ); + +/* -------------------------------------------------------------------- */ +/* Extract part/point count, and build vertex and part arrays */ +/* to proper size. */ +/* -------------------------------------------------------------------- */ + memcpy( &nPoints, psSHP->pabyRec + 40 + 8, 4 ); + memcpy( &nParts, psSHP->pabyRec + 36 + 8, 4 ); + + if( bBigEndian ) SwapWord( 4, &nPoints ); + if( bBigEndian ) SwapWord( 4, &nParts ); + + if (nPoints < 0 || nParts < 0 || + nPoints > 50 * 1000 * 1000 || nParts > 10 * 1000 * 1000) + { + snprintf(szErrorMsg, sizeof(szErrorMsg), + "Corrupted .shp file : shape %d, nPoints=%d, nParts=%d.", + hEntity, nPoints, nParts); + psSHP->sHooks.Error( szErrorMsg ); + SHPDestroyObject(psShape); + return NULL; + } + + /* With the previous checks on nPoints and nParts, */ + /* we should not overflow here and after */ + /* since 50 M * (16 + 8 + 8) = 1 600 MB */ + nRequiredSize = 44 + 8 + 4 * nParts + 16 * nPoints; + if ( psShape->nSHPType == SHPT_POLYGONZ + || psShape->nSHPType == SHPT_ARCZ + || psShape->nSHPType == SHPT_MULTIPATCH ) + { + nRequiredSize += 16 + 8 * nPoints; + } + if( psShape->nSHPType == SHPT_MULTIPATCH ) + { + nRequiredSize += 4 * nParts; + } + if (nRequiredSize > nEntitySize) + { + snprintf(szErrorMsg, sizeof(szErrorMsg), + "Corrupted .shp file : shape %d, nPoints=%d, nParts=%d, nEntitySize=%d.", + hEntity, nPoints, nParts, nEntitySize); + psSHP->sHooks.Error( szErrorMsg ); + SHPDestroyObject(psShape); + return NULL; + } + + psShape->nVertices = nPoints; + padf_boxlen = nPoints * sizeof(double); + psShape->padfX = (double *) dk_alloc (padf_boxlen); memset (psShape->padfX, 0, padf_boxlen); + psShape->padfY = (double *) dk_alloc (padf_boxlen); memset (psShape->padfY, 0, padf_boxlen); + psShape->padfZ = (double *) dk_alloc (padf_boxlen); memset (psShape->padfZ, 0, padf_boxlen); + psShape->padfM = (double *) dk_alloc (padf_boxlen); memset (psShape->padfM, 0, padf_boxlen); + + psShape->nParts = nParts; + psShape->panPartStart = (int *) dk_alloc (nParts * sizeof(int)); + psShape->panPartType = (int *) dk_alloc (nParts * sizeof(int)); + + if (psShape->padfX == NULL || + psShape->padfY == NULL || + psShape->padfZ == NULL || + psShape->padfM == NULL || + psShape->panPartStart == NULL || + psShape->panPartType == NULL) + { + snprintf(szErrorMsg, sizeof(szErrorMsg), + "Not enough memory to allocate requested memory (nPoints=%d, nParts=%d) for shape %d. " + "Probably broken SHP file", hEntity, nPoints, nParts ); + psSHP->sHooks.Error( szErrorMsg ); + SHPDestroyObject(psShape); + return NULL; + } + + for( i = 0; i < nParts; i++ ) + psShape->panPartType[i] = SHPP_RING; + +/* -------------------------------------------------------------------- */ +/* Copy out the part array from the record. */ +/* -------------------------------------------------------------------- */ + memcpy( psShape->panPartStart, psSHP->pabyRec + 44 + 8, 4 * nParts ); + for( i = 0; i < nParts; i++ ) + { + if( bBigEndian ) SwapWord( 4, psShape->panPartStart+i ); + + /* We check that the offset is inside the vertex array */ + if (psShape->panPartStart[i] < 0 + || (psShape->panPartStart[i] >= psShape->nVertices + && psShape->nVertices > 0) ) + { + snprintf(szErrorMsg, sizeof(szErrorMsg), + "Corrupted .shp file : shape %d : panPartStart[%d] = %d, nVertices = %d", + hEntity, i, psShape->panPartStart[i], psShape->nVertices); + psSHP->sHooks.Error( szErrorMsg ); + SHPDestroyObject(psShape); + return NULL; + } + if (i > 0 && psShape->panPartStart[i] <= psShape->panPartStart[i-1]) + { + snprintf(szErrorMsg, sizeof(szErrorMsg), + "Corrupted .shp file : shape %d : panPartStart[%d] = %d, panPartStart[%d] = %d", + hEntity, i, psShape->panPartStart[i], i - 1, psShape->panPartStart[i - 1]); + psSHP->sHooks.Error( szErrorMsg ); + SHPDestroyObject(psShape); + return NULL; + } + } + + nOffset = 44 + 8 + 4*nParts; + +/* -------------------------------------------------------------------- */ +/* If this is a multipatch, we will also have parts types. */ +/* -------------------------------------------------------------------- */ + if( psShape->nSHPType == SHPT_MULTIPATCH ) + { + memcpy( psShape->panPartType, psSHP->pabyRec + nOffset, 4*nParts ); + for( i = 0; i < nParts; i++ ) + { + if( bBigEndian ) SwapWord( 4, psShape->panPartType+i ); + } + + nOffset += 4*nParts; + } + +/* -------------------------------------------------------------------- */ +/* Copy out the vertices from the record. */ +/* -------------------------------------------------------------------- */ + for( i = 0; i < nPoints; i++ ) + { + memcpy(psShape->padfX + i, + psSHP->pabyRec + nOffset + i * 16, + 8 ); + + memcpy(psShape->padfY + i, + psSHP->pabyRec + nOffset + i * 16 + 8, + 8 ); + + if( bBigEndian ) SwapWord( 8, psShape->padfX + i ); + if( bBigEndian ) SwapWord( 8, psShape->padfY + i ); + } + + nOffset += 16*nPoints; + +/* -------------------------------------------------------------------- */ +/* If we have a Z coordinate, collect that now. */ +/* -------------------------------------------------------------------- */ + if( psShape->nSHPType == SHPT_POLYGONZ + || psShape->nSHPType == SHPT_ARCZ + || psShape->nSHPType == SHPT_MULTIPATCH ) + { + memcpy( &(psShape->dfZMin), psSHP->pabyRec + nOffset, 8 ); + memcpy( &(psShape->dfZMax), psSHP->pabyRec + nOffset + 8, 8 ); + + if( bBigEndian ) SwapWord( 8, &(psShape->dfZMin) ); + if( bBigEndian ) SwapWord( 8, &(psShape->dfZMax) ); + + for( i = 0; i < nPoints; i++ ) + { + memcpy( psShape->padfZ + i, + psSHP->pabyRec + nOffset + 16 + i*8, 8 ); + if( bBigEndian ) SwapWord( 8, psShape->padfZ + i ); + } + + nOffset += 16 + 8*nPoints; + } + +/* -------------------------------------------------------------------- */ +/* If we have a M measure value, then read it now. We assume */ +/* that the measure can be present for any shape if the size is */ +/* big enough, but really it will only occur for the Z shapes */ +/* (options), and the M shapes. */ +/* -------------------------------------------------------------------- */ + if( nEntitySize >= nOffset + 16 + 8*nPoints ) + { + memcpy( &(psShape->dfMMin), psSHP->pabyRec + nOffset, 8 ); + memcpy( &(psShape->dfMMax), psSHP->pabyRec + nOffset + 8, 8 ); + + if( bBigEndian ) SwapWord( 8, &(psShape->dfMMin) ); + if( bBigEndian ) SwapWord( 8, &(psShape->dfMMax) ); + + for( i = 0; i < nPoints; i++ ) + { + memcpy( psShape->padfM + i, + psSHP->pabyRec + nOffset + 16 + i*8, 8 ); + if( bBigEndian ) SwapWord( 8, psShape->padfM + i ); + } + psShape->bMeasureIsUsed = TRUE; + } + } + +/* ==================================================================== */ +/* Extract vertices for a MultiPoint. */ +/* ==================================================================== */ + else if( psShape->nSHPType == SHPT_MULTIPOINT + || psShape->nSHPType == SHPT_MULTIPOINTM + || psShape->nSHPType == SHPT_MULTIPOINTZ ) + { + int32 nPoints; + int i, nOffset; + size_t padf_boxlen; + + if ( 44 + 4 > nEntitySize ) + { + snprintf(szErrorMsg, sizeof(szErrorMsg), + "Corrupted .shp file : shape %d : nEntitySize = %d", + hEntity, nEntitySize); + psSHP->sHooks.Error( szErrorMsg ); + SHPDestroyObject(psShape); + return NULL; + } + memcpy( &nPoints, psSHP->pabyRec + 44, 4 ); + + if( bBigEndian ) SwapWord( 4, &nPoints ); + + if (nPoints < 0 || nPoints > 50 * 1000 * 1000) + { + snprintf(szErrorMsg, sizeof(szErrorMsg), + "Corrupted .shp file : shape %d : nPoints = %d", + hEntity, nPoints); + psSHP->sHooks.Error( szErrorMsg ); + SHPDestroyObject(psShape); + return NULL; + } + + nRequiredSize = 48 + nPoints * 16; + if( psShape->nSHPType == SHPT_MULTIPOINTZ ) + { + nRequiredSize += 16 + nPoints * 8; + } + if (nRequiredSize > nEntitySize) + { + snprintf(szErrorMsg, sizeof(szErrorMsg), + "Corrupted .shp file : shape %d : nPoints = %d, nEntitySize = %d", + hEntity, nPoints, nEntitySize); + psSHP->sHooks.Error( szErrorMsg ); + SHPDestroyObject(psShape); + return NULL; + } + + psShape->nVertices = nPoints; + padf_boxlen = nPoints * sizeof(double); + psShape->padfX = (double *) dk_alloc (padf_boxlen); memset (psShape->padfX, 0, padf_boxlen); + psShape->padfY = (double *) dk_alloc (padf_boxlen); memset (psShape->padfY, 0, padf_boxlen); + psShape->padfZ = (double *) dk_alloc (padf_boxlen); memset (psShape->padfZ, 0, padf_boxlen); + psShape->padfM = (double *) dk_alloc (padf_boxlen); memset (psShape->padfM, 0, padf_boxlen); + + if (psShape->padfX == NULL || + psShape->padfY == NULL || + psShape->padfZ == NULL || + psShape->padfM == NULL) + { + snprintf(szErrorMsg, sizeof(szErrorMsg), + "Not enough memory to allocate requested memory (nPoints=%d) for shape %d. " + "Probably broken SHP file", hEntity, nPoints ); + psSHP->sHooks.Error( szErrorMsg ); + SHPDestroyObject(psShape); + return NULL; + } + + for( i = 0; i < nPoints; i++ ) + { + memcpy(psShape->padfX+i, psSHP->pabyRec + 48 + 16 * i, 8 ); + memcpy(psShape->padfY+i, psSHP->pabyRec + 48 + 16 * i + 8, 8 ); + + if( bBigEndian ) SwapWord( 8, psShape->padfX + i ); + if( bBigEndian ) SwapWord( 8, psShape->padfY + i ); + } + + nOffset = 48 + 16*nPoints; + +/* -------------------------------------------------------------------- */ +/* Get the X/Y bounds. */ +/* -------------------------------------------------------------------- */ + memcpy( &(psShape->dfXMin), psSHP->pabyRec + 8 + 4, 8 ); + memcpy( &(psShape->dfYMin), psSHP->pabyRec + 8 + 12, 8 ); + memcpy( &(psShape->dfXMax), psSHP->pabyRec + 8 + 20, 8 ); + memcpy( &(psShape->dfYMax), psSHP->pabyRec + 8 + 28, 8 ); + + if( bBigEndian ) SwapWord( 8, &(psShape->dfXMin) ); + if( bBigEndian ) SwapWord( 8, &(psShape->dfYMin) ); + if( bBigEndian ) SwapWord( 8, &(psShape->dfXMax) ); + if( bBigEndian ) SwapWord( 8, &(psShape->dfYMax) ); + +/* -------------------------------------------------------------------- */ +/* If we have a Z coordinate, collect that now. */ +/* -------------------------------------------------------------------- */ + if( psShape->nSHPType == SHPT_MULTIPOINTZ ) + { + memcpy( &(psShape->dfZMin), psSHP->pabyRec + nOffset, 8 ); + memcpy( &(psShape->dfZMax), psSHP->pabyRec + nOffset + 8, 8 ); + + if( bBigEndian ) SwapWord( 8, &(psShape->dfZMin) ); + if( bBigEndian ) SwapWord( 8, &(psShape->dfZMax) ); + + for( i = 0; i < nPoints; i++ ) + { + memcpy( psShape->padfZ + i, + psSHP->pabyRec + nOffset + 16 + i*8, 8 ); + if( bBigEndian ) SwapWord( 8, psShape->padfZ + i ); + } + + nOffset += 16 + 8*nPoints; + } + +/* -------------------------------------------------------------------- */ +/* If we have a M measure value, then read it now. We assume */ +/* that the measure can be present for any shape if the size is */ +/* big enough, but really it will only occur for the Z shapes */ +/* (options), and the M shapes. */ +/* -------------------------------------------------------------------- */ + if( nEntitySize >= nOffset + 16 + 8*nPoints ) + { + memcpy( &(psShape->dfMMin), psSHP->pabyRec + nOffset, 8 ); + memcpy( &(psShape->dfMMax), psSHP->pabyRec + nOffset + 8, 8 ); + + if( bBigEndian ) SwapWord( 8, &(psShape->dfMMin) ); + if( bBigEndian ) SwapWord( 8, &(psShape->dfMMax) ); + + for( i = 0; i < nPoints; i++ ) + { + memcpy( psShape->padfM + i, + psSHP->pabyRec + nOffset + 16 + i*8, 8 ); + if( bBigEndian ) SwapWord( 8, psShape->padfM + i ); + } + psShape->bMeasureIsUsed = TRUE; + } + } + +/* ==================================================================== */ +/* Extract vertices for a point. */ +/* ==================================================================== */ + else if( psShape->nSHPType == SHPT_POINT + || psShape->nSHPType == SHPT_POINTM + || psShape->nSHPType == SHPT_POINTZ ) + { + int nOffset; + + psShape->nVertices = 1; + psShape->padfX = (double *) dk_alloc (sizeof(double)); memset (psShape->padfX, 0, sizeof(double)); + psShape->padfY = (double *) dk_alloc (sizeof(double)); memset (psShape->padfY, 0, sizeof(double)); + psShape->padfZ = (double *) dk_alloc (sizeof(double)); memset (psShape->padfZ, 0, sizeof(double)); + psShape->padfM = (double *) dk_alloc (sizeof(double)); memset (psShape->padfM, 0, sizeof(double)); + + if (20 + 8 + (( psShape->nSHPType == SHPT_POINTZ ) ? 8 : 0)> nEntitySize) + { + snprintf(szErrorMsg, sizeof(szErrorMsg), + "Corrupted .shp file : shape %d : nEntitySize = %d", + hEntity, nEntitySize); + psSHP->sHooks.Error( szErrorMsg ); + SHPDestroyObject(psShape); + return NULL; + } + memcpy( psShape->padfX, psSHP->pabyRec + 12, 8 ); + memcpy( psShape->padfY, psSHP->pabyRec + 20, 8 ); + + if( bBigEndian ) SwapWord( 8, psShape->padfX ); + if( bBigEndian ) SwapWord( 8, psShape->padfY ); + + nOffset = 20 + 8; + +/* -------------------------------------------------------------------- */ +/* If we have a Z coordinate, collect that now. */ +/* -------------------------------------------------------------------- */ + if( psShape->nSHPType == SHPT_POINTZ ) + { + memcpy( psShape->padfZ, psSHP->pabyRec + nOffset, 8 ); + + if( bBigEndian ) SwapWord( 8, psShape->padfZ ); + + nOffset += 8; + } + +/* -------------------------------------------------------------------- */ +/* If we have a M measure value, then read it now. We assume */ +/* that the measure can be present for any shape if the size is */ +/* big enough, but really it will only occur for the Z shapes */ +/* (options), and the M shapes. */ +/* -------------------------------------------------------------------- */ + if( nEntitySize >= nOffset + 8 ) + { + memcpy( psShape->padfM, psSHP->pabyRec + nOffset, 8 ); + + if( bBigEndian ) SwapWord( 8, psShape->padfM ); + psShape->bMeasureIsUsed = TRUE; + } + +/* -------------------------------------------------------------------- */ +/* Since no extents are supplied in the record, we will apply */ +/* them from the single vertex. */ +/* -------------------------------------------------------------------- */ + psShape->dfXMin = psShape->dfXMax = psShape->padfX[0]; + psShape->dfYMin = psShape->dfYMax = psShape->padfY[0]; + psShape->dfZMin = psShape->dfZMax = psShape->padfZ[0]; + psShape->dfMMin = psShape->dfMMax = psShape->padfM[0]; + } + + return( psShape ); +} + +/************************************************************************/ +/* SHPTypeName() */ +/************************************************************************/ + +const char SHPAPI_CALL1(*) +SHPTypeName( int nSHPType ) + +{ + switch( nSHPType ) + { + case SHPT_NULL: + return "NullShape"; + + case SHPT_POINT: + return "Point"; + + case SHPT_ARC: + return "Arc"; + + case SHPT_POLYGON: + return "Polygon"; + + case SHPT_MULTIPOINT: + return "MultiPoint"; + + case SHPT_POINTZ: + return "PointZ"; + + case SHPT_ARCZ: + return "ArcZ"; + + case SHPT_POLYGONZ: + return "PolygonZ"; + + case SHPT_MULTIPOINTZ: + return "MultiPointZ"; + + case SHPT_POINTM: + return "PointM"; + + case SHPT_ARCM: + return "ArcM"; + + case SHPT_POLYGONM: + return "PolygonM"; + + case SHPT_MULTIPOINTM: + return "MultiPointM"; + + case SHPT_MULTIPATCH: + return "MultiPatch"; + + default: + return "UnknownShapeType"; + } +} + +/************************************************************************/ +/* SHPPartTypeName() */ +/************************************************************************/ + +const char SHPAPI_CALL1(*) +SHPPartTypeName( int nPartType ) + +{ + switch( nPartType ) + { + case SHPP_TRISTRIP: + return "TriangleStrip"; + + case SHPP_TRIFAN: + return "TriangleFan"; + + case SHPP_OUTERRING: + return "OuterRing"; + + case SHPP_INNERRING: + return "InnerRing"; + + case SHPP_FIRSTRING: + return "FirstRing"; + + case SHPP_RING: + return "Ring"; + + default: + return "UnknownPartType"; + } +} + +/************************************************************************/ +/* SHPDestroyObject() */ +/************************************************************************/ + +void SHPAPI_CALL +SHPDestroyObject( SHPObject * psShape ) + +{ + if( psShape == NULL ) + return; + + if( psShape->padfX != NULL ) + dk_free( psShape->padfX, -1 ); + if( psShape->padfY != NULL ) + dk_free( psShape->padfY, -1 ); + if( psShape->padfZ != NULL ) + dk_free( psShape->padfZ, -1 ); + if( psShape->padfM != NULL ) + dk_free( psShape->padfM, -1 ); + + if( psShape->panPartStart != NULL ) + dk_free( psShape->panPartStart, -1 ); + if( psShape->panPartType != NULL ) + dk_free( psShape->panPartType, -1 ); + + dk_free( psShape, -1 ); +} + +/************************************************************************/ +/* SHPRewindObject() */ +/* */ +/* Reset the winding of polygon objects to adhere to the */ +/* specification. */ +/************************************************************************/ + +int SHPAPI_CALL +SHPRewindObject( SHPHandle hSHP, SHPObject * psObject ) + +{ + int iOpRing, bAltered = 0; + +/* -------------------------------------------------------------------- */ +/* Do nothing if this is not a polygon object. */ +/* -------------------------------------------------------------------- */ + if( psObject->nSHPType != SHPT_POLYGON + && psObject->nSHPType != SHPT_POLYGONZ + && psObject->nSHPType != SHPT_POLYGONM ) + return 0; + + if( psObject->nVertices == 0 || psObject->nParts == 0 ) + return 0; + +/* -------------------------------------------------------------------- */ +/* Process each of the rings. */ +/* -------------------------------------------------------------------- */ + for( iOpRing = 0; iOpRing < psObject->nParts; iOpRing++ ) + { + int bInner, iVert, nVertCount, nVertStart, iCheckRing; + double dfSum, dfTestX, dfTestY; + +/* -------------------------------------------------------------------- */ +/* Determine if this ring is an inner ring or an outer ring */ +/* relative to all the other rings. For now we assume the */ +/* first ring is outer and all others are inner, but eventually */ +/* we need to fix this to handle multiple island polygons and */ +/* unordered sets of rings. */ +/* */ +/* -------------------------------------------------------------------- */ + + /* Use point in the middle of segment to avoid testing + * common points of rings. + */ + dfTestX = ( psObject->padfX[psObject->panPartStart[iOpRing]] + + psObject->padfX[psObject->panPartStart[iOpRing] + 1] ) / 2; + dfTestY = ( psObject->padfY[psObject->panPartStart[iOpRing]] + + psObject->padfY[psObject->panPartStart[iOpRing] + 1] ) / 2; + + bInner = FALSE; + for( iCheckRing = 0; iCheckRing < psObject->nParts; iCheckRing++ ) + { + int iEdge; + + if( iCheckRing == iOpRing ) + continue; + + nVertStart = psObject->panPartStart[iCheckRing]; + + if( iCheckRing == psObject->nParts-1 ) + nVertCount = psObject->nVertices + - psObject->panPartStart[iCheckRing]; + else + nVertCount = psObject->panPartStart[iCheckRing+1] + - psObject->panPartStart[iCheckRing]; + + for( iEdge = 0; iEdge < nVertCount; iEdge++ ) + { + int iNext; + + if( iEdge < nVertCount-1 ) + iNext = iEdge+1; + else + iNext = 0; + + /* Rule #1: + * Test whether the edge 'straddles' the horizontal ray from the test point (dfTestY,dfTestY) + * The rule #1 also excludes edges collinear with the ray. + */ + if ( ( psObject->padfY[iEdge+nVertStart] < dfTestY + && dfTestY <= psObject->padfY[iNext+nVertStart] ) + || ( psObject->padfY[iNext+nVertStart] < dfTestY + && dfTestY <= psObject->padfY[iEdge+nVertStart] ) ) + { + /* Rule #2: + * Test if edge-ray intersection is on the right from the test point (dfTestY,dfTestY) + */ + double const intersect = + ( psObject->padfX[iEdge+nVertStart] + + ( dfTestY - psObject->padfY[iEdge+nVertStart] ) + / ( psObject->padfY[iNext+nVertStart] - psObject->padfY[iEdge+nVertStart] ) + * ( psObject->padfX[iNext+nVertStart] - psObject->padfX[iEdge+nVertStart] ) ); + + if (intersect < dfTestX) + { + bInner = !bInner; + } + } + } + } /* for iCheckRing */ + +/* -------------------------------------------------------------------- */ +/* Determine the current order of this ring so we will know if */ +/* it has to be reversed. */ +/* -------------------------------------------------------------------- */ + nVertStart = psObject->panPartStart[iOpRing]; + + if( iOpRing == psObject->nParts-1 ) + nVertCount = psObject->nVertices - psObject->panPartStart[iOpRing]; + else + nVertCount = psObject->panPartStart[iOpRing+1] + - psObject->panPartStart[iOpRing]; + + if (nVertCount < 2) + continue; + + dfSum = psObject->padfX[nVertStart] * (psObject->padfY[nVertStart+1] - psObject->padfY[nVertStart+nVertCount-1]); + for( iVert = nVertStart + 1; iVert < nVertStart+nVertCount-1; iVert++ ) + { + dfSum += psObject->padfX[iVert] * (psObject->padfY[iVert+1] - psObject->padfY[iVert-1]); + } + + dfSum += psObject->padfX[iVert] * (psObject->padfY[nVertStart] - psObject->padfY[iVert-1]); + +/* -------------------------------------------------------------------- */ +/* Reverse if necessary. */ +/* -------------------------------------------------------------------- */ + if( (dfSum < 0.0 && bInner) || (dfSum > 0.0 && !bInner) ) + { + int i; + + bAltered++; + for( i = 0; i < nVertCount/2; i++ ) + { + double dfSaved; + + /* Swap X */ + dfSaved = psObject->padfX[nVertStart+i]; + psObject->padfX[nVertStart+i] = + psObject->padfX[nVertStart+nVertCount-i-1]; + psObject->padfX[nVertStart+nVertCount-i-1] = dfSaved; + + /* Swap Y */ + dfSaved = psObject->padfY[nVertStart+i]; + psObject->padfY[nVertStart+i] = + psObject->padfY[nVertStart+nVertCount-i-1]; + psObject->padfY[nVertStart+nVertCount-i-1] = dfSaved; + + /* Swap Z */ + if( psObject->padfZ ) + { + dfSaved = psObject->padfZ[nVertStart+i]; + psObject->padfZ[nVertStart+i] = + psObject->padfZ[nVertStart+nVertCount-i-1]; + psObject->padfZ[nVertStart+nVertCount-i-1] = dfSaved; + } + + /* Swap M */ + if( psObject->padfM ) + { + dfSaved = psObject->padfM[nVertStart+i]; + psObject->padfM[nVertStart+i] = + psObject->padfM[nVertStart+nVertCount-i-1]; + psObject->padfM[nVertStart+nVertCount-i-1] = dfSaved; + } + } + } + } + + return bAltered; +} diff --git a/binsrc/hosting/shapefileio/shptree.c b/binsrc/hosting/shapefileio/shptree.c new file mode 100644 index 0000000000..bc94ae5207 --- /dev/null +++ b/binsrc/hosting/shapefileio/shptree.c @@ -0,0 +1,1013 @@ +/* $Id$ + * + * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) + * project. + * + * Copyright (C) 2011-2019 OpenLink Software + * + * The file is a modified version of source file of the Shapelib library. + * The original version was obtained via http://shapelib.maptools.org + * Authors of the original version are not responsible for possible errors + * in this modified version. + * The original copyright and licensing info is as follows: + */ + +/****************************************************************************** + * Original Id: shptree.c,v 1.15 2011-07-24 05:59:25 fwarmerdam Exp $ + * + * Project: Shapelib + * Purpose: Implementation of quadtree building and searching functions. + * Author: Frank Warmerdam, warmerdam@pobox.com + * + ****************************************************************************** + * Copyright (c) 1999, Frank Warmerdam + * + * This software is available under the following "MIT Style" license, + * or at the option of the licensee under the LGPL (see LICENSE.LGPL). This + * option is discussed in more detail in shapelib.html. + * + * -- + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + ******************************************************************************/ + +#include "shapefil.h" + +#include +#include +#include +#include + +#ifdef USE_CPL +#include "cpl_error.h" +#endif + +SHP_CVSID("$Id$") + +#ifndef TRUE +# define TRUE 1 +# define FALSE 0 +#endif + +static int bBigEndian = 0; + + +/* -------------------------------------------------------------------- */ +/* If the following is 0.5, nodes will be split in half. If it */ +/* is 0.6 then each subnode will contain 60% of the parent */ +/* node, with 20% representing overlap. This can be help to */ +/* prevent small objects on a boundary from shifting too high */ +/* up the tree. */ +/* -------------------------------------------------------------------- */ + +#define SHP_SPLIT_RATIO 0.55 + +/************************************************************************/ +/* SfRealloc() */ +/* */ +/* A realloc cover function that will access a NULL pointer as */ +/* a valid input. */ +/************************************************************************/ + +static void * SfRealloc( void * pMem, int nNewSize ) + +{ + if( pMem == NULL ) + return( (void *) dk_alloc (nNewSize) ); + else + { + dk_free (pMem, -1); + return( (void *) dk_alloc (nNewSize) ); + } +} + +/************************************************************************/ +/* SHPTreeNodeInit() */ +/* */ +/* Initialize a tree node. */ +/************************************************************************/ + +static SHPTreeNode *SHPTreeNodeCreate( double * padfBoundsMin, + double * padfBoundsMax ) + +{ + SHPTreeNode *psTreeNode; + + psTreeNode = (SHPTreeNode *) dk_alloc (sizeof(SHPTreeNode)); + if( NULL == psTreeNode ) + return NULL; + + psTreeNode->nShapeCount = 0; + psTreeNode->panShapeIds = NULL; + psTreeNode->papsShapeObj = NULL; + + psTreeNode->nSubNodes = 0; + + if( padfBoundsMin != NULL ) + memcpy( psTreeNode->adfBoundsMin, padfBoundsMin, sizeof(double) * 4 ); + + if( padfBoundsMax != NULL ) + memcpy( psTreeNode->adfBoundsMax, padfBoundsMax, sizeof(double) * 4 ); + + return psTreeNode; +} + + +/************************************************************************/ +/* SHPCreateTree() */ +/************************************************************************/ + +SHPTree SHPAPI_CALL1(*) + SHPCreateTree( SHPHandle hSHP, int nDimension, int nMaxDepth, + double *padfBoundsMin, double *padfBoundsMax ) + +{ + SHPTree *psTree; + + if( padfBoundsMin == NULL && hSHP == NULL ) + return NULL; + +/* -------------------------------------------------------------------- */ +/* Allocate the tree object */ +/* -------------------------------------------------------------------- */ + psTree = (SHPTree *) dk_alloc (sizeof(SHPTree)); + if( NULL == psTree ) + { + return NULL; + } + + psTree->hSHP = hSHP; + psTree->nMaxDepth = nMaxDepth; + psTree->nDimension = nDimension; + psTree->nTotalCount = 0; + +/* -------------------------------------------------------------------- */ +/* If no max depth was defined, try to select a reasonable one */ +/* that implies approximately 8 shapes per node. */ +/* -------------------------------------------------------------------- */ + if( psTree->nMaxDepth == 0 && hSHP != NULL ) + { + int nMaxNodeCount = 1; + int nShapeCount; + + SHPGetInfo( hSHP, &nShapeCount, NULL, NULL, NULL ); + while( nMaxNodeCount*4 < nShapeCount ) + { + psTree->nMaxDepth += 1; + nMaxNodeCount = nMaxNodeCount * 2; + } + +#ifdef USE_CPL + CPLDebug( "Shape", + "Estimated spatial index tree depth: %d", + psTree->nMaxDepth ); +#endif + + /* NOTE: Due to problems with memory allocation for deep trees, + * automatically estimated depth is limited up to 12 levels. + * See Ticket #1594 for detailed discussion. + */ + if( psTree->nMaxDepth > MAX_DEFAULT_TREE_DEPTH ) + { + psTree->nMaxDepth = MAX_DEFAULT_TREE_DEPTH; + +#ifdef USE_CPL + CPLDebug( "Shape", + "Falling back to max number of allowed index tree levels (%d).", + MAX_DEFAULT_TREE_DEPTH ); +#endif + } + } + +/* -------------------------------------------------------------------- */ +/* Allocate the root node. */ +/* -------------------------------------------------------------------- */ + psTree->psRoot = SHPTreeNodeCreate( padfBoundsMin, padfBoundsMax ); + if( NULL == psTree->psRoot ) + { + return NULL; + } + +/* -------------------------------------------------------------------- */ +/* Assign the bounds to the root node. If none are passed in, */ +/* use the bounds of the provided file otherwise the create */ +/* function will have already set the bounds. */ +/* -------------------------------------------------------------------- */ + assert( NULL != psTree ); + assert( NULL != psTree->psRoot ); + + if( padfBoundsMin == NULL ) + { + SHPGetInfo( hSHP, NULL, NULL, + psTree->psRoot->adfBoundsMin, + psTree->psRoot->adfBoundsMax ); + } + +/* -------------------------------------------------------------------- */ +/* If we have a file, insert all it's shapes into the tree. */ +/* -------------------------------------------------------------------- */ + if( hSHP != NULL ) + { + int iShape, nShapeCount; + + SHPGetInfo( hSHP, &nShapeCount, NULL, NULL, NULL ); + + for( iShape = 0; iShape < nShapeCount; iShape++ ) + { + SHPObject *psShape; + + psShape = SHPReadObject( hSHP, iShape ); + if( psShape != NULL ) + { + SHPTreeAddShapeId( psTree, psShape ); + SHPDestroyObject( psShape ); + } + } + } + + return psTree; +} + +/************************************************************************/ +/* SHPDestroyTreeNode() */ +/************************************************************************/ + +static void SHPDestroyTreeNode( SHPTreeNode * psTreeNode ) + +{ + int i; + + assert( NULL != psTreeNode ); + + for( i = 0; i < psTreeNode->nSubNodes; i++ ) + { + if( psTreeNode->apsSubNode[i] != NULL ) + SHPDestroyTreeNode( psTreeNode->apsSubNode[i] ); + } + + if( psTreeNode->panShapeIds != NULL ) + dk_free ( psTreeNode->panShapeIds, -1 ); + + if( psTreeNode->papsShapeObj != NULL ) + { + for( i = 0; i < psTreeNode->nShapeCount; i++ ) + { + if( psTreeNode->papsShapeObj[i] != NULL ) + SHPDestroyObject( psTreeNode->papsShapeObj[i] ); + } + + dk_free ( psTreeNode->papsShapeObj, -1 ); + } + + dk_free ( psTreeNode, -1 ); +} + +/************************************************************************/ +/* SHPDestroyTree() */ +/************************************************************************/ + +void SHPAPI_CALL +SHPDestroyTree( SHPTree * psTree ) + +{ + SHPDestroyTreeNode( psTree->psRoot ); + dk_free ( psTree, -1 ); +} + +/************************************************************************/ +/* SHPCheckBoundsOverlap() */ +/* */ +/* Do the given boxes overlap at all? */ +/************************************************************************/ + +int SHPAPI_CALL +SHPCheckBoundsOverlap( double * padfBox1Min, double * padfBox1Max, + double * padfBox2Min, double * padfBox2Max, + int nDimension ) + +{ + int iDim; + + for( iDim = 0; iDim < nDimension; iDim++ ) + { + if( padfBox2Max[iDim] < padfBox1Min[iDim] ) + return FALSE; + + if( padfBox1Max[iDim] < padfBox2Min[iDim] ) + return FALSE; + } + + return TRUE; +} + +/************************************************************************/ +/* SHPCheckObjectContained() */ +/* */ +/* Does the given shape fit within the indicated extents? */ +/************************************************************************/ + +static int SHPCheckObjectContained( SHPObject * psObject, int nDimension, + double * padfBoundsMin, double * padfBoundsMax ) + +{ + if( psObject->dfXMin < padfBoundsMin[0] + || psObject->dfXMax > padfBoundsMax[0] ) + return FALSE; + + if( psObject->dfYMin < padfBoundsMin[1] + || psObject->dfYMax > padfBoundsMax[1] ) + return FALSE; + + if( nDimension == 2 ) + return TRUE; + + if( psObject->dfZMin < padfBoundsMin[2] + || psObject->dfZMax > padfBoundsMax[2] ) + return FALSE; + + if( nDimension == 3 ) + return TRUE; + + if( psObject->dfMMin < padfBoundsMin[3] + || psObject->dfMMax > padfBoundsMax[3] ) + return FALSE; + + return TRUE; +} + +/************************************************************************/ +/* SHPTreeSplitBounds() */ +/* */ +/* Split a region into two subregion evenly, cutting along the */ +/* longest dimension. */ +/************************************************************************/ + +void SHPAPI_CALL +SHPTreeSplitBounds( double *padfBoundsMinIn, double *padfBoundsMaxIn, + double *padfBoundsMin1, double * padfBoundsMax1, + double *padfBoundsMin2, double * padfBoundsMax2 ) + +{ +/* -------------------------------------------------------------------- */ +/* The output bounds will be very similar to the input bounds, */ +/* so just copy over to start. */ +/* -------------------------------------------------------------------- */ + memcpy( padfBoundsMin1, padfBoundsMinIn, sizeof(double) * 4 ); + memcpy( padfBoundsMax1, padfBoundsMaxIn, sizeof(double) * 4 ); + memcpy( padfBoundsMin2, padfBoundsMinIn, sizeof(double) * 4 ); + memcpy( padfBoundsMax2, padfBoundsMaxIn, sizeof(double) * 4 ); + +/* -------------------------------------------------------------------- */ +/* Split in X direction. */ +/* -------------------------------------------------------------------- */ + if( (padfBoundsMaxIn[0] - padfBoundsMinIn[0]) + > (padfBoundsMaxIn[1] - padfBoundsMinIn[1]) ) + { + double dfRange = padfBoundsMaxIn[0] - padfBoundsMinIn[0]; + + padfBoundsMax1[0] = padfBoundsMinIn[0] + dfRange * SHP_SPLIT_RATIO; + padfBoundsMin2[0] = padfBoundsMaxIn[0] - dfRange * SHP_SPLIT_RATIO; + } + +/* -------------------------------------------------------------------- */ +/* Otherwise split in Y direction. */ +/* -------------------------------------------------------------------- */ + else + { + double dfRange = padfBoundsMaxIn[1] - padfBoundsMinIn[1]; + + padfBoundsMax1[1] = padfBoundsMinIn[1] + dfRange * SHP_SPLIT_RATIO; + padfBoundsMin2[1] = padfBoundsMaxIn[1] - dfRange * SHP_SPLIT_RATIO; + } +} + +/************************************************************************/ +/* SHPTreeNodeAddShapeId() */ +/************************************************************************/ + +static int +SHPTreeNodeAddShapeId( SHPTreeNode * psTreeNode, SHPObject * psObject, + int nMaxDepth, int nDimension ) + +{ + int i; + +/* -------------------------------------------------------------------- */ +/* If there are subnodes, then consider wiether this object */ +/* will fit in them. */ +/* -------------------------------------------------------------------- */ + if( nMaxDepth > 1 && psTreeNode->nSubNodes > 0 ) + { + for( i = 0; i < psTreeNode->nSubNodes; i++ ) + { + if( SHPCheckObjectContained(psObject, nDimension, + psTreeNode->apsSubNode[i]->adfBoundsMin, + psTreeNode->apsSubNode[i]->adfBoundsMax)) + { + return SHPTreeNodeAddShapeId( psTreeNode->apsSubNode[i], + psObject, nMaxDepth-1, + nDimension ); + } + } + } + +/* -------------------------------------------------------------------- */ +/* Otherwise, consider creating four subnodes if could fit into */ +/* them, and adding to the appropriate subnode. */ +/* -------------------------------------------------------------------- */ +#if MAX_SUBNODE == 4 + else if( nMaxDepth > 1 && psTreeNode->nSubNodes == 0 ) + { + double adfBoundsMinH1[4], adfBoundsMaxH1[4]; + double adfBoundsMinH2[4], adfBoundsMaxH2[4]; + double adfBoundsMin1[4], adfBoundsMax1[4]; + double adfBoundsMin2[4], adfBoundsMax2[4]; + double adfBoundsMin3[4], adfBoundsMax3[4]; + double adfBoundsMin4[4], adfBoundsMax4[4]; + + SHPTreeSplitBounds( psTreeNode->adfBoundsMin, + psTreeNode->adfBoundsMax, + adfBoundsMinH1, adfBoundsMaxH1, + adfBoundsMinH2, adfBoundsMaxH2 ); + + SHPTreeSplitBounds( adfBoundsMinH1, adfBoundsMaxH1, + adfBoundsMin1, adfBoundsMax1, + adfBoundsMin2, adfBoundsMax2 ); + + SHPTreeSplitBounds( adfBoundsMinH2, adfBoundsMaxH2, + adfBoundsMin3, adfBoundsMax3, + adfBoundsMin4, adfBoundsMax4 ); + + if( SHPCheckObjectContained(psObject, nDimension, + adfBoundsMin1, adfBoundsMax1) + || SHPCheckObjectContained(psObject, nDimension, + adfBoundsMin2, adfBoundsMax2) + || SHPCheckObjectContained(psObject, nDimension, + adfBoundsMin3, adfBoundsMax3) + || SHPCheckObjectContained(psObject, nDimension, + adfBoundsMin4, adfBoundsMax4) ) + { + psTreeNode->nSubNodes = 4; + psTreeNode->apsSubNode[0] = SHPTreeNodeCreate( adfBoundsMin1, + adfBoundsMax1 ); + psTreeNode->apsSubNode[1] = SHPTreeNodeCreate( adfBoundsMin2, + adfBoundsMax2 ); + psTreeNode->apsSubNode[2] = SHPTreeNodeCreate( adfBoundsMin3, + adfBoundsMax3 ); + psTreeNode->apsSubNode[3] = SHPTreeNodeCreate( adfBoundsMin4, + adfBoundsMax4 ); + + /* recurse back on this node now that it has subnodes */ + return( SHPTreeNodeAddShapeId( psTreeNode, psObject, + nMaxDepth, nDimension ) ); + } + } +#endif /* MAX_SUBNODE == 4 */ + +/* -------------------------------------------------------------------- */ +/* Otherwise, consider creating two subnodes if could fit into */ +/* them, and adding to the appropriate subnode. */ +/* -------------------------------------------------------------------- */ +#if MAX_SUBNODE == 2 + else if( nMaxDepth > 1 && psTreeNode->nSubNodes == 0 ) + { + double adfBoundsMin1[4], adfBoundsMax1[4]; + double adfBoundsMin2[4], adfBoundsMax2[4]; + + SHPTreeSplitBounds( psTreeNode->adfBoundsMin, psTreeNode->adfBoundsMax, + adfBoundsMin1, adfBoundsMax1, + adfBoundsMin2, adfBoundsMax2 ); + + if( SHPCheckObjectContained(psObject, nDimension, + adfBoundsMin1, adfBoundsMax1)) + { + psTreeNode->nSubNodes = 2; + psTreeNode->apsSubNode[0] = SHPTreeNodeCreate( adfBoundsMin1, + adfBoundsMax1 ); + psTreeNode->apsSubNode[1] = SHPTreeNodeCreate( adfBoundsMin2, + adfBoundsMax2 ); + + return( SHPTreeNodeAddShapeId( psTreeNode->apsSubNode[0], psObject, + nMaxDepth - 1, nDimension ) ); + } + else if( SHPCheckObjectContained(psObject, nDimension, + adfBoundsMin2, adfBoundsMax2) ) + { + psTreeNode->nSubNodes = 2; + psTreeNode->apsSubNode[0] = SHPTreeNodeCreate( adfBoundsMin1, + adfBoundsMax1 ); + psTreeNode->apsSubNode[1] = SHPTreeNodeCreate( adfBoundsMin2, + adfBoundsMax2 ); + + return( SHPTreeNodeAddShapeId( psTreeNode->apsSubNode[1], psObject, + nMaxDepth - 1, nDimension ) ); + } + } +#endif /* MAX_SUBNODE == 2 */ + +/* -------------------------------------------------------------------- */ +/* If none of that worked, just add it to this nodes list. */ +/* -------------------------------------------------------------------- */ + psTreeNode->nShapeCount++; + + psTreeNode->panShapeIds = (int *) + SfRealloc( psTreeNode->panShapeIds, + sizeof(int) * psTreeNode->nShapeCount ); + psTreeNode->panShapeIds[psTreeNode->nShapeCount-1] = psObject->nShapeId; + + if( psTreeNode->papsShapeObj != NULL ) + { + psTreeNode->papsShapeObj = (SHPObject **) + SfRealloc( psTreeNode->papsShapeObj, + sizeof(void *) * psTreeNode->nShapeCount ); + psTreeNode->papsShapeObj[psTreeNode->nShapeCount-1] = NULL; + } + + return TRUE; +} + +/************************************************************************/ +/* SHPTreeAddShapeId() */ +/* */ +/* Add a shape to the tree, but don't keep a pointer to the */ +/* object data, just keep the shapeid. */ +/************************************************************************/ + +int SHPAPI_CALL +SHPTreeAddShapeId( SHPTree * psTree, SHPObject * psObject ) + +{ + psTree->nTotalCount++; + + return( SHPTreeNodeAddShapeId( psTree->psRoot, psObject, + psTree->nMaxDepth, psTree->nDimension ) ); +} + +/************************************************************************/ +/* SHPTreeCollectShapesIds() */ +/* */ +/* Work function implementing SHPTreeFindLikelyShapes() on a */ +/* tree node by tree node basis. */ +/************************************************************************/ + +void SHPAPI_CALL +SHPTreeCollectShapeIds( SHPTree *hTree, SHPTreeNode * psTreeNode, + double * padfBoundsMin, double * padfBoundsMax, + int * pnShapeCount, int * pnMaxShapes, + int ** ppanShapeList ) + +{ + int i; + +/* -------------------------------------------------------------------- */ +/* Does this node overlap the area of interest at all? If not, */ +/* return without adding to the list at all. */ +/* -------------------------------------------------------------------- */ + if( !SHPCheckBoundsOverlap( psTreeNode->adfBoundsMin, + psTreeNode->adfBoundsMax, + padfBoundsMin, + padfBoundsMax, + hTree->nDimension ) ) + return; + +/* -------------------------------------------------------------------- */ +/* Grow the list to hold the shapes on this node. */ +/* -------------------------------------------------------------------- */ + if( *pnShapeCount + psTreeNode->nShapeCount > *pnMaxShapes ) + { + *pnMaxShapes = (*pnShapeCount + psTreeNode->nShapeCount) * 2 + 20; + *ppanShapeList = (int *) + SfRealloc(*ppanShapeList,sizeof(int) * *pnMaxShapes); + } + +/* -------------------------------------------------------------------- */ +/* Add the local nodes shapeids to the list. */ +/* -------------------------------------------------------------------- */ + for( i = 0; i < psTreeNode->nShapeCount; i++ ) + { + (*ppanShapeList)[(*pnShapeCount)++] = psTreeNode->panShapeIds[i]; + } + +/* -------------------------------------------------------------------- */ +/* Recurse to subnodes if they exist. */ +/* -------------------------------------------------------------------- */ + for( i = 0; i < psTreeNode->nSubNodes; i++ ) + { + if( psTreeNode->apsSubNode[i] != NULL ) + SHPTreeCollectShapeIds( hTree, psTreeNode->apsSubNode[i], + padfBoundsMin, padfBoundsMax, + pnShapeCount, pnMaxShapes, + ppanShapeList ); + } +} + +/************************************************************************/ +/* SHPTreeFindLikelyShapes() */ +/* */ +/* Find all shapes within tree nodes for which the tree node */ +/* bounding box overlaps the search box. The return value is */ +/* an array of shapeids terminated by a -1. The shapeids will */ +/* be in order, as hopefully this will result in faster (more */ +/* sequential) reading from the file. */ +/************************************************************************/ + +/* helper for qsort */ +static int +compare_ints( const void * a, const void * b) +{ + return (*(int*)a) - (*(int*)b); +} + +int SHPAPI_CALL1(*) +SHPTreeFindLikelyShapes( SHPTree * hTree, + double * padfBoundsMin, double * padfBoundsMax, + int * pnShapeCount ) + +{ + int *panShapeList=NULL, nMaxShapes = 0; + +/* -------------------------------------------------------------------- */ +/* Perform the search by recursive descent. */ +/* -------------------------------------------------------------------- */ + *pnShapeCount = 0; + + SHPTreeCollectShapeIds( hTree, hTree->psRoot, + padfBoundsMin, padfBoundsMax, + pnShapeCount, &nMaxShapes, + &panShapeList ); + +/* -------------------------------------------------------------------- */ +/* Sort the id array */ +/* -------------------------------------------------------------------- */ + + qsort(panShapeList, *pnShapeCount, sizeof(int), compare_ints); + + return panShapeList; +} + +/************************************************************************/ +/* SHPTreeNodeTrim() */ +/* */ +/* This is the recurve version of SHPTreeTrimExtraNodes() that */ +/* walks the tree cleaning it up. */ +/************************************************************************/ + +static int SHPTreeNodeTrim( SHPTreeNode * psTreeNode ) + +{ + int i; + +/* -------------------------------------------------------------------- */ +/* Trim subtrees, and dk_free subnodes that come back empty. */ +/* -------------------------------------------------------------------- */ + for( i = 0; i < psTreeNode->nSubNodes; i++ ) + { + if( SHPTreeNodeTrim( psTreeNode->apsSubNode[i] ) ) + { + SHPDestroyTreeNode( psTreeNode->apsSubNode[i] ); + + psTreeNode->apsSubNode[i] = + psTreeNode->apsSubNode[psTreeNode->nSubNodes-1]; + + psTreeNode->nSubNodes--; + + i--; /* process the new occupant of this subnode entry */ + } + } + +/* -------------------------------------------------------------------- */ +/* We should be trimmed if we have no subnodes, and no shapes. */ +/* -------------------------------------------------------------------- */ + return( psTreeNode->nSubNodes == 0 && psTreeNode->nShapeCount == 0 ); +} + +/************************************************************************/ +/* SHPTreeTrimExtraNodes() */ +/* */ +/* Trim empty nodes from the tree. Note that we never trim an */ +/* empty root node. */ +/************************************************************************/ + +void SHPAPI_CALL +SHPTreeTrimExtraNodes( SHPTree * hTree ) + +{ + SHPTreeNodeTrim( hTree->psRoot ); +} + +/************************************************************************/ +/* SwapWord() */ +/* */ +/* Swap a 2, 4 or 8 byte word. */ +/************************************************************************/ + +static void SwapWord( int length, void * wordP ) + +{ + int i; + unsigned char temp; + + for( i=0; i < length/2; i++ ) + { + temp = ((unsigned char *) wordP)[i]; + ((unsigned char *)wordP)[i] = ((unsigned char *) wordP)[length-i-1]; + ((unsigned char *) wordP)[length-i-1] = temp; + } +} + +/************************************************************************/ +/* SHPSearchDiskTreeNode() */ +/************************************************************************/ + +static int +SHPSearchDiskTreeNode( FILE *fp, double *padfBoundsMin, double *padfBoundsMax, + int **ppanResultBuffer, int *pnBufferMax, + int *pnResultCount, int bNeedSwap ) + +{ + int i; + int offset; + int numshapes, numsubnodes; + double adfNodeBoundsMin[2], adfNodeBoundsMax[2]; + +/* -------------------------------------------------------------------- */ +/* Read and unswap first part of node info. */ +/* -------------------------------------------------------------------- */ + fread( &offset, 4, 1, fp ); + if ( bNeedSwap ) SwapWord ( 4, &offset ); + + fread( adfNodeBoundsMin, sizeof(double), 2, fp ); + fread( adfNodeBoundsMax, sizeof(double), 2, fp ); + if ( bNeedSwap ) + { + SwapWord( 8, adfNodeBoundsMin + 0 ); + SwapWord( 8, adfNodeBoundsMin + 1 ); + SwapWord( 8, adfNodeBoundsMax + 0 ); + SwapWord( 8, adfNodeBoundsMax + 1 ); + } + + fread( &numshapes, 4, 1, fp ); + if ( bNeedSwap ) SwapWord ( 4, &numshapes ); + +/* -------------------------------------------------------------------- */ +/* If we don't overlap this node at all, we can just fseek() */ +/* pass this node info and all subnodes. */ +/* -------------------------------------------------------------------- */ + if( !SHPCheckBoundsOverlap( adfNodeBoundsMin, adfNodeBoundsMax, + padfBoundsMin, padfBoundsMax, 2 ) ) + { + offset += numshapes*sizeof(int) + sizeof(int); + fseek(fp, offset, SEEK_CUR); + return TRUE; + } + +/* -------------------------------------------------------------------- */ +/* Add all the shapeids at this node to our list. */ +/* -------------------------------------------------------------------- */ + if(numshapes > 0) + { + if( *pnResultCount + numshapes > *pnBufferMax ) + { + *pnBufferMax = (int) ((*pnResultCount + numshapes + 100) * 1.25); + *ppanResultBuffer = (int *) + SfRealloc( *ppanResultBuffer, *pnBufferMax * sizeof(int) ); + } + + fread( *ppanResultBuffer + *pnResultCount, + sizeof(int), numshapes, fp ); + + if (bNeedSwap ) + { + for( i=0; inSubNodes; i++ ) + { + if(node->apsSubNode[i]) + { + offset += 4*sizeof(double) + + (node->apsSubNode[i]->nShapeCount+3)*sizeof(int); + offset += SHPGetSubNodeOffset(node->apsSubNode[i]); + } + } + + return(offset); +} + +/************************************************************************/ +/* SHPWriteTreeNode() */ +/************************************************************************/ + +static void SHPWriteTreeNode( FILE *fp, SHPTreeNode *node) +{ + int i,j; + int offset; + unsigned char *pabyRec = NULL; + assert( NULL != node ); + + offset = SHPGetSubNodeOffset(node); + + pabyRec = (unsigned char *) + dk_alloc (sizeof(double) * 4 + + (3 * sizeof(int)) + (node->nShapeCount * sizeof(int)) ); + if( NULL == pabyRec ) + { + assert( 0 ); + return; + } + + memcpy( pabyRec, &offset, 4); + + /* minx, miny, maxx, maxy */ + memcpy( pabyRec+ 4, node->adfBoundsMin+0, sizeof(double) ); + memcpy( pabyRec+12, node->adfBoundsMin+1, sizeof(double) ); + memcpy( pabyRec+20, node->adfBoundsMax+0, sizeof(double) ); + memcpy( pabyRec+28, node->adfBoundsMax+1, sizeof(double) ); + + memcpy( pabyRec+36, &node->nShapeCount, 4); + j = node->nShapeCount * sizeof(int); + memcpy( pabyRec+40, node->panShapeIds, j); + memcpy( pabyRec+j+40, &node->nSubNodes, 4); + + fwrite( pabyRec, 44+j, 1, fp ); + dk_free (pabyRec, -1); + + for(i=0; inSubNodes; i++ ) + { + if(node->apsSubNode[i]) + SHPWriteTreeNode( fp, node->apsSubNode[i]); + } +} + +/************************************************************************/ +/* SHPWriteTree() */ +/************************************************************************/ + +int SHPAPI_CALL SHPWriteTree(SHPTree *tree, const char *filename ) +{ + char signature[4] = "SQT"; + int i; + char abyBuf[32]; + FILE *fp; + +/* -------------------------------------------------------------------- */ +/* Open the output file. */ +/* -------------------------------------------------------------------- */ + fp = fopen(filename, "wb"); + if( fp == NULL ) + { + return FALSE; + } + +/* -------------------------------------------------------------------- */ +/* Establish the byte order on this machine. */ +/* -------------------------------------------------------------------- */ + i = 1; + if( *((unsigned char *) &i) == 1 ) + bBigEndian = FALSE; + else + bBigEndian = TRUE; + +/* -------------------------------------------------------------------- */ +/* Write the header. */ +/* -------------------------------------------------------------------- */ + memcpy( abyBuf+0, signature, 3 ); + + if( bBigEndian ) + abyBuf[3] = 2; /* New MSB */ + else + abyBuf[3] = 1; /* New LSB */ + + abyBuf[4] = 1; /* version */ + abyBuf[5] = 0; /* next 3 reserved */ + abyBuf[6] = 0; + abyBuf[7] = 0; + + fwrite( abyBuf, 8, 1, fp ); + + fwrite( &(tree->nTotalCount), 4, 1, fp ); + + /* write maxdepth */ + + fwrite( &(tree->nMaxDepth), 4, 1, fp ); + +/* -------------------------------------------------------------------- */ +/* Write all the nodes "in order". */ +/* -------------------------------------------------------------------- */ + + SHPWriteTreeNode( fp, tree->psRoot ); + + fclose( fp ); + + return TRUE; +} diff --git a/binsrc/isparql/Makefile.am b/binsrc/isparql/Makefile.am index 285c02e4cd..65dcff7691 100644 --- a/binsrc/isparql/Makefile.am +++ b/binsrc/isparql/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/isparql/auth.vsp b/binsrc/isparql/auth.vsp index dac2a6890f..42d71d7b74 100644 --- a/binsrc/isparql/auth.vsp +++ b/binsrc/isparql/auth.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/isparql/auth_ods.vsp b/binsrc/isparql/auth_ods.vsp index a6b73121a8..3b0bedfa71 100644 --- a/binsrc/isparql/auth_ods.vsp +++ b/binsrc/isparql/auth_ods.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/isparql/cmds.vsp b/binsrc/isparql/cmds.vsp index 625b35c28e..a9a082afc0 100644 --- a/binsrc/isparql/cmds.vsp +++ b/binsrc/isparql/cmds.vsp @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/isparql/defaults.vsp b/binsrc/isparql/defaults.vsp index a51c06312f..5a6283a314 100644 --- a/binsrc/isparql/defaults.vsp +++ b/binsrc/isparql/defaults.vsp @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/isparql/error.js b/binsrc/isparql/error.js index ac09e3972b..d78fda4107 100644 --- a/binsrc/isparql/error.js +++ b/binsrc/isparql/error.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/execute.html b/binsrc/isparql/execute.html index a1c18ee7aa..032a872022 100644 --- a/binsrc/isparql/execute.html +++ b/binsrc/isparql/execute.html @@ -7,7 +7,7 @@ This file is part of the OpenLink Ajax Toolkit (OAT) project - Copyright (C) 2009-2018 OpenLink Software + Copyright (C) 2009-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -134,7 +134,7 @@

    -
    Copyright © 2006-2018 OpenLink Software
    +
    Copyright © 2006-2019 OpenLink Software
    Making Technology Work For You ™
    @@ -190,7 +190,7 @@

    Locating

    ODATA (Atom | JSON)
    - Copyright © 2006-2018 OpenLink Software

    + Copyright © 2006-2019 OpenLink Software

    diff --git a/binsrc/isparql/execute.js b/binsrc/isparql/execute.js index 14d79f587e..71092911ff 100644 --- a/binsrc/isparql/execute.js +++ b/binsrc/isparql/execute.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/index.html b/binsrc/isparql/index.html index 517da1fc6a..82b2f436cf 100644 --- a/binsrc/isparql/index.html +++ b/binsrc/isparql/index.html @@ -7,7 +7,7 @@ This file is part of the OpenLink Ajax Toolkit (OAT) project - Copyright (C) 2009-2018 OpenLink Software + Copyright (C) 2009-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -106,7 +106,7 @@
    -
    Copyright © 2006-2018 OpenLink Software
    +
    Copyright © 2006-2019 OpenLink Software
    Making Technology Work For You ™
    @@ -548,7 +548,7 @@

    iSPARQL
    - iSPARQL Copyright © 2006-2018 OpenLink Software

    + iSPARQL Copyright © 2006-2019 OpenLink Software

    diff --git a/binsrc/isparql/io.js b/binsrc/isparql/io.js index 8670edf1f7..6e485537d4 100644 --- a/binsrc/isparql/io.js +++ b/binsrc/isparql/io.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/location.js b/binsrc/isparql/location.js index 7b165e54ce..16a9d501b1 100644 --- a/binsrc/isparql/location.js +++ b/binsrc/isparql/location.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/main.js b/binsrc/isparql/main.js index c7578e6d18..aaa6f2386c 100644 --- a/binsrc/isparql/main.js +++ b/binsrc/isparql/main.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/make_vad.sh b/binsrc/isparql/make_vad.sh index 73184bfb16..60ddf1d6fe 100755 --- a/binsrc/isparql/make_vad.sh +++ b/binsrc/isparql/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -280,7 +280,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/binsrc/isparql/qbe.js b/binsrc/isparql/qbe.js index d7b4a72123..c296a1423c 100644 --- a/binsrc/isparql/qbe.js +++ b/binsrc/isparql/qbe.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/remote.vsp b/binsrc/isparql/remote.vsp index 5003e4361c..cd6711cc8c 100644 --- a/binsrc/isparql/remote.vsp +++ b/binsrc/isparql/remote.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/isparql/set_dav_props.vsp b/binsrc/isparql/set_dav_props.vsp index 853109c0a2..e14cd60e11 100644 --- a/binsrc/isparql/set_dav_props.vsp +++ b/binsrc/isparql/set_dav_props.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/isparql/sql/drop.sql b/binsrc/isparql/sql/drop.sql index f2bb6a32c7..d4587afe46 100644 --- a/binsrc/isparql/sql/drop.sql +++ b/binsrc/isparql/sql/drop.sql @@ -3,7 +3,7 @@ -- -- This file is part of the OpenLink Software Ajax Toolkit (OAT) project. -- --- Copyright (C) 2009-2018 OpenLink Software +-- Copyright (C) 2009-2019 OpenLink Software -- -- See LICENSE file for details. -- diff --git a/binsrc/isparql/sql/setup.sql b/binsrc/isparql/sql/setup.sql index 3a38f03497..93bf7bf2f6 100644 --- a/binsrc/isparql/sql/setup.sql +++ b/binsrc/isparql/sql/setup.sql @@ -3,7 +3,7 @@ -- -- This file is part of the OpenLink Software Ajax Toolkit (OAT) project. -- --- Copyright (C) 2009-2018 OpenLink Software +-- Copyright (C) 2009-2019 OpenLink Software -- -- See LICENSE file for details. -- diff --git a/binsrc/isparql/statusui.js b/binsrc/isparql/statusui.js index 6ac21499d0..f6a4b58c86 100644 --- a/binsrc/isparql/statusui.js +++ b/binsrc/isparql/statusui.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/styles/dialog.css b/binsrc/isparql/styles/dialog.css index c9146879ee..ffeb029bdd 100644 --- a/binsrc/isparql/styles/dialog.css +++ b/binsrc/isparql/styles/dialog.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/styles/execute.css b/binsrc/isparql/styles/execute.css index 11a9b904ad..692b94d520 100644 --- a/binsrc/isparql/styles/execute.css +++ b/binsrc/isparql/styles/execute.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/styles/menu.css b/binsrc/isparql/styles/menu.css index defce29730..fabcd2d3f4 100644 --- a/binsrc/isparql/styles/menu.css +++ b/binsrc/isparql/styles/menu.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/styles/mobile.css b/binsrc/isparql/styles/mobile.css index 595a7dbe04..21be35c072 100644 --- a/binsrc/isparql/styles/mobile.css +++ b/binsrc/isparql/styles/mobile.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/styles/qbe.css b/binsrc/isparql/styles/qbe.css index 2548ffc271..d073aa8fb5 100644 --- a/binsrc/isparql/styles/qbe.css +++ b/binsrc/isparql/styles/qbe.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/styles/style.css b/binsrc/isparql/styles/style.css index 3e7dfff164..575c25e01b 100644 --- a/binsrc/isparql/styles/style.css +++ b/binsrc/isparql/styles/style.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2009-2018 OpenLink Software + * Copyright (C) 2009-2019 OpenLink Software * * See LICENSE file for details. * diff --git a/binsrc/isparql/xslt/dynamic-page.xsl b/binsrc/isparql/xslt/dynamic-page.xsl index d3d5ffefc9..f33862de49 100644 --- a/binsrc/isparql/xslt/dynamic-page.xsl +++ b/binsrc/isparql/xslt/dynamic-page.xsl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Ajax Toolkit (OAT) project. - Copyright (C) 2009-2018 OpenLink Software + Copyright (C) 2009-2019 OpenLink Software See LICENSE file for details. diff --git a/binsrc/jena/Makefile.am b/binsrc/jena/Makefile.am index 1643a16f3f..08e7c1035f 100644 --- a/binsrc/jena/Makefile.am +++ b/binsrc/jena/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/testsuite/start.sh b/binsrc/jena/testsuite/start.sh index fc99745717..b9cf658253 100755 --- a/binsrc/jena/testsuite/start.sh +++ b/binsrc/jena/testsuite/start.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/Version.java b/binsrc/jena/virtuoso_driver/Version.java index 4dcc422286..d0553e2a1e 100644 --- a/binsrc/jena/virtuoso_driver/Version.java +++ b/binsrc/jena/virtuoso_driver/Version.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtBulkUpdateHandler.java b/binsrc/jena/virtuoso_driver/VirtBulkUpdateHandler.java index f05d162ee4..1cf805728c 100644 --- a/binsrc/jena/virtuoso_driver/VirtBulkUpdateHandler.java +++ b/binsrc/jena/virtuoso_driver/VirtBulkUpdateHandler.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtDataSource.java b/binsrc/jena/virtuoso_driver/VirtDataSource.java index d7ad724dd3..a1ad1d704f 100644 --- a/binsrc/jena/virtuoso_driver/VirtDataSource.java +++ b/binsrc/jena/virtuoso_driver/VirtDataSource.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtGraph.java b/binsrc/jena/virtuoso_driver/VirtGraph.java index 44a4bad27e..41540486cc 100644 --- a/binsrc/jena/virtuoso_driver/VirtGraph.java +++ b/binsrc/jena/virtuoso_driver/VirtGraph.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtInfGraph.java b/binsrc/jena/virtuoso_driver/VirtInfGraph.java index 2f342f0f85..20e503fc97 100644 --- a/binsrc/jena/virtuoso_driver/VirtInfGraph.java +++ b/binsrc/jena/virtuoso_driver/VirtInfGraph.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtModel.java b/binsrc/jena/virtuoso_driver/VirtModel.java index 5ccebb5882..0446977b5f 100644 --- a/binsrc/jena/virtuoso_driver/VirtModel.java +++ b/binsrc/jena/virtuoso_driver/VirtModel.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtPrefixMapping.java b/binsrc/jena/virtuoso_driver/VirtPrefixMapping.java index a955821b05..286552edcc 100644 --- a/binsrc/jena/virtuoso_driver/VirtPrefixMapping.java +++ b/binsrc/jena/virtuoso_driver/VirtPrefixMapping.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtResSetIter.java b/binsrc/jena/virtuoso_driver/VirtResSetIter.java index 25e152bd10..1c6a82289b 100644 --- a/binsrc/jena/virtuoso_driver/VirtResSetIter.java +++ b/binsrc/jena/virtuoso_driver/VirtResSetIter.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtTransactionHandler.java b/binsrc/jena/virtuoso_driver/VirtTransactionHandler.java index 64eb7030fe..1d4fc218fe 100644 --- a/binsrc/jena/virtuoso_driver/VirtTransactionHandler.java +++ b/binsrc/jena/virtuoso_driver/VirtTransactionHandler.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoQueryEngine.java b/binsrc/jena/virtuoso_driver/VirtuosoQueryEngine.java index b2678d60ab..a21d1632f5 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoQueryEngine.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoQueryEngine.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoQueryExecution.java b/binsrc/jena/virtuoso_driver/VirtuosoQueryExecution.java index 5990136a35..06465e70a5 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoQueryExecution.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoQueryExecution.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoQueryExecutionFactory.java b/binsrc/jena/virtuoso_driver/VirtuosoQueryExecutionFactory.java index ed2911c81a..7f34b97bdc 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoQueryExecutionFactory.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoQueryExecutionFactory.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample1.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample1.java index 29c70be198..76aac330d3 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample1.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample1.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample10.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample10.java index fa300efa75..3cebbe5714 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample10.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample10.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample11.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample11.java index a634330146..f8fb88bf91 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample11.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample11.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample12.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample12.java index 1ad11f56f8..b7f82e18d7 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample12.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample12.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample13.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample13.java index efb8a1521e..20e73b1361 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample13.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample13.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample2.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample2.java index a2417d8195..178515cdae 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample2.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample2.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample3.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample3.java index b66ac6f22e..d558a548af 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample3.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample3.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample4.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample4.java index ad0545dead..48da7b9f9e 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample4.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample4.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample5.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample5.java index c1ad56fe6a..cbe59a0f39 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample5.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample5.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample6.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample6.java index 94831a6404..16c76104c9 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample6.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample6.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample7.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample7.java index 1d49c216a5..ee7e2fd74f 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample7.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample7.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample8.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample8.java index 8dc0f5366f..2339b86edd 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample8.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample8.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample9.java b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample9.java index 71e681c856..b18973800a 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample9.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoSPARQLExample9.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoUpdateFactory.java b/binsrc/jena/virtuoso_driver/VirtuosoUpdateFactory.java index 5b6d2735de..1745a7f344 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoUpdateFactory.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoUpdateFactory.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena/virtuoso_driver/VirtuosoUpdateRequest.java b/binsrc/jena/virtuoso_driver/VirtuosoUpdateRequest.java index 25ff6bf71b..6b49dc6b08 100644 --- a/binsrc/jena/virtuoso_driver/VirtuosoUpdateRequest.java +++ b/binsrc/jena/virtuoso_driver/VirtuosoUpdateRequest.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/Makefile.am b/binsrc/jena2/Makefile.am index 658179321c..a626b9665d 100644 --- a/binsrc/jena2/Makefile.am +++ b/binsrc/jena2/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/tests/Test_BNode.java b/binsrc/jena2/tests/Test_BNode.java index c7142c413c..0cc1300c94 100644 --- a/binsrc/jena2/tests/Test_BNode.java +++ b/binsrc/jena2/tests/Test_BNode.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/tests/Test_BNode_perf1.java b/binsrc/jena2/tests/Test_BNode_perf1.java index cd65ff9601..a0e574872b 100644 --- a/binsrc/jena2/tests/Test_BNode_perf1.java +++ b/binsrc/jena2/tests/Test_BNode_perf1.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/testsuite/start.sh b/binsrc/jena2/testsuite/start.sh index a75c206ea0..82bfe2f5fa 100755 --- a/binsrc/jena2/testsuite/start.sh +++ b/binsrc/jena2/testsuite/start.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/Version.java b/binsrc/jena2/virtuoso_driver/Version.java index 7bd366e229..8600ae2e5c 100644 --- a/binsrc/jena2/virtuoso_driver/Version.java +++ b/binsrc/jena2/virtuoso_driver/Version.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtBulkUpdateHandler.java b/binsrc/jena2/virtuoso_driver/VirtBulkUpdateHandler.java index a46411ea31..a6a787d337 100644 --- a/binsrc/jena2/virtuoso_driver/VirtBulkUpdateHandler.java +++ b/binsrc/jena2/virtuoso_driver/VirtBulkUpdateHandler.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtDataset.java b/binsrc/jena2/virtuoso_driver/VirtDataset.java index d3ff7194f5..9308aa0683 100644 --- a/binsrc/jena2/virtuoso_driver/VirtDataset.java +++ b/binsrc/jena2/virtuoso_driver/VirtDataset.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtGraph.java b/binsrc/jena2/virtuoso_driver/VirtGraph.java index 39c913a35c..f48370d1fe 100644 --- a/binsrc/jena2/virtuoso_driver/VirtGraph.java +++ b/binsrc/jena2/virtuoso_driver/VirtGraph.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtInfGraph.java b/binsrc/jena2/virtuoso_driver/VirtInfGraph.java index 55574510d5..d89cd6ec6c 100644 --- a/binsrc/jena2/virtuoso_driver/VirtInfGraph.java +++ b/binsrc/jena2/virtuoso_driver/VirtInfGraph.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtModel.java b/binsrc/jena2/virtuoso_driver/VirtModel.java index 449b4849c2..bcf886438b 100644 --- a/binsrc/jena2/virtuoso_driver/VirtModel.java +++ b/binsrc/jena2/virtuoso_driver/VirtModel.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtPrefixMapping.java b/binsrc/jena2/virtuoso_driver/VirtPrefixMapping.java index bf73a89dc8..680434ffe4 100644 --- a/binsrc/jena2/virtuoso_driver/VirtPrefixMapping.java +++ b/binsrc/jena2/virtuoso_driver/VirtPrefixMapping.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtResSetIter.java b/binsrc/jena2/virtuoso_driver/VirtResSetIter.java index c49a3c4106..ac850cb2e8 100644 --- a/binsrc/jena2/virtuoso_driver/VirtResSetIter.java +++ b/binsrc/jena2/virtuoso_driver/VirtResSetIter.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtResSetIter2.java b/binsrc/jena2/virtuoso_driver/VirtResSetIter2.java index 7763ba864b..7d9c223dd7 100644 --- a/binsrc/jena2/virtuoso_driver/VirtResSetIter2.java +++ b/binsrc/jena2/virtuoso_driver/VirtResSetIter2.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtResSetQIter.java b/binsrc/jena2/virtuoso_driver/VirtResSetQIter.java index 0191ccf630..016c370ca0 100644 --- a/binsrc/jena2/virtuoso_driver/VirtResSetQIter.java +++ b/binsrc/jena2/virtuoso_driver/VirtResSetQIter.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtTransactionHandler.java b/binsrc/jena2/virtuoso_driver/VirtTransactionHandler.java index c58de126c8..8c62b1b0c3 100644 --- a/binsrc/jena2/virtuoso_driver/VirtTransactionHandler.java +++ b/binsrc/jena2/virtuoso_driver/VirtTransactionHandler.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoQueryEngine.java b/binsrc/jena2/virtuoso_driver/VirtuosoQueryEngine.java index cfbf3dad94..2cbd3d8ef0 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoQueryEngine.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoQueryEngine.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoQueryExecution.java b/binsrc/jena2/virtuoso_driver/VirtuosoQueryExecution.java index ca4a02e08d..86f542cf3f 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoQueryExecution.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoQueryExecution.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoQueryExecutionFactory.java b/binsrc/jena2/virtuoso_driver/VirtuosoQueryExecutionFactory.java index 03e824f11d..16ffa89b9a 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoQueryExecutionFactory.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoQueryExecutionFactory.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLBatchExample1.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLBatchExample1.java index 06ab4a6768..362ff5bd3c 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLBatchExample1.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLBatchExample1.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample1.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample1.java index 29c70be198..76aac330d3 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample1.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample1.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample10.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample10.java index fa300efa75..3cebbe5714 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample10.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample10.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample11.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample11.java index cc84c5c9ce..0718679857 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample11.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample11.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample12.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample12.java index 1ad11f56f8..b7f82e18d7 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample12.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample12.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample13.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample13.java index 164be7f567..b7c567bd4d 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample13.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample13.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample14.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample14.java index 182a535f47..d51a56dcd7 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample14.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample14.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample2.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample2.java index a2417d8195..178515cdae 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample2.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample2.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample3.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample3.java index b66ac6f22e..d558a548af 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample3.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample3.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample4.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample4.java index ad0545dead..48da7b9f9e 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample4.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample4.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample5.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample5.java index c1ad56fe6a..cbe59a0f39 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample5.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample5.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample6.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample6.java index dbf267f921..2631ba017c 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample6.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample6.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample7.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample7.java index 1d49c216a5..ee7e2fd74f 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample7.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample7.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample8.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample8.java index 8dc0f5366f..2339b86edd 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample8.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample8.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample9.java b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample9.java index 71e681c856..b18973800a 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample9.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoSPARQLExample9.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoUpdateFactory.java b/binsrc/jena2/virtuoso_driver/VirtuosoUpdateFactory.java index 27957f24d7..9f272dde1e 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoUpdateFactory.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoUpdateFactory.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena2/virtuoso_driver/VirtuosoUpdateRequest.java b/binsrc/jena2/virtuoso_driver/VirtuosoUpdateRequest.java index 5024c0451f..ca24cebcb5 100644 --- a/binsrc/jena2/virtuoso_driver/VirtuosoUpdateRequest.java +++ b/binsrc/jena2/virtuoso_driver/VirtuosoUpdateRequest.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/Makefile.am b/binsrc/jena3/Makefile.am index b46dbb67f9..a3599df0ac 100644 --- a/binsrc/jena3/Makefile.am +++ b/binsrc/jena3/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -60,8 +60,7 @@ JENA_SRC= \ TESTSUITE_SRC= \ testsuite/VirtuosoTestGraph.java - -JENA_CLASSPATH=.:lib/junit-4.5.jar:lib/jena-arq-3.1.1.jar:lib/jena-iri-3.1.1.jar:lib/jena-core-3.1.1.jar:lib/jena-base-3.1.1.jar:lib/jena-core-3.1.1-tests.jar:$(top_srcdir)/libsrc/JDBCDriverType4/virtjdbc4.jar:lib/jcl-over-slf4j-1.7.21.jar:lib/log4j-1.2.17.jar:lib/slf4j-api-1.7.21.jar:lib/slf4j-log4j12-1.7.21.jar:lib/xercesImpl-2.11.0.jar:lib/xml-apis-1.4.01.jar:lib/jena-shaded-guava-3.1.1.jar:lib/commons-lang3-3.4.jar +JENA_CLASSPATH=.:lib/junit-4.5.jar:lib/jena-arq-3.10.0.jar:lib/jena-iri-3.10.0.jar:lib/jena-core-3.10.0.jar:lib/jena-base-3.10.0.jar:lib/jena-core-3.10.0-tests.jar:$(top_srcdir)/libsrc/JDBCDriverType4/virtjdbc4.jar:lib/jcl-over-slf4j-1.7.25.jar:lib/log4j-1.2.17.jar:lib/slf4j-api-1.7.25.jar:lib/slf4j-log4j12-1.7.25.jar:lib/jena-shaded-guava-3.10.0.jar:lib/commons-lang3-3.4.jar:lib/libthrift-0.10.0.jar:lib/httpclient-4.5.5.jar:lib/commons-compress-1.17.jar diff --git a/binsrc/jena3/tests/Test_BNode.java b/binsrc/jena3/tests/Test_BNode.java index 0bdc9c0f52..650432a20b 100644 --- a/binsrc/jena3/tests/Test_BNode.java +++ b/binsrc/jena3/tests/Test_BNode.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/tests/Test_BNode_perf1.java b/binsrc/jena3/tests/Test_BNode_perf1.java index b334a9c59d..463ed25939 100644 --- a/binsrc/jena3/tests/Test_BNode_perf1.java +++ b/binsrc/jena3/tests/Test_BNode_perf1.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/testsuite/start.sh b/binsrc/jena3/testsuite/start.sh index bd2cf585e0..c71125c63e 100755 --- a/binsrc/jena3/testsuite/start.sh +++ b/binsrc/jena3/testsuite/start.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virt_jena3.jar b/binsrc/jena3/virt_jena3.jar index 4720dee10a..4d6bba5b8b 100644 Binary files a/binsrc/jena3/virt_jena3.jar and b/binsrc/jena3/virt_jena3.jar differ diff --git a/binsrc/jena3/virtuoso_driver/Version.java b/binsrc/jena3/virtuoso_driver/Version.java index 5cba123e81..56314d79bb 100644 --- a/binsrc/jena3/virtuoso_driver/Version.java +++ b/binsrc/jena3/virtuoso_driver/Version.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -26,10 +26,10 @@ public class Version { - protected static final String DRV_VER = "3.0.0"; + protected static final String DRV_VER = "3.10.0"; // The major and minor version number - protected static final String build_id = "1.31"; + protected static final String build_id = "1.33"; public static void main(String args[]) { diff --git a/binsrc/jena3/virtuoso_driver/VirtDataset.java b/binsrc/jena3/virtuoso_driver/VirtDataset.java index b7b1efa996..d5f4138176 100644 --- a/binsrc/jena3/virtuoso_driver/VirtDataset.java +++ b/binsrc/jena3/virtuoso_driver/VirtDataset.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -29,6 +29,7 @@ import org.apache.jena.graph.*; +import org.apache.jena.query.TxnType; import org.apache.jena.shared.*; import org.apache.jena.util.iterator.*; @@ -109,14 +110,20 @@ public synchronized Model getDefaultModel() { return defaultModel; } + @Override + public Model getUnionModel() { + throw new UnsupportedOperationException(); + } + /** * Set the background graph. Can be set to null for none. */ - public void setDefaultModel(Model model) { + public VirtDataset setDefaultModel(Model model) { if (model instanceof VirtModel && ((VirtGraph)model.getGraph()).getConnection()==this.connection ){ VirtGraph g = (VirtGraph)model.getGraph(); defaultModel = model; removeLink(g); + return this; } else throw new IllegalArgumentException("VirtDataset supports only VirtModel with the same DB connection"); } @@ -161,7 +168,7 @@ public boolean containsNamedModel(String name) { /** * Set a named graph. */ - public void addNamedModel(String name, Model model, boolean checkExists) throws LabelExistsException { + public VirtDataset addNamedModel(String name, Model model, boolean checkExists) throws LabelExistsException { String query = "select count(*) from (sparql select * where { graph `iri(??)` { ?s ?p ?o }})f"; ResultSet rs = null; int ret = 0; @@ -186,19 +193,21 @@ public void addNamedModel(String name, Model model, boolean checkExists) throws Graph g = model.getGraph(); add(name, g.find(Node.ANY, Node.ANY, Node.ANY), null); + return this; } /** * Set a named graph. */ - public void addNamedModel(String name, Model model) throws LabelExistsException { + public VirtDataset addNamedModel(String name, Model model) throws LabelExistsException { addNamedModel(name, model, true); + return this; } /** * Remove a named graph. */ - public void removeNamedModel(String name) { + public VirtDataset removeNamedModel(String name) { String exec_text = "sparql clear graph <" + name + ">"; checkOpen(); @@ -206,6 +215,7 @@ public void removeNamedModel(String name) { java.sql.Statement stmt = createStatement(true); stmt.executeQuery(exec_text); stmt.close(); + return this; } catch (Exception e) { throw new JenaException(e); } @@ -214,10 +224,11 @@ public void removeNamedModel(String name) { /** * Change a named graph for another uisng the same name */ - public void replaceNamedModel(String name, Model model) { + public VirtDataset replaceNamedModel(String name, Model model) { try { removeNamedModel(name); addNamedModel(name, model, false); + return this; } catch (Exception e) { throw new JenaException("Could not replace model:", e); } @@ -277,6 +288,12 @@ public boolean supportsTransactionAbort() { } + @Override + public void begin(TxnType txnType) { + VirtTransactionHandler handler = getTransactionHandler(); + handler.begin(txnType); + } + /** * Start either a READ or WRITE transaction */ @@ -285,6 +302,33 @@ public void begin(ReadWrite readWrite) { handler.begin(readWrite); } + /** + * Attempt to promote a transaction from "read" mode to "write" and the transaction. This + * method allows the form of promotion to be specified. The transaction must not have been started + * with {@code READ}, which is read-only. + *

    + * An argument of {@code READ_PROMOTE} treats the promotion as if the transaction was started + * with {@code READ_PROMOTE} (any other writer commiting since the transaction started + * blocks promotion) and {@code READ_COMMITTED_PROMOTE} treats the promotion as if the transaction was started + * with {@code READ_COMMITTED_PROMOTE} (intemediate writer commits become visible). + *

    + * Returns "true" if the transaction is in write mode after the call. The method + * always succeeds of the transaction is already "write". + *

    + * This method returns true if a {@code READ_PROMOTE} or + * {@code READ_COMMITTED_PROMOTE} is promoted. + *

    + * This method returns false if a {@code READ_PROMOTE} can't be promoted - the + * transaction is still valid and in "read" mode. + *

    + * This method throws an exception if there is an attempt to promote a {@code READ} + * transaction. + */ + @Override + public boolean promote(Promote promote) { + return true; + } + /** * Commit a transaction - finish the transaction and make any changes permanent (if a "write" transaction) @@ -338,6 +382,29 @@ public void end() { **/ } + /** + * Return the current mode of the transaction - "read" or "write". + * If the caller is not in a transaction, this method returns null. + */ + @Override + public ReadWrite transactionMode() { + VirtTransactionHandler handler = getTransactionHandler(); + return handler.getReadWrite(); + } + + + /** + * Return the transaction type used in {@code begin(TxnType)}. + * If the caller is not in a transaction, this method returns null. + */ + @Override + public TxnType transactionType() { + if (!isInTransaction()) + return null; + VirtTransactionHandler handler = getTransactionHandler(); + return handler.getTxnType(); + } + public synchronized void close() { synchronized (graphs){ HashSet copy = (HashSet) graphs.clone(); @@ -396,6 +463,11 @@ public Graph getGraph(Node graphNode) { } } + @Override + public Graph getUnionGraph() { + throw new UnsupportedOperationException(); + } + public boolean containsGraph(Node graphNode) { return containsNamedModel(graphNode.toString()); } @@ -514,6 +586,12 @@ public void delete(Node g, Node s, Node p, Node o) { * Delete any quads matching the pattern */ public void deleteAny(Node g, Node s, Node p, Node o) { + + g = (g!=null? g: Node.ANY); + s = (s!=null? s: Node.ANY); + p = (p!=null? p: Node.ANY); + o = (o!=null? o: Node.ANY); + Triple t = new Triple(s, p, o); if (Node.ANY.equals(g)) { @@ -556,6 +634,8 @@ public Iterator find() { * */ public Iterator find(Quad quad) { + if (quad == null) + return find(); return find(quad.getGraph(), quad.getSubject(), quad.getPredicate(), quad.getObject()); } @@ -565,11 +645,16 @@ public Iterator find(Quad quad) { * @see Graph#find(Node, Node, Node) */ public Iterator find(Node g, Node s, Node p, Node o) { + + s = (s!=null? s: Node.ANY); + p = (p!=null? p: Node.ANY); + o = (o!=null? o: Node.ANY); + List graphs; if (isWildcard(g)) { graphs = getListGraphNodes(); } else { - graphs = new LinkedList(); + graphs = new LinkedList<>(); graphs.add(g); } @@ -589,6 +674,11 @@ public Iterator findNG(Node g, Node s, Node p, Node o) { * Test whether the dataset (including default graph) contains a quad - may include wildcards, Node.ANY or null */ public boolean contains(Node g, Node s, Node p, Node o) { + + s = (s!=null? s: Node.ANY); + p = (p!=null? p: Node.ANY); + o = (o!=null? o: Node.ANY); + if (isWildcard(g)) { boolean save = vd.getReadFromAllGraphs(); vd.setReadFromAllGraphs(true); @@ -618,7 +708,7 @@ public boolean isEmpty() { return contains(Node.ANY, Node.ANY, Node.ANY, Node.ANY); } - protected boolean isWildcard(Node g) { + boolean isWildcard(Node g) { return g == null || Node.ANY.equals(g); } @@ -651,11 +741,21 @@ public boolean isInTransaction() { return vd.isInTransaction(); } - /** Start either a READ or WRITE transaction */ + @Override + public void begin(TxnType txnType) { + vd.begin(txnType); + } + + /** Start either a READ or WRITE transaction */ public void begin(ReadWrite readWrite) { vd.begin(readWrite); } - + + @Override + public boolean promote(Promote promote) { + return vd.promote(promote); + } + /** Commit a transaction - finish the transaction and make any changes permanent (if a "write" transaction) */ public void commit() { vd.commit(); @@ -671,6 +771,15 @@ public void end() { vd.end(); } + @Override + public ReadWrite transactionMode() { + return vd.transactionMode(); + } + + @Override + public TxnType transactionType() { + return vd.transactionType(); + } } diff --git a/binsrc/jena3/virtuoso_driver/VirtGraph.java b/binsrc/jena3/virtuoso_driver/VirtGraph.java index be2fe712ac..4370304b72 100644 --- a/binsrc/jena3/virtuoso_driver/VirtGraph.java +++ b/binsrc/jena3/virtuoso_driver/VirtGraph.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -1775,8 +1775,6 @@ else if (s_type.equals("http://www.w3.org/2001/XMLSchema#double")) flags |= 7; else if (s_type.equals("http://www.w3.org/2001/XMLSchema#decimal")) flags |= 8; - else if (s_type.equals("http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral")) - flags |= 4; else flags |= 3; } diff --git a/binsrc/jena3/virtuoso_driver/VirtInfGraph.java b/binsrc/jena3/virtuoso_driver/VirtInfGraph.java index c4cd7ba54a..07a79e4f1e 100644 --- a/binsrc/jena3/virtuoso_driver/VirtInfGraph.java +++ b/binsrc/jena3/virtuoso_driver/VirtInfGraph.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtModel.java b/binsrc/jena3/virtuoso_driver/VirtModel.java index 3eab4f6d91..da63d9b45e 100644 --- a/binsrc/jena3/virtuoso_driver/VirtModel.java +++ b/binsrc/jena3/virtuoso_driver/VirtModel.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtPrefixMapping.java b/binsrc/jena3/virtuoso_driver/VirtPrefixMapping.java index da43d66779..531ceddaf1 100644 --- a/binsrc/jena3/virtuoso_driver/VirtPrefixMapping.java +++ b/binsrc/jena3/virtuoso_driver/VirtPrefixMapping.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtResSetIter.java b/binsrc/jena3/virtuoso_driver/VirtResSetIter.java index d560040367..d8edbeec36 100644 --- a/binsrc/jena3/virtuoso_driver/VirtResSetIter.java +++ b/binsrc/jena3/virtuoso_driver/VirtResSetIter.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtResSetIter2.java b/binsrc/jena3/virtuoso_driver/VirtResSetIter2.java index 2ce0ef7155..3ac950551e 100644 --- a/binsrc/jena3/virtuoso_driver/VirtResSetIter2.java +++ b/binsrc/jena3/virtuoso_driver/VirtResSetIter2.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtResSetIter3.java b/binsrc/jena3/virtuoso_driver/VirtResSetIter3.java index 29f30fd482..6b7f9dfa5c 100644 --- a/binsrc/jena3/virtuoso_driver/VirtResSetIter3.java +++ b/binsrc/jena3/virtuoso_driver/VirtResSetIter3.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtResSetQIter.java b/binsrc/jena3/virtuoso_driver/VirtResSetQIter.java index 29e7989da4..bb9104f267 100644 --- a/binsrc/jena3/virtuoso_driver/VirtResSetQIter.java +++ b/binsrc/jena3/virtuoso_driver/VirtResSetQIter.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtTransactionHandler.java b/binsrc/jena3/virtuoso_driver/VirtTransactionHandler.java index 3456f17d03..f1dade6ab3 100644 --- a/binsrc/jena3/virtuoso_driver/VirtTransactionHandler.java +++ b/binsrc/jena3/virtuoso_driver/VirtTransactionHandler.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -29,6 +29,7 @@ import org.apache.jena.graph.impl.*; import org.apache.jena.query.ReadWrite; +import org.apache.jena.query.TxnType; import org.apache.jena.shared.*; import static virtuoso.jena.driver.VirtIsolationLevel.*; @@ -38,10 +39,14 @@ public class VirtTransactionHandler extends TransactionHandlerBase implements XA private VirtGraph graph = null; private Boolean m_transactionsSupported = null; private ReadWrite readWrite; + private TxnType txnType; protected ReadWrite getReadWrite() { return this.readWrite; } + protected TxnType getTxnType() { + return this.txnType; + } public VirtTransactionHandler(VirtGraph _graph) { super(); @@ -189,6 +194,7 @@ public void begin() { c.setAutoCommit(false); } this.readWrite = ReadWrite.READ; + this.txnType = TxnType.WRITE; } catch (SQLException e) { throw new JenaException("Transaction begin failed: ", e); } @@ -214,6 +220,34 @@ public void begin(ReadWrite _readWrite) { } } + public void begin(TxnType _txnType) { + checkNotXA("begin"); + if (transactionsSupported()) { + try { + Connection c = graph.getConnection(); + if (c.getAutoCommit()) { + c.setAutoCommit(false); + } + this.txnType = _txnType; + switch (_txnType){ + case READ: + this.readWrite = ReadWrite.READ; + break; + case READ_PROMOTE: + case READ_COMMITTED_PROMOTE: + case WRITE: + default: + this.readWrite = ReadWrite.WRITE; + break; + } + } catch (SQLException e) { + throw new JenaException("Transaction begin failed: ", e); + } + } else { + notSupported("begin transaction"); + } + } + public void abort() { checkNotXA("abort"); if (transactionsSupported()) { diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoQueryEngine.java b/binsrc/jena3/virtuoso_driver/VirtuosoQueryEngine.java index 4562d6506f..bda291728d 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoQueryEngine.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoQueryEngine.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoQueryExecution.java b/binsrc/jena3/virtuoso_driver/VirtuosoQueryExecution.java index 06b833324a..ffecb0db39 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoQueryExecution.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoQueryExecution.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -30,6 +30,12 @@ import java.sql.Statement; import java.sql.ResultSetMetaData; +import org.apache.jena.atlas.json.JsonArray; +import org.apache.jena.atlas.json.JsonObject; +/** +import org.apache.jena.atlas.json.JsonValue; +import org.apache.jena.sparql.lib.RDFTerm2Json; +**/ import virtuoso.sql.*; import org.apache.jena.graph.NodeFactory; @@ -331,6 +337,44 @@ public boolean execAsk() { return ret; } + @Override + public JsonArray execJson() { + throw new JenaException("Unsupported Operation"); +/*** checkme + JsonArray jsonArray = new JsonArray() ; + try { + stmt = graph.createStatement(false); + if (timeout > 0) + stmt.setQueryTimeout((int) (timeout / 1000)); + java.sql.ResultSet rs = stmt.executeQuery(getVosQuery()); + + VResultSet vrs = new VResultSet(graph, stmt, rs); + + List resultVars = vrs.getResultVars(); + while(vrs.hasNext()) + { + Binding binding = vrs.nextBinding(); + JsonObject jsonObject = new JsonObject() ; + for (String resultVar : resultVars) { + Node n = binding.get(Var.alloc(resultVar)) ; + JsonValue value = RDFTerm2Json.fromNode(n) ; + jsonObject.put(resultVar, value) ; + } + jsonArray.add(jsonObject) ; + } + return jsonArray; + } catch (Exception e) { + throw new JenaException("Can not create ResultSet.:" + e); + } + ***/ + } + + + @Override + public Iterator execJsonItems() { + throw new JenaException("Unsupported Operation"); + } + public void abort() { if (stmt != null) diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoQueryExecutionFactory.java b/binsrc/jena3/virtuoso_driver/VirtuosoQueryExecutionFactory.java index c4dabe68fc..b4587bf561 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoQueryExecutionFactory.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoQueryExecutionFactory.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLBatchExample1.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLBatchExample1.java index a06d00f969..3b5d04dd5a 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLBatchExample1.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLBatchExample1.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample1.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample1.java index bf91c1a0d5..ff7c3fde73 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample1.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample1.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample10.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample10.java index 1d4e9e7900..8f27ec87f8 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample10.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample10.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample11.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample11.java index 8ec3394aae..9137bfcf6b 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample11.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample11.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample12.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample12.java index 663d39648d..cb32ce8a9a 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample12.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample12.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample13.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample13.java index 42046dafd5..2fe1436eca 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample13.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample13.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample14.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample14.java index 36a7d6b38a..f3c1d509b7 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample14.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample14.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample2.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample2.java index e5d2af8a3c..b8cd651fce 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample2.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample2.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample3.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample3.java index eb5e6ac9bb..c80be8a9c3 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample3.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample3.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample4.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample4.java index cb1694d140..8997d7ddc9 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample4.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample4.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample5.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample5.java index cd71af586e..ac617ece93 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample5.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample5.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample6.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample6.java index 3bbaaf2d44..476045ae33 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample6.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample6.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample8.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample8.java index 98d21344b9..0c58eb6e2d 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample8.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample8.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample9.java b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample9.java index 95491fcaab..47fec15e3c 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample9.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoSPARQLExample9.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoUpdateFactory.java b/binsrc/jena3/virtuoso_driver/VirtuosoUpdateFactory.java index e53e7d7b68..187897e51b 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoUpdateFactory.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoUpdateFactory.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/jena3/virtuoso_driver/VirtuosoUpdateRequest.java b/binsrc/jena3/virtuoso_driver/VirtuosoUpdateRequest.java index 8f3f67e1f4..e4722c92f7 100644 --- a/binsrc/jena3/virtuoso_driver/VirtuosoUpdateRequest.java +++ b/binsrc/jena3/virtuoso_driver/VirtuosoUpdateRequest.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/maildrop/Makefile.am b/binsrc/maildrop/Makefile.am index 7200468041..7376f154ec 100644 --- a/binsrc/maildrop/Makefile.am +++ b/binsrc/maildrop/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/maildrop/dkstub.c b/binsrc/maildrop/dkstub.c index 282baa3652..5142800ef4 100644 --- a/binsrc/maildrop/dkstub.c +++ b/binsrc/maildrop/dkstub.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/maildrop/odbc_mail.c b/binsrc/maildrop/odbc_mail.c index e96f04d3b2..e0ce972a49 100644 --- a/binsrc/maildrop/odbc_mail.c +++ b/binsrc/maildrop/odbc_mail.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -111,6 +111,8 @@ PKVPair macros; char *ExpandMacro (char *str); +void maildrop_terminate (int n); + /* * For debugging purposes * Note that this also gets into the bounced message @@ -307,7 +309,7 @@ ExpandMacro (char *str) { Error ("Macro expansion recursion overflow"); BounceText ("InternalError"); - terminate (EX_SOFTWARE); + maildrop_terminate (EX_SOFTWARE); } return level ? str : strdup (str); @@ -450,7 +452,7 @@ DB_VerifyRecipient (void) if (SQLPrepare (hstmt, (SQLCHAR *) sqlRequest, SQL_NTS) == SQL_ERROR) { DB_Errors ("SQLPrepare"); - terminate (EX_CONFIG); /* most likely */ + maildrop_terminate (EX_CONFIG); /* most likely */ } /* do we need to check procedure return value? */ @@ -471,14 +473,14 @@ DB_VerifyRecipient (void) NULL) == SQL_ERROR) { DB_Errors ("SQLBindParameter1"); - terminate (EX_SOFTWARE); + maildrop_terminate (EX_SOFTWARE); } } if (SQLExecute (hstmt) == SQL_ERROR) { DB_Errors ("SQLExecute"); - terminate (EX_SOFTWARE); + maildrop_terminate (EX_SOFTWARE); } if (useRetCode) @@ -528,7 +530,7 @@ DB_VerifyRecipient (void) if (rc == SQL_ERROR) { DB_Errors ("SQLFetch"); - terminate (EX_SOFTWARE); + maildrop_terminate (EX_SOFTWARE); } } @@ -553,7 +555,7 @@ DB_DeliverMessage (char *msgTxt, int32 msgLen) { Error ("Missing Deliver statement in [Options]"); BounceText ("InternalError"); - terminate (EX_CONFIG); + maildrop_terminate (EX_CONFIG); } DefMacro ("message", "?"); @@ -578,7 +580,7 @@ DB_DeliverMessage (char *msgTxt, int32 msgLen) if (SQLPrepare (hstmt, (SQLCHAR *) sqlRequest, SQL_NTS) == SQL_ERROR) { DB_Errors ("SQLPrepare"); - terminate (EX_CONFIG); /* most likely */ + maildrop_terminate (EX_CONFIG); /* most likely */ } iParno = 1; @@ -598,7 +600,7 @@ DB_DeliverMessage (char *msgTxt, int32 msgLen) NULL) == SQL_ERROR) { DB_Errors ("SQLBindParameter1"); - terminate (EX_SOFTWARE); + maildrop_terminate (EX_SOFTWARE); } } @@ -616,13 +618,13 @@ DB_DeliverMessage (char *msgTxt, int32 msgLen) NULL) == SQL_ERROR) { DB_Errors ("SQLBindParameter3"); - terminate (EX_SOFTWARE); + maildrop_terminate (EX_SOFTWARE); } if (SQLExecute (hstmt) == SQL_ERROR) { DB_Errors ("SQLExecute"); - terminate (EX_SOFTWARE); + maildrop_terminate (EX_SOFTWARE); } SQLFreeStmt (hstmt, SQL_CLOSE); @@ -631,7 +633,7 @@ DB_DeliverMessage (char *msgTxt, int32 msgLen) { Debug ("DeliverCheckReturn want=%d got=%d", wantCode, retCode); BounceText ("UserUnknown"); - terminate (EX_NOUSER); + maildrop_terminate (EX_NOUSER); } } @@ -665,7 +667,7 @@ dump_environ (int argc, char **argv) void -terminate (int n) +maildrop_terminate (int n) { if (n == EX_OK) Debug ("++ TERMINATE SUCCESS ++"); @@ -724,7 +726,7 @@ MailTo (void) { Error ("Recipient not specified"); BounceText ("InternalError"); - terminate (EX_CONFIG); + maildrop_terminate (EX_CONFIG); } mailLOCAL = strdup (f_local); @@ -777,7 +779,7 @@ MailHeaders (MPL *mailPool) bad_env: Error ("Bad environment"); BounceText ("InternalError"); - terminate (EX_SOFTWARE); + maildrop_terminate (EX_SOFTWARE); } break; @@ -929,7 +931,7 @@ FallbackDeliver (void) default: /* let's hope we just ran out of resources - retry */ Error ("exec failed (%m)"); - terminate (EX_IOERR); + maildrop_terminate (EX_IOERR); } #endif } @@ -952,7 +954,7 @@ OpenConfig (char *argv0) cfg_not_found: Error ("Cannot open configuration file %s", f_config); BounceText ("InternalError"); /* don't try to look this up */ - terminate (EX_OSFILE); + maildrop_terminate (EX_OSFILE); } /* Check type & permissions */ @@ -960,7 +962,7 @@ OpenConfig (char *argv0) { Error ("Invalid configuration file %s", f_config); BounceText ("InternalError"); /* don't try to look this up */ - terminate (EX_CONFIG); + maildrop_terminate (EX_CONFIG); } /* Open the configuration file */ @@ -973,7 +975,7 @@ OpenConfig (char *argv0) { Error ("Bad permissions on %s", f_config); BounceText ("InternalError"); - terminate (EX_TEMPFAIL); + maildrop_terminate (EX_TEMPFAIL); } #endif } @@ -1073,7 +1075,7 @@ usage (void) fprintf (stderr, " -m exim (same as -m sendmail)\n"); fprintf (stderr, " -m qmail\n"); fprintf (stderr, " -m courier\n"); - terminate (EX_USAGE); + maildrop_terminate (EX_USAGE); } @@ -1092,7 +1094,6 @@ main (int argc, char **argv) char *mailMesg; char *mailDebug; - initialize_program (&argc, &argv); #ifdef WIN32 @@ -1148,8 +1149,8 @@ main (int argc, char **argv) if (DB_Connect (szDSN) != 0) { DB_Errors ("DB_Connect"); - /* terminate (EX_UNAVAILABLE); */ - terminate (EX_TEMPFAIL); + /* maildrop_terminate (EX_UNAVAILABLE); */ + maildrop_terminate (EX_TEMPFAIL); } /* Verify the recipient */ @@ -1158,7 +1159,7 @@ main (int argc, char **argv) /* user not found */ FallbackDeliver (); BounceText ("UserUnknown"); - terminate (EX_NOUSER); + maildrop_terminate (EX_NOUSER); } /* Construct the posted message into memory pool */ @@ -1185,7 +1186,7 @@ main (int argc, char **argv) { Error ("Read failure"); BounceText ("InternalError"); - terminate (EX_IOERR); + maildrop_terminate (EX_IOERR); } if (len == 0) break; @@ -1195,7 +1196,7 @@ main (int argc, char **argv) { Debug ("Message is too long (%ld)", (long) mailSize); BounceText ("TooLong"); - terminate (EX_NOPERM); + maildrop_terminate (EX_NOPERM); } } @@ -1220,7 +1221,7 @@ main (int argc, char **argv) /* All done */ DB_Disconnect (); - terminate (EX_OK); + maildrop_terminate (EX_OK); return 0; /* keep cc happy */ } diff --git a/binsrc/maildrop/odbc_mail.default.ini b/binsrc/maildrop/odbc_mail.default.ini index 9010df7624..f1e46c36b4 100644 --- a/binsrc/maildrop/odbc_mail.default.ini +++ b/binsrc/maildrop/odbc_mail.default.ini @@ -6,7 +6,7 @@ ; This file is part of the OpenLink Software Virtuoso Open-Source (VOS) ; project. ; -; Copyright (C) 1998-2018 OpenLink Software +; Copyright (C) 1998-2019 OpenLink Software ; ; This project is free software; you can redistribute it and/or modify it ; under the terms of the GNU General Public License as published by the diff --git a/binsrc/maildrop/win32/OpenX/Dialogs.ifs b/binsrc/maildrop/win32/OpenX/Dialogs.ifs index 74e24d2693..10728e345d 100644 --- a/binsrc/maildrop/win32/OpenX/Dialogs.ifs +++ b/binsrc/maildrop/win32/OpenX/Dialogs.ifs @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/maildrop/win32/OpenX/maildrop.iss b/binsrc/maildrop/win32/OpenX/maildrop.iss index 25e51e7890..8f3a01ea05 100644 --- a/binsrc/maildrop/win32/OpenX/maildrop.iss +++ b/binsrc/maildrop/win32/OpenX/maildrop.iss @@ -15,7 +15,7 @@ AlwaysCreateUninstallIcon=true MinVersion=0,5.0.2195 -AppCopyright=© 1998-2018 OpenLink Software +AppCopyright=© 1998-2019 OpenLink Software WizardImageFile=compiler:WizModernImage14.bmp WizardSmallImageFile=compiler:WizModernSmallImage14.bmp DisableStartupPrompt=true diff --git a/binsrc/maildrop/win32/OpenX/odbc_mail.ini b/binsrc/maildrop/win32/OpenX/odbc_mail.ini index 353a4be375..4a6f020bf6 100644 --- a/binsrc/maildrop/win32/OpenX/odbc_mail.ini +++ b/binsrc/maildrop/win32/OpenX/odbc_mail.ini @@ -6,7 +6,7 @@ ; This file is part of the OpenLink Software Virtuoso Open-Source (VOS) ; project. ; -; Copyright (C) 1998-2018 OpenLink Software +; Copyright (C) 1998-2019 OpenLink Software ; ; This project is free software; you can redistribute it and/or modify it ; under the terms of the GNU General Public License as published by the diff --git a/binsrc/maildrop/win32/generate.bat b/binsrc/maildrop/win32/generate.bat index 9a0d828958..88de334fae 100644 --- a/binsrc/maildrop/win32/generate.bat +++ b/binsrc/maildrop/win32/generate.bat @@ -2,7 +2,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/maildrop/win32/maildrop.cpp b/binsrc/maildrop/win32/maildrop.cpp index a4ee8e5502..7207ab7d9d 100644 --- a/binsrc/maildrop/win32/maildrop.cpp +++ b/binsrc/maildrop/win32/maildrop.cpp @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/maildrop/win32/maildrop.idl b/binsrc/maildrop/win32/maildrop.idl index 047d2c7293..77bd375197 100644 --- a/binsrc/maildrop/win32/maildrop.idl +++ b/binsrc/maildrop/win32/maildrop.idl @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/maildrop/win32/mpl.c b/binsrc/maildrop/win32/mpl.c index 77f9a00ef9..69c284dc32 100644 --- a/binsrc/maildrop/win32/mpl.c +++ b/binsrc/maildrop/win32/mpl.c @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/maildrop/win32/register.bat b/binsrc/maildrop/win32/register.bat index 2146db3dea..fe02cb7e96 100644 --- a/binsrc/maildrop/win32/register.bat +++ b/binsrc/maildrop/win32/register.bat @@ -2,7 +2,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/mono/Makefile.am b/binsrc/mono/Makefile.am index 3767952e4d..7d9143f0e6 100644 --- a/binsrc/mono/Makefile.am +++ b/binsrc/mono/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/mono/mono-build.sh b/binsrc/mono/mono-build.sh index 29ea603001..5fae54a9a4 100755 --- a/binsrc/mono/mono-build.sh +++ b/binsrc/mono/mono-build.sh @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/oat/LICENSE b/binsrc/oat/LICENSE index 5f097f22f8..b929f226b5 100644 --- a/binsrc/oat/LICENSE +++ b/binsrc/oat/LICENSE @@ -1,5 +1,5 @@ OpenLink Software's Ajax Toolkit (OAT) -Copyright (C) 2005-2018 OpenLink Software +Copyright (C) 2005-2019 OpenLink Software This software is licensed under the GNU General Public License (see COPYING). diff --git a/binsrc/oat/Makefile.am b/binsrc/oat/Makefile.am index 8a3ab674ed..0097bb092b 100644 --- a/binsrc/oat/Makefile.am +++ b/binsrc/oat/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Ajax Toolkit (OAT) project # # Copyright (C) 2006 Ondrej Zara -# Copyright (C) 2006-2018 OpenLink Software +# Copyright (C) 2006-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/oat/styles/grid.css b/binsrc/oat/styles/grid.css index acf9a60a1f..6dc1037a9c 100644 --- a/binsrc/oat/styles/grid.css +++ b/binsrc/oat/styles/grid.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/styles/pivot.css b/binsrc/oat/styles/pivot.css index 8bda9e919b..8be4f03a8e 100644 --- a/binsrc/oat/styles/pivot.css +++ b/binsrc/oat/styles/pivot.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/styles/rdftabs.css b/binsrc/oat/styles/rdftabs.css index 5e0039ca22..f229a3bd77 100644 --- a/binsrc/oat/styles/rdftabs.css +++ b/binsrc/oat/styles/rdftabs.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/styles/timeline.css b/binsrc/oat/styles/timeline.css index dbca7fb830..caac8908ab 100644 --- a/binsrc/oat/styles/timeline.css +++ b/binsrc/oat/styles/timeline.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/styles/webdav.css b/binsrc/oat/styles/webdav.css index 55fde274b8..f6f46effa9 100644 --- a/binsrc/oat/styles/webdav.css +++ b/binsrc/oat/styles/webdav.css @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/ajax.js b/binsrc/oat/toolkit/ajax.js index 5fe2461512..756bf83cad 100644 --- a/binsrc/oat/toolkit/ajax.js +++ b/binsrc/oat/toolkit/ajax.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software AJAX Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/anchor.js b/binsrc/oat/toolkit/anchor.js index f6b0e80d85..e0428ff90e 100644 --- a/binsrc/oat/toolkit/anchor.js +++ b/binsrc/oat/toolkit/anchor.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/animation.js b/binsrc/oat/toolkit/animation.js index f39324c946..6b9375e480 100644 --- a/binsrc/oat/toolkit/animation.js +++ b/binsrc/oat/toolkit/animation.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/barchart.js b/binsrc/oat/toolkit/barchart.js index ecd1418efd..a1bf4b46b7 100644 --- a/binsrc/oat/toolkit/barchart.js +++ b/binsrc/oat/toolkit/barchart.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/bezier.js b/binsrc/oat/toolkit/bezier.js index 84c669d214..552984b0f2 100644 --- a/binsrc/oat/toolkit/bezier.js +++ b/binsrc/oat/toolkit/bezier.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/bindings.js b/binsrc/oat/toolkit/bindings.js index 3a49998cf2..497e696a98 100644 --- a/binsrc/oat/toolkit/bindings.js +++ b/binsrc/oat/toolkit/bindings.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/calendar.js b/binsrc/oat/toolkit/calendar.js index dd386a9611..70761f3e07 100644 --- a/binsrc/oat/toolkit/calendar.js +++ b/binsrc/oat/toolkit/calendar.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/canvas.js b/binsrc/oat/toolkit/canvas.js index 29e4464638..1d256b75d3 100644 --- a/binsrc/oat/toolkit/canvas.js +++ b/binsrc/oat/toolkit/canvas.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/color.js b/binsrc/oat/toolkit/color.js index 23a4d28672..0bbcf6841e 100644 --- a/binsrc/oat/toolkit/color.js +++ b/binsrc/oat/toolkit/color.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/combobox.js b/binsrc/oat/toolkit/combobox.js index 2b818df12c..abba527711 100644 --- a/binsrc/oat/toolkit/combobox.js +++ b/binsrc/oat/toolkit/combobox.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/combobutton.js b/binsrc/oat/toolkit/combobutton.js index ea103272fe..7b3e71f87a 100644 --- a/binsrc/oat/toolkit/combobutton.js +++ b/binsrc/oat/toolkit/combobutton.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/combolist.js b/binsrc/oat/toolkit/combolist.js index fdb180ffed..53454bf187 100644 --- a/binsrc/oat/toolkit/combolist.js +++ b/binsrc/oat/toolkit/combolist.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/connection.js b/binsrc/oat/toolkit/connection.js index a038fc36de..a1354cdcf5 100644 --- a/binsrc/oat/toolkit/connection.js +++ b/binsrc/oat/toolkit/connection.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/datasource.js b/binsrc/oat/toolkit/datasource.js index 3773705c78..213efe2836 100644 --- a/binsrc/oat/toolkit/datasource.js +++ b/binsrc/oat/toolkit/datasource.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/dav.js b/binsrc/oat/toolkit/dav.js index 315e9ba0de..63e670faaa 100644 --- a/binsrc/oat/toolkit/dav.js +++ b/binsrc/oat/toolkit/dav.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ @@ -229,7 +229,7 @@ OAT.WebDav = { var wopts = { buttons:"cr", outerWidth:this.options.width, - outerHeight:this.options.height - 40, + // outerHeight:this.options.height - 40, imagePath:this.options.imagePath, title:"WebDAV Browser", stackGroupBase:998 diff --git a/binsrc/oat/toolkit/declarative.js b/binsrc/oat/toolkit/declarative.js index eca1e14f22..7d0f33053d 100644 --- a/binsrc/oat/toolkit/declarative.js +++ b/binsrc/oat/toolkit/declarative.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/dereference.js b/binsrc/oat/toolkit/dereference.js index 948cc66754..7dc02aceff 100644 --- a/binsrc/oat/toolkit/dereference.js +++ b/binsrc/oat/toolkit/dereference.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/dialog.js b/binsrc/oat/toolkit/dialog.js index f3ff02b02a..10106d246e 100644 --- a/binsrc/oat/toolkit/dialog.js +++ b/binsrc/oat/toolkit/dialog.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/dimmer.js b/binsrc/oat/toolkit/dimmer.js index ce04a6fe3d..b97ee13464 100644 --- a/binsrc/oat/toolkit/dimmer.js +++ b/binsrc/oat/toolkit/dimmer.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/dock.js b/binsrc/oat/toolkit/dock.js index f62f914fda..78c27d21aa 100644 --- a/binsrc/oat/toolkit/dock.js +++ b/binsrc/oat/toolkit/dock.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/drag.js b/binsrc/oat/toolkit/drag.js index ea4d2f811d..28cef4d9b7 100644 --- a/binsrc/oat/toolkit/drag.js +++ b/binsrc/oat/toolkit/drag.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/dstransport.js b/binsrc/oat/toolkit/dstransport.js index e61885b07d..67950692ae 100644 --- a/binsrc/oat/toolkit/dstransport.js +++ b/binsrc/oat/toolkit/dstransport.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/fisheye.js b/binsrc/oat/toolkit/fisheye.js index b995348e89..708971b829 100644 --- a/binsrc/oat/toolkit/fisheye.js +++ b/binsrc/oat/toolkit/fisheye.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/form.js b/binsrc/oat/toolkit/form.js index 645ddce8b9..c77d6a491c 100644 --- a/binsrc/oat/toolkit/form.js +++ b/binsrc/oat/toolkit/form.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/formobject.js b/binsrc/oat/toolkit/formobject.js index afef68faaf..31b34ffb60 100644 --- a/binsrc/oat/toolkit/formobject.js +++ b/binsrc/oat/toolkit/formobject.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/fresnel.js b/binsrc/oat/toolkit/fresnel.js index fff90748a7..3aad0f116f 100644 --- a/binsrc/oat/toolkit/fresnel.js +++ b/binsrc/oat/toolkit/fresnel.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/geometry.js b/binsrc/oat/toolkit/geometry.js index 41bb9cbb6f..fb2301e2f2 100644 --- a/binsrc/oat/toolkit/geometry.js +++ b/binsrc/oat/toolkit/geometry.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/ghostdrag.js b/binsrc/oat/toolkit/ghostdrag.js index b0d71363ae..4de114b053 100644 --- a/binsrc/oat/toolkit/ghostdrag.js +++ b/binsrc/oat/toolkit/ghostdrag.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/graph.js b/binsrc/oat/toolkit/graph.js index 5346b70098..ec2eab0e1b 100644 --- a/binsrc/oat/toolkit/graph.js +++ b/binsrc/oat/toolkit/graph.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/graphsidebar.js b/binsrc/oat/toolkit/graphsidebar.js index 07ad25e1d4..ef192d9c38 100644 --- a/binsrc/oat/toolkit/graphsidebar.js +++ b/binsrc/oat/toolkit/graphsidebar.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/graphsvg.js b/binsrc/oat/toolkit/graphsvg.js index a39206915f..9602450a82 100644 --- a/binsrc/oat/toolkit/graphsvg.js +++ b/binsrc/oat/toolkit/graphsvg.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/grid.js b/binsrc/oat/toolkit/grid.js index 04bd69ad8c..b5acb0ebe5 100644 --- a/binsrc/oat/toolkit/grid.js +++ b/binsrc/oat/toolkit/grid.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/instant.js b/binsrc/oat/toolkit/instant.js index a00d6b57e3..e3b9d7e6fe 100644 --- a/binsrc/oat/toolkit/instant.js +++ b/binsrc/oat/toolkit/instant.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/jsobj.js b/binsrc/oat/toolkit/jsobj.js index beca5843d2..4f6cfdc4dd 100644 --- a/binsrc/oat/toolkit/jsobj.js +++ b/binsrc/oat/toolkit/jsobj.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/json.js b/binsrc/oat/toolkit/json.js index 904ea705c8..e36edf3cfd 100644 --- a/binsrc/oat/toolkit/json.js +++ b/binsrc/oat/toolkit/json.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/keyboard.js b/binsrc/oat/toolkit/keyboard.js index 4215f54a58..2dcd10f976 100644 --- a/binsrc/oat/toolkit/keyboard.js +++ b/binsrc/oat/toolkit/keyboard.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/layers.js b/binsrc/oat/toolkit/layers.js index 14303d287a..8952bfdd08 100644 --- a/binsrc/oat/toolkit/layers.js +++ b/binsrc/oat/toolkit/layers.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/linechart.js b/binsrc/oat/toolkit/linechart.js index efed6f8db5..400e6522e2 100644 --- a/binsrc/oat/toolkit/linechart.js +++ b/binsrc/oat/toolkit/linechart.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/loader.js b/binsrc/oat/toolkit/loader.js index 4f295ac16e..863096227f 100644 --- a/binsrc/oat/toolkit/loader.js +++ b/binsrc/oat/toolkit/loader.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/location.js b/binsrc/oat/toolkit/location.js index 2d3cc0d068..8c48a58c95 100644 --- a/binsrc/oat/toolkit/location.js +++ b/binsrc/oat/toolkit/location.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/macwin.js b/binsrc/oat/toolkit/macwin.js index 78af7d0be1..e77eda31b9 100644 --- a/binsrc/oat/toolkit/macwin.js +++ b/binsrc/oat/toolkit/macwin.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/map.js b/binsrc/oat/toolkit/map.js index 023bb9ca96..cacb15f519 100644 --- a/binsrc/oat/toolkit/map.js +++ b/binsrc/oat/toolkit/map.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ @@ -1194,12 +1194,12 @@ OAT.Map.loadApi = function(provider, optObj) { } var providers = { - 'google':'http://maps.google.com/maps?file=api&v=2.x&async=2', - 'googlev3':'http://maps.google.com/maps/api/js?sensor=true', - 'yahoo':'http://api.maps.yahoo.com/ajaxymap?v=3.8', - 'openlayers':'http://openlayers.org/api/OpenLayers.js', - 'msve':'http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6.2', - 'msve_atlascompat':'http://dev.virtualearth.net/mapcontrol/v6.2/js/atlascompat.js' + 'google':'https://maps.google.com/maps?file=api&v=2.x&async=2', + 'googlev3':'https://maps.google.com/maps/api/js?sensor=true', + 'yahoo':'https://api.maps.yahoo.com/ajaxymap?v=3.8', + 'openlayers':'https://openlayers.org/api/OpenLayers.js', + 'msve':'https://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6.2', + 'msve_atlascompat':'https://dev.virtualearth.net/mapcontrol/v6.2/js/atlascompat.js' }; var options = { diff --git a/binsrc/oat/toolkit/menu.js b/binsrc/oat/toolkit/menu.js index 7528aad2da..784faf9504 100644 --- a/binsrc/oat/toolkit/menu.js +++ b/binsrc/oat/toolkit/menu.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/mswin.js b/binsrc/oat/toolkit/mswin.js index a1ed6c403a..5b8a9efd54 100644 --- a/binsrc/oat/toolkit/mswin.js +++ b/binsrc/oat/toolkit/mswin.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/n3.js b/binsrc/oat/toolkit/n3.js index 7ed95cb824..c9ac426df3 100644 --- a/binsrc/oat/toolkit/n3.js +++ b/binsrc/oat/toolkit/n3.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/notify.js b/binsrc/oat/toolkit/notify.js index 4e46dee83f..ff5b227140 100644 --- a/binsrc/oat/toolkit/notify.js +++ b/binsrc/oat/toolkit/notify.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/panelbar.js b/binsrc/oat/toolkit/panelbar.js index 5350202c74..5cdcc4ca57 100644 --- a/binsrc/oat/toolkit/panelbar.js +++ b/binsrc/oat/toolkit/panelbar.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/piechart.js b/binsrc/oat/toolkit/piechart.js index cd2c08778c..efb60ee00c 100644 --- a/binsrc/oat/toolkit/piechart.js +++ b/binsrc/oat/toolkit/piechart.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/pivot.js b/binsrc/oat/toolkit/pivot.js index a7a5e6efa4..df9edd70aa 100644 --- a/binsrc/oat/toolkit/pivot.js +++ b/binsrc/oat/toolkit/pivot.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/profiler.js b/binsrc/oat/toolkit/profiler.js index 550d297387..22dfb7b3e6 100644 --- a/binsrc/oat/toolkit/profiler.js +++ b/binsrc/oat/toolkit/profiler.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/quickedit.js b/binsrc/oat/toolkit/quickedit.js index 9aaf464bae..54030af54a 100644 --- a/binsrc/oat/toolkit/quickedit.js +++ b/binsrc/oat/toolkit/quickedit.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/rdf.js b/binsrc/oat/toolkit/rdf.js index 37f48d1a23..33ff074ba6 100644 --- a/binsrc/oat/toolkit/rdf.js +++ b/binsrc/oat/toolkit/rdf.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/rdfbrowser.js b/binsrc/oat/toolkit/rdfbrowser.js index d2b5602e77..cdf80f45b3 100644 --- a/binsrc/oat/toolkit/rdfbrowser.js +++ b/binsrc/oat/toolkit/rdfbrowser.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/rdfmini.js b/binsrc/oat/toolkit/rdfmini.js index d0a863ab43..90215d07aa 100644 --- a/binsrc/oat/toolkit/rdfmini.js +++ b/binsrc/oat/toolkit/rdfmini.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/rdfstore.js b/binsrc/oat/toolkit/rdfstore.js index 6105d545e0..bfa52188be 100644 --- a/binsrc/oat/toolkit/rdfstore.js +++ b/binsrc/oat/toolkit/rdfstore.js @@ -2,7 +2,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/rdftabs.js b/binsrc/oat/toolkit/rdftabs.js index 8cbe0e9b94..d2ac57cae3 100644 --- a/binsrc/oat/toolkit/rdftabs.js +++ b/binsrc/oat/toolkit/rdftabs.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/rectwin.js b/binsrc/oat/toolkit/rectwin.js index e34da7c726..8f843366ba 100644 --- a/binsrc/oat/toolkit/rectwin.js +++ b/binsrc/oat/toolkit/rectwin.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/resize.js b/binsrc/oat/toolkit/resize.js index a81ddffaa5..77a6986344 100644 --- a/binsrc/oat/toolkit/resize.js +++ b/binsrc/oat/toolkit/resize.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/rotator.js b/binsrc/oat/toolkit/rotator.js index bbad1ea9ea..7b0896285f 100644 --- a/binsrc/oat/toolkit/rotator.js +++ b/binsrc/oat/toolkit/rotator.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/roundwin.js b/binsrc/oat/toolkit/roundwin.js index a8c8c64971..4c0482bd4c 100644 --- a/binsrc/oat/toolkit/roundwin.js +++ b/binsrc/oat/toolkit/roundwin.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/rssreader.js b/binsrc/oat/toolkit/rssreader.js index bdc06c29d3..1b271819c4 100644 --- a/binsrc/oat/toolkit/rssreader.js +++ b/binsrc/oat/toolkit/rssreader.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/schema.js b/binsrc/oat/toolkit/schema.js index 6654fe2aac..d75553ff6e 100644 --- a/binsrc/oat/toolkit/schema.js +++ b/binsrc/oat/toolkit/schema.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/simplefx.js b/binsrc/oat/toolkit/simplefx.js index 0994f45b28..aac1721309 100644 --- a/binsrc/oat/toolkit/simplefx.js +++ b/binsrc/oat/toolkit/simplefx.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/slidebar.js b/binsrc/oat/toolkit/slidebar.js index f95ed37269..080bc43b7f 100644 --- a/binsrc/oat/toolkit/slidebar.js +++ b/binsrc/oat/toolkit/slidebar.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/slider.js b/binsrc/oat/toolkit/slider.js index 821e9dc17f..c8e4392506 100644 --- a/binsrc/oat/toolkit/slider.js +++ b/binsrc/oat/toolkit/slider.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/soap.js b/binsrc/oat/toolkit/soap.js index e1383b2846..293b7517c6 100644 --- a/binsrc/oat/toolkit/soap.js +++ b/binsrc/oat/toolkit/soap.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/sparkline.js b/binsrc/oat/toolkit/sparkline.js index b2d278f2d6..7f4bd05fde 100644 --- a/binsrc/oat/toolkit/sparkline.js +++ b/binsrc/oat/toolkit/sparkline.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/sparql.js b/binsrc/oat/toolkit/sparql.js index f74f935684..b35592dba1 100644 --- a/binsrc/oat/toolkit/sparql.js +++ b/binsrc/oat/toolkit/sparql.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/sqlquery.js b/binsrc/oat/toolkit/sqlquery.js index e5ebfaedac..0a8658ad3e 100644 --- a/binsrc/oat/toolkit/sqlquery.js +++ b/binsrc/oat/toolkit/sqlquery.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/statistics.js b/binsrc/oat/toolkit/statistics.js index 802d5dfb88..57b8deeb44 100644 --- a/binsrc/oat/toolkit/statistics.js +++ b/binsrc/oat/toolkit/statistics.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/svg.js b/binsrc/oat/toolkit/svg.js index 0ed8dfc53b..53f2e60204 100644 --- a/binsrc/oat/toolkit/svg.js +++ b/binsrc/oat/toolkit/svg.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/svgsparql.js b/binsrc/oat/toolkit/svgsparql.js index 22a40a4a86..23b998337a 100644 --- a/binsrc/oat/toolkit/svgsparql.js +++ b/binsrc/oat/toolkit/svgsparql.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/tab.js b/binsrc/oat/toolkit/tab.js index 03842a1164..5815203ce3 100644 --- a/binsrc/oat/toolkit/tab.js +++ b/binsrc/oat/toolkit/tab.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/tagcloud.js b/binsrc/oat/toolkit/tagcloud.js index 9eadd7787f..c12ea88f6d 100644 --- a/binsrc/oat/toolkit/tagcloud.js +++ b/binsrc/oat/toolkit/tagcloud.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/ticker.js b/binsrc/oat/toolkit/ticker.js index 146154f42c..2a64db313c 100644 --- a/binsrc/oat/toolkit/ticker.js +++ b/binsrc/oat/toolkit/ticker.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/timeline.js b/binsrc/oat/toolkit/timeline.js index 7059fb3496..979d635d55 100644 --- a/binsrc/oat/toolkit/timeline.js +++ b/binsrc/oat/toolkit/timeline.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/tlscale.js b/binsrc/oat/toolkit/tlscale.js index 97d31c1bb7..b92f0d3bef 100644 --- a/binsrc/oat/toolkit/tlscale.js +++ b/binsrc/oat/toolkit/tlscale.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/toolbar.js b/binsrc/oat/toolkit/toolbar.js index 308e306ac9..4827a1f4af 100644 --- a/binsrc/oat/toolkit/toolbar.js +++ b/binsrc/oat/toolkit/toolbar.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/tree.js b/binsrc/oat/toolkit/tree.js index 954a6c453b..655ab53538 100644 --- a/binsrc/oat/toolkit/tree.js +++ b/binsrc/oat/toolkit/tree.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/upload.js b/binsrc/oat/toolkit/upload.js index 0bf956615b..44e7cec78a 100644 --- a/binsrc/oat/toolkit/upload.js +++ b/binsrc/oat/toolkit/upload.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/validation.js b/binsrc/oat/toolkit/validation.js index 2a3735b895..18a2605f2f 100644 --- a/binsrc/oat/toolkit/validation.js +++ b/binsrc/oat/toolkit/validation.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/webclipbinding.js b/binsrc/oat/toolkit/webclipbinding.js index c95f1b1532..2230218830 100644 --- a/binsrc/oat/toolkit/webclipbinding.js +++ b/binsrc/oat/toolkit/webclipbinding.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/win.js b/binsrc/oat/toolkit/win.js index 6e18750ec6..fb4e70dea7 100644 --- a/binsrc/oat/toolkit/win.js +++ b/binsrc/oat/toolkit/win.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/window.js b/binsrc/oat/toolkit/window.js index 7a8a6ebdfe..a5e5f8cc9f 100644 --- a/binsrc/oat/toolkit/window.js +++ b/binsrc/oat/toolkit/window.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/ws.js b/binsrc/oat/toolkit/ws.js index f209b76193..ce7bb60072 100644 --- a/binsrc/oat/toolkit/ws.js +++ b/binsrc/oat/toolkit/ws.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/xml.js b/binsrc/oat/toolkit/xml.js index c53b0a9687..acf7f52188 100644 --- a/binsrc/oat/toolkit/xml.js +++ b/binsrc/oat/toolkit/xml.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/toolkit/xmla.js b/binsrc/oat/toolkit/xmla.js index 21ca4025cc..5c341204a5 100644 --- a/binsrc/oat/toolkit/xmla.js +++ b/binsrc/oat/toolkit/xmla.js @@ -3,7 +3,7 @@ * * This file is part of the OpenLink Software Ajax Toolkit (OAT) project. * - * Copyright (C) 2005-2018 OpenLink Software + * Copyright (C) 2005-2019 OpenLink Software * * See LICENSE file for details. */ diff --git a/binsrc/oat/xslt/designview.xsl b/binsrc/oat/xslt/designview.xsl index bda391b4e8..b5df304ff7 100644 --- a/binsrc/oat/xslt/designview.xsl +++ b/binsrc/oat/xslt/designview.xsl @@ -5,7 +5,7 @@ This file is part of the OpenLink Ajax Toolkit (OAT) project - Copyright (C) 2005-2018 OpenLink Software + Copyright (C) 2005-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/oat/xslt/formview.xsl b/binsrc/oat/xslt/formview.xsl index 01b3c0aaf6..caa622b5d6 100644 --- a/binsrc/oat/xslt/formview.xsl +++ b/binsrc/oat/xslt/formview.xsl @@ -5,7 +5,7 @@ This file is part of the OpenLink Ajax Toolkit (OAT) project - Copyright (C) 2005-2018 OpenLink Software + Copyright (C) 2005-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/oat/xslt/grid.xsl b/binsrc/oat/xslt/grid.xsl index e9d8c05e85..7a17ef187b 100644 --- a/binsrc/oat/xslt/grid.xsl +++ b/binsrc/oat/xslt/grid.xsl @@ -5,7 +5,7 @@ This file is part of the OpenLink Ajax Toolkit (OAT) project - Copyright (C) 2005-2018 OpenLink Software + Copyright (C) 2005-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/oat/xslt/pivotview.xsl b/binsrc/oat/xslt/pivotview.xsl index f4752b5139..2fa04a51a1 100644 --- a/binsrc/oat/xslt/pivotview.xsl +++ b/binsrc/oat/xslt/pivotview.xsl @@ -5,7 +5,7 @@ This file is part of the OpenLink Ajax Toolkit (OAT) project - Copyright (C) 2005-2018 OpenLink Software + Copyright (C) 2005-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/oat/xslt/query.xsl b/binsrc/oat/xslt/query.xsl index d644c3ac2c..f3f65dc719 100644 --- a/binsrc/oat/xslt/query.xsl +++ b/binsrc/oat/xslt/query.xsl @@ -5,7 +5,7 @@ This file is part of the OpenLink Ajax Toolkit (OAT) project - Copyright (C) 2005-2018 OpenLink Software + Copyright (C) 2005-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/oat/xslt/rdfbrowser.xsl b/binsrc/oat/xslt/rdfbrowser.xsl index 90709d2bca..6e22174ff4 100644 --- a/binsrc/oat/xslt/rdfbrowser.xsl +++ b/binsrc/oat/xslt/rdfbrowser.xsl @@ -5,7 +5,7 @@ This file is part of the OpenLink Ajax Toolkit (OAT) project - Copyright (C) 2005-2018 OpenLink Software + Copyright (C) 2005-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/oat/xslt/tree.xsl b/binsrc/oat/xslt/tree.xsl index d73e2bd1a5..ca6b1870be 100644 --- a/binsrc/oat/xslt/tree.xsl +++ b/binsrc/oat/xslt/tree.xsl @@ -5,7 +5,7 @@ This file is part of the OpenLink Ajax Toolkit (OAT) project - Copyright (C) 2005-2018 OpenLink Software + Copyright (C) 2005-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdb2rdf/Makefile.am b/binsrc/rdb2rdf/Makefile.am index 75d83bfd58..479f63e2a3 100644 --- a/binsrc/rdb2rdf/Makefile.am +++ b/binsrc/rdb2rdf/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdb2rdf/make_vad.sh b/binsrc/rdb2rdf/make_vad.sh index f582e5b410..48b2788aa4 100755 --- a/binsrc/rdb2rdf/make_vad.sh +++ b/binsrc/rdb2rdf/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdb2rdf/ovl.sql b/binsrc/rdb2rdf/ovl.sql index c0d01bbf76..0781807773 100644 --- a/binsrc/rdb2rdf/ovl.sql +++ b/binsrc/rdb2rdf/ovl.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdb2rdf/r2rml.sql b/binsrc/rdb2rdf/r2rml.sql index e7f6f3d977..dea8943f10 100644 --- a/binsrc/rdb2rdf/r2rml.sql +++ b/binsrc/rdb2rdf/r2rml.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -250,7 +250,7 @@ create method R2RML_FILL_TRIPLESMAP_METAS_CACHE () returns integer for DB.DBA.R2 all_metas := vector (null, null); if ("q" is not null) { - if (__tag ("q") = 246) + if (__tag ("q") = __tag of rdf_box) "q" := rdf_box_data ("q"); while (("q" <> '') and strchr (' \t\r\n', chr ("q" [length ("q") - 1])) is not null) "q" := "LEFT" ("q", length ("q") - 1); @@ -450,8 +450,8 @@ create function DB.DBA.R2RML_XSD_TYPE_OF_DTP (in dtp integer) if (__tag of double precision = dtp) return 'http://www.w3.org/2001/XMLSchema#double'; if (__tag of numeric = dtp) return 'http://www.w3.org/2001/XMLSchema#double'; if (__tag of real = dtp) return 'http://www.w3.org/2001/XMLSchema#float'; - if (230) return 'http://www.w3.org/2001/XMLSchema#XMLLiteral'; - if (238) return 'http://www.openlinksw.com/schemas/virtrdf#Geometry'; + if (__tag of XML) return 'http://www.w3.org/2001/XMLSchema#XMLLiteral'; + if (238) return default_geo_type(); return 'http://www.w3.org/2001/XMLSchema#any'; } ; @@ -703,7 +703,7 @@ create method R2RML_MAKE_QM_IMPL_REL_PO (in tmap IRI_ID, in tmap2 IRI_ID, in tma { declare p_md5 varchar; declare where_is_opened integer; - -- dbg_obj_princ ('R2RML_MAKE_QM: cross from ', "tmap", ' to ', "tmap2" ); + -- dbg_obj_princ ('R2RML_MAKE_QM_IMPL_REL_PO: cross from ', "tmap", ' to ', "tmap2" ); for (sparql define input:storage "" define output:valmode "LONG" select ?constp, ?consto, ?ocol, ?otmpl, ?ott where { graph `iri(?:self.graph_iid)` { @@ -721,7 +721,7 @@ create method R2RML_MAKE_QM_IMPL_REL_PO (in tmap IRI_ID, in tmap2 IRI_ID, in tma } } order by 1 2 3 4 5) do { - p_md5 := md5_box (vector (__rdf_strsqlval ("constp"), null, null)); + p_md5 := md5_box (vector (tmap, __rdf_strsqlval ("constp"), null, null)); if (self.prev_p_md5 is null or self.prev_p_md5 <> p_md5) { if (self.prev_p_md5 is not null) @@ -816,7 +816,7 @@ create method R2RML_MAKE_QM_IMPL_PLAIN_PO (in tmap IRI_ID, in pofld IRI_ID, in p } } order by 1 2 3 4 5 6 7 8 9) do { - p_md5 := md5_box (vector (__rdf_strsqlval("constp"), DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("pcol")), __rdf_strsqlval("ptmpl"))); + p_md5 := md5_box (vector (tmap, __rdf_strsqlval("constp"), DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("pcol")), __rdf_strsqlval("ptmpl"))); if (self.prev_p_md5 is null or self.prev_p_md5 <> p_md5) { if (self.prev_p_md5 is not null) @@ -838,63 +838,167 @@ create method R2RML_MAKE_QM_IMPL_PLAIN_PO (in tmap IRI_ID, in pofld IRI_ID, in p create method R2RML_MAKE_QM_IMPL_CHILDS (in needs_inner_g_field integer) returns any for DB.DBA.R2RML_MAP { - declare prev_g_md5, prev_s_md5 any; + declare prev_g_md5, prev_s_md5, childs any; + -- dbg_obj_princ ('R2RML_MAKE_QM_IMPL_CHILDS(', needs_inner_g_field, '), graph_iid is ', self.graph_iid); -- For each combination of mapclasses and graph prev_g_md5 := prev_s_md5 := null; self.prev_p_md5 := null; + +-- There was this query here but it fails for unknown reason. +-- for (sparql define input:storage "" define output:valmode "LONG" define +-- select ?constg, ?gcol, ?gtmpl, ?tmap, ?sfld, ?consts, ?scol, ?stmpl, ?stt, ?sclass, ?pofld, ?pconst, ?pfld, ?oconst, ?ofld, ?tmap2, ?tmap2sfld +-- where { graph `iri(?:self.graph_iid)` { +-- ?tmap a rr:TriplesMap . +-- { ?tmap rr:subject ?consts } +-- union +-- { +-- ?tmap rr:subjectMap ?sfld . +-- { ?sfld rr:constant ?consts } +-- union +-- { ?sfld rr:column ?scol } +-- union +-- { ?sfld rr:template ?stmpl } +-- optional { ?sfld rr:termType ?stt } +-- } +-- { +-- ?sfld rr:class ?sclass . +-- } +-- union +-- { +-- ?tmap rr:predicateObjectMap ?pofld . +-- { ?pofld rr:predicate ?pconst } +-- union +-- { ?pofld rr:predicateMap ?pfld } +-- { ?pofld rr:object ?oconst } +-- union +-- { ?pofld rr:objectMap ?ofld +-- optional { +-- ?ofld rr:parentTriplesMap ?tmap2 . +-- ?tmap2 a rr:TriplesMap ; +-- rr:subjectMap ?tmap2sfld . } +-- } +-- } +-- optional { +-- { ?gcontainer rr:graph ?constg . } +-- union +-- { +-- ?gcontainer rr:graphMap ?gfld . +-- { ?gfld rr:constant ?constg } +-- union +-- { ?gfld rr:column ?gcol } +-- union +-- { ?gfld rr:template ?gtmpl } } } +-- filter (?gcontainer in (?sfld, ?pofld) || !(bound(?gcontainer))) +-- } } +-- order by 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16) do +-- { + + + vectorbld_init (childs); for (sparql define input:storage "" define output:valmode "LONG" - select ?constg, ?gcol, ?gtmpl, ?tmap, ?sfld, ?consts, ?scol, ?stmpl, ?stt, ?sclass, ?pofld, ?pconst, ?pfld, ?oconst, ?ofld, ?tmap2, ?tmap2sfld + select ?tmap where { graph `iri(?:self.graph_iid)` { - ?tmap a rr:TriplesMap . - { ?tmap rr:subject ?consts } - union - { - ?tmap rr:subjectMap ?sfld . - { ?sfld rr:constant ?consts } - union - { ?sfld rr:column ?scol } - union - { ?sfld rr:template ?stmpl } - optional { ?sfld rr:termType ?stt } - } - { - ?sfld rr:class ?sclass . - } - union - { - ?tmap rr:predicateObjectMap ?pofld . - { ?pofld rr:predicate ?pconst } - union - { ?pofld rr:predicateMap ?pfld } - { ?pofld rr:object ?oconst } - union - { ?pofld rr:objectMap ?ofld - optional { - ?ofld rr:parentTriplesMap ?tmap2 . - ?tmap2 a rr:TriplesMap ; - rr:subjectMap ?tmap2sfld . } - } - } - optional { - { ?gcontainer rr:graph ?constg . } + ?tmap a rr:TriplesMap . } } ) do + { + -- dbg_obj_princ ('R2RML_MAKE_QM_IMPL_CHILDS: tmap woudl be ', "tmap"); + for (sparql define input:storage "" define output:valmode "LONG" + select ?sfld, ?consts, ?scol, ?stmpl, ?stt + where { graph `iri(?:self.graph_iid)` { + { ?:"tmap" rr:subject ?consts } union { - ?gcontainer rr:graphMap ?gfld . - { ?gfld rr:constant ?constg } + ?:"tmap" rr:subjectMap ?sfld . + { ?sfld rr:constant ?consts } union - { ?gfld rr:column ?gcol } + { ?sfld rr:column ?scol } union - { ?gfld rr:template ?gtmpl } } - filter (?gcontainer in (?sfld, ?pofld)) } - } } - order by 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16) do + { ?sfld rr:template ?stmpl } + optional { ?sfld rr:termType ?stt } + } } } ) do + { + -- dbg_obj_princ ('R2RML_MAKE_QM_IMPL_CHILDS: tmap would be ', "tmap", '; s is ', "sfld", "consts", "scol", "stmpl", "stt"); + for (sparql define input:storage "" define output:valmode "LONG" + select ?sclass, ?pofld, ?pconst, ?pfld, ?oconst, ?ofld, ?tmap2, ?tmap2sfld, ?constg, ?gcol, ?gtmpl + where { graph `iri(?:self.graph_iid)` { + { + ?:"sfld" rr:class ?sclass . + } + union + { + ?:"tmap" rr:predicateObjectMap ?pofld . + { ?pofld rr:predicate ?pconst } + union + { ?pofld rr:predicateMap ?pfld } + { ?pofld rr:object ?oconst } + union + { ?pofld rr:objectMap ?ofld + optional { + ?ofld rr:parentTriplesMap ?tmap2 . + ?tmap2 a rr:TriplesMap ; + rr:subjectMap ?tmap2sfld . } + } + } + optional { + { ?gcontainer rr:graph ?constg . } + union + { + ?gcontainer rr:graphMap ?gfld . + { ?gfld rr:constant ?constg } + union + { ?gfld rr:column ?gcol } + union + { ?gfld rr:template ?gtmpl } } } + filter (?gcontainer in (?:"sfld", ?pofld) || !(bound(?gcontainer))) + } } ) do + { + -- dbg_obj_princ ('R2RML_MAKE_QM_IMPL_CHILDS: g would be ', "constg", "gcol", "gtmpl", '; tmap is ', "tmap", '; s is ', "sfld", "consts", "scol", "stmpl", "stt", "sclass", '; po is ', "pconst", "pfld", ' and ', "oconst", "ofld"); + vectorbld_acc (childs, vector ("constg", "gcol", "gtmpl", "tmap", "sfld", "consts", "scol", "stmpl", "stt", "sclass", "pofld", "pconst", "pfld", "oconst", "ofld", "tmap2", "tmap2sfld")); + } + } + } + vectorbld_final (childs); + rowvector_obj_sort (childs, 15, 1); + rowvector_obj_sort (childs, 14, 1); + rowvector_obj_sort (childs, 13, 1); + rowvector_obj_sort (childs, 12, 1); + rowvector_obj_sort (childs, 11, 1); + rowvector_obj_sort (childs, 10, 1); + rowvector_obj_sort (childs, 9, 1); + rowvector_obj_sort (childs, 8, 1); + rowvector_obj_sort (childs, 7, 1); + rowvector_obj_sort (childs, 6, 1); + rowvector_obj_sort (childs, 5, 1); + rowvector_obj_sort (childs, 4, 1); + rowvector_obj_sort (childs, 3, 1); + rowvector_obj_sort (childs, 2, 1); + rowvector_obj_sort (childs, 1, 1); + rowvector_obj_sort (childs, 0, 1); + foreach (any tmap_case in childs) do { + declare "constg", "gcol", "gtmpl", "tmap", "sfld", "consts", "scol", "stmpl", "stt", "sclass", "pofld", "pconst", "pfld", "oconst", "ofld", "tmap2", "tmap2sfld" any; declare s_md5, p_md5 varchar; - -- dbg_obj_princ ('R2RML_MAKE_QM: g is ', "constg", "gcol", "gtmpl", '; tmap is ', "tmap", '; s is ', "sfld", "consts", "scol", "stmpl", "stt", "sclass", '; po is ', "pconst", "pfld", ' and ', "oconst", "ofld"); + "constg" := tmap_case[0]; + "gcol" := tmap_case[1]; + "gtmpl" := tmap_case[2]; + "tmap" := tmap_case[3]; + "sfld" := tmap_case[4]; + "consts" := tmap_case[5]; + "scol" := tmap_case[6]; + "stmpl" := tmap_case[7]; + "stt" := tmap_case[8]; + "sclass" := tmap_case[9]; + "pofld" := tmap_case[10]; + "pconst" := tmap_case[11]; + "pfld" := tmap_case[12]; + "oconst" := tmap_case[13]; + "ofld" := tmap_case[14]; + "tmap2" := tmap_case[15]; + "tmap2sfld" := tmap_case[16]; + -- dbg_obj_princ ('R2RML_MAKE_QM_IMPL_CHILDS: g is ', "constg", "gcol", "gtmpl", '; tmap is ', "tmap", '; s is ', "sfld", "consts", "scol", "stmpl", "stt", "sclass", '; po is ', "pconst", "pfld", ' and ', "oconst", "ofld"); if (needs_inner_g_field) { declare g_md5 any; - g_md5 := md5_box (vector (coalesce ("constg", self.default_constg), DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("gcol")), __rdf_strsqlval("gtmpl"))); + g_md5 := md5_box (vector ("tmap", coalesce ("constg", self.default_constg), DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("gcol")), __rdf_strsqlval("gtmpl"))); if (prev_g_md5 is null or prev_g_md5 <> g_md5) { if (prev_g_md5 is not null) @@ -912,7 +1016,7 @@ create method R2RML_MAKE_QM_IMPL_CHILDS (in needs_inner_g_field integer) returns prev_g_md5 := g_md5; } } - s_md5 := md5_box (vector (__rdf_strsqlval("consts"), DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("scol")), __rdf_strsqlval("stmpl"), __rdf_strsqlval("stt"))); + s_md5 := md5_box (vector ("tmap", __rdf_strsqlval("consts"), DB.DBA.R2RML_UNQUOTE_NAME (__rdf_strsqlval("scol")), __rdf_strsqlval("stmpl"), __rdf_strsqlval("stt"))); if (prev_s_md5 is null or prev_s_md5 <> s_md5) { if (prev_s_md5 is not null) @@ -930,7 +1034,7 @@ create method R2RML_MAKE_QM_IMPL_CHILDS (in needs_inner_g_field integer) returns } if ("sclass" is not null) { - p_md5 := 'rdf:type'; + p_md5 := md5_box (vector ("tmap", __bft ('http://www.w3.org/1999/02/22-rdf-syntax-ns#type', 1), null, null)); if (self.prev_p_md5 is null or self.prev_p_md5 <> p_md5) { if (self.prev_p_md5 is not null) @@ -1020,7 +1124,7 @@ create method R2RML_MAKE_QM (in storage_iid IRI_ID := null, in rdfview_iid IRI_I { ?gfld rr:column ?c } union { ?gfld rr:template ?t } filter (?gcontainer in (?smap, ?pomap)) } } ); --- -- dbg_obj_princ ('const_graph_count = ', const_graph_count, ', var_graph_count = ', var_graph_count); + -- dbg_obj_princ ('const_graph_count = ', const_graph_count, ', var_graph_count = ', var_graph_count); http ('alter quad storage ' || self.R2RML_IRI_ID_AS_QNAME (storage_iid) || '\n', self.codegen_ses); iter := self.triplesmap_metas_cache; for (dict_iter_rewind (iter); dict_iter_next (iter, iter_tmap, iter_metas); ) diff --git a/binsrc/rdb2rdf/r2rml_validation_metas.sql b/binsrc/rdb2rdf/r2rml_validation_metas.sql index b8c21ccb12..59495524d5 100644 --- a/binsrc/rdb2rdf/r2rml_validation_metas.sql +++ b/binsrc/rdb2rdf/r2rml_validation_metas.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdb2rdf/vad_dav.xml b/binsrc/rdb2rdf/vad_dav.xml index 52095cc392..d4eabb7347 100644 --- a/binsrc/rdb2rdf/vad_dav.xml +++ b/binsrc/rdb2rdf/vad_dav.xml @@ -7,7 +7,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -30,12 +30,12 @@ - + - - + + diff --git a/binsrc/rdb2rdf/vad_version b/binsrc/rdb2rdf/vad_version index 100d5699f2..10fcfb4b99 100644 --- a/binsrc/rdb2rdf/vad_version +++ b/binsrc/rdb2rdf/vad_version @@ -1 +1 @@ -1.00.0275 +1.00.0278 diff --git a/binsrc/rdf4j/Makefile.am b/binsrc/rdf4j/Makefile.am index b99203054e..91611ef522 100644 --- a/binsrc/rdf4j/Makefile.am +++ b/binsrc/rdf4j/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/tests/Test_BNode.java b/binsrc/rdf4j/tests/Test_BNode.java index 0d810caa8b..6175a6df6e 100644 --- a/binsrc/rdf4j/tests/Test_BNode.java +++ b/binsrc/rdf4j/tests/Test_BNode.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/tests/Test_BNode_perf1.java b/binsrc/rdf4j/tests/Test_BNode_perf1.java index 75a30beeea..1917e0225f 100644 --- a/binsrc/rdf4j/tests/Test_BNode_perf1.java +++ b/binsrc/rdf4j/tests/Test_BNode_perf1.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/virt_rdf4j.jar b/binsrc/rdf4j/virt_rdf4j.jar index bcfd731b43..22333edd9f 100644 Binary files a/binsrc/rdf4j/virt_rdf4j.jar and b/binsrc/rdf4j/virt_rdf4j.jar differ diff --git a/binsrc/rdf4j/virtuoso_driver/Version.java b/binsrc/rdf4j/virtuoso_driver/Version.java index 6b9a5d6cf8..f059931bdf 100644 --- a/binsrc/rdf4j/virtuoso_driver/Version.java +++ b/binsrc/rdf4j/virtuoso_driver/Version.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -26,7 +26,7 @@ public class Version { protected static final String DRV_VER = "2.1.4"; // The major and minor version number - protected static final String build_id = "1.7"; + protected static final String build_id = "1.8"; public static void main(String args[]) { diff --git a/binsrc/rdf4j/virtuoso_driver/VirtuosoBooleanQuery.java b/binsrc/rdf4j/virtuoso_driver/VirtuosoBooleanQuery.java index 00c117404d..e57df7f764 100644 --- a/binsrc/rdf4j/virtuoso_driver/VirtuosoBooleanQuery.java +++ b/binsrc/rdf4j/virtuoso_driver/VirtuosoBooleanQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/virtuoso_driver/VirtuosoGraphQuery.java b/binsrc/rdf4j/virtuoso_driver/VirtuosoGraphQuery.java index f914ed2a8b..b0dddc9f87 100644 --- a/binsrc/rdf4j/virtuoso_driver/VirtuosoGraphQuery.java +++ b/binsrc/rdf4j/virtuoso_driver/VirtuosoGraphQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/virtuoso_driver/VirtuosoOperation.java b/binsrc/rdf4j/virtuoso_driver/VirtuosoOperation.java index 277e38ff1c..7b34bd9409 100644 --- a/binsrc/rdf4j/virtuoso_driver/VirtuosoOperation.java +++ b/binsrc/rdf4j/virtuoso_driver/VirtuosoOperation.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/virtuoso_driver/VirtuosoQuery.java b/binsrc/rdf4j/virtuoso_driver/VirtuosoQuery.java index 2da55c5ae3..ef62595976 100644 --- a/binsrc/rdf4j/virtuoso_driver/VirtuosoQuery.java +++ b/binsrc/rdf4j/virtuoso_driver/VirtuosoQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/virtuoso_driver/VirtuosoRepository.java b/binsrc/rdf4j/virtuoso_driver/VirtuosoRepository.java index 41dbf143a0..9552b12af8 100644 --- a/binsrc/rdf4j/virtuoso_driver/VirtuosoRepository.java +++ b/binsrc/rdf4j/virtuoso_driver/VirtuosoRepository.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositoryConfig.java b/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositoryConfig.java index f85980d8b0..bf10d0e39b 100644 --- a/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositoryConfig.java +++ b/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositoryConfig.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositoryConnection.java b/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositoryConnection.java index 375797a2ec..5c2b39fd5d 100644 --- a/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositoryConnection.java +++ b/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositoryConnection.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -1003,8 +1003,109 @@ public void rollback() throws RepositoryException { * because the repository is not writable. */ public void add(InputStream in, String baseURI, RDFFormat dataFormat, Resource... contexts) throws IOException, RDFParseException, RepositoryException { - Reader reader = new InputStreamReader(in); - add(reader, baseURI, dataFormat, contexts); + verifyIsOpen(); + flushDelayAdd(); + + final boolean useStatementContext = (contexts != null && contexts.length == 0); // If no context are specified, each statement is added to statement context + + try { + RDFParser parser = Rio.createParser(dataFormat, getValueFactory()); + parser.setParserConfig(getParserConfig()); + parser.setParseErrorListener(new ParseErrorLogger()); + + // set up a handler for parsing the data from reader + + parser.setRDFHandler(new AbstractRDFHandler() { + + int count = 0; + PreparedStatement ps = null; + java.sql.Statement st_cmd = null; + Resource[] _contexts = checkDMLContext(contexts); + + public void startRDF() throws RDFHandlerException { + if (!insertBNodeAsVirtuosoIRI) { + try { + st_cmd = createStatement(-1, false); + st_cmd.executeUpdate("connection_set ('RDF_INSERT_TRIPLE_C_BNODES', dict_new(1000))"); + } + catch (SQLException e) { + throw new RDFHandlerException("Problem with creation of BNode cache: ", e); + } + } + } + + public void endRDF() throws RDFHandlerException { + try { + if (count > 0) + ps = flushDelayAdd_batch(ps, count); + } + catch (RepositoryException e) { + throw new RDFHandlerException("Problem executing query: ", e); + } + try { + if (st_cmd!=null) + st_cmd.executeUpdate("connection_set ('RDF_INSERT_TRIPLE_C_BNODES', NULL)"); + } + catch (SQLException e) { + throw new RDFHandlerException("Problem with clearing of BNode cache: ", e); + } + if (ps != null) { + try { + ps.close(); + } catch (Exception e) {} + } + if (st_cmd != null) { + try { + st_cmd.close(); + } catch (Exception e) {} + } + ps = null; + st_cmd = null; + count = 0; + } + + public void handleNamespace(String prefix, String name) throws RDFHandlerException { + String query = "DB.DBA.XML_SET_NS_DECL(?, ?, 1)"; + try { + PreparedStatement psn = prepareStatement(query, false); + psn.setString(1, prefix); + psn.setString(2, name); + psn.execute(); + psn.close(); + } + catch (SQLException e) { + throw new RDFHandlerException("Problem executing query: " + query, e); + } + } + + public void handleStatement(Statement st) throws RDFHandlerException { + try { + Resource[] hcontexts; + if (st.getContext() != null && useStatementContext) { + hcontexts = new Resource[] {st.getContext()}; + } else { + hcontexts = _contexts; + } + + ps = addToQuadStore_batch(ps, st.getSubject(), + st.getPredicate(), st.getObject(), hcontexts); + count += hcontexts.length; + + if (count > BATCH_SIZE) { + ps = flushDelayAdd_batch(ps, count); + count = 0; + } + } + catch(Exception e) { + throw new RDFHandlerException(e); + } + } + }); + parser.parse(in, baseURI); // parse out each tripled to be handled by the handler above + } + catch (Exception e) { + throw new RepositoryException("Problem parsing triples", e); + } } /** diff --git a/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositoryFactory.java b/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositoryFactory.java index fe5f2fe2c7..81a4910c12 100644 --- a/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositoryFactory.java +++ b/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositoryFactory.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositorySchema.java b/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositorySchema.java index ad9b936d4f..67d93395df 100644 --- a/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositorySchema.java +++ b/binsrc/rdf4j/virtuoso_driver/VirtuosoRepositorySchema.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/virtuoso_driver/VirtuosoTest.java b/binsrc/rdf4j/virtuoso_driver/VirtuosoTest.java index 5919124cae..e981e1d7d4 100644 --- a/binsrc/rdf4j/virtuoso_driver/VirtuosoTest.java +++ b/binsrc/rdf4j/virtuoso_driver/VirtuosoTest.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/virtuoso_driver/VirtuosoTupleQuery.java b/binsrc/rdf4j/virtuoso_driver/VirtuosoTupleQuery.java index cf1b04cbf1..fe7f9d5fee 100644 --- a/binsrc/rdf4j/virtuoso_driver/VirtuosoTupleQuery.java +++ b/binsrc/rdf4j/virtuoso_driver/VirtuosoTupleQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf4j/virtuoso_driver/VirtuosoUpdate.java b/binsrc/rdf4j/virtuoso_driver/VirtuosoUpdate.java index 4f84e69966..95bb6e8979 100644 --- a/binsrc/rdf4j/virtuoso_driver/VirtuosoUpdate.java +++ b/binsrc/rdf4j/virtuoso_driver/VirtuosoUpdate.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/Makefile.am b/binsrc/rdf_mappers/Makefile.am index 855b0729ad..3f27878dff 100644 --- a/binsrc/rdf_mappers/Makefile.am +++ b/binsrc/rdf_mappers/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/make_vad.sh b/binsrc/rdf_mappers/make_vad.sh index 9f456a4358..deae3f2c78 100755 --- a/binsrc/rdf_mappers/make_vad.sh +++ b/binsrc/rdf_mappers/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -315,7 +315,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/binsrc/rdf_mappers/ontologies/owl/attribution.owl b/binsrc/rdf_mappers/ontologies/owl/attribution.owl index 817fa05e4a..eec9caa5eb 100644 --- a/binsrc/rdf_mappers/ontologies/owl/attribution.owl +++ b/binsrc/rdf_mappers/ontologies/owl/attribution.owl @@ -6,7 +6,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplamazon.owl b/binsrc/rdf_mappers/ontologies/owl/oplamazon.owl index 473d5b7076..37cc1d330b 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplamazon.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplamazon.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplangel.owl b/binsrc/rdf_mappers/ontologies/owl/oplangel.owl index 632b4a7ec7..3bb6f2fa52 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplangel.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplangel.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplbase.owl b/binsrc/rdf_mappers/ontologies/owl/oplbase.owl index 23008ccc30..61a79c34c9 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplbase.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplbase.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplbestbuy.owl b/binsrc/rdf_mappers/ontologies/owl/oplbestbuy.owl index 71162ff0f9..bcedf5962c 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplbestbuy.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplbestbuy.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplcert.owl b/binsrc/rdf_mappers/ontologies/owl/oplcert.owl index 89ff64c97b..dfe07d4df8 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplcert.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplcert.owl @@ -6,7 +6,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplcnet.owl b/binsrc/rdf_mappers/ontologies/owl/oplcnet.owl index cf1e2366dc..9e930ba736 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplcnet.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplcnet.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplcrunchbase.owl b/binsrc/rdf_mappers/ontologies/owl/oplcrunchbase.owl index e724045c1c..87471b1064 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplcrunchbase.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplcrunchbase.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplcv.owl b/binsrc/rdf_mappers/ontologies/owl/oplcv.owl index 15de38ca08..fc1fa2fe7c 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplcv.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplcv.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/opldbps.owl b/binsrc/rdf_mappers/ontologies/owl/opldbps.owl index f4cea2efc8..572e815548 100644 --- a/binsrc/rdf_mappers/ontologies/owl/opldbps.owl +++ b/binsrc/rdf_mappers/ontologies/owl/opldbps.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplebay.owl b/binsrc/rdf_mappers/ontologies/owl/oplebay.owl index 56a4fb6778..158c8f373a 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplebay.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplebay.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplevri.owl b/binsrc/rdf_mappers/ontologies/owl/oplevri.owl index 4e3984b548..972419cca6 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplevri.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplevri.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplgooglebase.owl b/binsrc/rdf_mappers/ontologies/owl/oplgooglebase.owl index 1de8dc9b5d..fdc960757a 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplgooglebase.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplgooglebase.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplklout.owl b/binsrc/rdf_mappers/ontologies/owl/oplklout.owl index e1643ec706..584c256a86 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplklout.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplklout.owl @@ -6,7 +6,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/opllinkedin.owl b/binsrc/rdf_mappers/ontologies/owl/opllinkedin.owl index bc5ae84261..359cfead84 100644 --- a/binsrc/rdf_mappers/ontologies/owl/opllinkedin.owl +++ b/binsrc/rdf_mappers/ontologies/owl/opllinkedin.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplmoney.owl b/binsrc/rdf_mappers/ontologies/owl/oplmoney.owl index 0e916afe57..10d3702ba4 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplmoney.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplmoney.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplnyt.owl b/binsrc/rdf_mappers/ontologies/owl/oplnyt.owl index 406cbf9f94..9e2ae9221e 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplnyt.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplnyt.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplopengraph.owl b/binsrc/rdf_mappers/ontologies/owl/oplopengraph.owl index b831984725..5d8e504dcb 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplopengraph.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplopengraph.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplstackoverflow.owl b/binsrc/rdf_mappers/ontologies/owl/oplstackoverflow.owl index f132b0cf38..3109c3acdd 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplstackoverflow.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplstackoverflow.owl @@ -6,7 +6,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/opltesco.owl b/binsrc/rdf_mappers/ontologies/owl/opltesco.owl index afbc60341c..e10c422db1 100644 --- a/binsrc/rdf_mappers/ontologies/owl/opltesco.owl +++ b/binsrc/rdf_mappers/ontologies/owl/opltesco.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/opltwitter.owl b/binsrc/rdf_mappers/ontologies/owl/opltwitter.owl index 65c37d7620..7595ed5744 100644 --- a/binsrc/rdf_mappers/ontologies/owl/opltwitter.owl +++ b/binsrc/rdf_mappers/ontologies/owl/opltwitter.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/ontologies/owl/oplzillow.owl b/binsrc/rdf_mappers/ontologies/owl/oplzillow.owl index 12e8bab984..aa6bdb5eb0 100644 --- a/binsrc/rdf_mappers/ontologies/owl/oplzillow.owl +++ b/binsrc/rdf_mappers/ontologies/owl/oplzillow.owl @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/rdf_mappers.sql b/binsrc/rdf_mappers/rdf_mappers.sql index 8eb5b47b1f..2365156843 100644 --- a/binsrc/rdf_mappers/rdf_mappers.sql +++ b/binsrc/rdf_mappers/rdf_mappers.sql @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/rdf_mappers_drop.sql b/binsrc/rdf_mappers/rdf_mappers_drop.sql index 9f00b21e6a..3945d897bf 100644 --- a/binsrc/rdf_mappers/rdf_mappers_drop.sql +++ b/binsrc/rdf_mappers/rdf_mappers_drop.sql @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/rdfdesc/description.sql b/binsrc/rdf_mappers/rdfdesc/description.sql index d658b8ff71..dcbb17d626 100644 --- a/binsrc/rdf_mappers/rdfdesc/description.sql +++ b/binsrc/rdf_mappers/rdfdesc/description.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/sponger_coref_post_process.sql b/binsrc/rdf_mappers/sponger_coref_post_process.sql index 7860eaeeb7..281db01b23 100644 --- a/binsrc/rdf_mappers/sponger_coref_post_process.sql +++ b/binsrc/rdf_mappers/sponger_coref_post_process.sql @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/sponger_front_page/examples.vsp b/binsrc/rdf_mappers/sponger_front_page/examples.vsp index 5b6ff9becc..20406a44b6 100644 --- a/binsrc/rdf_mappers/sponger_front_page/examples.vsp +++ b/binsrc/rdf_mappers/sponger_front_page/examples.vsp @@ -95,7 +95,7 @@

    diff --git a/binsrc/rdf_mappers/sponger_front_page/fb_access_token_popup.vsp b/binsrc/rdf_mappers/sponger_front_page/fb_access_token_popup.vsp index 21c99a0711..f6c80c9293 100644 --- a/binsrc/rdf_mappers/sponger_front_page/fb_access_token_popup.vsp +++ b/binsrc/rdf_mappers/sponger_front_page/fb_access_token_popup.vsp @@ -329,7 +329,7 @@ auth_err: ;
    diff --git a/binsrc/rdf_mappers/sponger_front_page/index.vsp b/binsrc/rdf_mappers/sponger_front_page/index.vsp index 0ed5a07d91..c712dc6b51 100644 --- a/binsrc/rdf_mappers/sponger_front_page/index.vsp +++ b/binsrc/rdf_mappers/sponger_front_page/index.vsp @@ -434,7 +434,7 @@ href="http://{virtuoso-host}/about/id/{URIscheme}/{authority}/{local-path}"
    diff --git a/binsrc/rdf_mappers/sponger_front_page/linkedin_access_token.vsp b/binsrc/rdf_mappers/sponger_front_page/linkedin_access_token.vsp index 6d94013bba..50fa1df708 100644 --- a/binsrc/rdf_mappers/sponger_front_page/linkedin_access_token.vsp +++ b/binsrc/rdf_mappers/sponger_front_page/linkedin_access_token.vsp @@ -271,7 +271,7 @@ cartridge_options_err:
    diff --git a/binsrc/rdf_mappers/sponger_front_page/sponge_flickr.vsp b/binsrc/rdf_mappers/sponger_front_page/sponge_flickr.vsp index 48c1137bce..fbdea99af9 100644 --- a/binsrc/rdf_mappers/sponger_front_page/sponge_flickr.vsp +++ b/binsrc/rdf_mappers/sponger_front_page/sponge_flickr.vsp @@ -194,7 +194,7 @@
    diff --git a/binsrc/rdf_mappers/sponger_front_page/sponge_social_profile.vsp b/binsrc/rdf_mappers/sponger_front_page/sponge_social_profile.vsp index 62bdee4350..e4b780b35f 100644 --- a/binsrc/rdf_mappers/sponger_front_page/sponge_social_profile.vsp +++ b/binsrc/rdf_mappers/sponger_front_page/sponge_social_profile.vsp @@ -231,7 +231,7 @@
    diff --git a/binsrc/rdf_mappers/sponger_front_page/sponge_uri.vsp b/binsrc/rdf_mappers/sponger_front_page/sponge_uri.vsp index 25c6a269ce..0ddec1f301 100644 --- a/binsrc/rdf_mappers/sponger_front_page/sponge_uri.vsp +++ b/binsrc/rdf_mappers/sponger_front_page/sponge_uri.vsp @@ -269,7 +269,7 @@
    diff --git a/binsrc/rdf_mappers/sponger_front_page/sponger_architecture.vsp b/binsrc/rdf_mappers/sponger_front_page/sponger_architecture.vsp index 5a2023c630..4a832c47b3 100644 --- a/binsrc/rdf_mappers/sponger_front_page/sponger_architecture.vsp +++ b/binsrc/rdf_mappers/sponger_front_page/sponger_architecture.vsp @@ -160,7 +160,7 @@
    diff --git a/binsrc/rdf_mappers/sponger_front_page/sponger_setup.vsp b/binsrc/rdf_mappers/sponger_front_page/sponger_setup.vsp index c703be9431..f1e0fd74f3 100644 --- a/binsrc/rdf_mappers/sponger_front_page/sponger_setup.vsp +++ b/binsrc/rdf_mappers/sponger_front_page/sponger_setup.vsp @@ -628,7 +628,7 @@
    diff --git a/binsrc/rdf_mappers/sponger_front_page/twitter_access_token.vsp b/binsrc/rdf_mappers/sponger_front_page/twitter_access_token.vsp index 052d22d667..ede3d20791 100644 --- a/binsrc/rdf_mappers/sponger_front_page/twitter_access_token.vsp +++ b/binsrc/rdf_mappers/sponger_front_page/twitter_access_token.vsp @@ -270,7 +270,7 @@ cartridge_options_err:
    diff --git a/binsrc/rdf_mappers/virt_rdf_label.sql b/binsrc/rdf_mappers/virt_rdf_label.sql index 7889146a89..48c9286f45 100644 --- a/binsrc/rdf_mappers/virt_rdf_label.sql +++ b/binsrc/rdf_mappers/virt_rdf_label.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/abmeta2rdfxml.xsl b/binsrc/rdf_mappers/xslt/main/abmeta2rdfxml.xsl index a25a21f5f9..a4adea483b 100644 --- a/binsrc/rdf_mappers/xslt/main/abmeta2rdfxml.xsl +++ b/binsrc/rdf_mappers/xslt/main/abmeta2rdfxml.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/amazon2rdf.xsl b/binsrc/rdf_mappers/xslt/main/amazon2rdf.xsl index 57c7fc5c7a..dd223928a2 100644 --- a/binsrc/rdf_mappers/xslt/main/amazon2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/amazon2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/angellist2rdf.xsl b/binsrc/rdf_mappers/xslt/main/angellist2rdf.xsl index e9ae7a83ef..ed00569ad8 100644 --- a/binsrc/rdf_mappers/xslt/main/angellist2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/angellist2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/atom2rdf.xsl b/binsrc/rdf_mappers/xslt/main/atom2rdf.xsl index b31fcd20a4..06facc2ac4 100644 --- a/binsrc/rdf_mappers/xslt/main/atom2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/atom2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/atomdoc2rdf.xsl b/binsrc/rdf_mappers/xslt/main/atomdoc2rdf.xsl index ab6c902751..b512bc281c 100644 --- a/binsrc/rdf_mappers/xslt/main/atomdoc2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/atomdoc2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/atomentry2rdf.xsl b/binsrc/rdf_mappers/xslt/main/atomentry2rdf.xsl index 2c6d8726ae..cc3261dd6b 100644 --- a/binsrc/rdf_mappers/xslt/main/atomentry2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/atomentry2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/bestbuy2rdf.xsl b/binsrc/rdf_mappers/xslt/main/bestbuy2rdf.xsl index e540409a8b..33d81df85c 100644 --- a/binsrc/rdf_mappers/xslt/main/bestbuy2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/bestbuy2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/bugzilla2rdf.xsl b/binsrc/rdf_mappers/xslt/main/bugzilla2rdf.xsl index 593f364aab..c39e179285 100644 --- a/binsrc/rdf_mappers/xslt/main/bugzilla2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/bugzilla2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/cc2rdf.xsl b/binsrc/rdf_mappers/xslt/main/cc2rdf.xsl index a1e7ea7053..0fae5d3f6b 100644 --- a/binsrc/rdf_mappers/xslt/main/cc2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/cc2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/cnet2rdf.xsl b/binsrc/rdf_mappers/xslt/main/cnet2rdf.xsl index f069f4bd30..828995c43a 100644 --- a/binsrc/rdf_mappers/xslt/main/cnet2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/cnet2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/crunchbase2rdf.xsl b/binsrc/rdf_mappers/xslt/main/crunchbase2rdf.xsl index f5449703ae..91d5abc7fb 100644 --- a/binsrc/rdf_mappers/xslt/main/crunchbase2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/crunchbase2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/csvxml2rdf.xsl b/binsrc/rdf_mappers/xslt/main/csvxml2rdf.xsl index 3e177c9f4e..e5e8bdfd3c 100644 --- a/binsrc/rdf_mappers/xslt/main/csvxml2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/csvxml2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/dc2rdf.xsl b/binsrc/rdf_mappers/xslt/main/dc2rdf.xsl index 77ab2de139..781ff844de 100644 --- a/binsrc/rdf_mappers/xslt/main/dc2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/dc2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/delicious2rdf.xsl b/binsrc/rdf_mappers/xslt/main/delicious2rdf.xsl index cd10bb7b31..c45ee98c9e 100644 --- a/binsrc/rdf_mappers/xslt/main/delicious2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/delicious2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/digg2rdf.xsl b/binsrc/rdf_mappers/xslt/main/digg2rdf.xsl index 05d5e0fb4f..f0ebd4922c 100644 --- a/binsrc/rdf_mappers/xslt/main/digg2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/digg2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/discogs2rdf.xsl b/binsrc/rdf_mappers/xslt/main/discogs2rdf.xsl index bed4a0c064..a11db981c5 100644 --- a/binsrc/rdf_mappers/xslt/main/discogs2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/discogs2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/ebay2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ebay2rdf.xsl index 85acf5cd92..f4e06ae3d7 100644 --- a/binsrc/rdf_mappers/xslt/main/ebay2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/ebay2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/eol2rdf.xsl b/binsrc/rdf_mappers/xslt/main/eol2rdf.xsl index 8840bc9fba..01d2aff704 100644 --- a/binsrc/rdf_mappers/xslt/main/eol2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/eol2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/erdf2rdfxml.xsl b/binsrc/rdf_mappers/xslt/main/erdf2rdfxml.xsl index 1d65984347..8f891cec01 100644 --- a/binsrc/rdf_mappers/xslt/main/erdf2rdfxml.xsl +++ b/binsrc/rdf_mappers/xslt/main/erdf2rdfxml.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/etsy2rdf.xsl b/binsrc/rdf_mappers/xslt/main/etsy2rdf.xsl index cd602692fe..94818faac5 100644 --- a/binsrc/rdf_mappers/xslt/main/etsy2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/etsy2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/eventbrite2rdf.xsl b/binsrc/rdf_mappers/xslt/main/eventbrite2rdf.xsl index 8a68c58dd3..0fd787754f 100644 --- a/binsrc/rdf_mappers/xslt/main/eventbrite2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/eventbrite2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/eventful2rdf.xsl b/binsrc/rdf_mappers/xslt/main/eventful2rdf.xsl index 90859ec7f8..cea9155ccc 100644 --- a/binsrc/rdf_mappers/xslt/main/eventful2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/eventful2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/evri2rdf.xsl b/binsrc/rdf_mappers/xslt/main/evri2rdf.xsl index 7947b593b0..7b7d77d224 100644 --- a/binsrc/rdf_mappers/xslt/main/evri2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/evri2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - -- Copyright (C) 1998-2018 OpenLink Software +- Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/fb_og2rdf.xsl b/binsrc/rdf_mappers/xslt/main/fb_og2rdf.xsl index 0397ea56e7..c2ba1fde2c 100644 --- a/binsrc/rdf_mappers/xslt/main/fb_og2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/fb_og2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/fb_ogs2rdf.xsl b/binsrc/rdf_mappers/xslt/main/fb_ogs2rdf.xsl index 44239bd917..a1673da170 100644 --- a/binsrc/rdf_mappers/xslt/main/fb_ogs2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/fb_ogs2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/feed2sioc.xsl b/binsrc/rdf_mappers/xslt/main/feed2sioc.xsl index 0a853b69f0..d4b347e650 100644 --- a/binsrc/rdf_mappers/xslt/main/feed2sioc.xsl +++ b/binsrc/rdf_mappers/xslt/main/feed2sioc.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/flickr2rdf.xsl b/binsrc/rdf_mappers/xslt/main/flickr2rdf.xsl index 2485083a3d..9cdaff019f 100644 --- a/binsrc/rdf_mappers/xslt/main/flickr2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/flickr2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/fod2rdf.xsl b/binsrc/rdf_mappers/xslt/main/fod2rdf.xsl index 24e6cf87c5..68085a8125 100644 --- a/binsrc/rdf_mappers/xslt/main/fod2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/fod2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/foursquare2rdf.xsl b/binsrc/rdf_mappers/xslt/main/foursquare2rdf.xsl index ca7bd2a58c..9e74d68866 100644 --- a/binsrc/rdf_mappers/xslt/main/foursquare2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/foursquare2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/fql2rdf.xsl b/binsrc/rdf_mappers/xslt/main/fql2rdf.xsl index eef2298e5c..6579d6290d 100644 --- a/binsrc/rdf_mappers/xslt/main/fql2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/fql2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/friendfeed2rdf.xsl b/binsrc/rdf_mappers/xslt/main/friendfeed2rdf.xsl index 545ddc5d5d..a9dd550140 100644 --- a/binsrc/rdf_mappers/xslt/main/friendfeed2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/friendfeed2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/geo2rdf.xsl b/binsrc/rdf_mappers/xslt/main/geo2rdf.xsl index d6cec3d10b..b56b5ace06 100644 --- a/binsrc/rdf_mappers/xslt/main/geo2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/geo2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/geonames2rdf.xsl b/binsrc/rdf_mappers/xslt/main/geonames2rdf.xsl index 245b00ae04..b8025088b0 100644 --- a/binsrc/rdf_mappers/xslt/main/geonames2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/geonames2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/getsatisfaction2rdf.xsl b/binsrc/rdf_mappers/xslt/main/getsatisfaction2rdf.xsl index 17c5156491..a40fde8cae 100644 --- a/binsrc/rdf_mappers/xslt/main/getsatisfaction2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/getsatisfaction2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/google2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google2rdf.xsl index ea3327345d..a8e4be5726 100644 --- a/binsrc/rdf_mappers/xslt/main/google2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/google2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/google_book2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_book2rdf.xsl index a90687a6fd..51c6793d95 100644 --- a/binsrc/rdf_mappers/xslt/main/google_book2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/google_book2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/google_document2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_document2rdf.xsl index 42f3078075..2e32d5f572 100644 --- a/binsrc/rdf_mappers/xslt/main/google_document2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/google_document2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/google_place2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_place2rdf.xsl index 472d8cd2f5..89dc98e79a 100644 --- a/binsrc/rdf_mappers/xslt/main/google_place2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/google_place2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/google_profile2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_profile2rdf.xsl index cdd553aef0..805948a18a 100644 --- a/binsrc/rdf_mappers/xslt/main/google_profile2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/google_profile2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/google_spreadsheet2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_spreadsheet2rdf.xsl index 3bcf5b5b25..50f0989f20 100644 --- a/binsrc/rdf_mappers/xslt/main/google_spreadsheet2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/google_spreadsheet2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/google_store2rdf.xsl b/binsrc/rdf_mappers/xslt/main/google_store2rdf.xsl index 7329b7d28c..f83a31a0af 100644 --- a/binsrc/rdf_mappers/xslt/main/google_store2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/google_store2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/googlebase2rdf.xsl b/binsrc/rdf_mappers/xslt/main/googlebase2rdf.xsl index 10fe81fdc3..b564b3f77c 100644 --- a/binsrc/rdf_mappers/xslt/main/googlebase2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/googlebase2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/googleplus2rdf.xsl b/binsrc/rdf_mappers/xslt/main/googleplus2rdf.xsl index 4fc8c24e07..230d67689c 100644 --- a/binsrc/rdf_mappers/xslt/main/googleplus2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/googleplus2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/gowalla2rdf.xsl b/binsrc/rdf_mappers/xslt/main/gowalla2rdf.xsl index 23d74d7ea6..d237824f58 100644 --- a/binsrc/rdf_mappers/xslt/main/gowalla2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/gowalla2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/groupon2rdf.xsl b/binsrc/rdf_mappers/xslt/main/groupon2rdf.xsl index ecde915dc1..ca705a26a7 100644 --- a/binsrc/rdf_mappers/xslt/main/groupon2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/groupon2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/guardian2rdf.xsl b/binsrc/rdf_mappers/xslt/main/guardian2rdf.xsl index 3dbd27394d..51b72baa4e 100644 --- a/binsrc/rdf_mappers/xslt/main/guardian2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/guardian2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/hcal2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hcal2rdf.xsl index 44bd6170e4..dd5637ca8e 100644 --- a/binsrc/rdf_mappers/xslt/main/hcal2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/hcal2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/hcard2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hcard2rdf.xsl index ceae254aa9..085fa148e6 100644 --- a/binsrc/rdf_mappers/xslt/main/hcard2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/hcard2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/hlisting2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hlisting2rdf.xsl index dfdd43bae0..ea13403f26 100644 --- a/binsrc/rdf_mappers/xslt/main/hlisting2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/hlisting2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/hnews2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hnews2rdf.xsl index 45a1092896..29df536d8f 100644 --- a/binsrc/rdf_mappers/xslt/main/hnews2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/hnews2rdf.xsl @@ -10,7 +10,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/hproduct2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hproduct2rdf.xsl index 70eacf2c5d..c4e97fd7a5 100644 --- a/binsrc/rdf_mappers/xslt/main/hproduct2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/hproduct2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/hrecipe2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hrecipe2rdf.xsl index 9700d25d1a..1ae7853f85 100644 --- a/binsrc/rdf_mappers/xslt/main/hrecipe2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/hrecipe2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/hresume2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hresume2rdf.xsl index 43becff8bb..42c94647d8 100644 --- a/binsrc/rdf_mappers/xslt/main/hresume2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/hresume2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/hreview2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hreview2rdf.xsl index 73e1893e01..abba7ad333 100644 --- a/binsrc/rdf_mappers/xslt/main/hreview2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/hreview2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/hreview_aggregate2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hreview_aggregate2rdf.xsl index 43cabfc830..9fddd8b928 100644 --- a/binsrc/rdf_mappers/xslt/main/hreview_aggregate2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/hreview_aggregate2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/hrxml2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hrxml2rdf.xsl index 3fddcdd44b..528878705d 100644 --- a/binsrc/rdf_mappers/xslt/main/hrxml2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/hrxml2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/html2rdf.xsl b/binsrc/rdf_mappers/xslt/main/html2rdf.xsl index 65edba361e..2e84430e9d 100644 --- a/binsrc/rdf_mappers/xslt/main/html2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/html2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/html5md2rdf.xsl b/binsrc/rdf_mappers/xslt/main/html5md2rdf.xsl index 2aa4ccac95..9cdf58ed1b 100644 --- a/binsrc/rdf_mappers/xslt/main/html5md2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/html5md2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/htmlAllMeta2rdf.xsl b/binsrc/rdf_mappers/xslt/main/htmlAllMeta2rdf.xsl index 91a471dd3a..f348816173 100644 --- a/binsrc/rdf_mappers/xslt/main/htmlAllMeta2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/htmlAllMeta2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/hyperpublic2rdf.xsl b/binsrc/rdf_mappers/xslt/main/hyperpublic2rdf.xsl index 55fc6bb1da..30a6b89cba 100644 --- a/binsrc/rdf_mappers/xslt/main/hyperpublic2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/hyperpublic2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/ics2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ics2rdf.xsl index 1ee97ae36b..2c196329b8 100644 --- a/binsrc/rdf_mappers/xslt/main/ics2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/ics2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/idiomag2rdf.xsl b/binsrc/rdf_mappers/xslt/main/idiomag2rdf.xsl index b24663ba9a..325c12a67c 100644 --- a/binsrc/rdf_mappers/xslt/main/idiomag2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/idiomag2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/isbn2rdf.xsl b/binsrc/rdf_mappers/xslt/main/isbn2rdf.xsl index fcdc23fb4b..db88f2ba5d 100644 --- a/binsrc/rdf_mappers/xslt/main/isbn2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/isbn2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/jigsaw2rdf.xsl b/binsrc/rdf_mappers/xslt/main/jigsaw2rdf.xsl index 58e2eefd46..d641cd29ff 100644 --- a/binsrc/rdf_mappers/xslt/main/jigsaw2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/jigsaw2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/klout2rdf.xsl b/binsrc/rdf_mappers/xslt/main/klout2rdf.xsl index 13a0c326b9..d2e9447a87 100644 --- a/binsrc/rdf_mappers/xslt/main/klout2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/klout2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/lastfm2rdf.xsl b/binsrc/rdf_mappers/xslt/main/lastfm2rdf.xsl index 7fa7c321f3..7982836cbf 100644 --- a/binsrc/rdf_mappers/xslt/main/lastfm2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/lastfm2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/linkedin2rdf.xsl b/binsrc/rdf_mappers/xslt/main/linkedin2rdf.xsl index f22ff9aeb8..a7639d3d5d 100644 --- a/binsrc/rdf_mappers/xslt/main/linkedin2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/linkedin2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/linkedin_shares2rdf.xsl b/binsrc/rdf_mappers/xslt/main/linkedin_shares2rdf.xsl index ec6e9bb961..b3062020bb 100644 --- a/binsrc/rdf_mappers/xslt/main/linkedin_shares2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/linkedin_shares2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/lt2rdf.xsl b/binsrc/rdf_mappers/xslt/main/lt2rdf.xsl index bb9752385d..f16779e325 100644 --- a/binsrc/rdf_mappers/xslt/main/lt2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/lt2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/mbz2rdf.xsl b/binsrc/rdf_mappers/xslt/main/mbz2rdf.xsl index 7dcde4fc75..1d4b2a4b7a 100644 --- a/binsrc/rdf_mappers/xslt/main/mbz2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/mbz2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/meetup2rdf.xsl b/binsrc/rdf_mappers/xslt/main/meetup2rdf.xsl index 0a6a8dc180..f6403f3e2c 100644 --- a/binsrc/rdf_mappers/xslt/main/meetup2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/meetup2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/mql2rdf.xsl b/binsrc/rdf_mappers/xslt/main/mql2rdf.xsl index 7f013e0576..421763bf0d 100644 --- a/binsrc/rdf_mappers/xslt/main/mql2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/mql2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/mqlrdf2oplrdf.xsl b/binsrc/rdf_mappers/xslt/main/mqlrdf2oplrdf.xsl index f1a024df1e..06ea3a4b77 100644 --- a/binsrc/rdf_mappers/xslt/main/mqlrdf2oplrdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/mqlrdf2oplrdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/ms_doc2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ms_doc2rdf.xsl index 026ac5dd14..e8f359f2d1 100644 --- a/binsrc/rdf_mappers/xslt/main/ms_doc2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/ms_doc2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/ms_document2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ms_document2rdf.xsl index 01960f3589..62c2997c8b 100644 --- a/binsrc/rdf_mappers/xslt/main/ms_document2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/ms_document2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/ms_spreadsheet2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ms_spreadsheet2rdf.xsl index 01eb32732d..0f93129934 100644 --- a/binsrc/rdf_mappers/xslt/main/ms_spreadsheet2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/ms_spreadsheet2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/ning2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ning2rdf.xsl index fdc33e9744..90378ee5eb 100644 --- a/binsrc/rdf_mappers/xslt/main/ning2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/ning2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/nyt_article2rdf.xsl b/binsrc/rdf_mappers/xslt/main/nyt_article2rdf.xsl index 0df3eac481..87782878aa 100644 --- a/binsrc/rdf_mappers/xslt/main/nyt_article2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/nyt_article2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/oai2rdf.xsl b/binsrc/rdf_mappers/xslt/main/oai2rdf.xsl index ac3f18bf6f..9bf8962274 100644 --- a/binsrc/rdf_mappers/xslt/main/oai2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/oai2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/odata2rdf.xsl b/binsrc/rdf_mappers/xslt/main/odata2rdf.xsl index ddbc3ccdd5..0e959b0998 100644 --- a/binsrc/rdf_mappers/xslt/main/odata2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/odata2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/oo2rdf.xsl b/binsrc/rdf_mappers/xslt/main/oo2rdf.xsl index 7af74bacd8..ec1df0f24e 100644 --- a/binsrc/rdf_mappers/xslt/main/oo2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/oo2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/openlibrary2rdf.xsl b/binsrc/rdf_mappers/xslt/main/openlibrary2rdf.xsl index 3f704df964..8958a080ba 100644 --- a/binsrc/rdf_mappers/xslt/main/openlibrary2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/openlibrary2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/openstreet2rdf.xsl b/binsrc/rdf_mappers/xslt/main/openstreet2rdf.xsl index 6661fffd7b..28f053e63d 100644 --- a/binsrc/rdf_mappers/xslt/main/openstreet2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/openstreet2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/oreilly2rdf.xsl b/binsrc/rdf_mappers/xslt/main/oreilly2rdf.xsl index a98e903a17..8e6921baf9 100644 --- a/binsrc/rdf_mappers/xslt/main/oreilly2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/oreilly2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/ospeople2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ospeople2rdf.xsl index 30845cb1e7..f9e0d53314 100644 --- a/binsrc/rdf_mappers/xslt/main/ospeople2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/ospeople2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/picasa2rdf.xsl b/binsrc/rdf_mappers/xslt/main/picasa2rdf.xsl index 34656c25de..f4b5fbf4c0 100644 --- a/binsrc/rdf_mappers/xslt/main/picasa2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/picasa2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/plancast2rdf.xsl b/binsrc/rdf_mappers/xslt/main/plancast2rdf.xsl index eba5046b88..e514c0087d 100644 --- a/binsrc/rdf_mappers/xslt/main/plancast2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/plancast2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/productwiki2rdf.xsl b/binsrc/rdf_mappers/xslt/main/productwiki2rdf.xsl index bebc6b8d3f..cd7b0fd0b7 100644 --- a/binsrc/rdf_mappers/xslt/main/productwiki2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/productwiki2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/programmableweb2rdf.xsl b/binsrc/rdf_mappers/xslt/main/programmableweb2rdf.xsl index 575ae6fca2..adf7a08f9b 100644 --- a/binsrc/rdf_mappers/xslt/main/programmableweb2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/programmableweb2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/radiopop2rdf.xsl b/binsrc/rdf_mappers/xslt/main/radiopop2rdf.xsl index 8d05671c03..f4f2bf976b 100644 --- a/binsrc/rdf_mappers/xslt/main/radiopop2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/radiopop2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/rdf_wo_grddl.xsl b/binsrc/rdf_mappers/xslt/main/rdf_wo_grddl.xsl index e847b1a9d2..22b391329b 100644 --- a/binsrc/rdf_mappers/xslt/main/rdf_wo_grddl.xsl +++ b/binsrc/rdf_mappers/xslt/main/rdf_wo_grddl.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/rdfa2rdfxml.xsl b/binsrc/rdf_mappers/xslt/main/rdfa2rdfxml.xsl index 8ad4d9d3fd..5fef3faf13 100644 --- a/binsrc/rdf_mappers/xslt/main/rdfa2rdfxml.xsl +++ b/binsrc/rdf_mappers/xslt/main/rdfa2rdfxml.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/revyu2rdf.xsl b/binsrc/rdf_mappers/xslt/main/revyu2rdf.xsl index cc35ff4bb6..44ae247c4e 100644 --- a/binsrc/rdf_mappers/xslt/main/revyu2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/revyu2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/rhapsody2rdf.xsl b/binsrc/rdf_mappers/xslt/main/rhapsody2rdf.xsl index 78ca1f8233..1f59e39443 100644 --- a/binsrc/rdf_mappers/xslt/main/rhapsody2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/rhapsody2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/rss2rdf.xsl b/binsrc/rdf_mappers/xslt/main/rss2rdf.xsl index d09caf8d4d..76a9caf8e6 100644 --- a/binsrc/rdf_mappers/xslt/main/rss2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/rss2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/seatgeek2rdf.xsl b/binsrc/rdf_mappers/xslt/main/seatgeek2rdf.xsl index f9d9e05f64..36c28a46f7 100644 --- a/binsrc/rdf_mappers/xslt/main/seatgeek2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/seatgeek2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/seevl2rdf.xsl b/binsrc/rdf_mappers/xslt/main/seevl2rdf.xsl index 9dfaebd727..9df02839a0 100644 --- a/binsrc/rdf_mappers/xslt/main/seevl2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/seevl2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/sf2rdf.xsl b/binsrc/rdf_mappers/xslt/main/sf2rdf.xsl index 61aa2fd59c..22d614baca 100644 --- a/binsrc/rdf_mappers/xslt/main/sf2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/sf2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/sg2rdf.xsl b/binsrc/rdf_mappers/xslt/main/sg2rdf.xsl index cc243b92cc..9a58ddf67f 100644 --- a/binsrc/rdf_mappers/xslt/main/sg2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/sg2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/simplegeo2rdf.xsl b/binsrc/rdf_mappers/xslt/main/simplegeo2rdf.xsl index 2b86c9867b..2966144efb 100644 --- a/binsrc/rdf_mappers/xslt/main/simplegeo2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/simplegeo2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/slideshare2rdf.xsl b/binsrc/rdf_mappers/xslt/main/slideshare2rdf.xsl index 70be8c4172..9fa076f91a 100644 --- a/binsrc/rdf_mappers/xslt/main/slideshare2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/slideshare2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/slidesix2rdf.xsl b/binsrc/rdf_mappers/xslt/main/slidesix2rdf.xsl index a84e0a0d7e..9d47a2b560 100644 --- a/binsrc/rdf_mappers/xslt/main/slidesix2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/slidesix2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/slidy2rdf.xsl b/binsrc/rdf_mappers/xslt/main/slidy2rdf.xsl index 6e258c926b..ff35c447c4 100644 --- a/binsrc/rdf_mappers/xslt/main/slidy2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/slidy2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/socialstatistics2rdf.xsl b/binsrc/rdf_mappers/xslt/main/socialstatistics2rdf.xsl index 50b491bd3e..a61a652ff3 100644 --- a/binsrc/rdf_mappers/xslt/main/socialstatistics2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/socialstatistics2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/stackoverflow2rdf.xsl b/binsrc/rdf_mappers/xslt/main/stackoverflow2rdf.xsl index 379712c289..6edfeee77d 100644 --- a/binsrc/rdf_mappers/xslt/main/stackoverflow2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/stackoverflow2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/svg2rdf.xsl b/binsrc/rdf_mappers/xslt/main/svg2rdf.xsl index 83d2d9c885..b8c08b699a 100644 --- a/binsrc/rdf_mappers/xslt/main/svg2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/svg2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/tesco2rdf.xsl b/binsrc/rdf_mappers/xslt/main/tesco2rdf.xsl index 68febea10b..cc9d30d977 100644 --- a/binsrc/rdf_mappers/xslt/main/tesco2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/tesco2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/tumblr2rdf.xsl b/binsrc/rdf_mappers/xslt/main/tumblr2rdf.xsl index c99b318801..a39b28e563 100644 --- a/binsrc/rdf_mappers/xslt/main/tumblr2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/tumblr2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/twfy2rdf.xsl b/binsrc/rdf_mappers/xslt/main/twfy2rdf.xsl index 8534424122..6676652dda 100644 --- a/binsrc/rdf_mappers/xslt/main/twfy2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/twfy2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/twitter2rdf.xsl b/binsrc/rdf_mappers/xslt/main/twitter2rdf.xsl index 6fcf3d4c5f..e0250e8dff 100644 --- a/binsrc/rdf_mappers/xslt/main/twitter2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/twitter2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/twitter_fp2rdf.xsl b/binsrc/rdf_mappers/xslt/main/twitter_fp2rdf.xsl index e35a76f5db..e1228e77ff 100644 --- a/binsrc/rdf_mappers/xslt/main/twitter_fp2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/twitter_fp2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/twitter_rest_api2rdf.xsl b/binsrc/rdf_mappers/xslt/main/twitter_rest_api2rdf.xsl index 251e2996ec..9f6d4fb4eb 100644 --- a/binsrc/rdf_mappers/xslt/main/twitter_rest_api2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/twitter_rest_api2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/upcoming2rdf.xsl b/binsrc/rdf_mappers/xslt/main/upcoming2rdf.xsl index 68a3297dcd..5bb3dd582c 100644 --- a/binsrc/rdf_mappers/xslt/main/upcoming2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/upcoming2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/ustream2rdf.xsl b/binsrc/rdf_mappers/xslt/main/ustream2rdf.xsl index 23e823aae5..2c9f599753 100644 --- a/binsrc/rdf_mappers/xslt/main/ustream2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/ustream2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/vimeo2rdf.xsl b/binsrc/rdf_mappers/xslt/main/vimeo2rdf.xsl index f6752d0c01..7a86956a04 100644 --- a/binsrc/rdf_mappers/xslt/main/vimeo2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/vimeo2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/wine2rdf.xsl b/binsrc/rdf_mappers/xslt/main/wine2rdf.xsl index fdc0136467..31fd5e9cab 100644 --- a/binsrc/rdf_mappers/xslt/main/wine2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/wine2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/wolfram_alpha2rdf.xsl b/binsrc/rdf_mappers/xslt/main/wolfram_alpha2rdf.xsl index 198a3de2f0..9bdd431270 100644 --- a/binsrc/rdf_mappers/xslt/main/wolfram_alpha2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/wolfram_alpha2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/xbrl2rdf.xsl b/binsrc/rdf_mappers/xslt/main/xbrl2rdf.xsl index 6ee82d763c..1911845012 100644 --- a/binsrc/rdf_mappers/xslt/main/xbrl2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/xbrl2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/xfn2rdf.xsl b/binsrc/rdf_mappers/xslt/main/xfn2rdf.xsl index 442390fd13..2feea8bf5f 100644 --- a/binsrc/rdf_mappers/xslt/main/xfn2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/xfn2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/xfolk2rdf.xsl b/binsrc/rdf_mappers/xslt/main/xfolk2rdf.xsl index d7fea5997a..e2ea303798 100644 --- a/binsrc/rdf_mappers/xslt/main/xfolk2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/xfolk2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/xrd-generic.xsl b/binsrc/rdf_mappers/xslt/main/xrd-generic.xsl index 1bfdc3e8eb..9ee0820c02 100644 --- a/binsrc/rdf_mappers/xslt/main/xrd-generic.xsl +++ b/binsrc/rdf_mappers/xslt/main/xrd-generic.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/yahoo_stock2rdf.xsl b/binsrc/rdf_mappers/xslt/main/yahoo_stock2rdf.xsl index abd6752990..745eb0009c 100644 --- a/binsrc/rdf_mappers/xslt/main/yahoo_stock2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/yahoo_stock2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/yahoo_trf2rdf.xsl b/binsrc/rdf_mappers/xslt/main/yahoo_trf2rdf.xsl index 0f8d258d72..b88009aeac 100644 --- a/binsrc/rdf_mappers/xslt/main/yahoo_trf2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/yahoo_trf2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/yelp2rdf.xsl b/binsrc/rdf_mappers/xslt/main/yelp2rdf.xsl index fec9078874..8106e7c7a4 100644 --- a/binsrc/rdf_mappers/xslt/main/yelp2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/yelp2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/youtube2rdf.xsl b/binsrc/rdf_mappers/xslt/main/youtube2rdf.xsl index d302fc2921..335201e7a8 100644 --- a/binsrc/rdf_mappers/xslt/main/youtube2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/youtube2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/zappos2rdf.xsl b/binsrc/rdf_mappers/xslt/main/zappos2rdf.xsl index 8cf2d16673..6101d4cf8b 100644 --- a/binsrc/rdf_mappers/xslt/main/zappos2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/zappos2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/zillow2rdf.xsl b/binsrc/rdf_mappers/xslt/main/zillow2rdf.xsl index c651d92a65..f12a6ffb77 100644 --- a/binsrc/rdf_mappers/xslt/main/zillow2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/zillow2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/rdf_mappers/xslt/main/zoopla2rdf.xsl b/binsrc/rdf_mappers/xslt/main/zoopla2rdf.xsl index 84942e4970..0f058ed712 100644 --- a/binsrc/rdf_mappers/xslt/main/zoopla2rdf.xsl +++ b/binsrc/rdf_mappers/xslt/main/zoopla2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/redland/Makefile.am b/binsrc/redland/Makefile.am index ca668aba30..5f53043f97 100644 --- a/binsrc/redland/Makefile.am +++ b/binsrc/redland/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/redland/rdf_storage_virtuoso.c b/binsrc/redland/rdf_storage_virtuoso.c index cd3a8d57f3..b8a3fd07fc 100644 --- a/binsrc/redland/rdf_storage_virtuoso.c +++ b/binsrc/redland/rdf_storage_virtuoso.c @@ -6,7 +6,7 @@ * * Based in part on rdf_storage_virtuoso * - * Copyright (C) 2000-2018 OpenLink Software, http://www.openlinksw.com/ + * Copyright (C) 2000-2019 OpenLink Software, http://www.openlinksw.com/ * * This package is Free Software and part of Redland http://librdf.org/ * diff --git a/binsrc/samples/JDBC/BrowserCheck.java b/binsrc/samples/JDBC/BrowserCheck.java index 2ebaa35ec9..3efac336e8 100644 --- a/binsrc/samples/JDBC/BrowserCheck.java +++ b/binsrc/samples/JDBC/BrowserCheck.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/Makefile.am b/binsrc/samples/JDBC/Makefile.am index 444c5bbf0b..e36897f5bf 100644 --- a/binsrc/samples/JDBC/Makefile.am +++ b/binsrc/samples/JDBC/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/index.htm b/binsrc/samples/JDBC/index.htm index 4f0c137f12..69f499537a 100644 --- a/binsrc/samples/JDBC/index.htm +++ b/binsrc/samples/JDBC/index.htm @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnection.java index 2d5ab92f08..98aab8e5c6 100644 --- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnection.java +++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnection.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnectionList.java index 78b29c503d..03b0d0d4d1 100644 --- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnectionList.java +++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/DialogConnectionList.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.bat index 8cbc9124bb..eba3bbd186 100644 --- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.bat +++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.bat @@ -9,7 +9,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.java b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.java index 7feb505325..04ce424be7 100644 --- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.java +++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.sh index 73fe6f75be..0709d95f3b 100755 --- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.sh +++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/JDBCDemo.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.html index 20b5b209bb..a18942ba0f 100644 --- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.html +++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.java index b41c6da506..d98ed1d4c3 100644 --- a/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.java +++ b/binsrc/samples/JDBC/jdk1.1/JDBCDemo/WebJDBCDemo.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.1/index.htm b/binsrc/samples/JDBC/jdk1.1/index.htm index 7247cba2cc..f5a61e1cc1 100644 --- a/binsrc/samples/JDBC/jdk1.1/index.htm +++ b/binsrc/samples/JDBC/jdk1.1/index.htm @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnection.java index 2d5ab92f08..98aab8e5c6 100644 --- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnection.java +++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnection.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnectionList.java index 78b29c503d..03b0d0d4d1 100644 --- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnectionList.java +++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/DialogConnectionList.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.bat index 8cbc9124bb..eba3bbd186 100644 --- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.bat +++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.bat @@ -9,7 +9,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.java b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.java index c1e595f8e6..1c49f23296 100644 --- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.java +++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.sh index 73fe6f75be..0709d95f3b 100755 --- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.sh +++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/JDBCDemo.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.html index b4e52c0682..0134cce62a 100644 --- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.html +++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.java index e5aed351c1..0d2bc7d3e6 100644 --- a/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.java +++ b/binsrc/samples/JDBC/jdk1.2/JDBCDemo/WebJDBCDemo.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnection.java b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnection.java index 2d5ab92f08..98aab8e5c6 100644 --- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnection.java +++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnection.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnectionList.java index 78b29c503d..03b0d0d4d1 100644 --- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnectionList.java +++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/DialogConnectionList.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.bat b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.bat index 349833b14a..c0bede3350 100644 --- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.bat +++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.bat @@ -9,7 +9,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.java b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.java index e66c01733b..a22153b49d 100644 --- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.java +++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.sh b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.sh index d070dea52b..06c9de9111 100755 --- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.sh +++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/ScrollDemo2.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.html b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.html index 45dd09b091..3acd7a1b8a 100644 --- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.html +++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.java b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.java index 21b80f9ab7..c141851e59 100644 --- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.java +++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/WebScrollDemo2.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/index.htm b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/index.htm index 58bdbe5d99..397dede26c 100644 --- a/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/index.htm +++ b/binsrc/samples/JDBC/jdk1.2/ScrollDemo2/index.htm @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.2/index.htm b/binsrc/samples/JDBC/jdk1.2/index.htm index ea30019476..23b339de45 100644 --- a/binsrc/samples/JDBC/jdk1.2/index.htm +++ b/binsrc/samples/JDBC/jdk1.2/index.htm @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnection.java index 2d5ab92f08..98aab8e5c6 100644 --- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnection.java +++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnection.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnectionList.java index 78b29c503d..03b0d0d4d1 100644 --- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnectionList.java +++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/DialogConnectionList.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.bat index 8cbc9124bb..eba3bbd186 100644 --- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.bat +++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.bat @@ -9,7 +9,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.java b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.java index d6dcb9a7d5..c2e5a1eeb1 100644 --- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.java +++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.sh index 73fe6f75be..0709d95f3b 100755 --- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.sh +++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/JDBCDemo.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.html index df7a202089..2d9e469640 100644 --- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.html +++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.java index e5aed351c1..0d2bc7d3e6 100644 --- a/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.java +++ b/binsrc/samples/JDBC/jdk1.3/JDBCDemo/WebJDBCDemo.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnection.java b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnection.java index 2d5ab92f08..98aab8e5c6 100644 --- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnection.java +++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnection.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnectionList.java index 78b29c503d..03b0d0d4d1 100644 --- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnectionList.java +++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/DialogConnectionList.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.bat b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.bat index ad5d552561..0e659120d1 100644 --- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.bat +++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.bat @@ -9,7 +9,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.java b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.java index ef753eecee..30470117de 100644 --- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.java +++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.sh b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.sh index 8f070c9539..f025705a0d 100755 --- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.sh +++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/ScrollDemo2.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.html b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.html index 38f23318c2..debfee3c9f 100644 --- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.html +++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.java b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.java index 1fcf3b310f..6339d1bc8a 100644 --- a/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.java +++ b/binsrc/samples/JDBC/jdk1.3/ScrollDemo2/WebScrollDemo2.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.3/index.htm b/binsrc/samples/JDBC/jdk1.3/index.htm index 75c9b0314c..8288995514 100644 --- a/binsrc/samples/JDBC/jdk1.3/index.htm +++ b/binsrc/samples/JDBC/jdk1.3/index.htm @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.bat b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.bat index d275b80022..530dd604a2 100644 --- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.bat +++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.bat @@ -9,7 +9,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.java b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.java index d7099e2e21..7cbf421ca1 100644 --- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.java +++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.sh b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.sh index 8f3701af89..6d708b2eeb 100755 --- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.sh +++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/CachedRowSet.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnection1.java b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnection1.java index 6026c83d9a..3fbb2fc0e9 100644 --- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnection1.java +++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnection1.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnectionList1.java b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnectionList1.java index dd881e796c..61f055d3cd 100644 --- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnectionList1.java +++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/DialogConnectionList1.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.html b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.html index 84ff49a84e..50c061df65 100644 --- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.html +++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.java b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.java index aac193d9fd..052350d6dd 100644 --- a/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.java +++ b/binsrc/samples/JDBC/jdk1.4/CachedRowSet/WebCachedRowSet.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnection.java index 2d5ab92f08..98aab8e5c6 100644 --- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnection.java +++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnection.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnectionList.java index 78b29c503d..03b0d0d4d1 100644 --- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnectionList.java +++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/DialogConnectionList.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.bat index 8cbc9124bb..eba3bbd186 100644 --- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.bat +++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.bat @@ -9,7 +9,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.java b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.java index 929d72210c..874176aa7e 100644 --- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.java +++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.sh index 73fe6f75be..0709d95f3b 100755 --- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.sh +++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/JDBCDemo.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.html index 38635023cc..68d0792519 100644 --- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.html +++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.java index b41c6da506..d98ed1d4c3 100644 --- a/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.java +++ b/binsrc/samples/JDBC/jdk1.4/JDBCDemo/WebJDBCDemo.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnection.java b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnection.java index 2d5ab92f08..98aab8e5c6 100644 --- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnection.java +++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnection.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnectionList.java index 78b29c503d..03b0d0d4d1 100644 --- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnectionList.java +++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/DialogConnectionList.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.bat b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.bat index ad5d552561..0e659120d1 100644 --- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.bat +++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.bat @@ -9,7 +9,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.java b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.java index d0a764c5ed..20e0367475 100644 --- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.java +++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.sh b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.sh index 8f070c9539..f025705a0d 100755 --- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.sh +++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/ScrollDemo2.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.html b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.html index 1d5591dced..400a86f4b1 100644 --- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.html +++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.java b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.java index 1fcf3b310f..6339d1bc8a 100644 --- a/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.java +++ b/binsrc/samples/JDBC/jdk1.4/ScrollDemo2/WebScrollDemo2.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.4/index.htm b/binsrc/samples/JDBC/jdk1.4/index.htm index 65199717b8..9d3254438d 100644 --- a/binsrc/samples/JDBC/jdk1.4/index.htm +++ b/binsrc/samples/JDBC/jdk1.4/index.htm @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.bat b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.bat index d275b80022..530dd604a2 100644 --- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.bat +++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.bat @@ -9,7 +9,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.java b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.java index d7099e2e21..7cbf421ca1 100644 --- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.java +++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.sh b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.sh index 8f3701af89..6d708b2eeb 100755 --- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.sh +++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/CachedRowSet.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnection1.java b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnection1.java index 6026c83d9a..3fbb2fc0e9 100644 --- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnection1.java +++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnection1.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnectionList1.java b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnectionList1.java index dd881e796c..61f055d3cd 100644 --- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnectionList1.java +++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/DialogConnectionList1.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.html b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.html index 84ff49a84e..50c061df65 100644 --- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.html +++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.java b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.java index aac193d9fd..052350d6dd 100644 --- a/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.java +++ b/binsrc/samples/JDBC/jdk1.5/CachedRowSet/WebCachedRowSet.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnection.java b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnection.java index 2d5ab92f08..98aab8e5c6 100644 --- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnection.java +++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnection.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnectionList.java index 78b29c503d..03b0d0d4d1 100644 --- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnectionList.java +++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/DialogConnectionList.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.bat b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.bat index 8cbc9124bb..eba3bbd186 100644 --- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.bat +++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.bat @@ -9,7 +9,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.java b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.java index 929d72210c..874176aa7e 100644 --- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.java +++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.sh b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.sh index 73fe6f75be..0709d95f3b 100755 --- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.sh +++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/JDBCDemo.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.html b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.html index 38635023cc..68d0792519 100644 --- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.html +++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.java b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.java index b41c6da506..d98ed1d4c3 100644 --- a/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.java +++ b/binsrc/samples/JDBC/jdk1.5/JDBCDemo/WebJDBCDemo.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnection.java b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnection.java index 2d5ab92f08..98aab8e5c6 100644 --- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnection.java +++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnection.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnectionList.java b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnectionList.java index 78b29c503d..03b0d0d4d1 100644 --- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnectionList.java +++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/DialogConnectionList.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.bat b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.bat index ad5d552561..0e659120d1 100644 --- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.bat +++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.bat @@ -9,7 +9,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.java b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.java index d0a764c5ed..20e0367475 100644 --- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.java +++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.sh b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.sh index 8f070c9539..f025705a0d 100755 --- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.sh +++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/ScrollDemo2.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.html b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.html index 1d5591dced..400a86f4b1 100644 --- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.html +++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.java b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.java index 1fcf3b310f..6339d1bc8a 100644 --- a/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.java +++ b/binsrc/samples/JDBC/jdk1.5/ScrollDemo2/WebScrollDemo2.java @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/JDBC/jdk1.5/index.htm b/binsrc/samples/JDBC/jdk1.5/index.htm index defa2bb660..b0c5a27c08 100644 --- a/binsrc/samples/JDBC/jdk1.5/index.htm +++ b/binsrc/samples/JDBC/jdk1.5/index.htm @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/Makefile.am b/binsrc/samples/Makefile.am index 78a58fd1bc..e1e56cf49b 100644 --- a/binsrc/samples/Makefile.am +++ b/binsrc/samples/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/Makefile.am b/binsrc/samples/demo/Makefile.am index 300235d57b..5b4a8aa45c 100644 --- a/binsrc/samples/demo/Makefile.am +++ b/binsrc/samples/demo/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -150,6 +150,15 @@ endif if !WITH_RUBY REM_RUBY_C=; endif +if !WITH_PROJ4 +REM_PROJ4_C=; +endif +if !WITH_GEOS +REM_GEOS_C=; +endif +if !WITH_SHAPEFILEIO +REM_SHAPEFILEIO_C=; +endif do_subst = \ sed -e 's,[@]PREFIX[@],$(prefix),g' \ @@ -165,7 +174,10 @@ do_subst = \ -e 's,[@]REM_PHP5[@],$(REM_PHP5_C),g' \ -e 's,[@]REM_PYTHON[@],$(REM_PYTHON_C),g' \ -e 's,[@]REM_PERL[@],$(REM_PERL_C),g' \ - -e 's,[@]REM_RUBY[@],$(REM_RUBY_C),g' + -e 's,[@]REM_RUBY[@],$(REM_RUBY_C),g' \ + -e 's,[@]REM_PROJ4[@],$(REM_PROJ4_C),g' \ + -e 's,[@]REM_GEOS[@],$(REM_GEOS_C),g' \ + -e 's,[@]REM_SHAPEFILEIO[@],$(REM_SHAPEFILEIO_C),g' install-data-local: $(do_subst) < "$(srcdir)/install_ini.sh.in" > "install_ini.sh" diff --git a/binsrc/samples/demo/art.sql b/binsrc/samples/demo/art.sql index 8570f36461..8a2a87ed7a 100644 --- a/binsrc/samples/demo/art.sql +++ b/binsrc/samples/demo/art.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/art_vad.sql b/binsrc/samples/demo/art_vad.sql index 1428fd89b5..d6729ccc79 100644 --- a/binsrc/samples/demo/art_vad.sql +++ b/binsrc/samples/demo/art_vad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/check_demo.sql b/binsrc/samples/demo/check_demo.sql index 9f5e396f07..3708ca2350 100644 --- a/binsrc/samples/demo/check_demo.sql +++ b/binsrc/samples/demo/check_demo.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/countries.sql b/binsrc/samples/demo/countries.sql index 1ea662489e..5f1e9a2900 100644 --- a/binsrc/samples/demo/countries.sql +++ b/binsrc/samples/demo/countries.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/countries_vad.sql b/binsrc/samples/demo/countries_vad.sql index 4484029721..69524b9470 100644 --- a/binsrc/samples/demo/countries_vad.sql +++ b/binsrc/samples/demo/countries_vad.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/default-virtuoso.ini b/binsrc/samples/demo/default-virtuoso.ini index ecdc4163b3..00b0b3f6d3 100644 --- a/binsrc/samples/demo/default-virtuoso.ini +++ b/binsrc/samples/demo/default-virtuoso.ini @@ -63,7 +63,7 @@ MaxStaticCursorRows = 5000 CheckpointAuditTrail = 0 AllowOSCalls = 0 SchedulerInterval = 10 -DirsAllowed = ., @VADDIR@ +DirsAllowed = ., @VADDIR@, /usr/share/proj ThreadCleanupInterval = 0 ThreadThreshold = 10 ResourcesCleanupInterval = 0 @@ -251,10 +251,13 @@ Load2 = plain, mediawiki Load3 = plain, creolewiki @REM_IM@Load4 = plain, im @REM_WBXML2@Load5 = plain, wbxml2 -@REM_HSL@Load6 = plain, hslookup -@REM_PHP5@Load7 = attach, libphp5.so -@REM_PHP5@Load8 = Hosting, hosting_php.so -@REM_PERL@Load9 = Hosting,hosting_perl.so -@REM_PYTHON@Load10 = Hosting,hosting_python.so -@REM_RUBY@Load11 = Hosting,hosting_ruby.so -;Load12 = msdtc,msdtc_sample +@REM_PHP5@Load6 = attach, libphp5.so +@REM_PHP5@Load7 = Hosting, hosting_php.so +@REM_PROJ4@Load8 = plain, proj4 +@REM_GEOS@Load9 = plain, geos +@REM_SHAPEFILEIO@Load10 = plain, shapefileio +@REM_HSL@Load11 = plain, hslookup +@REM_PERL@Load12 = Hosting,hosting_perl.so +@REM_PYTHON@Load13 = Hosting,hosting_python.so +@REM_RUBY@Load14 = Hosting,hosting_ruby.so +;Load15 = msdtc,msdtc_sample diff --git a/binsrc/samples/demo/doc.owl b/binsrc/samples/demo/doc.owl index 372855415e..5a9cef7b37 100644 --- a/binsrc/samples/demo/doc.owl +++ b/binsrc/samples/demo/doc.owl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/drop.sql b/binsrc/samples/demo/drop.sql index 8402a5873e..a56a78b158 100644 --- a/binsrc/samples/demo/drop.sql +++ b/binsrc/samples/demo/drop.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/install_ini.sh.in b/binsrc/samples/demo/install_ini.sh.in index a456bb0b13..1e05875139 100644 --- a/binsrc/samples/demo/install_ini.sh.in +++ b/binsrc/samples/demo/install_ini.sh.in @@ -80,6 +80,10 @@ sed -e "s,[@]VADDIR[@],$VADDIR,g" \ -e 's,[@]REM_PYTHON[@],@REM_PYTHON@,g' \ -e 's,[@]REM_PERL[@],@REM_PERL@,g' \ -e 's,[@]REM_RUBY[@],@REM_RUBY@,g' \ + -e 's,[@]REM_PROJ4[@],@REM_PROJ4@,g' \ + -e 's,[@]REM_GEOS[@],@REM_GEOS@,g' \ + -e 's,[@]REM_SHAPEFILEIO[@],@REM_SHAPEFILEIO@,g' \ + -e 's,[@]REM_RUBY[@],@REM_RUBY@,g' \ < default-virtuoso.ini > "$INIFILE" exit 0 diff --git a/binsrc/samples/demo/make_vad.sh b/binsrc/samples/demo/make_vad.sh index 8337ce6d91..5541e31351 100755 --- a/binsrc/samples/demo/make_vad.sh +++ b/binsrc/samples/demo/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -357,7 +357,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/binsrc/samples/demo/mkdemo.bat b/binsrc/samples/demo/mkdemo.bat index 34e877a88c..b3f29301b4 100644 --- a/binsrc/samples/demo/mkdemo.bat +++ b/binsrc/samples/demo/mkdemo.bat @@ -2,7 +2,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/mkdemo.sh b/binsrc/samples/demo/mkdemo.sh index 31556beaa3..67458b5b0f 100755 --- a/binsrc/samples/demo/mkdemo.sh +++ b/binsrc/samples/demo/mkdemo.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -247,7 +247,7 @@ then if [ "x$HOST_OS" = "x" ] then (cd $HOME/appsrc ; make) - (cd $HOME/binsrc/b3s ; make) + (cd $HOME/binsrc/fct ; make) (cd $HOME/binsrc/bpel; make) (cd $HOME/binsrc/isparql ; make) (cd $HOME/binsrc/rdf_mappers ; make) @@ -255,7 +255,7 @@ then (cd $HOME/binsrc/samples/image_magick ; make) (cd $HOME/binsrc/samples/sparql_demo ; make) (cd $HOME/binsrc/tutorial ; make) - (cd $HOME/binsrc/yacutia ; make) + (cd $HOME/binsrc/conductor ; make) fi else (cd $HOME/binsrc/bpel; make ) @@ -339,14 +339,14 @@ fi BREAK ECHO "Collecting and installing VAD packages" -$LN $HOME/binsrc/b3s/fct_dav.vad . +$LN $HOME/binsrc/fct/fct_dav.vad . $LN $HOME/binsrc/bpel/bpel_dav.vad . $LN $HOME/binsrc/isparql/isparql_dav.vad . $LN $HOME/binsrc/rdf_mappers/rdf_mappers_dav.vad . $LN $HOME/binsrc/rdb2rdf/rdb2rdf_dav.vad . $LN $HOME/binsrc/samples/sparql_demo/sparql_demo_dav.vad . $LN $HOME/binsrc/tutorial/tutorial_dav.vad . -$LN $HOME/binsrc/yacutia/conductor_dav.vad . +$LN $HOME/binsrc/conductor/conductor_dav.vad . [ -f conductor_dav.vad ] && DO_COMMAND "vad_install ('conductor_dav.vad')" dba dba [ -f fct_dav.vad ] && DO_COMMAND "vad_install ('fct_dav.vad')" dba dba diff --git a/binsrc/samples/demo/mkdemo.sql b/binsrc/samples/demo/mkdemo.sql index 59979ff02c..5124b29230 100644 --- a/binsrc/samples/demo/mkdemo.sql +++ b/binsrc/samples/demo/mkdemo.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/mkdemo_vad.sql b/binsrc/samples/demo/mkdemo_vad.sql index 89c6d3b43c..8b48fd6009 100644 --- a/binsrc/samples/demo/mkdemo_vad.sql +++ b/binsrc/samples/demo/mkdemo_vad.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/mkdoc.sh b/binsrc/samples/demo/mkdoc.sh index 634e29eae9..ded110feaa 100755 --- a/binsrc/samples/demo/mkdoc.sh +++ b/binsrc/samples/demo/mkdoc.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -387,7 +387,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/binsrc/samples/demo/mkdoc.sql b/binsrc/samples/demo/mkdoc.sql index 468c569352..c93ebbed34 100644 --- a/binsrc/samples/demo/mkdoc.sql +++ b/binsrc/samples/demo/mkdoc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/mkdoc_new.sql b/binsrc/samples/demo/mkdoc_new.sql index 8b6acc3f59..6e85f01852 100644 --- a/binsrc/samples/demo/mkdoc_new.sql +++ b/binsrc/samples/demo/mkdoc_new.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/mksearch.sql b/binsrc/samples/demo/mksearch.sql index c9af1c5732..58ef29652a 100644 --- a/binsrc/samples/demo/mksearch.sql +++ b/binsrc/samples/demo/mksearch.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/mkvspxdoc.sql b/binsrc/samples/demo/mkvspxdoc.sql index c80124b880..921e80dfb5 100644 --- a/binsrc/samples/demo/mkvspxdoc.sql +++ b/binsrc/samples/demo/mkvspxdoc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/demo/nw.owl b/binsrc/samples/demo/nw.owl index 7b9a3d40ff..b0f7cd0fb3 100644 --- a/binsrc/samples/demo/nw.owl +++ b/binsrc/samples/demo/nw.owl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/hslookup/Makefile.am b/binsrc/samples/hslookup/Makefile.am index a530ed3ec4..7ac740203f 100644 --- a/binsrc/samples/hslookup/Makefile.am +++ b/binsrc/samples/hslookup/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/hslookup/hslookup.c b/binsrc/samples/hslookup/hslookup.c index 036a20f684..ac0ca9cb98 100644 --- a/binsrc/samples/hslookup/hslookup.c +++ b/binsrc/samples/hslookup/hslookup.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/image_magick/Makefile.am b/binsrc/samples/image_magick/Makefile.am index 42cb382f62..54e37f12f0 100644 --- a/binsrc/samples/image_magick/Makefile.am +++ b/binsrc/samples/image_magick/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/image_magick/demo.sql b/binsrc/samples/image_magick/demo.sql index a3c080d882..6aa41f34da 100644 --- a/binsrc/samples/image_magick/demo.sql +++ b/binsrc/samples/image_magick/demo.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/image_magick/im.c b/binsrc/samples/image_magick/im.c index c884c347b4..ca90f4b11d 100644 --- a/binsrc/samples/image_magick/im.c +++ b/binsrc/samples/image_magick/im.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/Makefile.am b/binsrc/samples/odp/Makefile.am index 584a54b381..972a27bf17 100644 --- a/binsrc/samples/odp/Makefile.am +++ b/binsrc/samples/odp/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/_current_config.sql b/binsrc/samples/odp/_current_config.sql index eb8d2496f8..6287e9b11b 100644 --- a/binsrc/samples/odp/_current_config.sql +++ b/binsrc/samples/odp/_current_config.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/http/all_profiles.vsp b/binsrc/samples/odp/http/all_profiles.vsp index a27765bbcc..c1598d6572 100644 --- a/binsrc/samples/odp/http/all_profiles.vsp +++ b/binsrc/samples/odp/http/all_profiles.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/http/dmoz_s1.vsp b/binsrc/samples/odp/http/dmoz_s1.vsp index 754dd19c49..7ff6640786 100644 --- a/binsrc/samples/odp/http/dmoz_s1.vsp +++ b/binsrc/samples/odp/http/dmoz_s1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/http/edit_topic.vsp b/binsrc/samples/odp/http/edit_topic.vsp index 8d5cd7b79a..d429fb3129 100644 --- a/binsrc/samples/odp/http/edit_topic.vsp +++ b/binsrc/samples/odp/http/edit_topic.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/http/editor.vsp b/binsrc/samples/odp/http/editor.vsp index cee9903b5e..724358ad40 100644 --- a/binsrc/samples/odp/http/editor.vsp +++ b/binsrc/samples/odp/http/editor.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/http/editors.vsp b/binsrc/samples/odp/http/editors.vsp index 3c14029c8e..396f6dd1db 100644 --- a/binsrc/samples/odp/http/editors.vsp +++ b/binsrc/samples/odp/http/editors.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/http/main.vsp b/binsrc/samples/odp/http/main.vsp index aeff2130b4..84a050b779 100644 --- a/binsrc/samples/odp/http/main.vsp +++ b/binsrc/samples/odp/http/main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/http/perform_search.vsp b/binsrc/samples/odp/http/perform_search.vsp index e69e962d09..fe1c13f59d 100644 --- a/binsrc/samples/odp/http/perform_search.vsp +++ b/binsrc/samples/odp/http/perform_search.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/http/search.vsp b/binsrc/samples/odp/http/search.vsp index 73fef410bf..7ad5667b5c 100644 --- a/binsrc/samples/odp/http/search.vsp +++ b/binsrc/samples/odp/http/search.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/http/status.vsp b/binsrc/samples/odp/http/status.vsp index ffb3dcebf9..623bc00e88 100644 --- a/binsrc/samples/odp/http/status.vsp +++ b/binsrc/samples/odp/http/status.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/http/topic.vsp b/binsrc/samples/odp/http/topic.vsp index 9d3f551f75..8bd6dee68c 100644 --- a/binsrc/samples/odp/http/topic.vsp +++ b/binsrc/samples/odp/http/topic.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/http/topic_descr.vsp b/binsrc/samples/odp/http/topic_descr.vsp index f9f354e84e..67d46fe382 100644 --- a/binsrc/samples/odp/http/topic_descr.vsp +++ b/binsrc/samples/odp/http/topic_descr.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/odp_boot.sql b/binsrc/samples/odp/odp_boot.sql index 2d23df6b9b..cdd2b11897 100644 --- a/binsrc/samples/odp/odp_boot.sql +++ b/binsrc/samples/odp/odp_boot.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/odp_lib.sql b/binsrc/samples/odp/odp_lib.sql index 93b3908ce0..cce64cca48 100644 --- a/binsrc/samples/odp/odp_lib.sql +++ b/binsrc/samples/odp/odp_lib.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/odp_vsp.sql b/binsrc/samples/odp/odp_vsp.sql index cf857d0053..ed9eca4948 100644 --- a/binsrc/samples/odp/odp_vsp.sql +++ b/binsrc/samples/odp/odp_vsp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/rdf_lib.sql b/binsrc/samples/odp/rdf_lib.sql index 3e729aefae..d972f59b15 100644 --- a/binsrc/samples/odp/rdf_lib.sql +++ b/binsrc/samples/odp/rdf_lib.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/setup.isql b/binsrc/samples/odp/setup.isql index 059d42d54a..81eb1d0ae4 100644 --- a/binsrc/samples/odp/setup.isql +++ b/binsrc/samples/odp/setup.isql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/odp/virtodp.sh b/binsrc/samples/odp/virtodp.sh index 3e77c9ae3e..0abbeb2aba 100755 --- a/binsrc/samples/odp/virtodp.sh +++ b/binsrc/samples/odp/virtodp.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/Makefile.am b/binsrc/samples/sparql_demo/Makefile.am index 4315435e00..8eacfabdfe 100644 --- a/binsrc/samples/sparql_demo/Makefile.am +++ b/binsrc/samples/sparql_demo/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/data_upload.vsp b/binsrc/samples/sparql_demo/data_upload.vsp index 807e8d9b2d..fc5a707937 100644 --- a/binsrc/samples/sparql_demo/data_upload.vsp +++ b/binsrc/samples/sparql_demo/data_upload.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/default.css b/binsrc/samples/sparql_demo/default.css index eace6a1219..95c3d91c06 100644 --- a/binsrc/samples/sparql_demo/default.css +++ b/binsrc/samples/sparql_demo/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/explain.vsp b/binsrc/samples/sparql_demo/explain.vsp index afb010a7e0..53aea87d2c 100644 --- a/binsrc/samples/sparql_demo/explain.vsp +++ b/binsrc/samples/sparql_demo/explain.vsp @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/load_dawg_usecase.vsp b/binsrc/samples/sparql_demo/load_dawg_usecase.vsp index c97eeedeb9..54bfbc0f59 100644 --- a/binsrc/samples/sparql_demo/load_dawg_usecase.vsp +++ b/binsrc/samples/sparql_demo/load_dawg_usecase.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/load_sq.vsp b/binsrc/samples/sparql_demo/load_sq.vsp index c346899559..7081d4373d 100644 --- a/binsrc/samples/sparql_demo/load_sq.vsp +++ b/binsrc/samples/sparql_demo/load_sq.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/load_uris.vsp b/binsrc/samples/sparql_demo/load_uris.vsp index b6b97f315c..fc0fa8e679 100644 --- a/binsrc/samples/sparql_demo/load_uris.vsp +++ b/binsrc/samples/sparql_demo/load_uris.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/make_vad.sh b/binsrc/samples/sparql_demo/make_vad.sh index ed2653357a..67bd427f12 100755 --- a/binsrc/samples/sparql_demo/make_vad.sh +++ b/binsrc/samples/sparql_demo/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -269,7 +269,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/binsrc/samples/sparql_demo/remote.vsp b/binsrc/samples/sparql_demo/remote.vsp index 5003e4361c..cd6711cc8c 100644 --- a/binsrc/samples/sparql_demo/remote.vsp +++ b/binsrc/samples/sparql_demo/remote.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/setup.sql b/binsrc/samples/sparql_demo/setup.sql index 4e3135131f..0e13b69ac5 100644 --- a/binsrc/samples/sparql_demo/setup.sql +++ b/binsrc/samples/sparql_demo/setup.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/setup_demo_db.sql b/binsrc/samples/sparql_demo/setup_demo_db.sql index 004c4f45a4..1d4e88c0c0 100644 --- a/binsrc/samples/sparql_demo/setup_demo_db.sql +++ b/binsrc/samples/sparql_demo/setup_demo_db.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/setup_queries.sql b/binsrc/samples/sparql_demo/setup_queries.sql index 14d1c148e1..cc24c96210 100644 --- a/binsrc/samples/sparql_demo/setup_queries.sql +++ b/binsrc/samples/sparql_demo/setup_queries.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/sparql_ajax.js b/binsrc/samples/sparql_demo/sparql_ajax.js index 98c0ca353a..33accd73f5 100644 --- a/binsrc/samples/sparql_demo/sparql_ajax.js +++ b/binsrc/samples/sparql_demo/sparql_ajax.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/sparql_ajax.vsp b/binsrc/samples/sparql_demo/sparql_ajax.vsp index e861ea67a7..70d0e52a80 100644 --- a/binsrc/samples/sparql_demo/sparql_ajax.vsp +++ b/binsrc/samples/sparql_demo/sparql_ajax.vsp @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/sparql_auth.vsp b/binsrc/samples/sparql_demo/sparql_auth.vsp index 90e6d43620..49a0deb332 100644 --- a/binsrc/samples/sparql_demo/sparql_auth.vsp +++ b/binsrc/samples/sparql_demo/sparql_auth.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/sparql_demo/sparql_file.vsp b/binsrc/samples/sparql_demo/sparql_file.vsp index 398821b8c1..c470b977b4 100644 --- a/binsrc/samples/sparql_demo/sparql_file.vsp +++ b/binsrc/samples/sparql_demo/sparql_file.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/wbxml2/Makefile.am b/binsrc/samples/wbxml2/Makefile.am index 80838908f9..dd38bc8ad6 100644 --- a/binsrc/samples/wbxml2/Makefile.am +++ b/binsrc/samples/wbxml2/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/wbxml2/wbxml2.c b/binsrc/samples/wbxml2/wbxml2.c index e67980032c..fe8ec02a34 100644 --- a/binsrc/samples/wbxml2/wbxml2.c +++ b/binsrc/samples/wbxml2/wbxml2.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -26,8 +26,8 @@ #include #include -#include "wbxml.h" #include "import_gate_virtuoso.h" +#include "wbxml.h" #define wi_inst (wi_instance_get()[0]) diff --git a/binsrc/samples/webapp/Makefile.am b/binsrc/samples/webapp/Makefile.am index 89728a76c4..9638afc593 100644 --- a/binsrc/samples/webapp/Makefile.am +++ b/binsrc/samples/webapp/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/app_common.sql b/binsrc/samples/webapp/app_common.sql index e31e206e67..07b3ae3a4f 100644 --- a/binsrc/samples/webapp/app_common.sql +++ b/binsrc/samples/webapp/app_common.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appcookie/appcookie.sql b/binsrc/samples/webapp/appcookie/appcookie.sql index 8867754b90..c7474e1a79 100644 --- a/binsrc/samples/webapp/appcookie/appcookie.sql +++ b/binsrc/samples/webapp/appcookie/appcookie.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appcookie/default.vsp b/binsrc/samples/webapp/appcookie/default.vsp index da5c0e9add..edd4dc6a05 100644 --- a/binsrc/samples/webapp/appcookie/default.vsp +++ b/binsrc/samples/webapp/appcookie/default.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appcookie/front.vsp b/binsrc/samples/webapp/appcookie/front.vsp index ca00455759..6d70cb5784 100644 --- a/binsrc/samples/webapp/appcookie/front.vsp +++ b/binsrc/samples/webapp/appcookie/front.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appcookie/login.vsp b/binsrc/samples/webapp/appcookie/login.vsp index 7cd5dc1359..57a2df8d9a 100644 --- a/binsrc/samples/webapp/appcookie/login.vsp +++ b/binsrc/samples/webapp/appcookie/login.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appcookie/logout.vsp b/binsrc/samples/webapp/appcookie/logout.vsp index 98e37e6cc5..6129a7ac3e 100644 --- a/binsrc/samples/webapp/appcookie/logout.vsp +++ b/binsrc/samples/webapp/appcookie/logout.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appcookie/register.vsp b/binsrc/samples/webapp/appcookie/register.vsp index 13243dbb0b..c50bc7949d 100644 --- a/binsrc/samples/webapp/appcookie/register.vsp +++ b/binsrc/samples/webapp/appcookie/register.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appcookie/relogin.vsp b/binsrc/samples/webapp/appcookie/relogin.vsp index d0fd5ffa90..169fab5046 100644 --- a/binsrc/samples/webapp/appcookie/relogin.vsp +++ b/binsrc/samples/webapp/appcookie/relogin.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appdigest/appdigest.sql b/binsrc/samples/webapp/appdigest/appdigest.sql index ddf42ba17a..3c0fc29e88 100644 --- a/binsrc/samples/webapp/appdigest/appdigest.sql +++ b/binsrc/samples/webapp/appdigest/appdigest.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appdigest/default.vsp b/binsrc/samples/webapp/appdigest/default.vsp index f0649a6c73..d2a386d47a 100644 --- a/binsrc/samples/webapp/appdigest/default.vsp +++ b/binsrc/samples/webapp/appdigest/default.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appdigest/front.vsp b/binsrc/samples/webapp/appdigest/front.vsp index 74a3017985..cd1db5effc 100644 --- a/binsrc/samples/webapp/appdigest/front.vsp +++ b/binsrc/samples/webapp/appdigest/front.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appdigest/logout.vsp b/binsrc/samples/webapp/appdigest/logout.vsp index 63acb591ea..8c40578c2c 100644 --- a/binsrc/samples/webapp/appdigest/logout.vsp +++ b/binsrc/samples/webapp/appdigest/logout.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appdigest/register.vsp b/binsrc/samples/webapp/appdigest/register.vsp index addff0ffb3..fdb7c40dd0 100644 --- a/binsrc/samples/webapp/appdigest/register.vsp +++ b/binsrc/samples/webapp/appdigest/register.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appjs/appjs.sql b/binsrc/samples/webapp/appjs/appjs.sql index 628f960177..8a7eb7b1ad 100644 --- a/binsrc/samples/webapp/appjs/appjs.sql +++ b/binsrc/samples/webapp/appjs/appjs.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appjs/default.vsp b/binsrc/samples/webapp/appjs/default.vsp index f0649a6c73..d2a386d47a 100644 --- a/binsrc/samples/webapp/appjs/default.vsp +++ b/binsrc/samples/webapp/appjs/default.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appjs/front.vsp b/binsrc/samples/webapp/appjs/front.vsp index 74a3017985..cd1db5effc 100644 --- a/binsrc/samples/webapp/appjs/front.vsp +++ b/binsrc/samples/webapp/appjs/front.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appjs/logout.vsp b/binsrc/samples/webapp/appjs/logout.vsp index 779699dbb4..c7f1a09361 100644 --- a/binsrc/samples/webapp/appjs/logout.vsp +++ b/binsrc/samples/webapp/appjs/logout.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appjs/register.vsp b/binsrc/samples/webapp/appjs/register.vsp index 4b52f6cc95..3fab989c73 100644 --- a/binsrc/samples/webapp/appjs/register.vsp +++ b/binsrc/samples/webapp/appjs/register.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appsimple/simple_session.sql b/binsrc/samples/webapp/appsimple/simple_session.sql index a31fbe514f..0f4b470700 100644 --- a/binsrc/samples/webapp/appsimple/simple_session.sql +++ b/binsrc/samples/webapp/appsimple/simple_session.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appsimple/simple_session.vsp b/binsrc/samples/webapp/appsimple/simple_session.vsp index 12ca856af8..3f3db3616f 100644 --- a/binsrc/samples/webapp/appsimple/simple_session.vsp +++ b/binsrc/samples/webapp/appsimple/simple_session.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appssl/appssl.sql b/binsrc/samples/webapp/appssl/appssl.sql index bdeb4c2ec2..175895574b 100644 --- a/binsrc/samples/webapp/appssl/appssl.sql +++ b/binsrc/samples/webapp/appssl/appssl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appssl/default.vsp b/binsrc/samples/webapp/appssl/default.vsp index 2967c6329e..768637e20c 100644 --- a/binsrc/samples/webapp/appssl/default.vsp +++ b/binsrc/samples/webapp/appssl/default.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appssl/front.vsp b/binsrc/samples/webapp/appssl/front.vsp index ca00455759..6d70cb5784 100644 --- a/binsrc/samples/webapp/appssl/front.vsp +++ b/binsrc/samples/webapp/appssl/front.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appssl/login.vsp b/binsrc/samples/webapp/appssl/login.vsp index e9ee88fadb..f966cba355 100644 --- a/binsrc/samples/webapp/appssl/login.vsp +++ b/binsrc/samples/webapp/appssl/login.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appssl/logout.vsp b/binsrc/samples/webapp/appssl/logout.vsp index eec01dfd49..3bb7bdfc3a 100644 --- a/binsrc/samples/webapp/appssl/logout.vsp +++ b/binsrc/samples/webapp/appssl/logout.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appssl/register.vsp b/binsrc/samples/webapp/appssl/register.vsp index 33555749c1..8eb74de019 100644 --- a/binsrc/samples/webapp/appssl/register.vsp +++ b/binsrc/samples/webapp/appssl/register.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appssl/relogin.vsp b/binsrc/samples/webapp/appssl/relogin.vsp index 83ca369422..accdc5b9f9 100644 --- a/binsrc/samples/webapp/appssl/relogin.vsp +++ b/binsrc/samples/webapp/appssl/relogin.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurl/appurl.sql b/binsrc/samples/webapp/appurl/appurl.sql index 50e62a39bc..9795207d38 100644 --- a/binsrc/samples/webapp/appurl/appurl.sql +++ b/binsrc/samples/webapp/appurl/appurl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurl/default.vsp b/binsrc/samples/webapp/appurl/default.vsp index 6ff2ece39e..dd09f23372 100644 --- a/binsrc/samples/webapp/appurl/default.vsp +++ b/binsrc/samples/webapp/appurl/default.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurl/front.vsp b/binsrc/samples/webapp/appurl/front.vsp index ca00455759..6d70cb5784 100644 --- a/binsrc/samples/webapp/appurl/front.vsp +++ b/binsrc/samples/webapp/appurl/front.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurl/login.vsp b/binsrc/samples/webapp/appurl/login.vsp index 164549033e..488c0b9065 100644 --- a/binsrc/samples/webapp/appurl/login.vsp +++ b/binsrc/samples/webapp/appurl/login.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurl/logout.vsp b/binsrc/samples/webapp/appurl/logout.vsp index 78c1ddef89..79722e6e2f 100644 --- a/binsrc/samples/webapp/appurl/logout.vsp +++ b/binsrc/samples/webapp/appurl/logout.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurl/register.vsp b/binsrc/samples/webapp/appurl/register.vsp index 39f316111c..116e56488a 100644 --- a/binsrc/samples/webapp/appurl/register.vsp +++ b/binsrc/samples/webapp/appurl/register.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurl/relogin.vsp b/binsrc/samples/webapp/appurl/relogin.vsp index 2cbe572421..efaee7ff55 100644 --- a/binsrc/samples/webapp/appurl/relogin.vsp +++ b/binsrc/samples/webapp/appurl/relogin.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurla/appurla.sql b/binsrc/samples/webapp/appurla/appurla.sql index 44214680e2..207319a97a 100644 --- a/binsrc/samples/webapp/appurla/appurla.sql +++ b/binsrc/samples/webapp/appurla/appurla.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurla/default.vsp b/binsrc/samples/webapp/appurla/default.vsp index 1af66b9dd4..5a8dfbb8c1 100644 --- a/binsrc/samples/webapp/appurla/default.vsp +++ b/binsrc/samples/webapp/appurla/default.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurla/front.vsp b/binsrc/samples/webapp/appurla/front.vsp index ca00455759..6d70cb5784 100644 --- a/binsrc/samples/webapp/appurla/front.vsp +++ b/binsrc/samples/webapp/appurla/front.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurla/login.vsp b/binsrc/samples/webapp/appurla/login.vsp index 81011c02c9..ec2afeb345 100644 --- a/binsrc/samples/webapp/appurla/login.vsp +++ b/binsrc/samples/webapp/appurla/login.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurla/logout.vsp b/binsrc/samples/webapp/appurla/logout.vsp index 893d856ee2..a6c8365fa0 100644 --- a/binsrc/samples/webapp/appurla/logout.vsp +++ b/binsrc/samples/webapp/appurla/logout.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurla/register.vsp b/binsrc/samples/webapp/appurla/register.vsp index c469b60711..3bf9674c93 100644 --- a/binsrc/samples/webapp/appurla/register.vsp +++ b/binsrc/samples/webapp/appurla/register.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/appurla/relogin.vsp b/binsrc/samples/webapp/appurla/relogin.vsp index b4e07772b8..368f35f328 100644 --- a/binsrc/samples/webapp/appurla/relogin.vsp +++ b/binsrc/samples/webapp/appurla/relogin.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/changeNews.vsp b/binsrc/samples/webapp/eNews/changeNews.vsp index e69382eee0..9fb0f88345 100644 --- a/binsrc/samples/webapp/eNews/changeNews.vsp +++ b/binsrc/samples/webapp/eNews/changeNews.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/css/one.css b/binsrc/samples/webapp/eNews/css/one.css index 57a929085a..4e1433b45c 100644 --- a/binsrc/samples/webapp/eNews/css/one.css +++ b/binsrc/samples/webapp/eNews/css/one.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/css/two.css b/binsrc/samples/webapp/eNews/css/two.css index 45b488fa86..d5fdf47e54 100644 --- a/binsrc/samples/webapp/eNews/css/two.css +++ b/binsrc/samples/webapp/eNews/css/two.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/dhtml.js b/binsrc/samples/webapp/eNews/dhtml.js index 67853354a8..d3515b7643 100644 --- a/binsrc/samples/webapp/eNews/dhtml.js +++ b/binsrc/samples/webapp/eNews/dhtml.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/eNews.sql b/binsrc/samples/webapp/eNews/eNews.sql index ea055b0819..1fabc9a0ad 100644 --- a/binsrc/samples/webapp/eNews/eNews.sql +++ b/binsrc/samples/webapp/eNews/eNews.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/eNews_vad.sql b/binsrc/samples/webapp/eNews/eNews_vad.sql index c7c7110c36..4f7fa63bca 100644 --- a/binsrc/samples/webapp/eNews/eNews_vad.sql +++ b/binsrc/samples/webapp/eNews/eNews_vad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/newslogin.vsp b/binsrc/samples/webapp/eNews/newslogin.vsp index 96e8d59a31..d9f0e9f42f 100644 --- a/binsrc/samples/webapp/eNews/newslogin.vsp +++ b/binsrc/samples/webapp/eNews/newslogin.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/newsmenu.vsp b/binsrc/samples/webapp/eNews/newsmenu.vsp index 1e6b5642c9..6805e4e944 100644 --- a/binsrc/samples/webapp/eNews/newsmenu.vsp +++ b/binsrc/samples/webapp/eNews/newsmenu.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/newsregistration.vsp b/binsrc/samples/webapp/eNews/newsregistration.vsp index 9c703ad20d..523b9dbd4f 100644 --- a/binsrc/samples/webapp/eNews/newsregistration.vsp +++ b/binsrc/samples/webapp/eNews/newsregistration.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/newsview.vsp b/binsrc/samples/webapp/eNews/newsview.vsp index c24c5d828c..66cbc60e8a 100644 --- a/binsrc/samples/webapp/eNews/newsview.vsp +++ b/binsrc/samples/webapp/eNews/newsview.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/newswatch.vsp b/binsrc/samples/webapp/eNews/newswatch.vsp index 72a55e6fbf..5fb6c99fad 100644 --- a/binsrc/samples/webapp/eNews/newswatch.vsp +++ b/binsrc/samples/webapp/eNews/newswatch.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/noblankscroll.xsl b/binsrc/samples/webapp/eNews/noblankscroll.xsl index c6679d1f41..c306616423 100644 --- a/binsrc/samples/webapp/eNews/noblankscroll.xsl +++ b/binsrc/samples/webapp/eNews/noblankscroll.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/stylesheets/block.xsl b/binsrc/samples/webapp/eNews/stylesheets/block.xsl index 8fe1a9b340..31c73ad58c 100644 --- a/binsrc/samples/webapp/eNews/stylesheets/block.xsl +++ b/binsrc/samples/webapp/eNews/stylesheets/block.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/stylesheets/grid.xsl b/binsrc/samples/webapp/eNews/stylesheets/grid.xsl index 1a6b76db01..3887153129 100644 --- a/binsrc/samples/webapp/eNews/stylesheets/grid.xsl +++ b/binsrc/samples/webapp/eNews/stylesheets/grid.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/stylesheets/multi-scroll.xsl b/binsrc/samples/webapp/eNews/stylesheets/multi-scroll.xsl index 7e6a88fd25..c82b602c69 100644 --- a/binsrc/samples/webapp/eNews/stylesheets/multi-scroll.xsl +++ b/binsrc/samples/webapp/eNews/stylesheets/multi-scroll.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/stylesheets/scroll.xsl b/binsrc/samples/webapp/eNews/stylesheets/scroll.xsl index 62a38ab3ca..9d757e96a5 100644 --- a/binsrc/samples/webapp/eNews/stylesheets/scroll.xsl +++ b/binsrc/samples/webapp/eNews/stylesheets/scroll.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/eNews/stylesheets/xscroll.xsl b/binsrc/samples/webapp/eNews/stylesheets/xscroll.xsl index ee34e54c3d..1d7e9c0104 100644 --- a/binsrc/samples/webapp/eNews/stylesheets/xscroll.xsl +++ b/binsrc/samples/webapp/eNews/stylesheets/xscroll.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/confirm.vsp b/binsrc/samples/webapp/forums/confirm.vsp index a2bead7eae..936eaa3259 100644 --- a/binsrc/samples/webapp/forums/confirm.vsp +++ b/binsrc/samples/webapp/forums/confirm.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/def.sql b/binsrc/samples/webapp/forums/def.sql index 29a7d7d850..9a1578a521 100644 --- a/binsrc/samples/webapp/forums/def.sql +++ b/binsrc/samples/webapp/forums/def.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/def_vad.sql b/binsrc/samples/webapp/forums/def_vad.sql index aae6bd0ae0..1d65241d49 100644 --- a/binsrc/samples/webapp/forums/def_vad.sql +++ b/binsrc/samples/webapp/forums/def_vad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/error.vsp b/binsrc/samples/webapp/forums/error.vsp index 76112ddb14..3e6a40c307 100644 --- a/binsrc/samples/webapp/forums/error.vsp +++ b/binsrc/samples/webapp/forums/error.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/forum.vsp b/binsrc/samples/webapp/forums/forum.vsp index d8c608227e..be9ef21afa 100644 --- a/binsrc/samples/webapp/forums/forum.vsp +++ b/binsrc/samples/webapp/forums/forum.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/func.sql b/binsrc/samples/webapp/forums/func.sql index 5be62d3e99..ea2443ca8c 100644 --- a/binsrc/samples/webapp/forums/func.sql +++ b/binsrc/samples/webapp/forums/func.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/func_vad.sql b/binsrc/samples/webapp/forums/func_vad.sql index 4766b1ee02..eff2228dfa 100644 --- a/binsrc/samples/webapp/forums/func_vad.sql +++ b/binsrc/samples/webapp/forums/func_vad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/home.vsp b/binsrc/samples/webapp/forums/home.vsp index bca527288b..1c0f6f530f 100644 --- a/binsrc/samples/webapp/forums/home.vsp +++ b/binsrc/samples/webapp/forums/home.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/login.vsp b/binsrc/samples/webapp/forums/login.vsp index e95ae39aea..92a590280d 100644 --- a/binsrc/samples/webapp/forums/login.vsp +++ b/binsrc/samples/webapp/forums/login.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/post_messages.vsp b/binsrc/samples/webapp/forums/post_messages.vsp index 26b2d0889a..6170360a02 100644 --- a/binsrc/samples/webapp/forums/post_messages.vsp +++ b/binsrc/samples/webapp/forums/post_messages.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/registr.vsp b/binsrc/samples/webapp/forums/registr.vsp index 5c7fa42aa4..3d096f4260 100644 --- a/binsrc/samples/webapp/forums/registr.vsp +++ b/binsrc/samples/webapp/forums/registr.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/search.vsp b/binsrc/samples/webapp/forums/search.vsp index 9b33e74893..2a039cc57e 100644 --- a/binsrc/samples/webapp/forums/search.vsp +++ b/binsrc/samples/webapp/forums/search.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/subforums.vsp b/binsrc/samples/webapp/forums/subforums.vsp index 5cd2b9a57b..50b60e39ee 100644 --- a/binsrc/samples/webapp/forums/subforums.vsp +++ b/binsrc/samples/webapp/forums/subforums.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/thread.vsp b/binsrc/samples/webapp/forums/thread.vsp index 6af4067242..63ad663f5d 100644 --- a/binsrc/samples/webapp/forums/thread.vsp +++ b/binsrc/samples/webapp/forums/thread.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/xslt/forums/confirm.xsl b/binsrc/samples/webapp/forums/xslt/forums/confirm.xsl index a6f638b6c9..99c97f9713 100644 --- a/binsrc/samples/webapp/forums/xslt/forums/confirm.xsl +++ b/binsrc/samples/webapp/forums/xslt/forums/confirm.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/xslt/forums/error.xsl b/binsrc/samples/webapp/forums/xslt/forums/error.xsl index 16a3a82744..315122d5bd 100644 --- a/binsrc/samples/webapp/forums/xslt/forums/error.xsl +++ b/binsrc/samples/webapp/forums/xslt/forums/error.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/xslt/forums/forum.xsl b/binsrc/samples/webapp/forums/xslt/forums/forum.xsl index 489f26a0ae..c6be1f9db5 100644 --- a/binsrc/samples/webapp/forums/xslt/forums/forum.xsl +++ b/binsrc/samples/webapp/forums/xslt/forums/forum.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/xslt/forums/home.xsl b/binsrc/samples/webapp/forums/xslt/forums/home.xsl index 4f2836be4d..31365c45ee 100644 --- a/binsrc/samples/webapp/forums/xslt/forums/home.xsl +++ b/binsrc/samples/webapp/forums/xslt/forums/home.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/xslt/forums/login.xsl b/binsrc/samples/webapp/forums/xslt/forums/login.xsl index 33b975da89..132db5709b 100644 --- a/binsrc/samples/webapp/forums/xslt/forums/login.xsl +++ b/binsrc/samples/webapp/forums/xslt/forums/login.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/xslt/forums/navigations.xsl b/binsrc/samples/webapp/forums/xslt/forums/navigations.xsl index ae51583fe3..774b5cfb30 100644 --- a/binsrc/samples/webapp/forums/xslt/forums/navigations.xsl +++ b/binsrc/samples/webapp/forums/xslt/forums/navigations.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/xslt/forums/post_messages.xsl b/binsrc/samples/webapp/forums/xslt/forums/post_messages.xsl index 816cda2611..d4f45c8bfd 100644 --- a/binsrc/samples/webapp/forums/xslt/forums/post_messages.xsl +++ b/binsrc/samples/webapp/forums/xslt/forums/post_messages.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/xslt/forums/registr.xsl b/binsrc/samples/webapp/forums/xslt/forums/registr.xsl index cea88881f6..26e40c5dd6 100644 --- a/binsrc/samples/webapp/forums/xslt/forums/registr.xsl +++ b/binsrc/samples/webapp/forums/xslt/forums/registr.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/xslt/forums/search.xsl b/binsrc/samples/webapp/forums/xslt/forums/search.xsl index fee61879a5..55e2205ea4 100644 --- a/binsrc/samples/webapp/forums/xslt/forums/search.xsl +++ b/binsrc/samples/webapp/forums/xslt/forums/search.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/xslt/forums/subforums.xsl b/binsrc/samples/webapp/forums/xslt/forums/subforums.xsl index 8a327e4ff3..193f28f6c5 100644 --- a/binsrc/samples/webapp/forums/xslt/forums/subforums.xsl +++ b/binsrc/samples/webapp/forums/xslt/forums/subforums.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/webapp/forums/xslt/forums/thread.xsl b/binsrc/samples/webapp/forums/xslt/forums/thread.xsl index 3b58d9e03d..92f2c16d9d 100644 --- a/binsrc/samples/webapp/forums/xslt/forums/thread.xsl +++ b/binsrc/samples/webapp/forums/xslt/forums/thread.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/Makefile.am b/binsrc/samples/xpath/Makefile.am index 1b01efb5a5..e362e4f23f 100644 --- a/binsrc/samples/xpath/Makefile.am +++ b/binsrc/samples/xpath/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/R-tables.sql b/binsrc/samples/xpath/R-tables.sql index 20fbc90207..4af1ebae1e 100644 --- a/binsrc/samples/xpath/R-tables.sql +++ b/binsrc/samples/xpath/R-tables.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/border.vsp b/binsrc/samples/xpath/border.vsp index 0452af03ad..4109534b56 100644 --- a/binsrc/samples/xpath/border.vsp +++ b/binsrc/samples/xpath/border.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/case.vsp b/binsrc/samples/xpath/case.vsp index b016432e13..065471f1f9 100644 --- a/binsrc/samples/xpath/case.vsp +++ b/binsrc/samples/xpath/case.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/demo.vsp b/binsrc/samples/xpath/demo.vsp index 484cff03b0..8bc5a5aeb8 100644 --- a/binsrc/samples/xpath/demo.vsp +++ b/binsrc/samples/xpath/demo.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/desk.sql b/binsrc/samples/xpath/desk.sql index 670ccbcbc3..441fa82886 100644 --- a/binsrc/samples/xpath/desk.sql +++ b/binsrc/samples/xpath/desk.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/desk.vsp b/binsrc/samples/xpath/desk.vsp index 7d9d0454f4..9601f765ab 100644 --- a/binsrc/samples/xpath/desk.vsp +++ b/binsrc/samples/xpath/desk.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/deskall.vsp b/binsrc/samples/xpath/deskall.vsp index d93d53c47c..88ea3dfe6f 100644 --- a/binsrc/samples/xpath/deskall.vsp +++ b/binsrc/samples/xpath/deskall.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/deskdata.vsp b/binsrc/samples/xpath/deskdata.vsp index 6c35d2fe65..e42e3ce6ce 100644 --- a/binsrc/samples/xpath/deskdata.vsp +++ b/binsrc/samples/xpath/deskdata.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/deskhome.vsp b/binsrc/samples/xpath/deskhome.vsp index ecab739a48..f03ccca116 100644 --- a/binsrc/samples/xpath/deskhome.vsp +++ b/binsrc/samples/xpath/deskhome.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/deskmeta.vsp b/binsrc/samples/xpath/deskmeta.vsp index f792869ee2..c197f320b5 100644 --- a/binsrc/samples/xpath/deskmeta.vsp +++ b/binsrc/samples/xpath/deskmeta.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/faq.vsp b/binsrc/samples/xpath/faq.vsp index 94259154dc..8ea9b12b69 100644 --- a/binsrc/samples/xpath/faq.vsp +++ b/binsrc/samples/xpath/faq.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/files2dav.sh b/binsrc/samples/xpath/files2dav.sh index d89a98c359..39213a04ad 100755 --- a/binsrc/samples/xpath/files2dav.sh +++ b/binsrc/samples/xpath/files2dav.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/header.vsp b/binsrc/samples/xpath/header.vsp index 1deb29429a..7f778a6310 100644 --- a/binsrc/samples/xpath/header.vsp +++ b/binsrc/samples/xpath/header.vsp @@ -3,7 +3,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/list.vsp b/binsrc/samples/xpath/list.vsp index 5d94c81fdb..5a4e9d510a 100644 --- a/binsrc/samples/xpath/list.vsp +++ b/binsrc/samples/xpath/list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/main.vsp b/binsrc/samples/xpath/main.vsp index 72f5602530..1f6cf0884d 100644 --- a/binsrc/samples/xpath/main.vsp +++ b/binsrc/samples/xpath/main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/metadata.sql b/binsrc/samples/xpath/metadata.sql index 53679fc091..0db96cd414 100644 --- a/binsrc/samples/xpath/metadata.sql +++ b/binsrc/samples/xpath/metadata.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/postsetup.sql b/binsrc/samples/xpath/postsetup.sql index 5e0c166070..96f861a46a 100644 --- a/binsrc/samples/xpath/postsetup.sql +++ b/binsrc/samples/xpath/postsetup.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/presetup.sql b/binsrc/samples/xpath/presetup.sql index d801cf02ab..5b5d9eedda 100644 --- a/binsrc/samples/xpath/presetup.sql +++ b/binsrc/samples/xpath/presetup.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xpath/sample.sql b/binsrc/samples/xpath/sample.sql index 36210cb98b..0aff77e001 100644 --- a/binsrc/samples/xpath/sample.sql +++ b/binsrc/samples/xpath/sample.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/Makefile.am b/binsrc/samples/xquery/Makefile.am index 5507dae7c3..9bc4e78696 100644 --- a/binsrc/samples/xquery/Makefile.am +++ b/binsrc/samples/xquery/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/R-tables.sql b/binsrc/samples/xquery/R-tables.sql index 8f5f0b1e2b..43bc3c3440 100644 --- a/binsrc/samples/xquery/R-tables.sql +++ b/binsrc/samples/xquery/R-tables.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/border.vsp b/binsrc/samples/xquery/border.vsp index 0452af03ad..4109534b56 100644 --- a/binsrc/samples/xquery/border.vsp +++ b/binsrc/samples/xquery/border.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/case.vsp b/binsrc/samples/xquery/case.vsp index 6f67358edb..7280733dbb 100644 --- a/binsrc/samples/xquery/case.vsp +++ b/binsrc/samples/xquery/case.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/demo.vsp b/binsrc/samples/xquery/demo.vsp index 5592c74596..5223d1d8d7 100644 --- a/binsrc/samples/xquery/demo.vsp +++ b/binsrc/samples/xquery/demo.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/desk.sql b/binsrc/samples/xquery/desk.sql index e143155180..64da2c2a1e 100644 --- a/binsrc/samples/xquery/desk.sql +++ b/binsrc/samples/xquery/desk.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/desk.vsp b/binsrc/samples/xquery/desk.vsp index 5c85b2558f..f82543ee27 100644 --- a/binsrc/samples/xquery/desk.vsp +++ b/binsrc/samples/xquery/desk.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/deskall.vsp b/binsrc/samples/xquery/deskall.vsp index bcd87bc250..04c3e50611 100644 --- a/binsrc/samples/xquery/deskall.vsp +++ b/binsrc/samples/xquery/deskall.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/deskdata.vsp b/binsrc/samples/xquery/deskdata.vsp index 2819aef1dc..48c018353e 100644 --- a/binsrc/samples/xquery/deskdata.vsp +++ b/binsrc/samples/xquery/deskdata.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/deskhome.vsp b/binsrc/samples/xquery/deskhome.vsp index 583a1f3788..16c8b28b12 100644 --- a/binsrc/samples/xquery/deskhome.vsp +++ b/binsrc/samples/xquery/deskhome.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/deskmeta.vsp b/binsrc/samples/xquery/deskmeta.vsp index f620d21926..b5feee3c8a 100644 --- a/binsrc/samples/xquery/deskmeta.vsp +++ b/binsrc/samples/xquery/deskmeta.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/faq.vsp b/binsrc/samples/xquery/faq.vsp index 94259154dc..8ea9b12b69 100644 --- a/binsrc/samples/xquery/faq.vsp +++ b/binsrc/samples/xquery/faq.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/files2dav.sh b/binsrc/samples/xquery/files2dav.sh index eb64b1909e..ccc1dfe2d0 100755 --- a/binsrc/samples/xquery/files2dav.sh +++ b/binsrc/samples/xquery/files2dav.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/header.vsp b/binsrc/samples/xquery/header.vsp index 45d9699aaa..3abf7d2c28 100644 --- a/binsrc/samples/xquery/header.vsp +++ b/binsrc/samples/xquery/header.vsp @@ -3,7 +3,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/list.vsp b/binsrc/samples/xquery/list.vsp index abe80f3499..db4f745265 100644 --- a/binsrc/samples/xquery/list.vsp +++ b/binsrc/samples/xquery/list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/main.vsp b/binsrc/samples/xquery/main.vsp index 4f80b01fc6..3f8fbb8d85 100644 --- a/binsrc/samples/xquery/main.vsp +++ b/binsrc/samples/xquery/main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/metadata.sql b/binsrc/samples/xquery/metadata.sql index 382d4e3ad0..f9e3d6e68b 100644 --- a/binsrc/samples/xquery/metadata.sql +++ b/binsrc/samples/xquery/metadata.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/postsetup.sql b/binsrc/samples/xquery/postsetup.sql index d7438e7e91..227f72861f 100644 --- a/binsrc/samples/xquery/postsetup.sql +++ b/binsrc/samples/xquery/postsetup.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/presetup.sql b/binsrc/samples/xquery/presetup.sql index 55a8e25a7f..f97eb4d8a5 100644 --- a/binsrc/samples/xquery/presetup.sql +++ b/binsrc/samples/xquery/presetup.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/search.sql b/binsrc/samples/xquery/search.sql index d290ab947e..42f8e7059e 100644 --- a/binsrc/samples/xquery/search.sql +++ b/binsrc/samples/xquery/search.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/search.vsp b/binsrc/samples/xquery/search.vsp index b7147b1213..8788b0afa6 100644 --- a/binsrc/samples/xquery/search.vsp +++ b/binsrc/samples/xquery/search.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/setup.isql b/binsrc/samples/xquery/setup.isql index 12719b9e9d..9ddc8ac7f7 100644 --- a/binsrc/samples/xquery/setup.isql +++ b/binsrc/samples/xquery/setup.isql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/samples/xquery/text.vsp b/binsrc/samples/xquery/text.vsp index 56b998da2c..d1b65b027e 100644 --- a/binsrc/samples/xquery/text.vsp +++ b/binsrc/samples/xquery/text.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame/Makefile.am b/binsrc/sesame/Makefile.am index d9fba550f1..d58e6f7d0c 100644 --- a/binsrc/sesame/Makefile.am +++ b/binsrc/sesame/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoAdminListener.java b/binsrc/sesame/virtuoso_driver/VirtuosoAdminListener.java index 4d55374d65..ebec537bdd 100644 --- a/binsrc/sesame/virtuoso_driver/VirtuosoAdminListener.java +++ b/binsrc/sesame/virtuoso_driver/VirtuosoAdminListener.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoExample1.java b/binsrc/sesame/virtuoso_driver/VirtuosoExample1.java index ded79330d7..025f6a5302 100644 --- a/binsrc/sesame/virtuoso_driver/VirtuosoExample1.java +++ b/binsrc/sesame/virtuoso_driver/VirtuosoExample1.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoExample2.java b/binsrc/sesame/virtuoso_driver/VirtuosoExample2.java index 48808962ba..7059bfacce 100644 --- a/binsrc/sesame/virtuoso_driver/VirtuosoExample2.java +++ b/binsrc/sesame/virtuoso_driver/VirtuosoExample2.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoExample3.java b/binsrc/sesame/virtuoso_driver/VirtuosoExample3.java index 7f5e32e7af..1f030953b8 100644 --- a/binsrc/sesame/virtuoso_driver/VirtuosoExample3.java +++ b/binsrc/sesame/virtuoso_driver/VirtuosoExample3.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoGraphQueryListener.java b/binsrc/sesame/virtuoso_driver/VirtuosoGraphQueryListener.java index 85669452d2..ef813b97e0 100644 --- a/binsrc/sesame/virtuoso_driver/VirtuosoGraphQueryListener.java +++ b/binsrc/sesame/virtuoso_driver/VirtuosoGraphQueryListener.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoQueryListener.java b/binsrc/sesame/virtuoso_driver/VirtuosoQueryListener.java index e45a824be0..d937d5b3e0 100644 --- a/binsrc/sesame/virtuoso_driver/VirtuosoQueryListener.java +++ b/binsrc/sesame/virtuoso_driver/VirtuosoQueryListener.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoRepository.java b/binsrc/sesame/virtuoso_driver/VirtuosoRepository.java index d397dd03db..331047de28 100644 --- a/binsrc/sesame/virtuoso_driver/VirtuosoRepository.java +++ b/binsrc/sesame/virtuoso_driver/VirtuosoRepository.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoSchemaRepository.java b/binsrc/sesame/virtuoso_driver/VirtuosoSchemaRepository.java index 12e11524de..b1239185f5 100644 --- a/binsrc/sesame/virtuoso_driver/VirtuosoSchemaRepository.java +++ b/binsrc/sesame/virtuoso_driver/VirtuosoSchemaRepository.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame/virtuoso_driver/VirtuosoStatementIterator.java b/binsrc/sesame/virtuoso_driver/VirtuosoStatementIterator.java index 9632262657..fc41c96d11 100644 --- a/binsrc/sesame/virtuoso_driver/VirtuosoStatementIterator.java +++ b/binsrc/sesame/virtuoso_driver/VirtuosoStatementIterator.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/Makefile.am b/binsrc/sesame2/Makefile.am index 22638566a7..11ec1402a0 100644 --- a/binsrc/sesame2/Makefile.am +++ b/binsrc/sesame2/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/tests/Test_BNode.java b/binsrc/sesame2/tests/Test_BNode.java index 59775d4f09..327fcaea46 100644 --- a/binsrc/sesame2/tests/Test_BNode.java +++ b/binsrc/sesame2/tests/Test_BNode.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/tests/Test_BNode_perf1.java b/binsrc/sesame2/tests/Test_BNode_perf1.java index bdb784b6da..4e49258fbe 100644 --- a/binsrc/sesame2/tests/Test_BNode_perf1.java +++ b/binsrc/sesame2/tests/Test_BNode_perf1.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/Version.java b/binsrc/sesame2/virtuoso_driver/Version.java index 0a137c1a59..df93346e17 100644 --- a/binsrc/sesame2/virtuoso_driver/Version.java +++ b/binsrc/sesame2/virtuoso_driver/Version.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoBooleanQuery.java b/binsrc/sesame2/virtuoso_driver/VirtuosoBooleanQuery.java index a910528479..34ed0dd17f 100644 --- a/binsrc/sesame2/virtuoso_driver/VirtuosoBooleanQuery.java +++ b/binsrc/sesame2/virtuoso_driver/VirtuosoBooleanQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoGraphQuery.java b/binsrc/sesame2/virtuoso_driver/VirtuosoGraphQuery.java index 0e3dd3055c..1b4cb2effa 100644 --- a/binsrc/sesame2/virtuoso_driver/VirtuosoGraphQuery.java +++ b/binsrc/sesame2/virtuoso_driver/VirtuosoGraphQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoOperation.java b/binsrc/sesame2/virtuoso_driver/VirtuosoOperation.java index bca9978f7e..be546f23d5 100644 --- a/binsrc/sesame2/virtuoso_driver/VirtuosoOperation.java +++ b/binsrc/sesame2/virtuoso_driver/VirtuosoOperation.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoQuery.java b/binsrc/sesame2/virtuoso_driver/VirtuosoQuery.java index ea69c09db4..0d4c8a0e63 100644 --- a/binsrc/sesame2/virtuoso_driver/VirtuosoQuery.java +++ b/binsrc/sesame2/virtuoso_driver/VirtuosoQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepository.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepository.java index feb408e7bf..2cf265b967 100644 --- a/binsrc/sesame2/virtuoso_driver/VirtuosoRepository.java +++ b/binsrc/sesame2/virtuoso_driver/VirtuosoRepository.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConfig.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConfig.java index 77048ce820..b3a873dfac 100644 --- a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConfig.java +++ b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConfig.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConnection.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConnection.java index a8a99120d2..5c271244bb 100644 --- a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConnection.java +++ b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryConnection.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryFactory.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryFactory.java index fdf29a825f..43c18a9d83 100644 --- a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryFactory.java +++ b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositoryFactory.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositorySchema.java b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositorySchema.java index b1b0ca1dad..1d40b139a9 100644 --- a/binsrc/sesame2/virtuoso_driver/VirtuosoRepositorySchema.java +++ b/binsrc/sesame2/virtuoso_driver/VirtuosoRepositorySchema.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoTest.java b/binsrc/sesame2/virtuoso_driver/VirtuosoTest.java index 7b7510db53..65d087e56f 100644 --- a/binsrc/sesame2/virtuoso_driver/VirtuosoTest.java +++ b/binsrc/sesame2/virtuoso_driver/VirtuosoTest.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoTupleQuery.java b/binsrc/sesame2/virtuoso_driver/VirtuosoTupleQuery.java index 315b503fc9..573423f344 100644 --- a/binsrc/sesame2/virtuoso_driver/VirtuosoTupleQuery.java +++ b/binsrc/sesame2/virtuoso_driver/VirtuosoTupleQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame2/virtuoso_driver/VirtuosoUpdate.java b/binsrc/sesame2/virtuoso_driver/VirtuosoUpdate.java index d757156632..b489144ee2 100644 --- a/binsrc/sesame2/virtuoso_driver/VirtuosoUpdate.java +++ b/binsrc/sesame2/virtuoso_driver/VirtuosoUpdate.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/Makefile.am b/binsrc/sesame3/Makefile.am index 415c38dfaa..139dc4ef9c 100644 --- a/binsrc/sesame3/Makefile.am +++ b/binsrc/sesame3/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/virtuoso_driver/Version.java b/binsrc/sesame3/virtuoso_driver/Version.java index 0e203b28b9..17e8c02061 100644 --- a/binsrc/sesame3/virtuoso_driver/Version.java +++ b/binsrc/sesame3/virtuoso_driver/Version.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoBooleanQuery.java b/binsrc/sesame3/virtuoso_driver/VirtuosoBooleanQuery.java index 01051d7e08..62f2e46703 100644 --- a/binsrc/sesame3/virtuoso_driver/VirtuosoBooleanQuery.java +++ b/binsrc/sesame3/virtuoso_driver/VirtuosoBooleanQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoGraphQuery.java b/binsrc/sesame3/virtuoso_driver/VirtuosoGraphQuery.java index 38c0e27a04..4719fe885f 100644 --- a/binsrc/sesame3/virtuoso_driver/VirtuosoGraphQuery.java +++ b/binsrc/sesame3/virtuoso_driver/VirtuosoGraphQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoQuery.java b/binsrc/sesame3/virtuoso_driver/VirtuosoQuery.java index e86b0662c7..9a16f33fcd 100644 --- a/binsrc/sesame3/virtuoso_driver/VirtuosoQuery.java +++ b/binsrc/sesame3/virtuoso_driver/VirtuosoQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepository.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepository.java index 6477844adc..7beb769cfc 100644 --- a/binsrc/sesame3/virtuoso_driver/VirtuosoRepository.java +++ b/binsrc/sesame3/virtuoso_driver/VirtuosoRepository.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConfig.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConfig.java index 2fc204667d..832e08c5e5 100644 --- a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConfig.java +++ b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConfig.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConnection.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConnection.java index a27f0166fb..5009b1dd62 100644 --- a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConnection.java +++ b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryConnection.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryFactory.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryFactory.java index 866aa49df4..ec63b1b9bd 100644 --- a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryFactory.java +++ b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryFactory.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryMetaData.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryMetaData.java index ef9184857c..198737ef4f 100644 --- a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryMetaData.java +++ b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositoryMetaData.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositorySchema.java b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositorySchema.java index 42fa9b1fa2..87dba797c0 100644 --- a/binsrc/sesame3/virtuoso_driver/VirtuosoRepositorySchema.java +++ b/binsrc/sesame3/virtuoso_driver/VirtuosoRepositorySchema.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoTest.java b/binsrc/sesame3/virtuoso_driver/VirtuosoTest.java index ade1d2e231..ad1bc3db4b 100644 --- a/binsrc/sesame3/virtuoso_driver/VirtuosoTest.java +++ b/binsrc/sesame3/virtuoso_driver/VirtuosoTest.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame3/virtuoso_driver/VirtuosoTupleQuery.java b/binsrc/sesame3/virtuoso_driver/VirtuosoTupleQuery.java index 260310245a..355ed1b545 100644 --- a/binsrc/sesame3/virtuoso_driver/VirtuosoTupleQuery.java +++ b/binsrc/sesame3/virtuoso_driver/VirtuosoTupleQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/Makefile.am b/binsrc/sesame4/Makefile.am index dd21936e3e..34edc1823c 100644 --- a/binsrc/sesame4/Makefile.am +++ b/binsrc/sesame4/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/tests/Test_BNode.java b/binsrc/sesame4/tests/Test_BNode.java index 5f0fc19db5..9302eafb71 100644 --- a/binsrc/sesame4/tests/Test_BNode.java +++ b/binsrc/sesame4/tests/Test_BNode.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/tests/Test_BNode_perf1.java b/binsrc/sesame4/tests/Test_BNode_perf1.java index 0afafd94e9..b24261bb8b 100644 --- a/binsrc/sesame4/tests/Test_BNode_perf1.java +++ b/binsrc/sesame4/tests/Test_BNode_perf1.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/Version.java b/binsrc/sesame4/virtuoso_driver/Version.java index 41ca57f0b9..13e508fddf 100644 --- a/binsrc/sesame4/virtuoso_driver/Version.java +++ b/binsrc/sesame4/virtuoso_driver/Version.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoBooleanQuery.java b/binsrc/sesame4/virtuoso_driver/VirtuosoBooleanQuery.java index b247f03a87..3d2f7b5893 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoBooleanQuery.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoBooleanQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoGraphQuery.java b/binsrc/sesame4/virtuoso_driver/VirtuosoGraphQuery.java index 753b6de24a..e8f27bfb8a 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoGraphQuery.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoGraphQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoOperation.java b/binsrc/sesame4/virtuoso_driver/VirtuosoOperation.java index 250b8b2c6e..a40eb4e957 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoOperation.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoOperation.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoQuery.java b/binsrc/sesame4/virtuoso_driver/VirtuosoQuery.java index 3934e98be4..506c475f99 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoQuery.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoRepository.java b/binsrc/sesame4/virtuoso_driver/VirtuosoRepository.java index d2546bed65..7dc29d976e 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoRepository.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoRepository.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryConfig.java b/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryConfig.java index ced3dfc3b9..5c04a944fa 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryConfig.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryConfig.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryConnection.java b/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryConnection.java index 78ac0a8c9e..ef452b56e5 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryConnection.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryConnection.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryConnectionFactory.java b/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryConnectionFactory.java index 0a3fb8b987..b9e1b6b8c0 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryConnectionFactory.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryConnectionFactory.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryFactory.java b/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryFactory.java index 018d9ec9f5..9360a6fa2f 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryFactory.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoRepositoryFactory.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoRepositorySchema.java b/binsrc/sesame4/virtuoso_driver/VirtuosoRepositorySchema.java index c8b1148e91..007d2b7154 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoRepositorySchema.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoRepositorySchema.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoTest.java b/binsrc/sesame4/virtuoso_driver/VirtuosoTest.java index a361ef2ec9..d21d6bdd3d 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoTest.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoTest.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoTupleQuery.java b/binsrc/sesame4/virtuoso_driver/VirtuosoTupleQuery.java index 9de459a996..ccc9dcdc77 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoTupleQuery.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoTupleQuery.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sesame4/virtuoso_driver/VirtuosoUpdate.java b/binsrc/sesame4/virtuoso_driver/VirtuosoUpdate.java index 3b81ba0b4e..2686f06882 100644 --- a/binsrc/sesame4/virtuoso_driver/VirtuosoUpdate.java +++ b/binsrc/sesame4/virtuoso_driver/VirtuosoUpdate.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sqldoc/Makefile.am b/binsrc/sqldoc/Makefile.am index f9f2f1fe36..f3d8bea693 100644 --- a/binsrc/sqldoc/Makefile.am +++ b/binsrc/sqldoc/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/sqldoc/bif_sps.sql b/binsrc/sqldoc/bif_sps.sql index 828978d749..b27d8036dd 100644 --- a/binsrc/sqldoc/bif_sps.sql +++ b/binsrc/sqldoc/bif_sps.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/sqldoc/cutter.c b/binsrc/sqldoc/cutter.c index 30db3d14d2..795d781207 100644 --- a/binsrc/sqldoc/cutter.c +++ b/binsrc/sqldoc/cutter.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sqldoc/escape8bit.c b/binsrc/sqldoc/escape8bit.c index cbe20c915b..fcb75d20e4 100644 --- a/binsrc/sqldoc/escape8bit.c +++ b/binsrc/sqldoc/escape8bit.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sqldoc/functions.sql b/binsrc/sqldoc/functions.sql index cd96fc5d02..7541400e31 100644 --- a/binsrc/sqldoc/functions.sql +++ b/binsrc/sqldoc/functions.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/sqldoc/isql_log_normalize.c b/binsrc/sqldoc/isql_log_normalize.c index 3f56bbd085..acaf3ca5a0 100644 --- a/binsrc/sqldoc/isql_log_normalize.c +++ b/binsrc/sqldoc/isql_log_normalize.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/sqldoc/mkfuncref.bat b/binsrc/sqldoc/mkfuncref.bat index 5e897e7b44..73ff98eb71 100644 --- a/binsrc/sqldoc/mkfuncref.bat +++ b/binsrc/sqldoc/mkfuncref.bat @@ -2,7 +2,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the diff --git a/binsrc/sqldoc/sql_functions.xsl b/binsrc/sqldoc/sql_functions.xsl index ba051f71c1..253dbd6515 100644 --- a/binsrc/sqldoc/sql_functions.xsl +++ b/binsrc/sqldoc/sql_functions.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/sqldoc/vspx_doc.sh b/binsrc/sqldoc/vspx_doc.sh index 951e60d868..1488b728fc 100755 --- a/binsrc/sqldoc/vspx_doc.sh +++ b/binsrc/sqldoc/vspx_doc.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/sync/Makefile.am b/binsrc/sync/Makefile.am index 105e479408..7c98554afe 100644 --- a/binsrc/sync/Makefile.am +++ b/binsrc/sync/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/sync/drop.sql b/binsrc/sync/drop.sql index 10b9c9a58e..14bb67e499 100644 --- a/binsrc/sync/drop.sql +++ b/binsrc/sync/drop.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/sync/make_vad.sh b/binsrc/sync/make_vad.sh index ee90682b0c..77512b9758 100755 --- a/binsrc/sync/make_vad.sh +++ b/binsrc/sync/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -221,7 +221,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/binsrc/sync/sync.sql b/binsrc/sync/sync.sql index f9bc2a097b..6a2eb46aa9 100644 --- a/binsrc/sync/sync.sql +++ b/binsrc/sync/sync.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/sync/sync.vsp b/binsrc/sync/sync.vsp index 6b12020487..d8323cee91 100644 --- a/binsrc/sync/sync.vsp +++ b/binsrc/sync/sync.vsp @@ -3,7 +3,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/sync/syncml.sql b/binsrc/sync/syncml.sql index a256744ebf..17cc2d6925 100644 --- a/binsrc/sync/syncml.sql +++ b/binsrc/sync/syncml.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/sync/syncml_drop.sql b/binsrc/sync/syncml_drop.sql index d4db81b8f4..cb79e1f05a 100644 --- a/binsrc/sync/syncml_drop.sql +++ b/binsrc/sync/syncml_drop.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/sync/wbxml.sql b/binsrc/sync/wbxml.sql index aa6b044f72..2473f7691b 100644 --- a/binsrc/sync/wbxml.sql +++ b/binsrc/sync/wbxml.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/Makefile.am b/binsrc/tests/Makefile.am index 59ca37b359..d134d6c913 100644 --- a/binsrc/tests/Makefile.am +++ b/binsrc/tests/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/b3078.c b/binsrc/tests/b3078.c index c0fcf6e6b0..4eae1a66a5 100644 --- a/binsrc/tests/b3078.c +++ b/binsrc/tests/b3078.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/Makefile.am b/binsrc/tests/biftest/Makefile.am index 895d000d1d..25da7eb28f 100644 --- a/binsrc/tests/biftest/Makefile.am +++ b/binsrc/tests/biftest/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/bif_sample.c b/binsrc/tests/biftest/bif_sample.c index ff0189e1a1..0b7cb4f917 100644 --- a/binsrc/tests/biftest/bif_sample.c +++ b/binsrc/tests/biftest/bif_sample.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/bif_sample_win32.c b/binsrc/tests/biftest/bif_sample_win32.c index ea50584c91..9196948cbf 100644 --- a/binsrc/tests/biftest/bif_sample_win32.c +++ b/binsrc/tests/biftest/bif_sample_win32.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/bif_server.c b/binsrc/tests/biftest/bif_server.c index a8b523795c..62b28ffd7e 100644 --- a/binsrc/tests/biftest/bif_server.c +++ b/binsrc/tests/biftest/bif_server.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/import_clr.sql b/binsrc/tests/biftest/import_clr.sql index eff8c3c0a1..732a19b956 100644 --- a/binsrc/tests/biftest/import_clr.sql +++ b/binsrc/tests/biftest/import_clr.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/java/BpelVarsAdaptor.java b/binsrc/tests/biftest/java/BpelVarsAdaptor.java index e5fed97913..837ce97dc3 100644 --- a/binsrc/tests/biftest/java/BpelVarsAdaptor.java +++ b/binsrc/tests/biftest/java/BpelVarsAdaptor.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/java/Restricted.java b/binsrc/tests/biftest/java/Restricted.java index a2e0d95fa8..5278a199f7 100644 --- a/binsrc/tests/biftest/java/Restricted.java +++ b/binsrc/tests/biftest/java/Restricted.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/java/Unrestricted.java b/binsrc/tests/biftest/java/Unrestricted.java index a8befe3b26..9bceaa551a 100644 --- a/binsrc/tests/biftest/java/Unrestricted.java +++ b/binsrc/tests/biftest/java/Unrestricted.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/java/__virt_access_granter.java b/binsrc/tests/biftest/java/__virt_access_granter.java index 541849e783..2d844eeb13 100644 --- a/binsrc/tests/biftest/java/__virt_access_granter.java +++ b/binsrc/tests/biftest/java/__virt_access_granter.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/java/__virt_class_loader_r.java b/binsrc/tests/biftest/java/__virt_class_loader_r.java index 716b682c70..34d221096f 100644 --- a/binsrc/tests/biftest/java/__virt_class_loader_r.java +++ b/binsrc/tests/biftest/java/__virt_class_loader_r.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/java/__virt_class_loader_ur.java b/binsrc/tests/biftest/java/__virt_class_loader_ur.java index d9591c7cb8..ca346ad2ff 100644 --- a/binsrc/tests/biftest/java/__virt_class_loader_ur.java +++ b/binsrc/tests/biftest/java/__virt_class_loader_ur.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/java/__virt_helper.java b/binsrc/tests/biftest/java/__virt_helper.java index b37c94f457..eaedcd0f45 100644 --- a/binsrc/tests/biftest/java/__virt_helper.java +++ b/binsrc/tests/biftest/java/__virt_helper.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/java_code.c b/binsrc/tests/biftest/java_code.c index a4d25f931c..84597d8854 100644 --- a/binsrc/tests/biftest/java_code.c +++ b/binsrc/tests/biftest/java_code.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/java_skel.c b/binsrc/tests/biftest/java_skel.c index 8473bba446..d24759d501 100644 --- a/binsrc/tests/biftest/java_skel.c +++ b/binsrc/tests/biftest/java_skel.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/java_to_c.awk b/binsrc/tests/biftest/java_to_c.awk index e815b82d69..97e5e50540 100644 --- a/binsrc/tests/biftest/java_to_c.awk +++ b/binsrc/tests/biftest/java_to_c.awk @@ -5,7 +5,7 @@ BEGIN { # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/javavm.c b/binsrc/tests/biftest/javavm.c index aa2a7ce035..f27bc5972f 100644 --- a/binsrc/tests/biftest/javavm.c +++ b/binsrc/tests/biftest/javavm.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/javavm_pl.xsl b/binsrc/tests/biftest/javavm_pl.xsl index 0415305567..6811519599 100644 --- a/binsrc/tests/biftest/javavm_pl.xsl +++ b/binsrc/tests/biftest/javavm_pl.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/javavm_type.xsl b/binsrc/tests/biftest/javavm_type.xsl index 84ca9bfdc5..7f496f0b8c 100644 --- a/binsrc/tests/biftest/javavm_type.xsl +++ b/binsrc/tests/biftest/javavm_type.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/javavm_xml.sql b/binsrc/tests/biftest/javavm_xml.sql index 0f1a789e55..87ac102b65 100644 --- a/binsrc/tests/biftest/javavm_xml.sql +++ b/binsrc/tests/biftest/javavm_xml.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/javavm_xml2.sql b/binsrc/tests/biftest/javavm_xml2.sql index 87497b4282..6ba70678ae 100644 --- a/binsrc/tests/biftest/javavm_xml2.sql +++ b/binsrc/tests/biftest/javavm_xml2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/javavm_xml3.sql b/binsrc/tests/biftest/javavm_xml3.sql index 1618177809..7f5743ed56 100644 --- a/binsrc/tests/biftest/javavm_xml3.sql +++ b/binsrc/tests/biftest/javavm_xml3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/lang_sample.c b/binsrc/tests/biftest/lang_sample.c index 0f33a3d160..d9e8d428ab 100644 --- a/binsrc/tests/biftest/lang_sample.c +++ b/binsrc/tests/biftest/lang_sample.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/Point.java b/binsrc/tests/biftest/tests/Point.java index 8fa8485665..db915717b8 100644 --- a/binsrc/tests/biftest/tests/Point.java +++ b/binsrc/tests/biftest/tests/Point.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/Point_src.aspx b/binsrc/tests/biftest/tests/Point_src.aspx index 7881f086dd..6cf0715723 100644 --- a/binsrc/tests/biftest/tests/Point_src.aspx +++ b/binsrc/tests/biftest/tests/Point_src.aspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/Write_no.java b/binsrc/tests/biftest/tests/Write_no.java index 56129f05d8..120441755f 100644 --- a/binsrc/tests/biftest/tests/Write_no.java +++ b/binsrc/tests/biftest/tests/Write_no.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/Write_yes.java b/binsrc/tests/biftest/tests/Write_yes.java index fa874b2a6b..2761c501a6 100644 --- a/binsrc/tests/biftest/tests/Write_yes.java +++ b/binsrc/tests/biftest/tests/Write_yes.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/java_ts.sql b/binsrc/tests/biftest/tests/java_ts.sql index 7421ad59b9..fd00955918 100644 --- a/binsrc/tests/biftest/tests/java_ts.sql +++ b/binsrc/tests/biftest/tests/java_ts.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/java_ts2.sql b/binsrc/tests/biftest/tests/java_ts2.sql index 7289263d7d..ce9e29cd68 100644 --- a/binsrc/tests/biftest/tests/java_ts2.sql +++ b/binsrc/tests/biftest/tests/java_ts2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/java_ts3.sql b/binsrc/tests/biftest/tests/java_ts3.sql index 8a156d1be3..58f720efd2 100644 --- a/binsrc/tests/biftest/tests/java_ts3.sql +++ b/binsrc/tests/biftest/tests/java_ts3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/my_finances.java b/binsrc/tests/biftest/tests/my_finances.java index fdabf8d98e..0ccd204279 100644 --- a/binsrc/tests/biftest/tests/my_finances.java +++ b/binsrc/tests/biftest/tests/my_finances.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/test_tax_java.sql b/binsrc/tests/biftest/tests/test_tax_java.sql index 84179a0ddf..bb0f759863 100644 --- a/binsrc/tests/biftest/tests/test_tax_java.sql +++ b/binsrc/tests/biftest/tests/test_tax_java.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/testsuite.java b/binsrc/tests/biftest/tests/testsuite.java index 0c34716e5c..1f3e313ff9 100644 --- a/binsrc/tests/biftest/tests/testsuite.java +++ b/binsrc/tests/biftest/tests/testsuite.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/testsuite_base.java b/binsrc/tests/biftest/tests/testsuite_base.java index a80692d9c5..c03c96b351 100644 --- a/binsrc/tests/biftest/tests/testsuite_base.java +++ b/binsrc/tests/biftest/tests/testsuite_base.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/testsuite_ns.java b/binsrc/tests/biftest/tests/testsuite_ns.java index b92dfc9cd7..efa59ce14b 100644 --- a/binsrc/tests/biftest/tests/testsuite_ns.java +++ b/binsrc/tests/biftest/tests/testsuite_ns.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/tests/tjavavm.sh b/binsrc/tests/biftest/tests/tjavavm.sh index 5bdd9bbc8b..368d6cb314 100755 --- a/binsrc/tests/biftest/tests/tjavavm.sh +++ b/binsrc/tests/biftest/tests/tjavavm.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/thook.sh b/binsrc/tests/biftest/thook.sh index 4ab718c548..957e50ad03 100755 --- a/binsrc/tests/biftest/thook.sh +++ b/binsrc/tests/biftest/thook.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/thook.sql b/binsrc/tests/biftest/thook.sql index 329f1f6d58..f864a3bddf 100644 --- a/binsrc/tests/biftest/thook.sql +++ b/binsrc/tests/biftest/thook.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/thook1.sql b/binsrc/tests/biftest/thook1.sql index ace0bd6897..b78407b43a 100644 --- a/binsrc/tests/biftest/thook1.sql +++ b/binsrc/tests/biftest/thook1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/thook2.sql b/binsrc/tests/biftest/thook2.sql index 6c468c999c..05df4f249b 100644 --- a/binsrc/tests/biftest/thook2.sql +++ b/binsrc/tests/biftest/thook2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/biftest/win32.mk b/binsrc/tests/biftest/win32.mk index 8d2cd554bc..339e4762b9 100644 --- a/binsrc/tests/biftest/win32.mk +++ b/binsrc/tests/biftest/win32.mk @@ -4,7 +4,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/blobnulls.c b/binsrc/tests/blobnulls.c index cea65bde84..9686a3bf96 100644 --- a/binsrc/tests/blobnulls.c +++ b/binsrc/tests/blobnulls.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -332,7 +332,7 @@ check_blob_col (HSTMT stmt, int n_col, long expect_bytes, int ctype) rc = SQLGetData (stmt, n_col, ctype, res, get_batch, &rec_len); if (rc == SQL_ERROR) { - IF_ERR_GO (stmt, err, rc) + IF_ERR_GO (stmt, err, rc); err: return 0; } if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) diff --git a/binsrc/tests/blobs.c b/binsrc/tests/blobs.c index 10bfbc8bc6..dcfcef2c49 100644 --- a/binsrc/tests/blobs.c +++ b/binsrc/tests/blobs.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -96,9 +96,6 @@ print_error (HSTMT e1, HSTMT e2, HSTMT e3) exit (-1); } - -HSTMT ins_stmt; - void del_blobs () { @@ -109,272 +106,419 @@ del_blobs () } -/* SDWORD long_len_array[] = { 4, 4, 4, 4, 4, 4 }; */ -HSTMT upd_stmt; +unsigned +incremental_tridgell32 (unsigned char *data, unsigned char *data_end, unsigned initial_tridgell32) +{ + unsigned t32_lo = (initial_tridgell32 & 0xFFFF), t32_hi = (initial_tridgell32 >> 16); + unsigned char *tail; + for (tail = data; tail < data_end; tail++) + { + t32_lo += tail[0]; + t32_hi += t32_lo; + } + return ((t32_hi << 16) | (t32_lo & 0xFFFF)); +} void -ins_blob (long row_no, int n_blocks) +fill_test_wchar_t_buffer (wchar_t *buffer, int buf_length_in_symbols, long row_no, const char *col_name, int fragment_offset, unsigned *tridgell32_acc) { - long w_start; - long rc, n_param, c; - SQLLEN l1 = SQL_DATA_AT_EXEC, l2 = SQL_DATA_AT_EXEC, l3 = SQL_DATA_AT_EXEC, l4 = SQL_DATA_AT_EXEC; - static char temp[10000], btemp[10000]; - static wchar_t wtemp[10000]; - if (!ins_stmt) + static wchar_t pattern[] = L"0123456789 wide char blob with unicoded Cyrillic: \"\x41e\x43d \x434\x43e\x431\x430\x432\x438\x43b \x43a\x430\x440\x442\x43e\x448\x43a\x438,...\" "; + static wchar_t thousand_pattern[] = L" THE THIRD CLOSING BRACE IS THE LAST CHAR OF A WHOLE THOUSAND: o123456789o123456789o123456789o123456789o123456]]]"; + size_t pattern_bytes = sizeof (pattern) - sizeof (wchar_t); + size_t thousand_pattern_bytes = sizeof (thousand_pattern) - sizeof (wchar_t); + wchar_t *tail = buffer, *buffer_end = (buffer + buf_length_in_symbols); + unsigned char label_buf[100], *label_tail; + while (tail < buffer_end - pattern_bytes / sizeof(wchar_t)) { - int inx; - INIT_STMT (hdbc, ins_stmt, - "insert into BLOBS (ROW_NO, B1, B2, B3, B4) values (?,?,?,?,?)"); - for (inx = 0; inx < sizeof (temp); inx++) - { - wtemp [inx] = (wchar_t)(temp[inx] = 'A' + (inx % ('Z' + 1 - 'A'))); - if (inx < sizeof (temp) / 2) - { - btemp [inx * 2] = ((temp[inx] & 0xF0) >> 4) + ((((temp[inx] & 0xF0) >> 4) < 10) ? '0' : 'A' - 10); - btemp [inx * 2 + 1] = (temp[inx] & 0x0F) + (((temp[inx] & 0x0F) < 10) ? '0' : 'A' - 10); - } - } + memcpy (tail, pattern, pattern_bytes); + tail += pattern_bytes / sizeof (wchar_t); } - IBINDL (ins_stmt, 1, row_no); - IS_ERR (ins_stmt, - SQLSetParam (ins_stmt, 2, SQL_C_CHAR, SQL_LONGVARCHAR, 10, 0, (void *) 2L, &l1)); - IS_ERR (ins_stmt, - SQLSetParam (ins_stmt, 3, SQL_C_BINARY, SQL_LONGVARBINARY, 10, 0, (void *) 3L, &l2)); - IS_ERR (ins_stmt, - SQLSetParam (ins_stmt, 4, SQL_C_WCHAR, SQL_WLONGVARCHAR, 10, 0, (void *) 4L, &l3)); - IS_ERR (ins_stmt, - SQLSetParam (ins_stmt, 5, SQL_C_CHAR, SQL_LONGVARBINARY, 10, 0, (void *) 5L, &l4)); - - w_start = get_msec_count (); - rc = SQLExecute (ins_stmt); - IF_ERR_GO (ins_stmt, err, rc); - rc = SQLParamData (ins_stmt, (void **) &n_param); - while (rc == SQL_NEED_DATA) + if (tail < buffer_end) + memcpy (tail, pattern, buffer_end - tail); + for (tail = buffer + 1000 - (fragment_offset % 1000) - (thousand_pattern_bytes / sizeof (wchar_t)); tail < buffer_end; tail += 1000) { - switch (n_param) - { - case 2: - for (c = 0; c < n_blocks; c++) - { - IF_ERR_GO (ins_stmt, i_err, - SQLPutData (ins_stmt, temp, sizeof (temp))); - write_bytes += sizeof (temp); - } - break; + int bytes_to_fit = ((tail <= buffer_end - (thousand_pattern_bytes / sizeof (wchar_t))) ? thousand_pattern_bytes : ((buffer_end - tail) * sizeof (wchar_t))); + if (tail >= buffer) + memcpy (tail, thousand_pattern, bytes_to_fit); + else + memcpy (buffer, thousand_pattern + (buffer - tail), bytes_to_fit - (buffer - tail) * sizeof (wchar_t)); + } + snprintf ((char *)label_buf, sizeof (label_buf), "[ Row #%ld, Column %s, offset %d ]", row_no, col_name, fragment_offset); + label_tail = label_buf; + tail = buffer; + while ('\0' != label_tail[0]) (tail++)[0] = (label_tail++)[0]; + tridgell32_acc[0] = incremental_tridgell32 ((unsigned char *)buffer, (unsigned char *)buffer_end, tridgell32_acc[0]); +} - case 3: - for (c = 0; c < n_blocks; c++) - { - IF_ERR_GO (ins_stmt, i_err, - SQLPutData (ins_stmt, temp, sizeof (temp) / 2)); - write_bytes += sizeof (temp) / 2; - } - break; +void +fill_test_char_buffer (unsigned char *buffer, int buf_length_in_symbols, long row_no, const char *col_name, int fragment_offset, unsigned *tridgell32_acc) +{ + static unsigned char pattern[] = "0123456789 single-byte char blob with UTF-8 Cyrillic: \"Он добавил картошки,...\" and Windows-1251 Cyrillic: \"Îí äîáàâèë êàðòîøêè,...\" "; + size_t pattern_bytes = sizeof (pattern) - sizeof (unsigned char); + unsigned char *tail = (unsigned char *)buffer, *buffer_end = (unsigned char *)(buffer + buf_length_in_symbols); + unsigned char label_buf[100]; + while (tail < buffer_end - pattern_bytes) + { + memcpy (tail, pattern, pattern_bytes); + tail += pattern_bytes; + } + if (tail < buffer_end) + memcpy (tail, pattern, buffer_end - tail); + snprintf ((char *)label_buf, sizeof (label_buf), "[ Row #%ld, Column %s, offset %d ]", row_no, col_name, fragment_offset); + memcpy (buffer, label_buf, strlen ((char *)label_buf)); + tridgell32_acc[0] = incremental_tridgell32 ((unsigned char *)buffer, buffer_end, tridgell32_acc[0]); +} - case 4: - for (c = 0; c < n_blocks; c++) - { - IF_ERR_GO (ins_stmt, i_err, - SQLPutData (ins_stmt, wtemp, sizeof (wtemp))); - write_bytes += sizeof (wtemp); - } - break; +void +hexencode_chars_to_bin (unsigned char *bin_buffer, unsigned char *buffer, size_t buffer_bytes) +{ + int idx; + for (idx = 0; idx < buffer_bytes; idx++) + { + bin_buffer[idx * 2] = "0123456789ABCDEF"[buffer[idx] >> 4]; + bin_buffer[idx * 2 + 1] = "0123456789ABCDEF"[buffer[idx] & 0xF]; + } +} - case 5: - for (c = 0; c < n_blocks; c++) - { - IF_ERR_GO (ins_stmt, i_err, - SQLPutData (ins_stmt, btemp, sizeof (btemp))); - write_bytes += sizeof (btemp); - } - break; +void +fill_test_bin_buffer (unsigned char *buffer, int buf_length_in_symbols, long row_no, const char *col_name, int fragment_offset, unsigned *tridgell32_acc) +{ + static unsigned char pattern[] = "0123456789 bin blob with UTF-8 Cyrillic: \"Он добавил картошки,...\" and Windows-1251 Cyrillic: \"Îí äîáàâèë êàðòîøêè,...\" "; + static unsigned char bin_pattern[sizeof (pattern)*2]; + static int bin_pattern_inited = 0; + size_t pattern_bytes = (sizeof (pattern) - sizeof (unsigned char)), bin_pattern_bytes = pattern_bytes * 2; + unsigned char *tail = (unsigned char *)buffer, *buffer_end = (unsigned char *)(buffer + buf_length_in_symbols); + unsigned char label_buf[100]; + if (!bin_pattern_inited) + { + hexencode_chars_to_bin (bin_pattern, pattern, pattern_bytes); + bin_pattern_inited = 1; + } + while (tail < buffer_end - bin_pattern_bytes) + { + memcpy (tail, bin_pattern, bin_pattern_bytes); + tail += bin_pattern_bytes; + } + if (tail < buffer_end) + memcpy (tail, bin_pattern, buffer_end - tail); + snprintf ((char *)label_buf, sizeof (label_buf), "[ Row #%ld, Column %s, offset %d ]", row_no, col_name, fragment_offset); + hexencode_chars_to_bin (buffer, label_buf, strlen ((char *)label_buf)); + tridgell32_acc[0] = incremental_tridgell32 ((unsigned char *)buffer, buffer_end, tridgell32_acc[0]); +} - default: - printf ("Bad param number asked by SQLParamData."); - } +#define BLOCK_SYMBOLS 10000 +HSTMT test_insert_stmt; +HSTMT test_update_stmt; - i_err: - rc = SQLParamData (ins_stmt, (void **) &n_param); - } +typedef struct known_checksum_s { + long kc_row_no; + const char *kc_col_name; + int kc_length_in_symbols; + unsigned kc_tridgell32; +} known_checksum_t; - IF_ERR_GO (ins_stmt, err, rc); - write_msecs += get_msec_count () - w_start; +known_checksum_t known_checksums[1000]; +int known_checksum_count = 0; -err:; +int +recall_checksum (long row_no, const char *col_name, int length_in_symbols, unsigned *tridgell32_ret) +{ + known_checksum_t *iter, *end = known_checksums + known_checksum_count; + for (iter = known_checksums; iter < end; iter++) + { + if (iter->kc_row_no != row_no) continue; + if (iter->kc_length_in_symbols != length_in_symbols) continue; + if (strcmp (iter->kc_col_name, col_name)) continue; + tridgell32_ret[0] = iter->kc_tridgell32; + return 1; + } + return 0; } - void -copy_blob (long from, long to) +verify_checksum (long row_no, const char *col_name, int length_in_symbols, unsigned tridgell32, long new_row_no, const char *timing) { - long rc; - static HSTMT cp_stmt; - - if (!cp_stmt) + unsigned old_t32 = 0; + if (recall_checksum (row_no, col_name, length_in_symbols, &old_t32)) { - INIT_STMT (hdbc, cp_stmt, - "insert into BLOBS (ROW_NO, B1, B2, B3, B4) " - " select ?, B1, B2, B3, B4 from BLOBS where ROW_NO = ?"); + if (old_t32 != tridgell32) + printf ("*** FAILED: Checksum for ROW_NO %ld column %s, length %d symbols: expected value is %u actual in ROW_NO %ld is %u, %s\n", row_no, col_name, length_in_symbols, old_t32, new_row_no, tridgell32, timing); + else + printf ("PASSED: Checksum for ROW_NO %ld column %s, length %d symbols: expected value is %u actual in ROW_NO %ld %u, %s\n", row_no, col_name, length_in_symbols, old_t32, new_row_no, tridgell32, timing); + return; } - IBINDL (cp_stmt, 1, to); - IBINDL (cp_stmt, 2, from); - - rc = SQLExecute (cp_stmt); - IF_ERR_GO (cp_stmt, err, rc); - return; - -err:; + printf ("*** FAILED: Checksum for ROW_NO %ld column %s, length %d symbols: value is %u in ROW_NO %ld, %s, but it was never remembered\n", row_no, col_name, length_in_symbols, tridgell32, new_row_no, timing); } - void -upd_blob (long row_no, int n_blocks) +store_checksum (long row_no, const char *col_name, int length_in_symbols, unsigned tridgell32) { - long w_start = get_msec_count (); - long rc, n_param, c; - SQLLEN l1 = SQL_DATA_AT_EXEC, l2 = SQL_DATA_AT_EXEC, l3 = SQL_DATA_AT_EXEC, l4 = SQL_DATA_AT_EXEC; - static char temp[10000], btemp[10000]; - static wchar_t wtemp[10000]; - - if (!upd_stmt) + known_checksum_t *new_kc; + unsigned old_t32 = 0; + if (recall_checksum (row_no, col_name, length_in_symbols, &old_t32)) { - int inx; - INIT_STMT (hdbc, upd_stmt, - "update BLOBS set B1 = ?, B2 = ?, B3 = ?, B4 = ? where ROW_NO = ?"); - for (inx = 0; inx < sizeof (temp); inx++) - { - wtemp [inx] = (wchar_t)(temp[inx] = 'A' + (inx % ('Z' - 'A'))); - if (inx < sizeof (temp) / 2) - { - btemp [inx * 2] = ((temp[inx] & 0xF0) >> 4) + ((((temp[inx] & 0xF0) >> 4) < 10) ? '0' : 'A' - 10); - btemp [inx * 2 + 1] = (temp[inx] & 0x0F) + (((temp[inx] & 0x0F) < 10) ? '0' : 'A' - 10); - } - } + if (old_t32 != tridgell32) + printf ("*** FAILED: Checksum for ROW_NO %ld column %s, length %d symbols: it was %u now %u, weird\n", row_no, col_name, length_in_symbols, old_t32, tridgell32); + return; } + if (known_checksum_count >= (sizeof (known_checksums) / sizeof (known_checksums[0]))) + { + printf ("*** FAILED: internal error in %s: please increase size of known_checksums array\n", __FILE__); + return; + } + new_kc = known_checksums + known_checksum_count++; + new_kc->kc_row_no = row_no; + new_kc->kc_col_name = col_name; + new_kc->kc_length_in_symbols = length_in_symbols; + new_kc->kc_tridgell32 = tridgell32; +} - SQLSetParam (upd_stmt, 1, SQL_C_CHAR, SQL_LONGVARCHAR, 0, 0, (void *) 1L, &l1); - SQLSetParam (upd_stmt, 2, SQL_C_BINARY, SQL_LONGVARBINARY, 0, 0, (void *) 2L, &l2); - SQLSetParam (upd_stmt, 3, SQL_C_WCHAR, SQL_WLONGVARCHAR, 0, 0, (void *) 3L, &l3); - SQLSetParam (upd_stmt, 4, SQL_C_CHAR, SQL_LONGVARBINARY, 0, 0, (void *) 4L, &l4); - IBINDL (upd_stmt, 5, row_no); - rc = SQLExecute (upd_stmt); - IF_ERR_GO (upd_stmt, err, rc); - rc = SQLParamData (upd_stmt, (void **) &n_param); +void +ins_or_upd_blob (long row_no, int n_blocks, int is_update) +{ + long w_start; + long rc, n_param, c; + SQLLEN B1_len = SQL_DATA_AT_EXEC, B2_len = SQL_DATA_AT_EXEC, B3_len = SQL_DATA_AT_EXEC, B4_len = SQL_DATA_AT_EXEC; + HSTMT stmt; + unsigned B1_t32 = 0, B2_t32 = 0, B3_t32 = 0, B4_t32 = 0; + if (!test_insert_stmt) + INIT_STMT (hdbc, test_insert_stmt, "insert into BLOBS (B1, B2, B3, B4, ROW_NO) values (?,?,?,?,?)"); + if (!test_update_stmt) + INIT_STMT (hdbc, test_update_stmt, "update BLOBS set B1 = ?, B2 = ?, B3 = ?, B4 = ? where ROW_NO = ?"); + stmt = (is_update ? test_update_stmt : test_insert_stmt); + IF_ERR (stmt, SQLSetParam (stmt, 1, SQL_C_CHAR , SQL_LONGVARCHAR , 10, 0, (void *) 1L, &B1_len)); + IF_ERR (stmt, SQLSetParam (stmt, 2, SQL_C_BINARY , SQL_LONGVARBINARY , 10, 0, (void *) 2L, &B2_len)); + IF_ERR (stmt, SQLSetParam (stmt, 3, SQL_C_WCHAR , SQL_WLONGVARCHAR , 10, 0, (void *) 3L, &B3_len)); + IF_ERR (stmt, SQLSetParam (stmt, 4, SQL_C_CHAR , SQL_LONGVARBINARY , 10, 0, (void *) 4L, &B4_len)); + IBINDL (stmt, 5, row_no); + + w_start = get_msec_count (); + rc = SQLExecute (stmt); + IF_ERR_GO (stmt, err, rc); + rc = SQLParamData (stmt, (void **) &n_param); while (rc == SQL_NEED_DATA) { + char blob_fname[128]; + FILE *blob_f; + snprintf (blob_fname, sizeof (blob_fname), "blobs_row_%ld_B%d_%ld_ORIG.bin", row_no, (int)n_param, (long)n_blocks * BLOCK_SYMBOLS); + blob_f = fopen (blob_fname, "wb"); switch (n_param) { case 1: + B1_t32 = 0; for (c = 0; c < n_blocks; c++) { - SQLPutData (upd_stmt, temp, sizeof (temp)); + unsigned char temp[BLOCK_SYMBOLS]; + fill_test_char_buffer (temp, BLOCK_SYMBOLS, row_no, "B1", c * BLOCK_SYMBOLS, &B1_t32); + fwrite (temp, sizeof (temp), 1, blob_f); + IF_ERR_GO (stmt, i_err_1, + SQLPutData (stmt, temp, sizeof (temp))); write_bytes += sizeof (temp); } +i_err_1: + store_checksum (row_no, "B1", n_blocks * BLOCK_SYMBOLS, B1_t32); break; case 2: + B2_t32 = 0; for (c = 0; c < n_blocks; c++) { - SQLPutData (upd_stmt, temp, sizeof (temp) / 2); - write_bytes += sizeof (temp) / 2; + unsigned char temp[BLOCK_SYMBOLS]; + fill_test_char_buffer (temp, BLOCK_SYMBOLS, row_no, "B2", c * BLOCK_SYMBOLS, &B2_t32); + fwrite (temp, sizeof (temp), 1, blob_f); + IF_ERR_GO (stmt, i_err_2, + SQLPutData (stmt, temp, sizeof (temp))); + write_bytes += sizeof (temp); } +i_err_2: + store_checksum (row_no, "B2", n_blocks * BLOCK_SYMBOLS, B2_t32); break; case 3: + B3_t32 = 0; for (c = 0; c < n_blocks; c++) { - SQLPutData (upd_stmt, wtemp, sizeof (wtemp)); + wchar_t wtemp[BLOCK_SYMBOLS]; + fill_test_wchar_t_buffer (wtemp, BLOCK_SYMBOLS, row_no, "B3", c * BLOCK_SYMBOLS, &B3_t32); + fwrite (wtemp, sizeof (wtemp), 1, blob_f); + IF_ERR_GO (stmt, i_err_3, + SQLPutData (stmt, wtemp, sizeof (wtemp))); write_bytes += sizeof (wtemp); } +i_err_3: + store_checksum (row_no, "B3", n_blocks * BLOCK_SYMBOLS, B3_t32); break; + case 4: + B4_t32 = 0; for (c = 0; c < n_blocks; c++) { - SQLPutData (upd_stmt, btemp, sizeof (btemp)); + unsigned char btemp[BLOCK_SYMBOLS*2]; + fill_test_bin_buffer (btemp, BLOCK_SYMBOLS*2, row_no, "B4", c * BLOCK_SYMBOLS, &B4_t32); + fwrite (btemp, sizeof (btemp), 1, blob_f); + IF_ERR_GO (stmt, i_err_4, + SQLPutData (stmt, btemp, sizeof (btemp))); write_bytes += sizeof (btemp); } +i_err_4: + store_checksum (row_no, "B4", n_blocks * BLOCK_SYMBOLS, B4_t32); break; - default: - printf ("Bad param number asked by SQLParamData in update."); + printf ("*** FAILED: Bad param number %ld asked by SQLParamData.\n", n_param); + break; } - - rc = SQLParamData (upd_stmt, (void **) &n_param); + fclose (blob_f); + rc = SQLParamData (stmt, (void **) &n_param); } - IF_ERR_GO (upd_stmt, err, rc); + IF_ERR_GO (stmt, err, rc); write_msecs += get_msec_count () - w_start; + if (is_update) + printf ("Update BLOBS, ROW_NO=%ld, checksums=%u,%u,%u,%u\n", row_no, B1_t32, B2_t32, B3_t32, B4_t32); + else + printf ("Insert into BLOBS, ROW_NO=%ld, checksums=%u,%u,%u,%u\n", row_no, B1_t32, B2_t32, B3_t32, B4_t32); + return; +err: + if (is_update) + printf ("*** FAILED: Update BLOBS, ROW_NO=%ld, ERROR\n", row_no); + else + printf ("*** FAILED: Insert into BLOBS, ROW_NO=%ld, ERROR\n", row_no); +} -err:; +void +ins_blob (long row_no, int n_blocks) +{ + ins_or_upd_blob (row_no, n_blocks, 0); } +void +upd_blob (long row_no, int n_blocks) +{ + ins_or_upd_blob (row_no, n_blocks, 1); +} + +void +copy_blob (long from, long to) +{ + long rc; + static HSTMT cp_stmt; + + if (!cp_stmt) + { + INIT_STMT (hdbc, cp_stmt, + "insert into BLOBS (ROW_NO, B1, B2, B3, B4) " + " select ?, B1, B2, B3, B4 from BLOBS where ROW_NO = ?"); + } + IBINDL (cp_stmt, 1, to); + IBINDL (cp_stmt, 2, from); + + rc = SQLExecute (cp_stmt); + IF_ERR_GO (cp_stmt, err, rc); + return; -char res[9001]; +err:; +} int -check_blob_col (HSTMT stmt, int n_col, long expect_bytes, int ctype) +check_blob_col (HSTMT stmt, long orig_row_no, const char *col_name, int n_col, int n_col_of_len, long expect_symbols, long expect_bytes, int bytes_per_source_char, int ctype, long new_row_no, const char *timing) { + char res[9001]; + char sample[101]; RETCODE rc; long r_start = get_msec_count (); long total = 0; - int get_batch = 2 * (ctype == SQL_C_WCHAR ? sizeof (wchar_t) : 1) + ((n_col == 4) ? 1 : 0); + long col_length_from_server; + SQLLEN get_batch = 400; SQLLEN init_len; SQLLEN rec_len; - + unsigned tridgell32 = 0; + int usable_batch_len; + char blob_fname[128]; + FILE *blob_f; + snprintf (blob_fname, sizeof(blob_fname), "blobs_row_%ld_B%d_%ld_in_%ld_%s.bin", orig_row_no, n_col, expect_symbols, new_row_no, timing); + blob_f = fopen (blob_fname, "wb"); + strcpy (res, "\n*** FAILED: unset res in check_blob_col()!\n"); + strcpy (sample, "\n*** FAILED: unset sample in check_blob_col()!\n"); + if (0 < n_col_of_len) + { + SQLLEN res_l_len; + rc = SQLGetData (stmt, n_col_of_len, SQL_C_LONG, &col_length_from_server, sizeof (col_length_from_server), &res_l_len); + if (rc == SQL_ERROR) + { + IF_ERR_GO (stmt, err_l, rc); +err_l: + printf ("*** FAILED: ROW_NO %ld, column %s: SQL_ERROR on SQLGetData() for length\n", new_row_no, col_name); + return 0; + } + } for (;;) { + int rec_bytes_of_data; rc = SQLGetData (stmt, n_col, ctype, res, get_batch, &rec_len); + /* printf ("SQLGetData() set rec_len=%ld at ccheck_blob_col() with ROW_NO %ld, column %s, expected %ld bytes %ld symbols\n", (long)rec_len, new_row_no, col_name, expect_bytes, expect_symbols); */ if (rc == SQL_ERROR) - { - IF_ERR_GO (stmt, err, rc) - err: return 0; - } + { + IF_ERR_GO (stmt, err1, rc); +err1: + printf ("*** FAILED: ROW_NO %ld, column %s: SQL_ERROR on SQLGetData() for string value\n", new_row_no, col_name); + return 0; + } if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) - break; + { + break; + } if (rec_len == SQL_NULL_DATA) { total = 0; break; } if (SQL_C_CHAR == ctype) - total += rec_len > get_batch - 1 ? get_batch - 1 : rec_len; + usable_batch_len = (((get_batch-1) / bytes_per_source_char) * bytes_per_source_char); else if (SQL_C_WCHAR == ctype) - total += rec_len > get_batch - sizeof (wchar_t) ? - get_batch - sizeof (wchar_t) : rec_len; + usable_batch_len = get_batch - sizeof (wchar_t); else - total += rec_len > get_batch ? get_batch : rec_len; + usable_batch_len = get_batch; + rec_bytes_of_data = rec_len > usable_batch_len ? usable_batch_len : rec_len; + fwrite (res, rec_bytes_of_data, 1, blob_f); + if (0 == total) + { + int ctr; + memcpy (sample, res, sizeof (sample)); + for (ctr = 0; ((ctr < (sizeof(sample)-1)) && (ctr < rec_bytes_of_data)); ctr++) + if ('\0' == sample[ctr]) sample[ctr] = '_'; + sample[sizeof(sample)-1] = '\0'; + } + total += rec_bytes_of_data; + tridgell32 = incremental_tridgell32 ((unsigned char *)res, (unsigned char *)res + rec_bytes_of_data, tridgell32); get_batch = (SQL_C_WCHAR == ctype ? ((long)(sizeof (res) / sizeof (wchar_t))) * sizeof (wchar_t) : sizeof (res)); } - + fclose (blob_f); if (ctype == SQL_C_WCHAR) { if (total % sizeof (wchar_t)) - printf ("*** Received bytes not at wchar_t boundary\n"); + printf ("*** FAILED: ROW_NO %ld, column %s: %ld received bytes not at wchar_t boundary; length()=%ld, tridgell32=%u, sample=\"%s\".\n", new_row_no, col_name, total, col_length_from_server, tridgell32, sample); if (total != expect_bytes) - printf ("*** "); - printf ("Received %ld bytes (%ld chars), wanted %ld (%ld chars).\n", - total, - total / sizeof (wchar_t), - expect_bytes, - expect_bytes / sizeof (wchar_t)); + printf ("*** FAILED: "); + printf ("ROW_NO %ld, column %s: Received %ld bytes (%ld wide chars), wanted %ld (%ld wide chars); length()=%ld, tridgell32=%u, sample=\"%s\".\n", + new_row_no, col_name, + total, total / sizeof (wchar_t), + expect_bytes, expect_bytes / sizeof (wchar_t), + col_length_from_server, tridgell32, sample ); } else { if (total != expect_bytes) - printf ("*** Received %ld bytes, wanted %ld.\n", total, expect_bytes); - else - printf ("Received %ld bytes, wanted %ld.\n", total, expect_bytes); + printf ("*** FAILED: "); + printf ("ROW_NO %ld, column %s: Received %ld bytes, wanted %ld; length()=%ld, tridgell32=%u, sample=\"%s\".\n", new_row_no, col_name, total, expect_bytes, col_length_from_server, tridgell32, sample); } - + verify_checksum (orig_row_no, col_name, expect_symbols, tridgell32, new_row_no, timing); read_msecs += get_msec_count () - r_start; read_bytes += total; - SQLGetData (stmt, n_col, SQL_C_CHAR, res, 10, &init_len); SQLGetData (stmt, n_col, SQL_C_CHAR, res, 10, &init_len); - return 1; } @@ -382,36 +526,48 @@ check_blob_col (HSTMT stmt, int n_col, long expect_bytes, int ctype) void read_bound_blobs () { - SQLLEN len1, len2, len3, len4; + SQLLEN len1, len2, len3, len4, len_row_no, len_len_b1, len_len_b2, len_len_b3, len_len_b4; char temp[100]; char wtemp[100]; wchar_t wtemp3[100]; char wtemp4[100]; + char buf_row_no [sizeof (long)], buf_len_b1 [sizeof (long)], buf_len_b2 [sizeof (long)], buf_len_b3 [sizeof (long)], buf_len_b4 [sizeof (long)]; HSTMT st; SQLAllocStmt (hdbc, &st); IF_ERR_GO (st, err, - SQLExecDirect (st, (UCHAR *) "select B1, B2, B3, B4 from BLOBS", SQL_NTS)); + SQLExecDirect (st, (UCHAR *) "select B1, B2, B3, B4, ROW_NO, length(B1), length(B2), length(B3), length(B4) from BLOBS", SQL_NTS)); SQLBindCol (st, 1, SQL_C_CHAR, temp, sizeof (temp), &len1); SQLBindCol (st, 2, SQL_C_BINARY, wtemp, sizeof (wtemp), &len2); SQLBindCol (st, 3, SQL_C_WCHAR, wtemp3, sizeof (wtemp3), &len3); SQLBindCol (st, 4, SQL_C_CHAR, wtemp4, sizeof (wtemp4), &len4); - + SQLBindCol (st, 5, SQL_C_LONG, buf_row_no, sizeof (buf_row_no), &len_row_no); + SQLBindCol (st, 6, SQL_C_LONG, buf_len_b1, sizeof (buf_len_b1), &len_len_b1); + SQLBindCol (st, 7, SQL_C_LONG, buf_len_b2, sizeof (buf_len_b2), &len_len_b2); + SQLBindCol (st, 8, SQL_C_LONG, buf_len_b3, sizeof (buf_len_b3), &len_len_b3); + SQLBindCol (st, 9, SQL_C_LONG, buf_len_b4, sizeof (buf_len_b4), &len_len_b4); for (;;) { + long fetched_row_no, fetched_len_b1, fetched_len_b2, fetched_len_b3, fetched_len_b4; RETCODE rc = SQLFetch (st); if (rc == SQL_NO_DATA_FOUND) break; + fetched_row_no = ((long *)buf_row_no)[0]; + fetched_len_b1 = ((long *)buf_len_b1)[0]; + fetched_len_b2 = ((long *)buf_len_b2)[0]; + fetched_len_b3 = ((long *)buf_len_b3)[0]; + fetched_len_b4 = ((long *)buf_len_b4)[0]; if (rc == SQL_ERROR) { IF_ERR_GO (st, err, rc); } - temp[10] = 0; - wtemp[10] = 0; - printf (" Bound clob len %ld %s\n", (long) len1, temp); - printf (" Bound blob len %ld %s\n", (long) len2, wtemp); - printf (" Bound nlob len %ld\n", (long) len3); - printf (" Bound cblob len %ld %s\n", (long) len4, wtemp4); + temp[99] = 0; + wtemp[99] = 0; + wtemp4[99] = 0; + printf ("ROW_NO %ld Bound clob server length() %ld client bound len %ld %s\n" , fetched_row_no, fetched_len_b1, (long) len1, temp); + printf ("ROW_NO %ld Bound blob server length() %ld client bound len %ld %s\n" , fetched_row_no, fetched_len_b2, (long) len2, wtemp); + printf ("ROW_NO %ld Bound nlob server length() %ld client bound len %ld\n" , fetched_row_no, fetched_len_b3, (long) len3); + printf ("ROW_NO %ld Bound cblob server length() %ld client bound len %ld %s\n" , fetched_row_no, fetched_len_b4, (long) len4, wtemp4); } err: @@ -420,26 +576,27 @@ read_bound_blobs () void -sel_blob (long row_no, int expect_n_blocks) +sel_blob (long orig_row_no, long new_row_no, int expect_n_blocks, const char *timing) { RETCODE rc; static HSTMT sel_stmt; if (!sel_stmt) { INIT_STMT (hdbc, sel_stmt, - "select B1, B2, B3, B4 from BLOBS where ROW_NO = ?"); + "select B1, B2, B3, B4, length(B1), length(B2), length(B3), length(B4) from BLOBS where ROW_NO = ?"); } - IBINDL (sel_stmt, 1, row_no); + IBINDL (sel_stmt, 1, new_row_no); IF_ERR_GO (sel_stmt, err, SQLExecute (sel_stmt)); rc = SQLFetch (sel_stmt); if (rc == SQL_SUCCESS || rc == SQL_SUCCESS_WITH_INFO) { - check_blob_col (sel_stmt, 1, expect_n_blocks * 10000, SQL_C_CHAR); - check_blob_col (sel_stmt, 2, expect_n_blocks * 5000, SQL_C_BINARY); - check_blob_col (sel_stmt, 3, expect_n_blocks * 10000 * sizeof (wchar_t), SQL_C_WCHAR); - check_blob_col (sel_stmt, 4, expect_n_blocks * 10000, SQL_C_CHAR); + printf ("PASSED: select for ROW_NO %ld\n", new_row_no); + check_blob_col (sel_stmt, orig_row_no, "B1", 1, 5, expect_n_blocks * 10000, expect_n_blocks * 10000, sizeof (char), SQL_C_CHAR, new_row_no, timing); + check_blob_col (sel_stmt, orig_row_no, "B2", 2, 6, expect_n_blocks * 10000, expect_n_blocks * 10000, sizeof (char), SQL_C_BINARY, new_row_no, timing); + check_blob_col (sel_stmt, orig_row_no, "B3", 3, 7, expect_n_blocks * 10000, expect_n_blocks * 10000 * sizeof (wchar_t), sizeof (wchar_t), SQL_C_WCHAR, new_row_no, timing); + check_blob_col (sel_stmt, orig_row_no, "B4", 4, 8, expect_n_blocks * 10000, (expect_n_blocks * 10000 * 2), 2*sizeof (char), SQL_C_CHAR, new_row_no, timing); } err:; @@ -460,7 +617,7 @@ is_init_SQL_statement (char **argv, int nth_arg) if (it_index < MAX_INIT_STATEMENTS) return (init_texts[it_index++] = (argv[nth_arg] + 5)); - printf ("%s: More than max. %d allowed initial statements (%s)\n", + printf ("*** FAILED: %s: More than max. %d allowed initial statements (%s)\n", argv[0], MAX_INIT_STATEMENTS, argv[nth_arg]); exit (1); } @@ -533,7 +690,7 @@ main (int argc, char **argv) { char *uid = "dba", *pwd = "dba"; int opt_ind; - + int row_ctr; if (argc < 2) { @@ -616,29 +773,45 @@ main (int argc, char **argv) del_blobs (); ins_blob (1, 2); SQLTransact (henv, hdbc, SQL_COMMIT); - sel_blob (1, 2); - + sel_blob (1, 1, 2, "after ins_blob (1,2)"); upd_blob (1, 14); - sel_blob (1, 14); + sel_blob (1, 1, 14, "after upd_blob (1, 14)"); upd_blob (1, 5); - sel_blob (1, 5); + sel_blob (1, 1, 5, "after upd_blob (1, 5)"); upd_blob (1, 50); - sel_blob (1, 50); + sel_blob (1, 1, 50, "after upd_blob (1, 50)"); copy_blob (1, 2); - sel_blob (2, 50); + sel_blob (1, 2, 50, "after copy_blob (1, 2)"); IF_CERR_GO (hdbc, err, SQLTransact (henv, hdbc, SQL_COMMIT)); - sel_blob (1, 50); - sel_blob (2, 50); - + sel_blob (1, 1, 50, "after upd_blob (1, 50) and commit"); + sel_blob (1, 2, 50, "after copy_blob (1, 2) and commit"); upd_blob (1, 12); - sel_blob (1, 12); + sel_blob (1, 1, 12, "after upd_blob (1, 12)"); SQLTransact (henv, hdbc, SQL_ROLLBACK); - sel_blob (1, 50); + sel_blob (1, 1, 50, "after upd_blob (1, 50) and commit, then upd_blob (1, 12) rolled back"); +/* + for (row_ctr = 0; row_ctr < 100; row_ctr++) + { + int r_no = 100 + ((row_ctr * 4093) % 100); + ins_blob (r_no, 1); + } + for (row_ctr = 0; row_ctr < 100; row_ctr++) + { + int r_no = 100 + ((row_ctr * 4093) % 100); + sel_blob (r_no, r_no, 1, "after numerous inserts"); + } + IF_CERR_GO (hdbc, err, SQLTransact (henv, hdbc, SQL_COMMIT)); + for (row_ctr = 0; row_ctr < 100; row_ctr++) + { + int r_no = 100 + ((row_ctr * 4093) % 100); + sel_blob (r_no, r_no, 1, "after numerous inserts, committed"); + } +*/ read_bound_blobs (); SQLSetConnectOption (hdbc, SQL_AUTOCOMMIT, 1); read_bound_blobs (); - sel_blob (1, 50); + sel_blob (1, 1, 50, "after all reads of all blobs"); printf ("\nRead: %ld KB/s, %ld b, %ld msec\nWrite %ld KB/s, %ld b, %ld msec\n", ((read_bytes / read_msecs) * 1000) / 1024, read_bytes, read_msecs, diff --git a/binsrc/tests/blobs2.c b/binsrc/tests/blobs2.c index 10759f312c..c4c96b40d8 100644 --- a/binsrc/tests/blobs2.c +++ b/binsrc/tests/blobs2.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -328,7 +328,7 @@ check_blob_col (HSTMT stmt, int n_col, long expect_bytes, int ctype) rc = SQLGetData (stmt, n_col, ctype, res, get_batch, &rec_len); if (rc == SQL_ERROR) { - IF_ERR_GO (stmt, err, rc) + IF_ERR_GO (stmt, err, rc); err: return 0; } if (rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) diff --git a/binsrc/tests/bsbm/Makefile.am b/binsrc/tests/bsbm/Makefile.am index ca88a7e8fd..81794d8b3a 100644 --- a/binsrc/tests/bsbm/Makefile.am +++ b/binsrc/tests/bsbm/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/bsbm/run_javac.sh b/binsrc/tests/bsbm/run_javac.sh index c818b0a6a4..4d5e808462 100755 --- a/binsrc/tests/bsbm/run_javac.sh +++ b/binsrc/tests/bsbm/run_javac.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/bsbm/run_test.sh b/binsrc/tests/bsbm/run_test.sh index 652f1d2da9..9cc5f0aff8 100755 --- a/binsrc/tests/bsbm/run_test.sh +++ b/binsrc/tests/bsbm/run_test.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/burstoff.c b/binsrc/tests/burstoff.c index f456da8472..3bed6e1f6c 100644 --- a/binsrc/tests/burstoff.c +++ b/binsrc/tests/burstoff.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/butils.h b/binsrc/tests/butils.h index 6473f955d4..d9c2f68c14 100644 --- a/binsrc/tests/butils.h +++ b/binsrc/tests/butils.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/chil.c b/binsrc/tests/chil.c index 5b63589afa..3b4bf4537a 100644 --- a/binsrc/tests/chil.c +++ b/binsrc/tests/chil.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/cursor.c b/binsrc/tests/cursor.c index 51506e14da..1509409c01 100644 --- a/binsrc/tests/cursor.c +++ b/binsrc/tests/cursor.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/davperf.sql b/binsrc/tests/davperf.sql index 72dee7213d..b0005210dd 100644 --- a/binsrc/tests/davperf.sql +++ b/binsrc/tests/davperf.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dbdump.c b/binsrc/tests/dbdump.c index b73ef0041f..b874a01549 100644 --- a/binsrc/tests/dbdump.c +++ b/binsrc/tests/dbdump.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/Makefile.am b/binsrc/tests/dotnet/Makefile.am index ab33045f94..c39e668c7b 100644 --- a/binsrc/tests/dotnet/Makefile.am +++ b/binsrc/tests/dotnet/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/Test.cs b/binsrc/tests/dotnet/Test.cs index 1f081675cd..db797eaf5a 100644 --- a/binsrc/tests/dotnet/Test.cs +++ b/binsrc/tests/dotnet/Test.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/AssemblyInfo.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/AssemblyInfo.cs index d8c81d4d19..0ef27ec12f 100644 --- a/binsrc/tests/dotnet/VirtuosoClientSuite/AssemblyInfo.cs +++ b/binsrc/tests/dotnet/VirtuosoClientSuite/AssemblyInfo.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/BlobTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/BlobTest.cs index 9bd41f07a7..1c410041eb 100644 --- a/binsrc/tests/dotnet/VirtuosoClientSuite/BlobTest.cs +++ b/binsrc/tests/dotnet/VirtuosoClientSuite/BlobTest.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/CommandBuilderTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/CommandBuilderTest.cs index ef4f96955d..d9a9b4e70c 100644 --- a/binsrc/tests/dotnet/VirtuosoClientSuite/CommandBuilderTest.cs +++ b/binsrc/tests/dotnet/VirtuosoClientSuite/CommandBuilderTest.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/CommandTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/CommandTest.cs index 46eece6594..83379e5b5e 100644 --- a/binsrc/tests/dotnet/VirtuosoClientSuite/CommandTest.cs +++ b/binsrc/tests/dotnet/VirtuosoClientSuite/CommandTest.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/ConnectionTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/ConnectionTest.cs index 4b45f389af..cffdcfe4c8 100644 --- a/binsrc/tests/dotnet/VirtuosoClientSuite/ConnectionTest.cs +++ b/binsrc/tests/dotnet/VirtuosoClientSuite/ConnectionTest.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/DtcTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/DtcTest.cs index aa323d5e3f..e8711c010d 100644 --- a/binsrc/tests/dotnet/VirtuosoClientSuite/DtcTest.cs +++ b/binsrc/tests/dotnet/VirtuosoClientSuite/DtcTest.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/SqlServer.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/SqlServer.cs index ab7a708337..7c98faf405 100644 --- a/binsrc/tests/dotnet/VirtuosoClientSuite/SqlServer.cs +++ b/binsrc/tests/dotnet/VirtuosoClientSuite/SqlServer.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/SqlXmlTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/SqlXmlTest.cs index b8f4bd6c77..fa1b1454ff 100644 --- a/binsrc/tests/dotnet/VirtuosoClientSuite/SqlXmlTest.cs +++ b/binsrc/tests/dotnet/VirtuosoClientSuite/SqlXmlTest.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/TimeoutTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/TimeoutTest.cs index e1ae50f4fa..04d7f698b2 100644 --- a/binsrc/tests/dotnet/VirtuosoClientSuite/TimeoutTest.cs +++ b/binsrc/tests/dotnet/VirtuosoClientSuite/TimeoutTest.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/TransactionTest.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/TransactionTest.cs index 202b290322..084fe1eaf9 100644 --- a/binsrc/tests/dotnet/VirtuosoClientSuite/TransactionTest.cs +++ b/binsrc/tests/dotnet/VirtuosoClientSuite/TransactionTest.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoClientSuite.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoClientSuite.cs index efbeb34823..ca0587ca85 100644 --- a/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoClientSuite.cs +++ b/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoClientSuite.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoDtcSuite.cs b/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoDtcSuite.cs index 3bddc015c5..f1e736e13a 100644 --- a/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoDtcSuite.cs +++ b/binsrc/tests/dotnet/VirtuosoClientSuite/VirtuosoDtcSuite.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/AssemblyInfo.cs b/binsrc/tests/dotnet/harness/AssemblyInfo.cs index b62d76f9aa..5bffb85c02 100644 --- a/binsrc/tests/dotnet/harness/AssemblyInfo.cs +++ b/binsrc/tests/dotnet/harness/AssemblyInfo.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the @@ -34,7 +34,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("OpenLink Software")] [assembly: AssemblyProduct("OpenLink.Data.VirtuosoClient")] -[assembly: AssemblyCopyright("Copyright (C) 2002-2018 OpenLink Software. All rights reserved.")] +[assembly: AssemblyCopyright("Copyright (C) 2002-2019 OpenLink Software. All rights reserved.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ComparisonException.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ComparisonException.cs index dc2f4b0667..97115d7df1 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ComparisonException.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ComparisonException.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITest.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITest.cs index 2f57c28084..1879035104 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITest.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITest.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITestListener.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITestListener.cs index 2b426828e1..157a5cb0e1 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITestListener.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/ITestListener.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCase.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCase.cs index 26f78b3f80..a5e050c0b1 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCase.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCase.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseAttribute.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseAttribute.cs index a2684538af..aaf3f123d2 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseAttribute.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseAttribute.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseResult.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseResult.cs index edf219ca2a..37c7f17b1d 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseResult.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestCaseResult.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestFailedException.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestFailedException.cs index 60d3e1843e..fbd34fb6d9 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestFailedException.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestFailedException.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestResult.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestResult.cs index 97fe9cb99b..0efa210163 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestResult.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestResult.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSkippedException.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSkippedException.cs index 8e4a117da5..28488beefe 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSkippedException.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSkippedException.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatus.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatus.cs index e77b38772c..bd53fee213 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatus.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatus.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatusCode.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatusCode.cs index d078949024..4d7ba18e79 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatusCode.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestStatusCode.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuite.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuite.cs index 17bb766b26..d9762eb0ca 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuite.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuite.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuiteAttribute.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuiteAttribute.cs index 6ae058b525..80ae93ba35 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuiteAttribute.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Framework/TestSuiteAttribute.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/BaseTestRunner.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/BaseTestRunner.cs index a47ed0b039..b527a4ccd1 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/BaseTestRunner.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/BaseTestRunner.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/ConsoleTestRunner.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/ConsoleTestRunner.cs index 2a44ab3122..60a1867fc0 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/ConsoleTestRunner.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/UI/ConsoleTestRunner.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/harness/OpenLink/Testing/Util/TestSettings.cs b/binsrc/tests/dotnet/harness/OpenLink/Testing/Util/TestSettings.cs index e98f5138c9..8df3062037 100644 --- a/binsrc/tests/dotnet/harness/OpenLink/Testing/Util/TestSettings.cs +++ b/binsrc/tests/dotnet/harness/OpenLink/Testing/Util/TestSettings.cs @@ -4,7 +4,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/dotnet/test_server.sh b/binsrc/tests/dotnet/test_server.sh index 70fc9ac608..27e1ef7e28 100755 --- a/binsrc/tests/dotnet/test_server.sh +++ b/binsrc/tests/dotnet/test_server.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/force_dbms_name.c b/binsrc/tests/force_dbms_name.c index b433b92999..7054759d43 100644 --- a/binsrc/tests/force_dbms_name.c +++ b/binsrc/tests/force_dbms_name.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/getdata.c b/binsrc/tests/getdata.c index 91d05932b0..6e1b7cac78 100644 --- a/binsrc/tests/getdata.c +++ b/binsrc/tests/getdata.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/inifile.c b/binsrc/tests/inifile.c index d9294487bf..f62cb2d723 100644 --- a/binsrc/tests/inifile.c +++ b/binsrc/tests/inifile.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -74,7 +74,7 @@ usage (void) "
    will be\ndeleted.\n\n")); fprintf(stderr, _("If both and contain a single - character " " the whole
    \nwill be deleted.\n")); - terminate (1); + terminate_program (1); } diff --git a/binsrc/tests/ins.c b/binsrc/tests/ins.c index 679c38af05..03bc0fa31e 100644 --- a/binsrc/tests/ins.c +++ b/binsrc/tests/ins.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/isql.c b/binsrc/tests/isql.c index 14fca806fd..8f578f4617 100644 --- a/binsrc/tests/isql.c +++ b/binsrc/tests/isql.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -646,9 +646,17 @@ TCHAR *web_query_string = NULL; /* from environment variable QUERY_STRING */ int web_mode = 0; /* Is set to 1 in the beginning of main if used as a cgi-script */ int kubl_mode = 1; /* Currently affects only how MAXROWS are handled. */ -int print_banner_flag = 1, print_types_also = 1, verbose_mode = 1, echo_mode = 0, - explain_mode = 0, sparql_translate_mode = 0, vert_row_out_mode = 0, - csv_mode = 0, csv_rfc4180_mode = 0, profile_mode = 0; +int print_banner_flag = 1; +int print_types_also = 1; +int verbose_mode = 1; +int echo_mode = 0; +int explain_mode = 0; +int sparql_translate_mode = 0; +int vert_row_out_mode = 0; +int csv_mode = 0; +int csv_rfc4180_mode = 0; +int profile_mode = 0; +int json_mode = 0; int flag_newlines_at_eor = 1; /* By default print one nl at the end of row */ long int select_max_rows = 0; /* By default show them all. */ long int perm_deadlock_retries = 0, vol_deadlock_retries = 0; @@ -698,6 +706,9 @@ void print_csv_banner (); void print_csv_rfc4180_banner (); int print_csv_row(); int print_csv_rfc4180_row(); +void print_json_banner (void); +void print_json_footer (void); +int print_json_row(int row_nr); /* Only after fully_connected has been set to non-zero (i.e. after full connection to data source and statement allocation) @@ -2648,6 +2659,7 @@ struct name_var_pair isql_variables[] = add_var_def (_T("CSV_RFC4180_FIELD_SEPARATOR"), (&csv_rfc4180_field_separator), CHARPTR_VAR, NULL), add_var_def (_T("CSV_ROW_SEPARATOR"), (&csv_row_separator), CHARPTR_VAR, NULL), add_var_def (_T("CSV_RFC4180_ROW_SEPARATOR"), (&csv_rfc4180_row_separator), CHARPTR_VAR, NULL), + add_var_def (_T("JSON"), (&json_mode), INT_FLAG, OFF_ON), add_var_def (_T("HIDDEN_CRS"), (&clear_hidden_crs_flag), INT_FLAG, PRESERVED_CLEARED), add_var_def (_T("BINARY_OUTPUT"), (&flag_binary_output), INT_FLAG, OFF_ON), add_var_def (_T("BANNER"), (&print_banner_flag), INT_FLAG, OFF_ON), @@ -5144,6 +5156,52 @@ print_blob_col_csv_rfc4180 (HSTMT stmt, UWORD n_col, SQLULEN width, SWORD sql_ty return rc; } +int +print_blob_col_json (HSTMT stmt, UWORD n_col, SQLULEN width, SWORD sql_type) +{ + static TCHAR blob_buffer[BLOB_BUFFER_SIZE + 1]; + TCHAR *ch; + int got_n_bytes; + SQLULEN total = 0; + int rc; + + for (;;) + { + SQLLEN n_recv; + rc = SQLGetData (stmt, n_col, SQL_C_TCHAR, blob_buffer, BLOB_BUFFER_SIZE, &n_recv); + /* Here we got either SQL_NO_DATA or an error. */ + if ((rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO) || n_recv == SQL_NULL_DATA) + { /* This ^ means really a blob of length 0, not real NULL ??? */ + /* Tell calling function that everything is still all right, no panic: */ + if (SQL_NO_DATA_FOUND == rc) + rc = SQL_SUCCESS; + break; + } + + /* If we get SQL_NO_TOTAL, then we have to use isqlt_tcslen. This doesn't + work with true binary data with null bytes in the last part. */ + got_n_bytes = (int) ((rc == SQL_SUCCESS) ? ((n_recv != SQL_NO_TOTAL) ? n_recv : isqlt_tcslen (blob_buffer)) : BLOB_BUFFER_SIZE - 1); /* Not the last part. */ + total += got_n_bytes; + + isqlt_puttchar ('"'); + for (ch = blob_buffer; *ch; ++ch) + { + if (!isprint (*ch)) + isqlt_tprintf (_T ("%%%2.2hX"), (short) *ch); + else if (*ch == (TCHAR) ('"')) + isqlt_tprintf (_T ("\"\"")); + else + isqlt_puttchar (*ch); + } + isqlt_puttchar ('"'); + + if (rc == SQL_SUCCESS) /* No more data after this one. */ + break; + } + + return rc; +} + void print_datetime_col (TCHAR *timebinstr, SQLULEN width, int rightp, SQLLEN collen, int type, int inx) @@ -5395,6 +5453,21 @@ print_csv_rfc4180_banner () } } + +void +print_json_banner (void) +{ + isqlt_fputts (_T ("[ {\n"), stdout); +} + + +void +print_json_footer (void) +{ + isqlt_fputts (_T ("\n} ]\n"), stdout); +} + + void print_datetime_col_csv ( TCHAR *data, SQLULEN width, SQLLEN collen, int type, int inx, int n_cols) { @@ -5448,6 +5521,32 @@ print_datetime_col_csv_rfc4180 ( TCHAR *data, SQLULEN width, SQLLEN collen, int } +void +print_datetime_col_json (TCHAR * data, SQLULEN width, SQLLEN collen, int type, int inx, int n_cols) +{ + if (type == SQL_DATE) + { + /* Defined in /odbcsdk/include/sqlext.h */ + DATE_STRUCT *ts = (DATE_STRUCT *) data; + isqlt_tprintf (_T ("\"%04d-%02d-%02d\""), ts->year, ts->month, ts->day); + } + else if (type == SQL_TIME) + { + /* Defined in /odbcsdk/include/sqlext.h */ + TIME_STRUCT *ts = (TIME_STRUCT *) data; + + isqlt_tprintf (_T ("\"%02d:%02d.%02d\""), ts->hour, ts->minute, ts->second); + } + else if (type == SQL_TIMESTAMP) + { + /* Defined in /odbcsdk/include/sqlext.h */ + TIMESTAMP_STRUCT *ts = (TIMESTAMP_STRUCT *) data; + isqlt_tprintf (_T ("\"%04d-%02d-%02dT%02d:%02d:%02d.%ldZ\""), ts->year, ts->month, ts->day, ts->hour, ts->minute, ts->second, + (long) ts->fraction); + } +} + + /* Returns either SQL_SUCCESS or the last return code returned by print_blob_col (which calls SQLGetData in the loop.) */ int @@ -5524,6 +5623,88 @@ print_csv_rfc4180_row() return (rc); } + +/* Returns either SQL_SUCCESS or the last return code returned by + print_blob_col (which calls SQLGetData in the loop.) */ +int +print_json_row (int row_nr) +{ + int inx; + int rc = SQL_SUCCESS; + + if (row_nr) + isqlt_fputts (_T ("\n},{\n"), stdout); + + for (inx = 0; inx < n_out_cols; inx++) + { + TCHAR *o_buffer = (TCHAR *) out_cols[inx].o_buffer; + SQLULEN o_width = out_cols[inx].o_width; + SQLLEN o_col_len = out_cols[inx].o_col_len; + int o_type = out_cols[inx].o_type; + int use_quote = 1; + + isqlt_tprintf (_T (" \"%") PCT_S _T ("\" : "), out_cols[inx].o_title ? out_cols[inx].o_title : (TCHAR *) _T ("")); + + if (o_col_len == SQL_NULL_DATA) + isqlt_fputts (_T ("null"), stdout); + else + switch (o_type) + { + case SQL_DATE: + case SQL_TIME: + case SQL_TIMESTAMP: + print_datetime_col_json (o_buffer, o_width, o_col_len, o_type, inx, n_out_cols); + break; + + case SQL_LONGVARBINARY: + case SQL_LONGVARCHAR: + case SQL_WLONGVARCHAR: + /* Note zero-based indexing here. print_blob_col needs one+ */ + if ((rc = print_blob_col_json (stmt, ((UWORD) (inx + 1)), o_width, o_type)) != SQL_SUCCESS) + return (rc); + break; + + case SQL_DECIMAL: + case SQL_DOUBLE: + case SQL_FLOAT: + case SQL_INTEGER: + case SQL_NUMERIC: + case SQL_REAL: + case SQL_SMALLINT: + use_quote = 0; + /* FALLTRHOUGH */ + + default: + { + TCHAR *ch; + + if (use_quote) + isqlt_puttchar ('"'); + + for (ch = o_buffer; *ch; ++ch) + { + if (!isprint (*ch)) + isqlt_tprintf (_T ("%%%2.2hX"), (short) *ch); + else if (*ch == (TCHAR) ('"')) + isqlt_tprintf (_T ("\"\"")); + else + isqlt_puttchar (*ch); + } + + if (use_quote) + isqlt_puttchar ('"'); + } + break; + } + + if (inx < n_out_cols - 1) + isqlt_fputts (_T (",\n"), stdout); + } + + return (rc); +} + + /* If this is set to non-zero value, it will override the width values got with SQLDescribeCol. */ SQLULEN max_col_width = 0; @@ -6646,6 +6827,8 @@ show_results (long start, int rc, int nth_set, print_csv_rfc4180_banner (); else if (csv_mode) print_csv_banner (); + else if (json_mode) + print_json_banner (); else print_banner (); } @@ -6664,6 +6847,8 @@ show_results (long start, int rc, int nth_set, rc = print_csv_rfc4180_row(); else if(csv_mode) rc = print_csv_row(); + else if (json_mode) + rc = print_json_row(n_rows); else rc = print_row(); IF_ERR_GO (stmt, error, rc); @@ -6673,6 +6858,10 @@ show_results (long start, int rc, int nth_set, break; } } /* for fetch loop */ + + if (json_mode) + print_json_footer(); + if (in_HTML_mode ()) { HTML_sets_open--; diff --git a/binsrc/tests/isql_tchar.h b/binsrc/tests/isql_tchar.h index f8cab517d8..220b97857f 100644 --- a/binsrc/tests/isql_tchar.h +++ b/binsrc/tests/isql_tchar.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/isql_wfuncs.c b/binsrc/tests/isql_wfuncs.c index 5b048311f1..215936293e 100644 --- a/binsrc/tests/isql_wfuncs.c +++ b/binsrc/tests/isql_wfuncs.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/isql_win32.c b/binsrc/tests/isql_win32.c index 40d7e062eb..f7d692adbd 100644 --- a/binsrc/tests/isql_win32.c +++ b/binsrc/tests/isql_win32.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/lubm-cli.c b/binsrc/tests/lubm-cli.c index 44fb004064..c4ff5ce47f 100644 --- a/binsrc/tests/lubm-cli.c +++ b/binsrc/tests/lubm-cli.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/lubm/Makefile.am b/binsrc/tests/lubm/Makefile.am index 51dcc9c28a..701a5c3891 100644 --- a/binsrc/tests/lubm/Makefile.am +++ b/binsrc/tests/lubm/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/lubm/big-lubm-load.sql b/binsrc/tests/lubm/big-lubm-load.sql index 1e6f8ecef6..b1ec04d9c8 100644 --- a/binsrc/tests/lubm/big-lubm-load.sql +++ b/binsrc/tests/lubm/big-lubm-load.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/lubm/lubm-cp.sql b/binsrc/tests/lubm/lubm-cp.sql index dfeb078e31..95d00eed8b 100644 --- a/binsrc/tests/lubm/lubm-cp.sql +++ b/binsrc/tests/lubm/lubm-cp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/lubm/lubm-inf.sql b/binsrc/tests/lubm/lubm-inf.sql index 69c35fb62b..8d4f723eea 100644 --- a/binsrc/tests/lubm/lubm-inf.sql +++ b/binsrc/tests/lubm/lubm-inf.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/lubm/lubm-load.sql b/binsrc/tests/lubm/lubm-load.sql index f2e2aab86b..2e2ba4bce2 100644 --- a/binsrc/tests/lubm/lubm-load.sql +++ b/binsrc/tests/lubm/lubm-load.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/lubm/lubm-org.sql b/binsrc/tests/lubm/lubm-org.sql index 5221924f20..e8eda07b76 100644 --- a/binsrc/tests/lubm/lubm-org.sql +++ b/binsrc/tests/lubm/lubm-org.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/lubm/lubm-phys.sql b/binsrc/tests/lubm/lubm-phys.sql index 5e770bd290..09a6fc6686 100644 --- a/binsrc/tests/lubm/lubm-phys.sql +++ b/binsrc/tests/lubm/lubm-phys.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/lubm/lubm.sql b/binsrc/tests/lubm/lubm.sql index 6f30f285f3..03e72160ec 100644 --- a/binsrc/tests/lubm/lubm.sql +++ b/binsrc/tests/lubm/lubm.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/lubm/test_server.sh b/binsrc/tests/lubm/test_server.sh index df6c50bcbe..e8955abcbc 100755 --- a/binsrc/tests/lubm/test_server.sh +++ b/binsrc/tests/lubm/test_server.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/lubm/tlubm.sh b/binsrc/tests/lubm/tlubm.sh index 2bfbc68537..4e53e7299c 100755 --- a/binsrc/tests/lubm/tlubm.sh +++ b/binsrc/tests/lubm/tlubm.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/lubm/trdfrng.sql b/binsrc/tests/lubm/trdfrng.sql index 32cd58a187..412d3c2361 100644 --- a/binsrc/tests/lubm/trdfrng.sql +++ b/binsrc/tests/lubm/trdfrng.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/mail_virt.c b/binsrc/tests/mail_virt.c index 60683b2606..58e0ef7cef 100644 --- a/binsrc/tests/mail_virt.c +++ b/binsrc/tests/mail_virt.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/odbcinc.h b/binsrc/tests/odbcinc.h index e692ad47d8..6fb105f1ad 100644 --- a/binsrc/tests/odbcinc.h +++ b/binsrc/tests/odbcinc.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/odbcuti.h b/binsrc/tests/odbcuti.h index 1a2b52dd4d..7262f4bed6 100644 --- a/binsrc/tests/odbcuti.h +++ b/binsrc/tests/odbcuti.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -33,37 +33,32 @@ extern int quiet; #define QUIET quiet = 1 #define QUIET_OFF quiet = 0 -#define IS_ERR(stmt, foo) \ +#define IF_ERR(stmt, foo) do { \ if (SQL_ERROR == foo) \ { \ print_error (SQL_NULL_HENV, SQL_NULL_HDBC, stmt); \ if (!messages_off) \ printf ("\n Line %d, file %s\n", __LINE__, __FILE__); \ - } + } } while (0) -#define IF_ERR(stmt, foo) \ - if (SQL_ERROR == foo) \ - { \ - print_error (SQL_NULL_HENV, SQL_NULL_HDBC, stmt); \ - if (!messages_off) \ - printf ("\n Line %d, file %s\n", __LINE__, __FILE__); \ - } +/* Old typo, easier to legalize than to fix */ +#define IS_ERR(stmt, foo) IF_ERR ((stmt), (foo)) -#define IF_ERR_GO(stmt, tag, foo) \ +#define IF_ERR_GO(stmt, tag, foo) do { \ if (SQL_ERROR == (foo)) \ { \ print_error (SQL_NULL_HENV, SQL_NULL_HDBC, stmt); \ if (!messages_off) \ printf ("\n Line %d, file %s\n", __LINE__, __FILE__); \ goto tag; \ - } + } } while (0) #define DECLARE_FOR_SQLERROR \ int len; \ char state[10]; \ char message[1000] -#define IF_DEADLOCK_OR_ERR_GO(stmt, tag, foo, deadlocktag) \ +#define IF_DEADLOCK_OR_ERR_GO(stmt, tag, foo, deadlocktag) do { \ if (SQL_ERROR == (foo)) \ { \ while (SQL_NO_DATA_FOUND != SQLError (SQL_NULL_HENV, SQL_NULL_HDBC, stmt, (UCHAR *) state, NULL, \ @@ -80,43 +75,43 @@ extern int quiet; printf ("\n Line %d, file %s\n", __LINE__, __FILE__); \ goto tag; \ } \ - } + } } while (0) -#define IF_CERR_GO(con, tag, foo) \ +#define IF_CERR_GO(con, tag, foo) do { \ if (SQL_ERROR == (foo)) \ { \ print_error (SQL_NULL_HENV, con, SQL_NULL_HSTMT); \ if (!messages_off) \ printf ("\n Line %d, file %s\n", __LINE__, __FILE__); \ goto tag; \ - } + } } while (0) -#define IF_ERR_EXIT(stmt, foo) \ +#define IF_ERR_EXIT(stmt, foo) do { \ if (SQL_ERROR == foo) \ { \ print_error (SQL_NULL_HENV, SQL_NULL_HDBC, stmt); \ if (!messages_off) \ printf ("\n Line %d, file %s\n", __LINE__, __FILE__); \ exit (1); \ - } + } } while (0) -#define IF_CERR_EXIT(hdbc, foo) \ +#define IF_CERR_EXIT(hdbc, foo) do { \ if (SQL_ERROR == foo) { \ print_error (SQL_NULL_HENV, hdbc, SQL_NULL_HSTMT); \ if (!messages_off) \ printf ("\n Line %d, file %s\n", __LINE__, __FILE__); \ exit (1); \ - } + } } while (0) -#define IF_EERR_EXIT(henv, foo) \ +#define IF_EERR_EXIT(henv, foo) do { \ if (SQL_ERROR == foo) { \ print_error (henv, SQL_NULL_HDBC, SQL_NULL_HSTMT); \ if (!messages_off) \ printf ("\n Line %d, file %s\n", __LINE__, __FILE__); \ exit (1); \ - } + } } while (0) #define BINDN(stmt, n, v) \ SQLSetParam (stmt, n, SQL_C_LONG, SQL_INTEGER, 0,0, &v, NULL); @@ -152,9 +147,10 @@ extern int quiet; SQLBindCol (stmt, n, SQL_C_LONG, &buf, sizeof (buf) , &len) -#define INIT_STMT(hdbc, st, text) \ +#define INIT_STMT(hdbc, st, text) do { \ SQLAllocStmt (hdbc, &st); \ - IF_ERR_EXIT (st, SQLPrepare (st, (UCHAR *) text, SQL_NTS)); + IF_ERR_EXIT (st, SQLPrepare (st, (UCHAR *) text, SQL_NTS)); \ + } while (0) #define HIST_READ(st) \ diff --git a/binsrc/tests/oledb/Makefile.am b/binsrc/tests/oledb/Makefile.am index 8c16fd6d8a..ca2378080b 100644 --- a/binsrc/tests/oledb/Makefile.am +++ b/binsrc/tests/oledb/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/oledb/dts_import.sql b/binsrc/tests/oledb/dts_import.sql index e7a08fac48..a656515a55 100644 --- a/binsrc/tests/oledb/dts_import.sql +++ b/binsrc/tests/oledb/dts_import.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/paramstats.c b/binsrc/tests/paramstats.c index fe9cba8809..82cafb19d3 100644 --- a/binsrc/tests/paramstats.c +++ b/binsrc/tests/paramstats.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/rdf/Makefile.am b/binsrc/tests/rdf/Makefile.am index 7c519adff2..7019ef184e 100644 --- a/binsrc/tests/rdf/Makefile.am +++ b/binsrc/tests/rdf/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/rdf/articles.sql b/binsrc/tests/rdf/articles.sql index 0a1ab4d9f0..f4797f9852 100644 --- a/binsrc/tests/rdf/articles.sql +++ b/binsrc/tests/rdf/articles.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/rdf/rdf-exp-load.xsl b/binsrc/tests/rdf/rdf-exp-load.xsl index c0540241ba..0db0683b59 100644 --- a/binsrc/tests/rdf/rdf-exp-load.xsl +++ b/binsrc/tests/rdf/rdf-exp-load.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/rdf/rdf-exp-rdfxml2dict.xsl b/binsrc/tests/rdf/rdf-exp-rdfxml2dict.xsl index 68fdc44436..c854d0c8ff 100644 --- a/binsrc/tests/rdf/rdf-exp-rdfxml2dict.xsl +++ b/binsrc/tests/rdf/rdf-exp-rdfxml2dict.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/rdf/rdf-exp.sql b/binsrc/tests/rdf/rdf-exp.sql index 06afc528ad..719bf52723 100644 --- a/binsrc/tests/rdf/rdf-exp.sql +++ b/binsrc/tests/rdf/rdf-exp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/rdf/rdfbase.sql b/binsrc/tests/rdf/rdfbase.sql index 23d815b9e3..58c6cd7c26 100644 --- a/binsrc/tests/rdf/rdfbase.sql +++ b/binsrc/tests/rdf/rdfbase.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/rdf/rdfxmlload.xsl b/binsrc/tests/rdf/rdfxmlload.xsl index b05e31baba..46f1006919 100644 --- a/binsrc/tests/rdf/rdfxmlload.xsl +++ b/binsrc/tests/rdf/rdfxmlload.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/rdf/wordnet.sql b/binsrc/tests/rdf/wordnet.sql index f5db5aba9d..cca8303a02 100644 --- a/binsrc/tests/rdf/wordnet.sql +++ b/binsrc/tests/rdf/wordnet.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/runbg.c b/binsrc/tests/runbg.c index aba833b964..bc4f9463e4 100644 --- a/binsrc/tests/runbg.c +++ b/binsrc/tests/runbg.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/scroll.c b/binsrc/tests/scroll.c index ad1d2fdd80..c6e7664943 100644 --- a/binsrc/tests/scroll.c +++ b/binsrc/tests/scroll.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/setcurs.c b/binsrc/tests/setcurs.c index 80b000c48d..f2a826ffa4 100644 --- a/binsrc/tests/setcurs.c +++ b/binsrc/tests/setcurs.c @@ -11,7 +11,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/smtpsend.c b/binsrc/tests/smtpsend.c index bdd87142b9..6c348c8395 100644 --- a/binsrc/tests/smtpsend.c +++ b/binsrc/tests/smtpsend.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/Makefile.am b/binsrc/tests/suite/Makefile.am index 9dfdd4939f..6dbf067341 100644 --- a/binsrc/tests/suite/Makefile.am +++ b/binsrc/tests/suite/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -100,9 +100,9 @@ check_SCRIPTS = \ TESTS_ENVIRONMENT= \ HOME="$(TOP)" \ HOST=localhost \ - JDK2="@ac_jdk2_path@" \ - JDK3="@ac_jdk3_path@" \ JDK4="@ac_jdk4_path@" \ + JDK4_1="@ac_jdk4_1_path@" \ + JDK4_2="@ac_jdk4_2_path@" \ MAKE=$(MAKE) \ PATH="$(TOP)/binsrc/virtuoso:$(TOP)/binsrc/tests:.:$$PATH" \ PORT=$(PORT) \ diff --git a/binsrc/tests/suite/backup.sql b/binsrc/tests/suite/backup.sql index 7c5c16b105..9d00007e6c 100644 --- a/binsrc/tests/suite/backup.sql +++ b/binsrc/tests/suite/backup.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/blobs.sql b/binsrc/tests/suite/blobs.sql index 286f09625d..e01b69b8ea 100644 --- a/binsrc/tests/suite/blobs.sql +++ b/binsrc/tests/suite/blobs.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/bpel.sh b/binsrc/tests/suite/bpel.sh index c806634447..13926c5765 100755 --- a/binsrc/tests/suite/bpel.sh +++ b/binsrc/tests/suite/bpel.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/byteorder.sh b/binsrc/tests/suite/byteorder.sh index a0a4cd5116..13d6faf810 100755 --- a/binsrc/tests/suite/byteorder.sh +++ b/binsrc/tests/suite/byteorder.sh @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/byteorder.sql b/binsrc/tests/suite/byteorder.sql index e82ea9ba50..7ee6aeb096 100644 --- a/binsrc/tests/suite/byteorder.sql +++ b/binsrc/tests/suite/byteorder.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ca.sql b/binsrc/tests/suite/ca.sql index 5f677513db..64176f9e07 100644 --- a/binsrc/tests/suite/ca.sql +++ b/binsrc/tests/suite/ca.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ca2.sql b/binsrc/tests/suite/ca2.sql index 835e0c23bd..6fd083b99e 100644 --- a/binsrc/tests/suite/ca2.sql +++ b/binsrc/tests/suite/ca2.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ce.xml b/binsrc/tests/suite/ce.xml index 26ef152304..6e055faf15 100644 --- a/binsrc/tests/suite/ce.xml +++ b/binsrc/tests/suite/ce.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/clean.sh b/binsrc/tests/suite/clean.sh index a198ff0819..2e29eac3ee 100755 --- a/binsrc/tests/suite/clean.sh +++ b/binsrc/tests/suite/clean.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/clexpck.sql b/binsrc/tests/suite/clexpck.sql index 00151ac1e8..f43985e716 100644 --- a/binsrc/tests/suite/clexpck.sql +++ b/binsrc/tests/suite/clexpck.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/col.sql b/binsrc/tests/suite/col.sql index 8e375fa816..6fd30cff8b 100644 --- a/binsrc/tests/suite/col.sql +++ b/binsrc/tests/suite/col.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/csv_loader.sql b/binsrc/tests/suite/csv_loader.sql index 87f3a98d0b..cf314e6f70 100644 --- a/binsrc/tests/suite/csv_loader.sql +++ b/binsrc/tests/suite/csv_loader.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/cube.sql b/binsrc/tests/suite/cube.sql index c8a3d0c8bd..bc80dda923 100644 --- a/binsrc/tests/suite/cube.sql +++ b/binsrc/tests/suite/cube.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/dbev_login.sql b/binsrc/tests/suite/dbev_login.sql index 70ce6d796b..ae341b3aa9 100644 --- a/binsrc/tests/suite/dbev_login.sql +++ b/binsrc/tests/suite/dbev_login.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/dbconcepts.xml b/binsrc/tests/suite/docsrc/dbconcepts.xml index 7abcbe3878..65b2b0d725 100644 --- a/binsrc/tests/suite/docsrc/dbconcepts.xml +++ b/binsrc/tests/suite/docsrc/dbconcepts.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/html_common_v.xsl b/binsrc/tests/suite/docsrc/html_common_v.xsl index 026ccfc925..20e7f85217 100644 --- a/binsrc/tests/suite/docsrc/html_common_v.xsl +++ b/binsrc/tests/suite/docsrc/html_common_v.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/intl.xml b/binsrc/tests/suite/docsrc/intl.xml index 78bd9f21b6..ad62f16648 100644 --- a/binsrc/tests/suite/docsrc/intl.xml +++ b/binsrc/tests/suite/docsrc/intl.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/odbcimplementation.xml b/binsrc/tests/suite/docsrc/odbcimplementation.xml index 4d76cfbbed..9d10e76b62 100644 --- a/binsrc/tests/suite/docsrc/odbcimplementation.xml +++ b/binsrc/tests/suite/docsrc/odbcimplementation.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/ptune.xml b/binsrc/tests/suite/docsrc/ptune.xml index e70f4137f0..7c35e20114 100644 --- a/binsrc/tests/suite/docsrc/ptune.xml +++ b/binsrc/tests/suite/docsrc/ptune.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/repl.xml b/binsrc/tests/suite/docsrc/repl.xml index 166f991613..9a171901b1 100644 --- a/binsrc/tests/suite/docsrc/repl.xml +++ b/binsrc/tests/suite/docsrc/repl.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/server.xml b/binsrc/tests/suite/docsrc/server.xml index 70319bcad2..e5eeae34bb 100644 --- a/binsrc/tests/suite/docsrc/server.xml +++ b/binsrc/tests/suite/docsrc/server.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/sqlfunctions.xml b/binsrc/tests/suite/docsrc/sqlfunctions.xml index 4616e10bfc..5e1281bdb8 100644 --- a/binsrc/tests/suite/docsrc/sqlfunctions.xml +++ b/binsrc/tests/suite/docsrc/sqlfunctions.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/sqlprocedures.xml b/binsrc/tests/suite/docsrc/sqlprocedures.xml index ce480ce16e..2e4714d3d3 100644 --- a/binsrc/tests/suite/docsrc/sqlprocedures.xml +++ b/binsrc/tests/suite/docsrc/sqlprocedures.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/sqlreference.xml b/binsrc/tests/suite/docsrc/sqlreference.xml index b6e76ce4d4..3e17dfc2d1 100644 --- a/binsrc/tests/suite/docsrc/sqlreference.xml +++ b/binsrc/tests/suite/docsrc/sqlreference.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/tsales.xml b/binsrc/tests/suite/docsrc/tsales.xml index 2e8872c353..16bccf86ca 100644 --- a/binsrc/tests/suite/docsrc/tsales.xml +++ b/binsrc/tests/suite/docsrc/tsales.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/tsales.xsl b/binsrc/tests/suite/docsrc/tsales.xsl index e17fd3b11d..109b742d7f 100644 --- a/binsrc/tests/suite/docsrc/tsales.xsl +++ b/binsrc/tests/suite/docsrc/tsales.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/tsales2.xsl b/binsrc/tests/suite/docsrc/tsales2.xsl index 81962e865e..8ada1a532d 100644 --- a/binsrc/tests/suite/docsrc/tsales2.xsl +++ b/binsrc/tests/suite/docsrc/tsales2.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/docsrc/vdbconcepts.xml b/binsrc/tests/suite/docsrc/vdbconcepts.xml index ebc7f2927c..b403c5def4 100644 --- a/binsrc/tests/suite/docsrc/vdbconcepts.xml +++ b/binsrc/tests/suite/docsrc/vdbconcepts.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/emp.xsl b/binsrc/tests/suite/emp.xsl index 86f246f979..4e6ca8cc14 100644 --- a/binsrc/tests/suite/emp.xsl +++ b/binsrc/tests/suite/emp.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/emp_my.xsl b/binsrc/tests/suite/emp_my.xsl index 1e31ff0437..7c1193a4ed 100644 --- a/binsrc/tests/suite/emp_my.xsl +++ b/binsrc/tests/suite/emp_my.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/epilog.sh b/binsrc/tests/suite/epilog.sh index cb6f889667..27c63b4912 100755 --- a/binsrc/tests/suite/epilog.sh +++ b/binsrc/tests/suite/epilog.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/error.sql b/binsrc/tests/suite/error.sql index af286256fc..b085689f35 100644 --- a/binsrc/tests/suite/error.sql +++ b/binsrc/tests/suite/error.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ftirepl.sql b/binsrc/tests/suite/ftirepl.sql index e1c7c0a2ff..51c75ff9e1 100644 --- a/binsrc/tests/suite/ftirepl.sql +++ b/binsrc/tests/suite/ftirepl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ginx.sql b/binsrc/tests/suite/ginx.sql index 6313ffccab..b625268bd9 100644 --- a/binsrc/tests/suite/ginx.sql +++ b/binsrc/tests/suite/ginx.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/go_functions.sh b/binsrc/tests/suite/go_functions.sh index 0ee5361ca2..3ce5b56649 100755 --- a/binsrc/tests/suite/go_functions.sh +++ b/binsrc/tests/suite/go_functions.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/gtkbench.sh b/binsrc/tests/suite/gtkbench.sh index d8123c874a..c11ef91d29 100755 --- a/binsrc/tests/suite/gtkbench.sh +++ b/binsrc/tests/suite/gtkbench.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/inprocess.sh b/binsrc/tests/suite/inprocess.sh index 33f27539c0..f4fd0bd763 100755 --- a/binsrc/tests/suite/inprocess.sh +++ b/binsrc/tests/suite/inprocess.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/inprocess.sql b/binsrc/tests/suite/inprocess.sql index 3ac04da529..0d4e6ec33d 100644 --- a/binsrc/tests/suite/inprocess.sql +++ b/binsrc/tests/suite/inprocess.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/large_db.sh b/binsrc/tests/suite/large_db.sh index df30defc54..6accf63fb3 100755 --- a/binsrc/tests/suite/large_db.sh +++ b/binsrc/tests/suite/large_db.sh @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/large_db.sql b/binsrc/tests/suite/large_db.sql index cef2d13b2c..fb09fa01e3 100644 --- a/binsrc/tests/suite/large_db.sql +++ b/binsrc/tests/suite/large_db.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/large_db_3g.sql b/binsrc/tests/suite/large_db_3g.sql index 1f96573754..4c16667fe8 100644 --- a/binsrc/tests/suite/large_db_3g.sql +++ b/binsrc/tests/suite/large_db_3g.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/large_db_3g_check.sql b/binsrc/tests/suite/large_db_3g_check.sql index 4184726a85..3f4476d1c7 100644 --- a/binsrc/tests/suite/large_db_3g_check.sql +++ b/binsrc/tests/suite/large_db_3g_check.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/large_db_5g.sql b/binsrc/tests/suite/large_db_5g.sql index d82bfed28e..10ee1520f5 100644 --- a/binsrc/tests/suite/large_db_5g.sql +++ b/binsrc/tests/suite/large_db_5g.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/large_db_backup.sql b/binsrc/tests/suite/large_db_backup.sql index 9f21811851..62c1828afa 100644 --- a/binsrc/tests/suite/large_db_backup.sql +++ b/binsrc/tests/suite/large_db_backup.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/large_db_check.sql b/binsrc/tests/suite/large_db_check.sql index 835a9efe37..09b25b57c7 100644 --- a/binsrc/tests/suite/large_db_check.sql +++ b/binsrc/tests/suite/large_db_check.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ldmeter.sql b/binsrc/tests/suite/ldmeter.sql index 93a97f016f..39a4463b55 100644 --- a/binsrc/tests/suite/ldmeter.sql +++ b/binsrc/tests/suite/ldmeter.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/lowerall.sh b/binsrc/tests/suite/lowerall.sh index ca09aa8c7f..b924a2ca6a 100755 --- a/binsrc/tests/suite/lowerall.sh +++ b/binsrc/tests/suite/lowerall.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/mail.sql b/binsrc/tests/suite/mail.sql index 9dd8653254..1bd924d9d9 100644 --- a/binsrc/tests/suite/mail.sql +++ b/binsrc/tests/suite/mail.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/msdtc.sh b/binsrc/tests/suite/msdtc.sh index 0800204d6c..4069eb2279 100755 --- a/binsrc/tests/suite/msdtc.sh +++ b/binsrc/tests/suite/msdtc.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/msdtc_conn_check.sql b/binsrc/tests/suite/msdtc_conn_check.sql index 0490c02ad1..8408cb16b1 100644 --- a/binsrc/tests/suite/msdtc_conn_check.sql +++ b/binsrc/tests/suite/msdtc_conn_check.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/netmeter.sql b/binsrc/tests/suite/netmeter.sql index 5cc5a9080b..9f61bf3504 100644 --- a/binsrc/tests/suite/netmeter.sql +++ b/binsrc/tests/suite/netmeter.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nntp_suite.sql b/binsrc/tests/suite/nntp_suite.sql index 713799182b..c5aa4b8f82 100644 --- a/binsrc/tests/suite/nntp_suite.sql +++ b/binsrc/tests/suite/nntp_suite.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwdemo.sql b/binsrc/tests/suite/nwdemo.sql index e1350b3dd8..9e3e8a64e9 100644 --- a/binsrc/tests/suite/nwdemo.sql +++ b/binsrc/tests/suite/nwdemo.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwdemo_norefs.sql b/binsrc/tests/suite/nwdemo_norefs.sql index cb49badb31..e2c090f148 100644 --- a/binsrc/tests/suite/nwdemo_norefs.sql +++ b/binsrc/tests/suite/nwdemo_norefs.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwdemo_update.sql b/binsrc/tests/suite/nwdemo_update.sql index 860b5084f5..e1d076b0a0 100644 --- a/binsrc/tests/suite/nwdemo_update.sql +++ b/binsrc/tests/suite/nwdemo_update.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxml.sh b/binsrc/tests/suite/nwxml.sh index 12ea54290e..a8c93fa3d4 100755 --- a/binsrc/tests/suite/nwxml.sh +++ b/binsrc/tests/suite/nwxml.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxml.sql b/binsrc/tests/suite/nwxml.sql index 91dc1c53de..2573f0a6f5 100644 --- a/binsrc/tests/suite/nwxml.sql +++ b/binsrc/tests/suite/nwxml.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxml1.sql b/binsrc/tests/suite/nwxml1.sql index c37756e0e3..db39a082c1 100644 --- a/binsrc/tests/suite/nwxml1.sql +++ b/binsrc/tests/suite/nwxml1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxml2.sql b/binsrc/tests/suite/nwxml2.sql index 387a95d7f7..e337f3a3d8 100644 --- a/binsrc/tests/suite/nwxml2.sql +++ b/binsrc/tests/suite/nwxml2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -66,28 +66,29 @@ create procedure xml_text_load (in f varchar) insert into XML_TEXT (XT_ID, XT_FILE, XT_TEXT) values (sequence_next ('XML_TEXT'), f, file_to_string (f)); } +; create procedure xml_text_load_r (in f varchar) { declare str any; - declare ni int; + str := file_to_string (f); if (exists (select 1 from XML_TEXT where XT_FILE = f)) - update XML_TEXT set XT_TEXT = file_to_string (f) where XT_FILE = f; + update XML_TEXT set XT_TEXT = str where XT_FILE = f; else { - ni := coalesce ((select xt_id + 1 from xml_text order by xt_id desc), 1); insert into XML_TEXT (XT_ID, XT_FILE, XT_TEXT) - values (ni, f, str); + values (sequence_next ('XML_TEXT'), f, str); } } - +; create procedure xml_text_insert (in f varchar) { insert into XML_TEXT (XT_ID, XT_FILE, XT_TEXT) values (sequence_next ('XML_TEXT'), NULL, f); } +; create procedure xml_html_load (in f varchar) { @@ -110,8 +111,7 @@ create procedure xml_html_load (in f varchar) rollback work; goto again; } - - +; create procedure pxml_html_load (in f varchar) { @@ -135,6 +135,7 @@ create procedure pxml_html_load (in f varchar) rollback work; goto again; } +; xml_text_load ('docsrc/dbconcepts.xml'); xml_text_load ('docsrc/intl.xml'); diff --git a/binsrc/tests/suite/nwxml2_vad.sql b/binsrc/tests/suite/nwxml2_vad.sql index ee18b3a234..af00804a68 100644 --- a/binsrc/tests/suite/nwxml2_vad.sql +++ b/binsrc/tests/suite/nwxml2_vad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -19,30 +19,31 @@ -- with this program; if not, write to the Free Software Foundation, Inc., -- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -- --- create procedure xml_text_load (in f varchar) { + declare str any; + + str := DB.DBA.get_blob_from_dav (concat('/DAV/', f)); if (exists (select 1 from XML_TEXT where XT_FILE = f)) - update XML_TEXT set XT_TEXT = DB.DBA.get_blob_from_dav (concat('/DAV/' , f)) where XT_FILE = f; + update XML_TEXT set XT_TEXT = str where XT_FILE = f; else insert into XML_TEXT (XT_ID, XT_FILE, XT_TEXT) - values (sequence_next ('XML_TEXT'), f, DB.DBA.get_blob_from_dav (concat('/DAV/' , f))); + values (sequence_next ('XML_TEXT'), f, str); } ; create procedure xml_text_load_r (in f varchar) { declare str any; - declare ni int; + str := file_to_string (f); if (exists (select 1 from XML_TEXT where XT_FILE = f)) - update XML_TEXT set XT_TEXT = file_to_string (f) where XT_FILE = f; + update XML_TEXT set XT_TEXT = str where XT_FILE = f; else { - ni := coalesce ((select xt_id + 1 from xml_text order by xt_id desc), 1); insert into XML_TEXT (XT_ID, XT_FILE, XT_TEXT) - values (ni, f, str); + values (sequence_next ('XML_TEXT'), f, str); } } ; diff --git a/binsrc/tests/suite/nwxml3.sql b/binsrc/tests/suite/nwxml3.sql index 3ea6cdc64a..bede742280 100644 --- a/binsrc/tests/suite/nwxml3.sql +++ b/binsrc/tests/suite/nwxml3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxml3a.sql b/binsrc/tests/suite/nwxml3a.sql index f606450825..2305bed2c4 100644 --- a/binsrc/tests/suite/nwxml3a.sql +++ b/binsrc/tests/suite/nwxml3a.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxml3b.sql b/binsrc/tests/suite/nwxml3b.sql index 5549490677..f931284285 100644 --- a/binsrc/tests/suite/nwxml3b.sql +++ b/binsrc/tests/suite/nwxml3b.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxml3c.sql b/binsrc/tests/suite/nwxml3c.sql index 6c14edff98..c77c438f17 100644 --- a/binsrc/tests/suite/nwxml3c.sql +++ b/binsrc/tests/suite/nwxml3c.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxml4.sql b/binsrc/tests/suite/nwxml4.sql index f926fb52c1..7f5937375a 100644 --- a/binsrc/tests/suite/nwxml4.sql +++ b/binsrc/tests/suite/nwxml4.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxml_vad.sql b/binsrc/tests/suite/nwxml_vad.sql index 07a022b81a..1ad72eadad 100644 --- a/binsrc/tests/suite/nwxml_vad.sql +++ b/binsrc/tests/suite/nwxml_vad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxmla.sql b/binsrc/tests/suite/nwxmla.sql index 12ed49aae3..c45cf7630c 100644 --- a/binsrc/tests/suite/nwxmla.sql +++ b/binsrc/tests/suite/nwxmla.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxmlb.sql b/binsrc/tests/suite/nwxmlb.sql index 989c095326..9ac0c920a8 100644 --- a/binsrc/tests/suite/nwxmlb.sql +++ b/binsrc/tests/suite/nwxmlb.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxmlco.sql b/binsrc/tests/suite/nwxmlco.sql index f08bf36ae8..d883c088bb 100644 --- a/binsrc/tests/suite/nwxmlco.sql +++ b/binsrc/tests/suite/nwxmlco.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxmlo.sql b/binsrc/tests/suite/nwxmlo.sql index 9ead05304c..32f371f641 100644 --- a/binsrc/tests/suite/nwxmlo.sql +++ b/binsrc/tests/suite/nwxmlo.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxmltype3.sql b/binsrc/tests/suite/nwxmltype3.sql index de39a5b1bb..841f26b158 100644 --- a/binsrc/tests/suite/nwxmltype3.sql +++ b/binsrc/tests/suite/nwxmltype3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxmltype3a.sql b/binsrc/tests/suite/nwxmltype3a.sql index 283420b725..f696283457 100644 --- a/binsrc/tests/suite/nwxmltype3a.sql +++ b/binsrc/tests/suite/nwxmltype3a.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxmltype3b.sql b/binsrc/tests/suite/nwxmltype3b.sql index 0b687b951b..e4a0e9c6af 100644 --- a/binsrc/tests/suite/nwxmltype3b.sql +++ b/binsrc/tests/suite/nwxmltype3b.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxmltype3c.sql b/binsrc/tests/suite/nwxmltype3c.sql index 2afc410b5d..cf1d7514a3 100644 --- a/binsrc/tests/suite/nwxmltype3c.sql +++ b/binsrc/tests/suite/nwxmltype3c.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/nwxp.sql b/binsrc/tests/suite/nwxp.sql index 12c7f3b579..4eb5e364f9 100644 --- a/binsrc/tests/suite/nwxp.sql +++ b/binsrc/tests/suite/nwxp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ob_tpcc_check.sql b/binsrc/tests/suite/ob_tpcc_check.sql index ceac3e6f61..9f97daf64b 100644 --- a/binsrc/tests/suite/ob_tpcc_check.sql +++ b/binsrc/tests/suite/ob_tpcc_check.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/obackup.sh b/binsrc/tests/suite/obackup.sh index f0ff28bf7f..b982c4964d 100755 --- a/binsrc/tests/suite/obackup.sh +++ b/binsrc/tests/suite/obackup.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/obackup.sql b/binsrc/tests/suite/obackup.sql index 35e3b2f6bc..3cf01c3d78 100644 --- a/binsrc/tests/suite/obackup.sql +++ b/binsrc/tests/suite/obackup.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/obackup0.sql b/binsrc/tests/suite/obackup0.sql index bf17feba21..7bf32f247f 100644 --- a/binsrc/tests/suite/obackup0.sql +++ b/binsrc/tests/suite/obackup0.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/obackup1.sql b/binsrc/tests/suite/obackup1.sql index 19bf214c9e..0a4e51c06c 100644 --- a/binsrc/tests/suite/obackup1.sql +++ b/binsrc/tests/suite/obackup1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/obackup_userck.sql b/binsrc/tests/suite/obackup_userck.sql index 80c2807350..f5326b7fdd 100644 --- a/binsrc/tests/suite/obackup_userck.sql +++ b/binsrc/tests/suite/obackup_userck.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/obackup_userck2.sql b/binsrc/tests/suite/obackup_userck2.sql index 5d799bbe78..73503d8b13 100644 --- a/binsrc/tests/suite/obackup_userck2.sql +++ b/binsrc/tests/suite/obackup_userck2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/obackupck.sql b/binsrc/tests/suite/obackupck.sql index 7341b6a3b9..bbba081e07 100644 --- a/binsrc/tests/suite/obackupck.sql +++ b/binsrc/tests/suite/obackupck.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/oledb.sh b/binsrc/tests/suite/oledb.sh index 9cbca0763b..701347415f 100755 --- a/binsrc/tests/suite/oledb.sh +++ b/binsrc/tests/suite/oledb.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/pass.sql b/binsrc/tests/suite/pass.sql index 8ae5c68df7..0403815f20 100644 --- a/binsrc/tests/suite/pass.sql +++ b/binsrc/tests/suite/pass.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/pddin.sql b/binsrc/tests/suite/pddin.sql index 01b35e5b59..6eedaeee2b 100644 --- a/binsrc/tests/suite/pddin.sql +++ b/binsrc/tests/suite/pddin.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/pddin2.sql b/binsrc/tests/suite/pddin2.sql index f5940f3dc9..7b0b90ee86 100644 --- a/binsrc/tests/suite/pddin2.sql +++ b/binsrc/tests/suite/pddin2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/prepare_t1.sh b/binsrc/tests/suite/prepare_t1.sh index b6d65f6c71..d25cb75926 100755 --- a/binsrc/tests/suite/prepare_t1.sh +++ b/binsrc/tests/suite/prepare_t1.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/prolog.sh b/binsrc/tests/suite/prolog.sh index ff5f7ef18e..97efa170ec 100755 --- a/binsrc/tests/suite/prolog.sh +++ b/binsrc/tests/suite/prolog.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/complex-doc-1.xsd b/binsrc/tests/suite/r4/complex-doc-1.xsd index e454af057c..ba1ccc2382 100644 --- a/binsrc/tests/suite/r4/complex-doc-1.xsd +++ b/binsrc/tests/suite/r4/complex-doc-1.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/complex-doc-2.xsd b/binsrc/tests/suite/r4/complex-doc-2.xsd index fec2c31bd1..478c25e5a4 100644 --- a/binsrc/tests/suite/r4/complex-doc-2.xsd +++ b/binsrc/tests/suite/r4/complex-doc-2.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/complex-doc-3.xsd b/binsrc/tests/suite/r4/complex-doc-3.xsd index 3c6a93710d..05961ffb8b 100644 --- a/binsrc/tests/suite/r4/complex-doc-3.xsd +++ b/binsrc/tests/suite/r4/complex-doc-3.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/complex-doc-literal.sql b/binsrc/tests/suite/r4/complex-doc-literal.sql index d3285b8785..c5dce417bb 100644 --- a/binsrc/tests/suite/r4/complex-doc-literal.sql +++ b/binsrc/tests/suite/r4/complex-doc-literal.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/complex-rpc-encoded.sql b/binsrc/tests/suite/r4/complex-rpc-encoded.sql index 99e6c8c841..4442d22c76 100644 --- a/binsrc/tests/suite/r4/complex-rpc-encoded.sql +++ b/binsrc/tests/suite/r4/complex-rpc-encoded.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/complex-rpc-encoded.xsd b/binsrc/tests/suite/r4/complex-rpc-encoded.xsd index 0942fbcbfb..75415c6eef 100644 --- a/binsrc/tests/suite/r4/complex-rpc-encoded.xsd +++ b/binsrc/tests/suite/r4/complex-rpc-encoded.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/dime-doc.sql b/binsrc/tests/suite/r4/dime-doc.sql index fdee81e89c..f5a96414dc 100644 --- a/binsrc/tests/suite/r4/dime-doc.sql +++ b/binsrc/tests/suite/r4/dime-doc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/dime-doc.xsd b/binsrc/tests/suite/r4/dime-doc.xsd index 9249e79573..5ded2129e0 100644 --- a/binsrc/tests/suite/r4/dime-doc.xsd +++ b/binsrc/tests/suite/r4/dime-doc.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/dime-rpc.sql b/binsrc/tests/suite/r4/dime-rpc.sql index d3db679c5a..660e9f524c 100644 --- a/binsrc/tests/suite/r4/dime-rpc.sql +++ b/binsrc/tests/suite/r4/dime-rpc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/dime-rpc.xsd b/binsrc/tests/suite/r4/dime-rpc.xsd index 83c7c847d9..6f5ffc649f 100644 --- a/binsrc/tests/suite/r4/dime-rpc.xsd +++ b/binsrc/tests/suite/r4/dime-rpc.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/load_xsd.sql b/binsrc/tests/suite/r4/load_xsd.sql index fd980b77f2..b97cfc2bac 100644 --- a/binsrc/tests/suite/r4/load_xsd.sql +++ b/binsrc/tests/suite/r4/load_xsd.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/mime-doc.sql b/binsrc/tests/suite/r4/mime-doc.sql index ac7aa2eebc..3beecbb73d 100644 --- a/binsrc/tests/suite/r4/mime-doc.sql +++ b/binsrc/tests/suite/r4/mime-doc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/mime-rpc.sql b/binsrc/tests/suite/r4/mime-rpc.sql index 0d97313c2b..70c57ab67e 100644 --- a/binsrc/tests/suite/r4/mime-rpc.sql +++ b/binsrc/tests/suite/r4/mime-rpc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/round4xsd-1.xsd b/binsrc/tests/suite/r4/round4xsd-1.xsd index 08f5849e71..16dc48b4e4 100644 --- a/binsrc/tests/suite/r4/round4xsd-1.xsd +++ b/binsrc/tests/suite/r4/round4xsd-1.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/round4xsd-2.xsd b/binsrc/tests/suite/r4/round4xsd-2.xsd index 1f1dba5b77..93c1cc1512 100644 --- a/binsrc/tests/suite/r4/round4xsd-2.xsd +++ b/binsrc/tests/suite/r4/round4xsd-2.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/round4xsd-3.xsd b/binsrc/tests/suite/r4/round4xsd-3.xsd index af04c1bb50..6e9e5aa491 100644 --- a/binsrc/tests/suite/r4/round4xsd-3.xsd +++ b/binsrc/tests/suite/r4/round4xsd-3.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/round4xsd-4.xsd b/binsrc/tests/suite/r4/round4xsd-4.xsd index 7cbd37afbe..0d52c74b73 100644 --- a/binsrc/tests/suite/r4/round4xsd-4.xsd +++ b/binsrc/tests/suite/r4/round4xsd-4.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/simple-doc-literal-1.xsd b/binsrc/tests/suite/r4/simple-doc-literal-1.xsd index 61c900b838..017966f3ff 100644 --- a/binsrc/tests/suite/r4/simple-doc-literal-1.xsd +++ b/binsrc/tests/suite/r4/simple-doc-literal-1.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/simple-doc-literal-2.xsd b/binsrc/tests/suite/r4/simple-doc-literal-2.xsd index 4d10b6d6f8..d14e67e193 100644 --- a/binsrc/tests/suite/r4/simple-doc-literal-2.xsd +++ b/binsrc/tests/suite/r4/simple-doc-literal-2.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/simple-doc-literal-3.xsd b/binsrc/tests/suite/r4/simple-doc-literal-3.xsd index 953e128ff4..a609d80903 100644 --- a/binsrc/tests/suite/r4/simple-doc-literal-3.xsd +++ b/binsrc/tests/suite/r4/simple-doc-literal-3.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/simple-doc-literal.sql b/binsrc/tests/suite/r4/simple-doc-literal.sql index d29d7327d6..f84a5c1cf8 100644 --- a/binsrc/tests/suite/r4/simple-doc-literal.sql +++ b/binsrc/tests/suite/r4/simple-doc-literal.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/simple-rpc-encoded.sql b/binsrc/tests/suite/r4/simple-rpc-encoded.sql index 916b60966f..a517cd4984 100644 --- a/binsrc/tests/suite/r4/simple-rpc-encoded.sql +++ b/binsrc/tests/suite/r4/simple-rpc-encoded.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/simple-rpc-encoded.xsd b/binsrc/tests/suite/r4/simple-rpc-encoded.xsd index ec198e1cc9..f543c45e5d 100644 --- a/binsrc/tests/suite/r4/simple-rpc-encoded.xsd +++ b/binsrc/tests/suite/r4/simple-rpc-encoded.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/r4/xsd.sql b/binsrc/tests/suite/r4/xsd.sql index 4fe0e6efcf..de201b0b05 100644 --- a/binsrc/tests/suite/r4/xsd.sql +++ b/binsrc/tests/suite/r4/xsd.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rdfldck.sql b/binsrc/tests/suite/rdfldck.sql index aea4bad6e6..345c29b32f 100644 --- a/binsrc/tests/suite/rdfldck.sql +++ b/binsrc/tests/suite/rdfldck.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rdflddir.sql b/binsrc/tests/suite/rdflddir.sql index a65db0f1a1..95e0b26261 100644 --- a/binsrc/tests/suite/rdflddir.sql +++ b/binsrc/tests/suite/rdflddir.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/recovck1.sql b/binsrc/tests/suite/recovck1.sql index 2806e7ca1d..6b8eaec12c 100644 --- a/binsrc/tests/suite/recovck1.sql +++ b/binsrc/tests/suite/recovck1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/recovck1_noreg.sql b/binsrc/tests/suite/recovck1_noreg.sql index 8e20d6b62f..c3f81e64fb 100644 --- a/binsrc/tests/suite/recovck1_noreg.sql +++ b/binsrc/tests/suite/recovck1_noreg.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/release.sh b/binsrc/tests/suite/release.sh index f250b0a245..2a62fe118a 100755 --- a/binsrc/tests/suite/release.sh +++ b/binsrc/tests/suite/release.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/revstr.sql b/binsrc/tests/suite/revstr.sql index 5156fb7d13..70c0d78baf 100644 --- a/binsrc/tests/suite/revstr.sql +++ b/binsrc/tests/suite/revstr.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rexecute.sql b/binsrc/tests/suite/rexecute.sql index 685c36763d..ad3f78153c 100644 --- a/binsrc/tests/suite/rexecute.sql +++ b/binsrc/tests/suite/rexecute.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rls.sql b/binsrc/tests/suite/rls.sql index 7dc86961dd..eba0329bb5 100644 --- a/binsrc/tests/suite/rls.sql +++ b/binsrc/tests/suite/rls.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rls_attach.sql b/binsrc/tests/suite/rls_attach.sql index 1fca7937e6..4734488b2e 100644 --- a/binsrc/tests/suite/rls_attach.sql +++ b/binsrc/tests/suite/rls_attach.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rls_create.sql b/binsrc/tests/suite/rls_create.sql index 1489888528..532c5de04b 100644 --- a/binsrc/tests/suite/rls_create.sql +++ b/binsrc/tests/suite/rls_create.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rpjoin.sql b/binsrc/tests/suite/rpjoin.sql index 09aea88f81..5382389b9a 100644 --- a/binsrc/tests/suite/rpjoin.sql +++ b/binsrc/tests/suite/rpjoin.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rproc1.sql b/binsrc/tests/suite/rproc1.sql index 1c9049760c..a48923f480 100644 --- a/binsrc/tests/suite/rproc1.sql +++ b/binsrc/tests/suite/rproc1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rproc2.sql b/binsrc/tests/suite/rproc2.sql index 9e001292f3..a5c3edaeea 100644 --- a/binsrc/tests/suite/rproc2.sql +++ b/binsrc/tests/suite/rproc2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rtest.sh b/binsrc/tests/suite/rtest.sh index 12ace11c74..f39bbe3dfa 100755 --- a/binsrc/tests/suite/rtest.sh +++ b/binsrc/tests/suite/rtest.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rtest0.sql b/binsrc/tests/suite/rtest0.sql index 4eecc97a45..21a2b02320 100644 --- a/binsrc/tests/suite/rtest0.sql +++ b/binsrc/tests/suite/rtest0.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rtest1-1.sql b/binsrc/tests/suite/rtest1-1.sql index 42e2423e2b..75c5a523c6 100644 --- a/binsrc/tests/suite/rtest1-1.sql +++ b/binsrc/tests/suite/rtest1-1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rtest1.sql b/binsrc/tests/suite/rtest1.sql index 69bef5276b..079e47e9d2 100644 --- a/binsrc/tests/suite/rtest1.sql +++ b/binsrc/tests/suite/rtest1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rtest2-1.sql b/binsrc/tests/suite/rtest2-1.sql index d1cc148997..92bdf8dc10 100644 --- a/binsrc/tests/suite/rtest2-1.sql +++ b/binsrc/tests/suite/rtest2-1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rtest2.sql b/binsrc/tests/suite/rtest2.sql index 21cdb717e2..2de6e6b202 100644 --- a/binsrc/tests/suite/rtest2.sql +++ b/binsrc/tests/suite/rtest2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rtest3.sql b/binsrc/tests/suite/rtest3.sql index 8759f59b2b..94d6e95aea 100644 --- a/binsrc/tests/suite/rtest3.sql +++ b/binsrc/tests/suite/rtest3.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rtest4.sql b/binsrc/tests/suite/rtest4.sql index 6bcdf226ca..9572aa06c9 100644 --- a/binsrc/tests/suite/rtest4.sql +++ b/binsrc/tests/suite/rtest4.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rtest5.sql b/binsrc/tests/suite/rtest5.sql index eb9b352a26..e3c097792e 100644 --- a/binsrc/tests/suite/rtest5.sql +++ b/binsrc/tests/suite/rtest5.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rtesta.sql b/binsrc/tests/suite/rtesta.sql index be20a62960..d858b97d4c 100644 --- a/binsrc/tests/suite/rtesta.sql +++ b/binsrc/tests/suite/rtesta.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/rtrxdead.sql b/binsrc/tests/suite/rtrxdead.sql index 212fb0f369..4f369c2d7f 100644 --- a/binsrc/tests/suite/rtrxdead.sql +++ b/binsrc/tests/suite/rtrxdead.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/selt1.sql b/binsrc/tests/suite/selt1.sql index d56c870d50..d97b2849e6 100644 --- a/binsrc/tests/suite/selt1.sql +++ b/binsrc/tests/suite/selt1.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/selt2.sql b/binsrc/tests/suite/selt2.sql index 248ef584a7..121b048d80 100644 --- a/binsrc/tests/suite/selt2.sql +++ b/binsrc/tests/suite/selt2.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/selt3.sql b/binsrc/tests/suite/selt3.sql index 56d2a8ca9d..96126178d9 100644 --- a/binsrc/tests/suite/selt3.sql +++ b/binsrc/tests/suite/selt3.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/selt4.sql b/binsrc/tests/suite/selt4.sql index e3394790bb..c36b098621 100644 --- a/binsrc/tests/suite/selt4.sql +++ b/binsrc/tests/suite/selt4.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/selt5.sql b/binsrc/tests/suite/selt5.sql index d9e088972f..bc8cdbac8d 100644 --- a/binsrc/tests/suite/selt5.sql +++ b/binsrc/tests/suite/selt5.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/soapauth.sql b/binsrc/tests/suite/soapauth.sql index 7880f31c00..ff45421447 100644 --- a/binsrc/tests/suite/soapauth.sql +++ b/binsrc/tests/suite/soapauth.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/sqlo.sql b/binsrc/tests/suite/sqlo.sql index f7468bc190..59d0cb8c8c 100644 --- a/binsrc/tests/suite/sqlo.sql +++ b/binsrc/tests/suite/sqlo.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/sqlo2.sql b/binsrc/tests/suite/sqlo2.sql index 5b7d0c7e1f..7d43b6bed7 100644 --- a/binsrc/tests/suite/sqlo2.sql +++ b/binsrc/tests/suite/sqlo2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/sqlovdb.sql b/binsrc/tests/suite/sqlovdb.sql index a93f41cb01..769ccff1f1 100644 --- a/binsrc/tests/suite/sqlovdb.sql +++ b/binsrc/tests/suite/sqlovdb.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/stat.sql b/binsrc/tests/suite/stat.sql index 27c2999eba..73adc5452f 100644 --- a/binsrc/tests/suite/stat.sql +++ b/binsrc/tests/suite/stat.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/succ.sql b/binsrc/tests/suite/succ.sql index 6b409e83f9..ca9936d759 100644 --- a/binsrc/tests/suite/succ.sql +++ b/binsrc/tests/suite/succ.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/summary.sh b/binsrc/tests/suite/summary.sh index c0b4b01562..4f33487dba 100755 --- a/binsrc/tests/suite/summary.sh +++ b/binsrc/tests/suite/summary.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tac.sql b/binsrc/tests/suite/tac.sql index dbd06c3567..97d8eab19a 100644 --- a/binsrc/tests/suite/tac.sql +++ b/binsrc/tests/suite/tac.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tacl.sql b/binsrc/tests/suite/tacl.sql index 7ba27bd1cc..36f90fec15 100644 --- a/binsrc/tests/suite/tacl.sql +++ b/binsrc/tests/suite/tacl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tany.sql b/binsrc/tests/suite/tany.sql index 048000c6e7..e64023985f 100644 --- a/binsrc/tests/suite/tany.sql +++ b/binsrc/tests/suite/tany.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tany2.sql b/binsrc/tests/suite/tany2.sql index 231770aedd..53c280b595 100644 --- a/binsrc/tests/suite/tany2.sql +++ b/binsrc/tests/suite/tany2.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tanytime.sql b/binsrc/tests/suite/tanytime.sql index 9335976df2..1ce0bcd9cc 100644 --- a/binsrc/tests/suite/tanytime.sql +++ b/binsrc/tests/suite/tanytime.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/taq.sql b/binsrc/tests/suite/taq.sql index ed183a2f14..206660a233 100644 --- a/binsrc/tests/suite/taq.sql +++ b/binsrc/tests/suite/taq.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tarith.sql b/binsrc/tests/suite/tarith.sql index 06eb7ae7f8..4a2069c726 100644 --- a/binsrc/tests/suite/tarith.sql +++ b/binsrc/tests/suite/tarith.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tarray.sql b/binsrc/tests/suite/tarray.sql index f30b095718..a3daa4e81e 100644 --- a/binsrc/tests/suite/tarray.sql +++ b/binsrc/tests/suite/tarray.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tbak.sql b/binsrc/tests/suite/tbak.sql index 71f57267e2..e2346ae118 100644 --- a/binsrc/tests/suite/tbak.sql +++ b/binsrc/tests/suite/tbak.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tbfree.sql b/binsrc/tests/suite/tbfree.sql index ce180550fe..2e4cfb8869 100644 --- a/binsrc/tests/suite/tbfree.sql +++ b/binsrc/tests/suite/tbfree.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tbin.sql b/binsrc/tests/suite/tbin.sql index ade730b98c..d7543c81e2 100644 --- a/binsrc/tests/suite/tbin.sql +++ b/binsrc/tests/suite/tbin.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tbint.sql b/binsrc/tests/suite/tbint.sql index 0379c68332..d288d1c271 100644 --- a/binsrc/tests/suite/tbint.sql +++ b/binsrc/tests/suite/tbint.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tbitmap.sql b/binsrc/tests/suite/tbitmap.sql index 8c87a69962..c4bb246cc8 100644 --- a/binsrc/tests/suite/tbitmap.sql +++ b/binsrc/tests/suite/tbitmap.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tblob.sql b/binsrc/tests/suite/tblob.sql index b5e5cafe3e..df09aebf8d 100644 --- a/binsrc/tests/suite/tblob.sql +++ b/binsrc/tests/suite/tblob.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tblob_recode.sh b/binsrc/tests/suite/tblob_recode.sh index 3a6ee0d265..65c7ca1cfd 100755 --- a/binsrc/tests/suite/tblob_recode.sh +++ b/binsrc/tests/suite/tblob_recode.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tblog.sql b/binsrc/tests/suite/tblog.sql index dab9168a1c..fd20a708c6 100644 --- a/binsrc/tests/suite/tblog.sql +++ b/binsrc/tests/suite/tblog.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tblogq.sql b/binsrc/tests/suite/tblogq.sql index 421abee160..849718ca9f 100644 --- a/binsrc/tests/suite/tblogq.sql +++ b/binsrc/tests/suite/tblogq.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tbreakup.sql b/binsrc/tests/suite/tbreakup.sql index b4332b18aa..4c89ccb5b7 100644 --- a/binsrc/tests/suite/tbreakup.sql +++ b/binsrc/tests/suite/tbreakup.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tbunion.sql b/binsrc/tests/suite/tbunion.sql index 7c98af0c6c..a2a051836a 100644 --- a/binsrc/tests/suite/tbunion.sql +++ b/binsrc/tests/suite/tbunion.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcast.sql b/binsrc/tests/suite/tcast.sql index c24741deef..0b1c9b3456 100644 --- a/binsrc/tests/suite/tcast.sql +++ b/binsrc/tests/suite/tcast.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tchars.sql b/binsrc/tests/suite/tchars.sql index e8bcd281e9..8d143b7ab1 100644 --- a/binsrc/tests/suite/tchars.sql +++ b/binsrc/tests/suite/tchars.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcheck.sql b/binsrc/tests/suite/tcheck.sql index 1600bcb1d5..ea922fca11 100644 --- a/binsrc/tests/suite/tcheck.sql +++ b/binsrc/tests/suite/tcheck.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcl.sh b/binsrc/tests/suite/tcl.sh index a120c01671..80a9dd200a 100755 --- a/binsrc/tests/suite/tcl.sh +++ b/binsrc/tests/suite/tcl.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tclcast.sql b/binsrc/tests/suite/tclcast.sql index 4d2cc61698..08c30440bb 100644 --- a/binsrc/tests/suite/tclcast.sql +++ b/binsrc/tests/suite/tclcast.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcldfg.sql b/binsrc/tests/suite/tcldfg.sql index 6648e5c020..0c377bc47f 100644 --- a/binsrc/tests/suite/tcldfg.sql +++ b/binsrc/tests/suite/tcldfg.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcldt.sql b/binsrc/tests/suite/tcldt.sql index d098d1d2dc..f8e32141ae 100644 --- a/binsrc/tests/suite/tcldt.sql +++ b/binsrc/tests/suite/tcldt.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tclforvec.sql b/binsrc/tests/suite/tclforvec.sql new file mode 100644 index 0000000000..82e123250d --- /dev/null +++ b/binsrc/tests/suite/tclforvec.sql @@ -0,0 +1,37 @@ + +-- cluster for vectored test + + +echo both "For vectored test\n"; + + +ttlp (' 1234 .' , '', 'fvg1'); +ttlp (' 1234 .' , '', 'fvg2'); +ttlp (' 1234 .' , '', 'fvg3'); + +create procedure ff (in gs any) +{ + declare ret any; + for vectored (in i any := gs, out ret := r) { + declare r any; + r := __ro2sq ((select s from rdf_quad where g = iri_to_id (i))); + } + return ret; +} + +select ff (vector ('fvg1', 'fvg2', 'fvg3', 'fvg4'))[1]; +echo both $if $equ $last[1] g2s "PASSED" "***FAILED"; +echo both ": Found g2\n"; + + +select ff (vector ('fvg1', 'fvg2', 'fvg3', 'fvg4'))[3]; +echo both $if $equ $last[1] NULL "PASSED" "***FAILED"; +echo both ": Missing g4\n"; + +rdf_clear_graphs_c (vector ('fvg1', 'fvg2', 'fvg3', 'fvg4')); + +select ff (vector ('fvg1', 'fvg2', 'fvg3', 'fvg4'))[1]; +echo both $if $equ $last[1] NULL "PASSED" "***FAILED"; +echo both ": Deleted g2\n"; + + diff --git a/binsrc/tests/suite/tclins.sql b/binsrc/tests/suite/tclins.sql index c7a5d639f1..1127c7d99c 100644 --- a/binsrc/tests/suite/tclins.sql +++ b/binsrc/tests/suite/tclins.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcljoin.sql b/binsrc/tests/suite/tcljoin.sql index b8b0c69842..4a5582822d 100644 --- a/binsrc/tests/suite/tcljoin.sql +++ b/binsrc/tests/suite/tcljoin.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcllock.sql b/binsrc/tests/suite/tcllock.sql index 7339ef8ab8..a42c5467b9 100644 --- a/binsrc/tests/suite/tcllock.sql +++ b/binsrc/tests/suite/tcllock.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcllock2.sql b/binsrc/tests/suite/tcllock2.sql index 6938acf992..e0673cafd4 100644 --- a/binsrc/tests/suite/tcllock2.sql +++ b/binsrc/tests/suite/tcllock2.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tclparts.sql b/binsrc/tests/suite/tclparts.sql index 708f6b0230..b9ec4a44c7 100644 --- a/binsrc/tests/suite/tclparts.sql +++ b/binsrc/tests/suite/tclparts.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tclrec.sql b/binsrc/tests/suite/tclrec.sql index b6d9b008b8..f44853852e 100644 --- a/binsrc/tests/suite/tclrec.sql +++ b/binsrc/tests/suite/tclrec.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tclstart.sh b/binsrc/tests/suite/tclstart.sh index 54180e05a6..a7e8a6ea32 100755 --- a/binsrc/tests/suite/tclstart.sh +++ b/binsrc/tests/suite/tclstart.sh @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tclstop.sh b/binsrc/tests/suite/tclstop.sh index 64a945c0fb..3a1e35a321 100755 --- a/binsrc/tests/suite/tclstop.sh +++ b/binsrc/tests/suite/tclstop.sh @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcol.sql b/binsrc/tests/suite/tcol.sql index 25cf7e189a..d016bcccf1 100644 --- a/binsrc/tests/suite/tcol.sql +++ b/binsrc/tests/suite/tcol.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcol1.sql b/binsrc/tests/suite/tcol1.sql index 5931df9d49..873d5daac6 100644 --- a/binsrc/tests/suite/tcol1.sql +++ b/binsrc/tests/suite/tcol1.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcoll.sql b/binsrc/tests/suite/tcoll.sql index ce7a805697..702303cf11 100644 --- a/binsrc/tests/suite/tcoll.sql +++ b/binsrc/tests/suite/tcoll.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcompress.sql b/binsrc/tests/suite/tcompress.sql index 9467f919c2..2d07a1b8a1 100644 --- a/binsrc/tests/suite/tcompress.sql +++ b/binsrc/tests/suite/tcompress.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tconcur2.sql b/binsrc/tests/suite/tconcur2.sql index e20ddc749d..db77f5be6c 100644 --- a/binsrc/tests/suite/tconcur2.sql +++ b/binsrc/tests/suite/tconcur2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcptrb.sql b/binsrc/tests/suite/tcptrb.sql index 17cdf06858..079a3053b8 100644 --- a/binsrc/tests/suite/tcptrb.sql +++ b/binsrc/tests/suite/tcptrb.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcptrb2.sql b/binsrc/tests/suite/tcptrb2.sql index cb82161a72..b872a03e19 100644 --- a/binsrc/tests/suite/tcptrb2.sql +++ b/binsrc/tests/suite/tcptrb2.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcptrb3.sql b/binsrc/tests/suite/tcptrb3.sql index acdce5c553..2b7a1f5df9 100644 --- a/binsrc/tests/suite/tcptrb3.sql +++ b/binsrc/tests/suite/tcptrb3.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcptrbck.sql b/binsrc/tests/suite/tcptrbck.sql index b3789ca701..964b42f7a9 100644 --- a/binsrc/tests/suite/tcptrbck.sql +++ b/binsrc/tests/suite/tcptrbck.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tcred.sql b/binsrc/tests/suite/tcred.sql index ff43ee83cb..3b3ad22a9f 100644 --- a/binsrc/tests/suite/tcred.sql +++ b/binsrc/tests/suite/tcred.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdate.sql b/binsrc/tests/suite/tdate.sql index 4aa9ab21e3..e37fc21d40 100644 --- a/binsrc/tests/suite/tdate.sql +++ b/binsrc/tests/suite/tdate.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdatefun.sql b/binsrc/tests/suite/tdatefun.sql index 57d6476808..10b0f02488 100644 --- a/binsrc/tests/suite/tdatefun.sql +++ b/binsrc/tests/suite/tdatefun.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdatetime.sh b/binsrc/tests/suite/tdatetime.sh index 8ad45be960..a5856d051f 100755 --- a/binsrc/tests/suite/tdatetime.sh +++ b/binsrc/tests/suite/tdatetime.sh @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdatetime.sql b/binsrc/tests/suite/tdatetime.sql index 72050bb7be..bd2e3f6cf0 100644 --- a/binsrc/tests/suite/tdatetime.sql +++ b/binsrc/tests/suite/tdatetime.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdav.sh b/binsrc/tests/suite/tdav.sh index af783e2174..353c1d4bc6 100755 --- a/binsrc/tests/suite/tdav.sh +++ b/binsrc/tests/suite/tdav.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdav.sql b/binsrc/tests/suite/tdav.sql index 866df138ef..ad9d3acca0 100644 --- a/binsrc/tests/suite/tdav.sql +++ b/binsrc/tests/suite/tdav.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdav1.sql b/binsrc/tests/suite/tdav1.sql index c19787a081..9906050bfb 100644 --- a/binsrc/tests/suite/tdav1.sql +++ b/binsrc/tests/suite/tdav1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdav_conc.sql b/binsrc/tests/suite/tdav_conc.sql index b4b780faa3..332742d855 100644 --- a/binsrc/tests/suite/tdav_conc.sql +++ b/binsrc/tests/suite/tdav_conc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdav_meta.sh b/binsrc/tests/suite/tdav_meta.sh index 08b2d47928..e0eda3d0b9 100755 --- a/binsrc/tests/suite/tdav_meta.sh +++ b/binsrc/tests/suite/tdav_meta.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdav_meta.sql b/binsrc/tests/suite/tdav_meta.sql index 81b0fec49c..8583bb57d5 100644 --- a/binsrc/tests/suite/tdav_meta.sql +++ b/binsrc/tests/suite/tdav_meta.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdav_meta_checks.sql b/binsrc/tests/suite/tdav_meta_checks.sql index 696fb8893a..9a9b6f2e2c 100644 --- a/binsrc/tests/suite/tdav_meta_checks.sql +++ b/binsrc/tests/suite/tdav_meta_checks.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdav_meta_rdf.sql b/binsrc/tests/suite/tdav_meta_rdf.sql index 8e8b5488d0..7e18e91658 100644 --- a/binsrc/tests/suite/tdav_meta_rdf.sql +++ b/binsrc/tests/suite/tdav_meta_rdf.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdavmigr1.sql b/binsrc/tests/suite/tdavmigr1.sql index 7e16dc2633..dc56941c76 100644 --- a/binsrc/tests/suite/tdavmigr1.sql +++ b/binsrc/tests/suite/tdavmigr1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdavmigr2.sql b/binsrc/tests/suite/tdavmigr2.sql index 4ad16ca83d..4bdac219f7 100644 --- a/binsrc/tests/suite/tdavmigr2.sql +++ b/binsrc/tests/suite/tdavmigr2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdbp.sh b/binsrc/tests/suite/tdbp.sh index d1574058c6..c6c12732e0 100755 --- a/binsrc/tests/suite/tdbp.sh +++ b/binsrc/tests/suite/tdbp.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdcascade.sql b/binsrc/tests/suite/tdcascade.sql index 461a52726a..3076344d87 100644 --- a/binsrc/tests/suite/tdcascade.sql +++ b/binsrc/tests/suite/tdcascade.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdconv.sh b/binsrc/tests/suite/tdconv.sh index a2b36390f4..891c3a0ec9 100755 --- a/binsrc/tests/suite/tdconv.sh +++ b/binsrc/tests/suite/tdconv.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdelete.sql b/binsrc/tests/suite/tdelete.sql index d5e4d72aba..c4b4b2131e 100644 --- a/binsrc/tests/suite/tdelete.sql +++ b/binsrc/tests/suite/tdelete.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdrop.sh b/binsrc/tests/suite/tdrop.sh index 4b3fda6b54..df8a26590d 100755 --- a/binsrc/tests/suite/tdrop.sh +++ b/binsrc/tests/suite/tdrop.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdrop.sql b/binsrc/tests/suite/tdrop.sql index 95e32253df..f6e9b60acf 100644 --- a/binsrc/tests/suite/tdrop.sql +++ b/binsrc/tests/suite/tdrop.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdrop1.sql b/binsrc/tests/suite/tdrop1.sql index 5e65fc031c..6df2909c7f 100644 --- a/binsrc/tests/suite/tdrop1.sql +++ b/binsrc/tests/suite/tdrop1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tdrop2.sql b/binsrc/tests/suite/tdrop2.sql index 757ff5b28e..50db679d07 100644 --- a/binsrc/tests/suite/tdrop2.sql +++ b/binsrc/tests/suite/tdrop2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/terror.sql b/binsrc/tests/suite/terror.sql index 0de4e7bc75..730843d255 100644 --- a/binsrc/tests/suite/terror.sql +++ b/binsrc/tests/suite/terror.sql @@ -10,7 +10,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -866,7 +866,7 @@ ECHO BOTH ": ins func call casting narrow string into nvarchar column STATE=" $S update WIDEZTEST set data = cast ('\x5\xfc\x1\xfd\x2\xfe\x3\xff\x4' as nvarchar); select bin2hex(DATA) from WIDEZTEST where ID = 3; select length (DATA) from WIDEZTEST where ID = 3; -ECHO BOTH $IF $EQU $LAST[1] 9 "PASSED" "*** SKIPPED"; +ECHO BOTH $IF $EQU $LAST[1] 9 "PASSED" "*** FAILED"; ECHO BOTH ": update casting narrow string into nvarchar column STATE=" $STATE " MESSAGE=" $MESSAGE " DATA LENGTH=" $LAST[1] ", must be 9\n"; update WIDEZTEST set data = ff (cast ('\x5\xfc\x1\xfd\x2\xfe\x3\xff\x4' as nvarchar)); @@ -1537,60 +1537,21 @@ from DB.DBA.RDF_IRI_RANK_C as r ',0) ; -select xmlelement ("result", xmlattributes ('list' as "type"), - xmlagg (xmlelement ("row", - xmlelement ("column", - xmlattributes (fct_lang ("c1") as "xml:lang", - fct_dtp ("c1") as "datatype", - fct_short_form(__ro2sq("c1")) as "shortform", - fct_sparql_ser ("c1") as "sparql_ser"), - __ro2sq ("c1")), - xmlelement ("column", fct_label ("c1", 0, 'facets' ))))) - from (sparql define output:valmode "LONG" define input:storage virtrdf:IRI_Rank_Storage - select distinct ?s11 as ?c1 ?g where {?s1 ?s1condp ?s2 . - filter (?s2 = """EMBL""") . - ?s1 ?s1condp ?s3 . - filter (?s3 = """GeneID""") . - ?s1 ?s1condp ?s4 . - filter (?s4 = """IPI""") . - ?s1 ?s1condp ?s5 . - filter (?s5 = """InterPro""") . - ?s1 ?s1condp ?s6 . - filter (?s6 = """MGI""") . - ?s1 ?s1condp ?s7 . - filter (?s7 = """UniGene""") . - ?s1 ?s1condp ?s8 . - filter (?s8 = ) . - quad map virtrdf:DefaultQuadMap { ?s9 ?s1 . - }?s1 a . - quad map virtrdf:DefaultQuadMap { ?s10 ?s1 . - } quad map virtrdf:DefaultQuadMap { ?s11 ?s10 . - } filter (?s11 = ) . - ?s10 a . - ?s10 a . - filter (?s1 = ) . - quad map virtrdf:DefaultQuadMap { ?s12 ?s1 . - } quad map virtrdf:DefaultQuadMap { ?s13 ?s1 . - }?s1 a . - filter (?s1 = ) . - ?s1 a . - quad map virtrdf:DefaultQuadMap { ?s14 ?s1 . - }?s14 a . - filter (?s1 = ) . - ?s1 a . - filter (?s1 = ) . - ?s1 a . - ?s1 a . - ?s1 a . - filter (?s1 = ) . - quad map virtrdf:DefaultQuadMap { ?s15 ?s1 . - }?s15 a . - filter (?s1 = ) . - filter (?s1 = ) . - filter (?s1 = ) . - quad map virtrdf:DefaultQuadMap { ?s1 ?s16 . -} } order by desc (?srank11) limit 20 offset 0 ) xx option (quietcast) -; +create procedure tlongssl() +{ + declare ss any; + ss := string_output (); + http ('create procedure tlongssl_tmp (\n', ss); + for (declare i int, i := 0; i < 70000; i := i + 1) + { + --http (sprintf ('declare v%d any; v%d := %d; \n', i, i, i), ss); + http (sprintf ('in v%d any, \n', i), ss); + } + http (' in endvar any ) \n { return ; }', ss); + exec (string_output_string (ss)); +}; + +tlongssl(); ECHO BOTH $IF $NEQ $STATE OK "PASSED" "***FAILED"; ECHO BOTH ": long sql statement, over 64K ssls STATE=" $STATE " MESSAGE=" $MESSAGE "\n"; diff --git a/binsrc/tests/suite/tescape.sql b/binsrc/tests/suite/tescape.sql index 2a66ebf75b..b5a7e8f690 100644 --- a/binsrc/tests/suite/tescape.sql +++ b/binsrc/tests/suite/tescape.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/test-isql.sql b/binsrc/tests/suite/test-isql.sql index 05b462556a..42ad19b341 100644 --- a/binsrc/tests/suite/test-isql.sql +++ b/binsrc/tests/suite/test-isql.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/test_cluster.sh b/binsrc/tests/suite/test_cluster.sh index d632e334a9..d582e7d6f5 100755 --- a/binsrc/tests/suite/test_cluster.sh +++ b/binsrc/tests/suite/test_cluster.sh @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/test_fn.sh b/binsrc/tests/suite/test_fn.sh index 03d830359d..c39202f547 100755 --- a/binsrc/tests/suite/test_fn.sh +++ b/binsrc/tests/suite/test_fn.sh @@ -6,7 +6,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -489,13 +489,15 @@ MAKECFG_FILE () _testcfgfile=$1 _port=$2 _cfgfile=$3 + _repl=${4-virt1111} cat $_testcfgfile | sed -e \ "s/PORT/$_port/g" \ -e "s/SQLOPTIMIZE/$SQLOPTIMIZE/g" \ -e "s/PLDBG/$PLDBG/g" \ -e "s/CASE_MODE/$CASE_MODE/g" \ -e "s/LITEMODE/$LITEMODE/g" \ - -e "s/TIMEZONELESS/$TIMEZONELESS/g" > $_cfgfile + -e "s/TIMEZONELESS/$TIMEZONELESS/g" \ + -e "s/REPLNAME/$_repl/g" > $_cfgfile } MAKECFG_FILE_WITH_HTTP() diff --git a/binsrc/tests/suite/test_ldp.sh b/binsrc/tests/suite/test_ldp.sh index 5274e3db99..fc1954aee3 100755 --- a/binsrc/tests/suite/test_ldp.sh +++ b/binsrc/tests/suite/test_ldp.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/test_run.sh b/binsrc/tests/suite/test_run.sh index d467422fa7..9b3feeac30 100755 --- a/binsrc/tests/suite/test_run.sh +++ b/binsrc/tests/suite/test_run.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/test_server.sh b/binsrc/tests/suite/test_server.sh index 5647064454..3b6dc567bd 100755 --- a/binsrc/tests/suite/test_server.sh +++ b/binsrc/tests/suite/test_server.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/testall.sh b/binsrc/tests/suite/testall.sh index f9b5e75587..80c25d70e2 100755 --- a/binsrc/tests/suite/testall.sh +++ b/binsrc/tests/suite/testall.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -133,7 +133,10 @@ twcopy \ txslt \ trecov \ tlubm \ -rtest" +rtest \ +trepl_rdf \ +tsoap12 \ +tvspxex " QUICKTEST=1 TPCDMODE=local diff --git a/binsrc/tests/suite/testgz.sql b/binsrc/tests/suite/testgz.sql index d979f72be4..547317975b 100644 --- a/binsrc/tests/suite/testgz.sql +++ b/binsrc/tests/suite/testgz.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/testlib.sh b/binsrc/tests/suite/testlib.sh index f1b05a0d44..a863b1a147 100755 --- a/binsrc/tests/suite/testlib.sh +++ b/binsrc/tests/suite/testlib.sh @@ -10,7 +10,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/testtext.sql b/binsrc/tests/suite/testtext.sql index eb12b97199..70e137fabb 100644 --- a/binsrc/tests/suite/testtext.sql +++ b/binsrc/tests/suite/testtext.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/texcept.sql b/binsrc/tests/suite/texcept.sql index 6e927e9f40..839dd18d58 100644 --- a/binsrc/tests/suite/texcept.sql +++ b/binsrc/tests/suite/texcept.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/texecute.sql b/binsrc/tests/suite/texecute.sql index 03f80f0295..4ed98b9ad0 100644 --- a/binsrc/tests/suite/texecute.sql +++ b/binsrc/tests/suite/texecute.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/text.sql b/binsrc/tests/suite/text.sql index b841689517..2ad99d1f21 100644 --- a/binsrc/tests/suite/text.sql +++ b/binsrc/tests/suite/text.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/textdef.sql b/binsrc/tests/suite/textdef.sql index 6d6e6f1ab7..425908a5ca 100644 --- a/binsrc/tests/suite/textdef.sql +++ b/binsrc/tests/suite/textdef.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tfk.sql b/binsrc/tests/suite/tfk.sql index 8c68a16140..6df689e5a6 100644 --- a/binsrc/tests/suite/tfk.sql +++ b/binsrc/tests/suite/tfk.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tfref.sql b/binsrc/tests/suite/tfref.sql index c56e3dce9f..24ad38ab2a 100644 --- a/binsrc/tests/suite/tfref.sql +++ b/binsrc/tests/suite/tfref.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tft_offband.sql b/binsrc/tests/suite/tft_offband.sql index 4c4ff540e6..c25c53d3ed 100644 --- a/binsrc/tests/suite/tft_offband.sql +++ b/binsrc/tests/suite/tft_offband.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tftext.sql b/binsrc/tests/suite/tftext.sql index f8c1a28a40..93fa99a1f2 100644 --- a/binsrc/tests/suite/tftext.sql +++ b/binsrc/tests/suite/tftext.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tftp.sql b/binsrc/tests/suite/tftp.sql index 50316d071f..6dbf18203a 100644 --- a/binsrc/tests/suite/tftp.sql +++ b/binsrc/tests/suite/tftp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tftt.sql b/binsrc/tests/suite/tftt.sql index 0c95303d86..63208de057 100644 --- a/binsrc/tests/suite/tftt.sql +++ b/binsrc/tests/suite/tftt.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tgeo.sql b/binsrc/tests/suite/tgeo.sql index 2302f19976..d1f8c6909c 100644 --- a/binsrc/tests/suite/tgeo.sql +++ b/binsrc/tests/suite/tgeo.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tgroup.sql b/binsrc/tests/suite/tgroup.sql index 384b5789ff..2dbb98463b 100644 --- a/binsrc/tests/suite/tgroup.sql +++ b/binsrc/tests/suite/tgroup.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tgroupc.sql b/binsrc/tests/suite/tgroupc.sql index 32186ddfb5..5fdb3d7616 100644 --- a/binsrc/tests/suite/tgroupc.sql +++ b/binsrc/tests/suite/tgroupc.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/thashj.sql b/binsrc/tests/suite/thashj.sql new file mode 100644 index 0000000000..5705637e33 --- /dev/null +++ b/binsrc/tests/suite/thashj.sql @@ -0,0 +1,154 @@ + + +-- test join on build side of hash join +-- over tpch qualification db + +explain ('select count (*) from customer, nation, region where c_nationkey = n_nationkey and n_regionkey = r_regionkey and r_name = ''EUROPE'' and c_mktsegment = ''BUILDING'' ', -5); + +explain ('select n_name, r_regionkey, count (*) from customer, nation, region where c_nationkey = n_nationkey and n_regionkey = r_regionkey and r_name = ''EUROPE'' and c_mktsegment = ''BUILDING'' group by n_name, r_regionkey option (order)', -5); + +explain ('select n_name, r_name, count (*) from customer, nation, region where c_nationkey = n_nationkey and n_regionkey = r_regionkey and r_name = ''EUROPE'' and c_mktsegment = ''BUILDING'' group by n_name, r_name option (order)', -5); + +explain ('select n_name, r_name, count (*) from customer, nation, region where c_nationkey = n_nationkey and n_regionkey = r_regionkey and r_name = ''EUROPE'' and c_mktsegment = ''BUILDING'' group by n_name, r_name ', -5); + +explain ('select n_nationkey, n_name, r_name, count (*) from customer, nation, region where c_nationkey = n_nationkey and n_regionkey = r_regionkey and r_name = ''EUROPE'' and c_mktsegment = ''BUILDING'' group by n_nationkey, n_name, r_name ', -5); + +select n_name, r_name, count (*) from customer, nation, region where c_nationkey = n_nationkey and n_regionkey = r_regionkey and r_name = 'EUROPE' and c_mktsegment = 'BUILDING' group by n_name, r_name option (order); +select n_name, r_name, count (*) from customer, nation, region where c_nationkey = n_nationkey and n_regionkey = r_regionkey and r_name = 'EUROPE' and c_mktsegment = 'BUILDING' group by n_name, r_name ; + +select n_nationkey, n_name, r_name, count (*) from customer, nation, region where c_nationkey = n_nationkey and n_regionkey = r_regionkey and r_name = 'EUROPE' and c_mktsegment = 'BUILDING' group by n_nationkey, n_name, r_name; + + + +explain ('select count (*) from lineitem, supplier, nation sn, region sr, part where l_suppkey = s_suppkey and s_nationkey = sn.n_nationkey and sn.n_regionkey = sr.r_regionkey and sr.r_name = ''EUROPE'' and l_partkey = p_partkey and p_size = 15'); + + +explain ('select n_name, count (*) from lineitem, supplier, nation sn, region sr, part where l_suppkey = s_suppkey and s_nationkey = sn.n_nationkey and sn.n_regionkey = sr.r_regionkey and sr.r_name = ''EUROPE'' and l_partkey = p_partkey and p_size = 15 group by n_name'); + +explain ('select n_name, count (*) from lineitem, supplier, nation sn, region sr, part where l_suppkey = s_suppkey and s_nationkey = sn.n_nationkey and sn.n_regionkey = sr.r_regionkey and sr.r_name = ''EUROPE'' and l_partkey = p_partkey and p_size = 15 group by n_name option (order)'); + + +select count (*) from words a, words b where a.word = b.word option (order, hash); + + +select count (*) from words a, where exists (select 1 from words b table option (hash) where subseq (b.word, 0, length (b.word) - 1) = subseq (a.word, 0, length (a.word) - 1) and b.word <> a.word); + + +select count (*) from t1 a, t1 b where a.row_no = b.row_no option (order, hash); + + +select top 20 * from (select c_custkey, min (cast (o_totalprice as float)) as minp, max (cast (o_totalprice as float)) as maxp, count (*) as cnt from customer, orders where o_custkey = c_custkey group by c_custkey order by c_custkey) ff where minp = maxp and cnt > 1; +echo both if $equ $rowcnt 0 "PASSED" "***FAILED"; +echo both ": group by added up as floats\n"; + +select top 20 * from (select c_custkey, min (cast (o_totalprice as decimal)) as minp, max (cast (o_totalprice as decimal)) as maxp, count (*) as cnt from customer, orders where o_custkey = c_custkey group by c_custkey order by c_custkey) ff where minp = maxp and cnt > 1; +echo both if $equ $rowcnt 0 "PASSED" "***FAILED"; +echo both ": group by added up as decimals\n"; + + + + +-- aggregates of union + + + +select n_name, r_name, count (*), grouping (n_name), grouping (r_name) from ( + select n_name, r_name from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal < 10 + union all select n_name, r_name from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal > 100 + union all select n_name, r_name from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal between 40 and 50 ) f +group by rollup (n_name, r_name); + +select n_name, r_name, count (*) from ( + select n_name, r_name from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal < 10 + union all select n_name, r_name from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal > 100 + union all select n_name, r_name from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal between 40 and 50 ) f +group by n_name, r_name order by n_name; + +echo both $if $equ $last[1] 25 "PASSED" "***FAILED"; +echo both ": union all 1\n"; + +select n_name, r_name, count (*), avg (bal) from ( + select n_name, r_name, c_acctbal * 0.75 as bal from ( + select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal < 10 + union all select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal > 100 + union all select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal between 40 and 50 ) f + ) i +group by n_name, r_name order by n_name; +echo both $if $equ $last[1] 25 "PASSED" "***FAILED"; +echo both ": union all 2\n"; + + + +select n_name, r_name, count (*) from ( + select n_name, r_name from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal < 10 + union all select n_name, r_name from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal > 100 + union all select n_name, r_name from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal between 40 and 50 ) f +group by n_name, r_name order by n_name; +echo both $if $equ $last[1] 25 "PASSED" "***FAILED"; +echo both ": union all 3\n"; + + + +select n_name, r_name, count (*), avg (bal) from ( + select n_name, r_name, c_acctbal * 0.75 as bal from ( + select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal < 10 + union all select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal > 100 + union all select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal between 40 and 50 ) f + ) i +group by n_name, r_name order by n_name; +echo both $if $equ $last[1] 25 "PASSED" "***FAILED"; +echo both ": union all 4\n"; + + +select count (*), avg (bal) from ( + select n_name, r_name, c_acctbal * 0.75 as bal from ( + select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal < 10 + union all select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal > 100 + union all select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal between 40 and 50 ) f + ) i; + +echo both $if $equ $last[1] 1 "PASSED" "***FAILED"; +echo both ": union all 5\n"; + + +select top 10 * from ( + select n_name, r_name, c_acctbal * 0.75 as bal from ( + select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal < 10 + union all select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal > 100 + union all select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal between 40 and 50 ) f + ) i +order by bal desc; + +echo both $if $equ $last[1] 10 "PASSED" "***FAILED"; +echo both ": union all top oby 1\n"; + + +select distinct top 10 * from ( + select n_name, r_name, c_acctbal * 0.75 as bal from ( + select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal < 10 + union all select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal > 100 + union all select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal between 40 and 50 ) f + ) i +order by bal desc; + +echo both $if $equ $last[1] 10 "PASSED" "***FAILED"; +echo both ": union all top oby 2\n"; + +select distinct top 10 n_name, r_name, bal + 1 from ( + select n_name, r_name, c_acctbal * 0.75 as bal from ( + select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal < 10 + union all select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal > 100 + union all select n_name, r_name, c_acctbal from customer, nation, region where n_nationkey = c_nationkey and r_regionkey = n_regionkey and c_acctbal between 40 and 50 ) f + ) i +order by bal + 1 desc; +echo both $if $equ $last[1] 10 "PASSED" "***FAILED"; +echo both ": union all top oby 3\n"; + + + + +select top 10 a.l_partkey, a.total, b.total from +(select l_partkey, sum (l_extendedprice) as total from lineitem where l_shipdate between cast ('1995-1-1'as date) and cast ('1996-1-1' as date)) a, +(select l_partkey, sum (l_extendedprice) as total from lineitem where l_shipdate between cast ('1996-1-1'as date) and cast ('1997-1-1' as date)) b +where a.l_partkey = b.l_partkey +order by a.total desc; diff --git a/binsrc/tests/suite/thttp.sh b/binsrc/tests/suite/thttp.sh index 9f4ffa1523..93f5963391 100755 --- a/binsrc/tests/suite/thttp.sh +++ b/binsrc/tests/suite/thttp.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/thttp.sql b/binsrc/tests/suite/thttp.sql index a297109fc1..d38aa1fd12 100644 --- a/binsrc/tests/suite/thttp.sql +++ b/binsrc/tests/suite/thttp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -430,7 +430,7 @@ SET ARGV[$LIF] $+ $ARGV[$LIF] 1; ECHO BOTH ": Created new folder with admin account : STATE=" $STATE " MESSAGE=" $MESSAGE "\n"; meth ('http://localhost:$U{HTTPPORT1}/user/', 'MKCOL', 'dav:dav', null); -ECHO BOTH $IF $EQU $STATE 'HT409' "PASSED" "***FAILED"; +ECHO BOTH $IF $EQU $STATE 'HT405' "PASSED" "***FAILED"; SET ARGV[$LIF] $+ $ARGV[$LIF] 1; ECHO BOTH ": Access to / denied with user account : STATE=" $STATE " MESSAGE=" $MESSAGE "\n"; diff --git a/binsrc/tests/suite/tidxksize.sql b/binsrc/tests/suite/tidxksize.sql index 18f940435d..565ee36f91 100644 --- a/binsrc/tests/suite/tidxksize.sql +++ b/binsrc/tests/suite/tidxksize.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/timsg.sh b/binsrc/tests/suite/timsg.sh index b6e9964647..c1fc5aeee3 100755 --- a/binsrc/tests/suite/timsg.sh +++ b/binsrc/tests/suite/timsg.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tinl.sql b/binsrc/tests/suite/tinl.sql index 1c85c6cadd..ef337979de 100644 --- a/binsrc/tests/suite/tinl.sql +++ b/binsrc/tests/suite/tinl.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tinlist.sql b/binsrc/tests/suite/tinlist.sql index 7c71ded72a..c9ed0641d9 100644 --- a/binsrc/tests/suite/tinlist.sql +++ b/binsrc/tests/suite/tinlist.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tinx.sql b/binsrc/tests/suite/tinx.sql index 007815c240..8394c72aa6 100644 --- a/binsrc/tests/suite/tinx.sql +++ b/binsrc/tests/suite/tinx.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tinxint.sql b/binsrc/tests/suite/tinxint.sql index 4564a487c1..f5c3e5ca9e 100644 --- a/binsrc/tests/suite/tinxint.sql +++ b/binsrc/tests/suite/tinxint.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tinxintbm.sql b/binsrc/tests/suite/tinxintbm.sql index e572d8d71a..77c8f82945 100644 --- a/binsrc/tests/suite/tinxintbm.sql +++ b/binsrc/tests/suite/tinxintbm.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tiri.sql b/binsrc/tests/suite/tiri.sql index e4a24368bb..b4839ad76b 100644 --- a/binsrc/tests/suite/tiri.sql +++ b/binsrc/tests/suite/tiri.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tiso.sql b/binsrc/tests/suite/tiso.sql index a0f15e6dac..d1ec6662f2 100644 --- a/binsrc/tests/suite/tiso.sql +++ b/binsrc/tests/suite/tiso.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tisql_blob.sql b/binsrc/tests/suite/tisql_blob.sql index c54d95a040..fce59a95f0 100644 --- a/binsrc/tests/suite/tisql_blob.sql +++ b/binsrc/tests/suite/tisql_blob.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tjdbc.sh b/binsrc/tests/suite/tjdbc.sh index 852b1ab5b2..4324830e3f 100755 --- a/binsrc/tests/suite/tjdbc.sh +++ b/binsrc/tests/suite/tjdbc.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -33,7 +33,7 @@ CURRDIR=`pwd` BANNER "STARTED JDBC Driver TEST (tjdbc.sh)" -if [ "x$JDK2" != "x" -a -f $JDBCDIR/virtjdbc2.jar -a -f $JDBCDIR/testsuite2.jar ] +if [ "x$JDK4" != "x" -a -f $JDBCDIR/testsuite4.jar ] then STOP_SERVER rm -f $DBLOGFILE @@ -42,74 +42,37 @@ then START_SERVER $PORT 1000 - ECHO "STARTED: JDBC 2 Test suite" + ECHO "STARTED: JDBC 4 Test suite" cd $JDBCDIR - sh $JDBCDIR/test2.sh "jdbc:virtuoso://localhost:$PORT/" > $CURRDIR/jdbc.out 2>&1 + sh $JDBCDIR/test4.sh "jdbc:virtuoso://localhost:$PORT/" > $CURRDIR/jdbc4.out 2>&1 cd $CURRDIR - passed=`egrep "PASSED\$" jdbc.out` - passed_cnt=`egrep "PASSED\$" jdbc.out | wc -l` - failed=`egrep "FAILED\$" jdbc.out` - failed_cnt=`egrep "FAILED\$" jdbc.out | wc -l` + passed=`egrep "PASSED\$" jdbc4.out` + passed_cnt=`egrep "PASSED\$" jdbc4.out | wc -l` + failed=`egrep "FAILED\$" jdbc4.out` + failed_cnt=`egrep "FAILED\$" jdbc4.out | wc -l` errors=0 if [ $failed_cnt -gt 0 ] then errors=1 - ECHO "*** FAILED: $failed_cnt JDBC 2 Tests failed (check jdbc.out): $failed" + ECHO "*** FAILED: $failed_cnt JDBC 4 Tests failed (check jdbc4.out): $failed" fi if [ $passed_cnt -eq 0 ] then errors=1 - ECHO "*** FAILED: no JDBC 2 Tests passed! (check jdbc.out)" + ECHO "*** FAILED: no JDBC 4 Tests passed! (check jdbc4.out)" fi if [ $errors -eq 0 ] then - ECHO "PASSED: JDBC 2 Test suite" + ECHO "PASSED: JDBC 4 Test suite" fi SHUTDOWN_SERVER -fi # JDK2 - -if [ "x$JDK3" != "x" -a -f $JDBCDIR/virtjdbc3ssl.jar -a -f $JDBCDIR/testsuite3.jar ] -then - STOP_SERVER - rm -f $DBLOGFILE - rm -f $DBFILE - MAKECFG_FILE $TESTCFGFILE $PORT $CFGFILE - - START_SERVER $PORT 1000 - - ECHO "STARTED: JDBC 3 Test suite" - cd $JDBCDIR - sh $JDBCDIR/test3.sh "jdbc:virtuoso://localhost:$PORT/" > $CURRDIR/jdbc3.out 2>&1 - cd $CURRDIR - - passed=`egrep "PASSED\$" jdbc3.out` - passed_cnt=`egrep "PASSED\$" jdbc3.out | wc -l` - failed=`egrep "FAILED\$" jdbc3.out` - failed_cnt=`egrep "FAILED\$" jdbc3.out | wc -l` - - errors=0 - if [ $failed_cnt -gt 0 ] - then - errors=1 - ECHO "*** FAILED: $failed_cnt JDBC 3 Tests failed (check jdbc3.out): $failed" - fi - if [ $passed_cnt -eq 0 ] - then - errors=1 - ECHO "*** FAILED: no JDBC 3 Tests passed! (check jdbc3.out)" - fi - if [ $errors -eq 0 ] - then - ECHO "PASSED: JDBC 3 Test suite" - fi +fi # JDK4 - SHUTDOWN_SERVER -fi # JDK3 -if [ "x$JDK4" != "x" -a -f $JDBCDIR/virtjdbc4ssl.jar -a -f $JDBCDIR/testsuite4.jar ] +if [ "x$JDK4_1" != "x" -a -f $JDBCDIR/testsuite4.jar ] then STOP_SERVER rm -f $DBLOGFILE @@ -118,36 +81,37 @@ then START_SERVER $PORT 1000 - ECHO "STARTED: JDBC 4 Test suite" + ECHO "STARTED: JDBC 4_1 Test suite" cd $JDBCDIR - sh $JDBCDIR/test4.sh "jdbc:virtuoso://localhost:$PORT/" > $CURRDIR/jdbc4.out 2>&1 + sh $JDBCDIR/test4_1.sh "jdbc:virtuoso://localhost:$PORT/" > $CURRDIR/jdbc4_1.out 2>&1 cd $CURRDIR - passed=`egrep "PASSED\$" jdbc4.out` - passed_cnt=`egrep "PASSED\$" jdbc4.out | wc -l` - failed=`egrep "FAILED\$" jdbc4.out` - failed_cnt=`egrep "FAILED\$" jdbc4.out | wc -l` + passed=`egrep "PASSED\$" jdbc4_1.out` + passed_cnt=`egrep "PASSED\$" jdbc4_1.out | wc -l` + failed=`egrep "FAILED\$" jdbc4_1.out` + failed_cnt=`egrep "FAILED\$" jdbc4_1.out | wc -l` errors=0 if [ $failed_cnt -gt 0 ] then errors=1 - ECHO "*** FAILED: $failed_cnt JDBC 4 Tests failed (check jdbc4.out): $failed" + ECHO "*** FAILED: $failed_cnt JDBC 4_1 Tests failed (check jdbc4_1.out): $failed" fi if [ $passed_cnt -eq 0 ] then errors=1 - ECHO "*** FAILED: no JDBC 4 Tests passed! (check jdbc4.out)" + ECHO "*** FAILED: no JDBC 4_1 Tests passed! (check jdbc4_1.out)" fi if [ $errors -eq 0 ] then - ECHO "PASSED: JDBC 4 Test suite" + ECHO "PASSED: JDBC 4_1 Test suite" fi SHUTDOWN_SERVER -fi # JDK4 +fi # JDK4_1 + -if [ "x$JDK4_1" != "x" -a -f $JDBCDIR/virtjdbc4_1ssl.jar -a -f $JDBCDIR/testsuite4.jar ] +if [ "x$JDK4_2" != "x" -a -f $JDBCDIR/testsuite4.jar ] then STOP_SERVER rm -f $DBLOGFILE @@ -156,34 +120,34 @@ then START_SERVER $PORT 1000 - ECHO "STARTED: JDBC 4_1 Test suite" + ECHO "STARTED: JDBC 4_2 Test suite" cd $JDBCDIR - sh $JDBCDIR/test4_1.sh "jdbc:virtuoso://localhost:$PORT/" > $CURRDIR/jdbc4_1.out 2>&1 + sh $JDBCDIR/test4_2.sh "jdbc:virtuoso://localhost:$PORT/" > $CURRDIR/jdbc4_2.out 2>&1 cd $CURRDIR - passed=`egrep "PASSED\$" jdbc4_1.out` - passed_cnt=`egrep "PASSED\$" jdbc4_1.out | wc -l` - failed=`egrep "FAILED\$" jdbc4_1.out` - failed_cnt=`egrep "FAILED\$" jdbc4_1.out | wc -l` + passed=`egrep "PASSED\$" jdbc4_2.out` + passed_cnt=`egrep "PASSED\$" jdbc4_2.out | wc -l` + failed=`egrep "FAILED\$" jdbc4_2.out` + failed_cnt=`egrep "FAILED\$" jdbc4_2.out | wc -l` errors=0 if [ $failed_cnt -gt 0 ] then errors=1 - ECHO "*** FAILED: $failed_cnt JDBC 4_1 Tests failed (check jdbc4_1.out): $failed" + ECHO "*** FAILED: $failed_cnt JDBC 4_2 Tests failed (check jdbc4_2.out): $failed" fi if [ $passed_cnt -eq 0 ] then errors=1 - ECHO "*** FAILED: no JDBC 4_1 Tests passed! (check jdbc4_1.out)" + ECHO "*** FAILED: no JDBC 4_2 Tests passed! (check jdbc4_2.out)" fi if [ $errors -eq 0 ] then - ECHO "PASSED: JDBC 4_1 Test suite" + ECHO "PASSED: JDBC 4_2 Test suite" fi SHUTDOWN_SERVER -fi # JDK4_1 +fi # JDK4_2 CHECK_LOG diff --git a/binsrc/tests/suite/tjoin.sql b/binsrc/tests/suite/tjoin.sql index c95787ee86..a315931125 100644 --- a/binsrc/tests/suite/tjoin.sql +++ b/binsrc/tests/suite/tjoin.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tjoin2.sql b/binsrc/tests/suite/tjoin2.sql index 906bdca933..44182d0522 100644 --- a/binsrc/tests/suite/tjoin2.sql +++ b/binsrc/tests/suite/tjoin2.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tkwd.sql b/binsrc/tests/suite/tkwd.sql index 25a0050fdc..f949e2e337 100644 --- a/binsrc/tests/suite/tkwd.sql +++ b/binsrc/tests/suite/tkwd.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tldap.sql b/binsrc/tests/suite/tldap.sql index 0dedb67eb2..e55ddd7bc4 100644 --- a/binsrc/tests/suite/tldap.sql +++ b/binsrc/tests/suite/tldap.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tlock.sql b/binsrc/tests/suite/tlock.sql index ebd7f6cccd..4023bcdc1e 100644 --- a/binsrc/tests/suite/tlock.sql +++ b/binsrc/tests/suite/tlock.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tlogft1.sql b/binsrc/tests/suite/tlogft1.sql index a682c3ae4b..73e158f7b7 100644 --- a/binsrc/tests/suite/tlogft1.sql +++ b/binsrc/tests/suite/tlogft1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tlogft2.sql b/binsrc/tests/suite/tlogft2.sql index 4bacb45509..282b6aaebe 100644 --- a/binsrc/tests/suite/tlogft2.sql +++ b/binsrc/tests/suite/tlogft2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tlogmrg.sql b/binsrc/tests/suite/tlogmrg.sql new file mode 100644 index 0000000000..7b2f29792e --- /dev/null +++ b/binsrc/tests/suite/tlogmrg.sql @@ -0,0 +1,33 @@ +-- tests for mt txn blob operations +set echo on; +__dbf_set ('enable_mt_txn', 1); +__dbf_set ('qp_thread_min_usec', 0); +__dbf_set ('dbf_explain_level', 3); + +drop table tblob; +drop table tblob2; +create table tblob (id int primary key, bl long varchar); +create table tblob2 (id int primary key, bl long varchar); + +create procedure tblob_fill (in n int) +{ + declare i int; + for (i := 0; i < n; i := i + 1) + { + insert into tblob values (i, repeat ('xyz', 8000 + rnd (10000))); + } +} +; + +tblob_fill (10000); + +set explain on; +insert into tblob2 select * from tblob; +update tblob2 set bl = subseq (bl, 0, 6000) || repeat ('abc', 100 + rnd (3000)) where exists (select 1 from tblob b where b.id = id + 100); +set explain off; + +set autocommit manual; +insert into tblob2 select * from tblob; +commit work; +update tblob2 set bl = subseq (bl, 0, 6000) || repeat ('abc', 100 + rnd (3000)) where exists (select 1 from tblob b where b.id = id + 100); +commit work; diff --git a/binsrc/tests/suite/tlubm.sh b/binsrc/tests/suite/tlubm.sh index 457ea8d29d..d405fa6f59 100755 --- a/binsrc/tests/suite/tlubm.sh +++ b/binsrc/tests/suite/tlubm.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tmttxn.sql b/binsrc/tests/suite/tmttxn.sql index 21dfe8d48c..34851c4977 100644 --- a/binsrc/tests/suite/tmttxn.sql +++ b/binsrc/tests/suite/tmttxn.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tmulgrp.sql b/binsrc/tests/suite/tmulgrp.sql index 1eea4ab692..46fc2817d0 100644 --- a/binsrc/tests/suite/tmulgrp.sql +++ b/binsrc/tests/suite/tmulgrp.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tmulgrp1.sql b/binsrc/tests/suite/tmulgrp1.sql index 398106c2b8..3f7e79ab7e 100644 --- a/binsrc/tests/suite/tmulgrp1.sql +++ b/binsrc/tests/suite/tmulgrp1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tmulgrp2.sql b/binsrc/tests/suite/tmulgrp2.sql index 5c08f553fc..0acdf25078 100644 --- a/binsrc/tests/suite/tmulgrp2.sql +++ b/binsrc/tests/suite/tmulgrp2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tnull.sql b/binsrc/tests/suite/tnull.sql index f1aa83dc50..2fc1b6d88b 100644 --- a/binsrc/tests/suite/tnull.sql +++ b/binsrc/tests/suite/tnull.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tnum.sql b/binsrc/tests/suite/tnum.sql index b952f73393..024205a972 100644 --- a/binsrc/tests/suite/tnum.sql +++ b/binsrc/tests/suite/tnum.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tnumr.sql b/binsrc/tests/suite/tnumr.sql index 0709ad9a0b..d774578666 100644 --- a/binsrc/tests/suite/tnumr.sql +++ b/binsrc/tests/suite/tnumr.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tnumt.sql b/binsrc/tests/suite/tnumt.sql index 02dbba1ccc..77ce12a744 100644 --- a/binsrc/tests/suite/tnumt.sql +++ b/binsrc/tests/suite/tnumt.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tnvarchar.sql b/binsrc/tests/suite/tnvarchar.sql index 31611f62a7..3a221dc8ba 100644 --- a/binsrc/tests/suite/tnvarchar.sql +++ b/binsrc/tests/suite/tnvarchar.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tnwords.sql b/binsrc/tests/suite/tnwords.sql index aff08a4046..e619f041c3 100644 --- a/binsrc/tests/suite/tnwords.sql +++ b/binsrc/tests/suite/tnwords.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tnwords_create.sql b/binsrc/tests/suite/tnwords_create.sql index fc196c510e..b9cb1b425e 100644 --- a/binsrc/tests/suite/tnwords_create.sql +++ b/binsrc/tests/suite/tnwords_create.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tnwords_remote.sql b/binsrc/tests/suite/tnwords_remote.sql index 21e567ed0f..fd69146637 100644 --- a/binsrc/tests/suite/tnwords_remote.sql +++ b/binsrc/tests/suite/tnwords_remote.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tobject.sql b/binsrc/tests/suite/tobject.sql index 88a1a6a11d..bcea789c0b 100644 --- a/binsrc/tests/suite/tobject.sql +++ b/binsrc/tests/suite/tobject.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/toptiremote.sh b/binsrc/tests/suite/toptiremote.sh index aed7665bc3..a55d4bf5a3 100755 --- a/binsrc/tests/suite/toptiremote.sh +++ b/binsrc/tests/suite/toptiremote.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/toptitpcd.sh b/binsrc/tests/suite/toptitpcd.sh index 177607f89b..b9ffbb8767 100755 --- a/binsrc/tests/suite/toptitpcd.sh +++ b/binsrc/tests/suite/toptitpcd.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/toutdsk.sql b/binsrc/tests/suite/toutdsk.sql index dd6ccc4d19..044e490f00 100644 --- a/binsrc/tests/suite/toutdsk.sql +++ b/binsrc/tests/suite/toutdsk.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/toutdskck.sql b/binsrc/tests/suite/toutdskck.sql index dbffffa27b..c4b9e0fa89 100644 --- a/binsrc/tests/suite/toutdskck.sql +++ b/binsrc/tests/suite/toutdskck.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tp.sh b/binsrc/tests/suite/tp.sh index da3d8ca36a..49bee72688 100755 --- a/binsrc/tests/suite/tp.sh +++ b/binsrc/tests/suite/tp.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/LOAD.sh b/binsrc/tests/suite/tpc-d/LOAD.sh index 0404735657..74ff071618 100755 --- a/binsrc/tests/suite/tpc-d/LOAD.sh +++ b/binsrc/tests/suite/tpc-d/LOAD.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Makefile.am b/binsrc/tests/suite/tpc-d/Makefile.am index ba998205ed..c65010c84f 100644 --- a/binsrc/tests/suite/tpc-d/Makefile.am +++ b/binsrc/tests/suite/tpc-d/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q.sql b/binsrc/tests/suite/tpc-d/Q.sql index dd18e3cc74..d77c0beabe 100644 --- a/binsrc/tests/suite/tpc-d/Q.sql +++ b/binsrc/tests/suite/tpc-d/Q.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q1.sql b/binsrc/tests/suite/tpc-d/Q1.sql index 3407b0720e..3ff2517499 100644 --- a/binsrc/tests/suite/tpc-d/Q1.sql +++ b/binsrc/tests/suite/tpc-d/Q1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q10.sql b/binsrc/tests/suite/tpc-d/Q10.sql index 44ed0365cc..5a11334e89 100644 --- a/binsrc/tests/suite/tpc-d/Q10.sql +++ b/binsrc/tests/suite/tpc-d/Q10.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q11.sql b/binsrc/tests/suite/tpc-d/Q11.sql index db2a94519c..08620b2991 100644 --- a/binsrc/tests/suite/tpc-d/Q11.sql +++ b/binsrc/tests/suite/tpc-d/Q11.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q12.sql b/binsrc/tests/suite/tpc-d/Q12.sql index 3908a80a8f..56c6176f9a 100644 --- a/binsrc/tests/suite/tpc-d/Q12.sql +++ b/binsrc/tests/suite/tpc-d/Q12.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q13.sql b/binsrc/tests/suite/tpc-d/Q13.sql index 4eb69e12ec..c450f7c035 100644 --- a/binsrc/tests/suite/tpc-d/Q13.sql +++ b/binsrc/tests/suite/tpc-d/Q13.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q14.sql b/binsrc/tests/suite/tpc-d/Q14.sql index 24926f4d99..e35f83dca0 100644 --- a/binsrc/tests/suite/tpc-d/Q14.sql +++ b/binsrc/tests/suite/tpc-d/Q14.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q15.sql b/binsrc/tests/suite/tpc-d/Q15.sql index 1717c83642..dd4077da8f 100644 --- a/binsrc/tests/suite/tpc-d/Q15.sql +++ b/binsrc/tests/suite/tpc-d/Q15.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q16.sql b/binsrc/tests/suite/tpc-d/Q16.sql index f7017ef557..10f632f8d4 100644 --- a/binsrc/tests/suite/tpc-d/Q16.sql +++ b/binsrc/tests/suite/tpc-d/Q16.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q17.sql b/binsrc/tests/suite/tpc-d/Q17.sql index d0bc0e888a..26c37042e4 100644 --- a/binsrc/tests/suite/tpc-d/Q17.sql +++ b/binsrc/tests/suite/tpc-d/Q17.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q18.sql b/binsrc/tests/suite/tpc-d/Q18.sql index 1b414393b2..9d008a5085 100644 --- a/binsrc/tests/suite/tpc-d/Q18.sql +++ b/binsrc/tests/suite/tpc-d/Q18.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q19.sql b/binsrc/tests/suite/tpc-d/Q19.sql index afeb156107..e17c4ff8f9 100644 --- a/binsrc/tests/suite/tpc-d/Q19.sql +++ b/binsrc/tests/suite/tpc-d/Q19.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q2.sql b/binsrc/tests/suite/tpc-d/Q2.sql index 9a1a94679e..1a2e2ffd49 100644 --- a/binsrc/tests/suite/tpc-d/Q2.sql +++ b/binsrc/tests/suite/tpc-d/Q2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q20.sql b/binsrc/tests/suite/tpc-d/Q20.sql index f394482db6..7679b86c6e 100644 --- a/binsrc/tests/suite/tpc-d/Q20.sql +++ b/binsrc/tests/suite/tpc-d/Q20.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q21.sql b/binsrc/tests/suite/tpc-d/Q21.sql index cb629c6657..4f53f2bfa6 100644 --- a/binsrc/tests/suite/tpc-d/Q21.sql +++ b/binsrc/tests/suite/tpc-d/Q21.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q22.sql b/binsrc/tests/suite/tpc-d/Q22.sql index f6c76c32d6..37f28907a6 100644 --- a/binsrc/tests/suite/tpc-d/Q22.sql +++ b/binsrc/tests/suite/tpc-d/Q22.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q3.sql b/binsrc/tests/suite/tpc-d/Q3.sql index 2aa534a835..b476a1e0da 100644 --- a/binsrc/tests/suite/tpc-d/Q3.sql +++ b/binsrc/tests/suite/tpc-d/Q3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q4.sql b/binsrc/tests/suite/tpc-d/Q4.sql index 05bfdf6425..c4968d74de 100644 --- a/binsrc/tests/suite/tpc-d/Q4.sql +++ b/binsrc/tests/suite/tpc-d/Q4.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q5.sql b/binsrc/tests/suite/tpc-d/Q5.sql index 4ad66fb0c9..c1ddc0afe8 100644 --- a/binsrc/tests/suite/tpc-d/Q5.sql +++ b/binsrc/tests/suite/tpc-d/Q5.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q6.sql b/binsrc/tests/suite/tpc-d/Q6.sql index 5387f2ada6..b23a21bab5 100644 --- a/binsrc/tests/suite/tpc-d/Q6.sql +++ b/binsrc/tests/suite/tpc-d/Q6.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q7.sql b/binsrc/tests/suite/tpc-d/Q7.sql index d7962435e2..25ac24b500 100644 --- a/binsrc/tests/suite/tpc-d/Q7.sql +++ b/binsrc/tests/suite/tpc-d/Q7.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q8.sql b/binsrc/tests/suite/tpc-d/Q8.sql index ab4da6e15b..7d95a2d22d 100644 --- a/binsrc/tests/suite/tpc-d/Q8.sql +++ b/binsrc/tests/suite/tpc-d/Q8.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q9.sql b/binsrc/tests/suite/tpc-d/Q9.sql index 35eb6b452d..44e0a6f254 100644 --- a/binsrc/tests/suite/tpc-d/Q9.sql +++ b/binsrc/tests/suite/tpc-d/Q9.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS1.sql b/binsrc/tests/suite/tpc-d/QS1.sql index 499a420227..fd0fee2e48 100644 --- a/binsrc/tests/suite/tpc-d/QS1.sql +++ b/binsrc/tests/suite/tpc-d/QS1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS10.sql b/binsrc/tests/suite/tpc-d/QS10.sql index 93cf640175..71ef6a2bbf 100644 --- a/binsrc/tests/suite/tpc-d/QS10.sql +++ b/binsrc/tests/suite/tpc-d/QS10.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS11.sql b/binsrc/tests/suite/tpc-d/QS11.sql index 0056d87a47..4494d66745 100644 --- a/binsrc/tests/suite/tpc-d/QS11.sql +++ b/binsrc/tests/suite/tpc-d/QS11.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS12.sql b/binsrc/tests/suite/tpc-d/QS12.sql index 7cf3b8d32c..34765bfd75 100644 --- a/binsrc/tests/suite/tpc-d/QS12.sql +++ b/binsrc/tests/suite/tpc-d/QS12.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS13.sql b/binsrc/tests/suite/tpc-d/QS13.sql index 1457c7bdc4..c432b6e622 100644 --- a/binsrc/tests/suite/tpc-d/QS13.sql +++ b/binsrc/tests/suite/tpc-d/QS13.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS14.sql b/binsrc/tests/suite/tpc-d/QS14.sql index efeaed61a3..2894201053 100644 --- a/binsrc/tests/suite/tpc-d/QS14.sql +++ b/binsrc/tests/suite/tpc-d/QS14.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS15.sql b/binsrc/tests/suite/tpc-d/QS15.sql index 58d8802dc6..ddc02fd793 100644 --- a/binsrc/tests/suite/tpc-d/QS15.sql +++ b/binsrc/tests/suite/tpc-d/QS15.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS17.sql b/binsrc/tests/suite/tpc-d/QS17.sql index 6491efffe7..1f12021c16 100644 --- a/binsrc/tests/suite/tpc-d/QS17.sql +++ b/binsrc/tests/suite/tpc-d/QS17.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS18.sql b/binsrc/tests/suite/tpc-d/QS18.sql index ecba2f4628..16c77f2f45 100644 --- a/binsrc/tests/suite/tpc-d/QS18.sql +++ b/binsrc/tests/suite/tpc-d/QS18.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS18o.sql b/binsrc/tests/suite/tpc-d/QS18o.sql index a6a526b76a..e6a32d2f21 100644 --- a/binsrc/tests/suite/tpc-d/QS18o.sql +++ b/binsrc/tests/suite/tpc-d/QS18o.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS2.sql b/binsrc/tests/suite/tpc-d/QS2.sql index 2160f20aff..da723bab6a 100644 --- a/binsrc/tests/suite/tpc-d/QS2.sql +++ b/binsrc/tests/suite/tpc-d/QS2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS20.sql b/binsrc/tests/suite/tpc-d/QS20.sql index cf151811e4..3c1d5b6ecf 100644 --- a/binsrc/tests/suite/tpc-d/QS20.sql +++ b/binsrc/tests/suite/tpc-d/QS20.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS21.sql b/binsrc/tests/suite/tpc-d/QS21.sql index c4c965c7ad..e658bf03c2 100644 --- a/binsrc/tests/suite/tpc-d/QS21.sql +++ b/binsrc/tests/suite/tpc-d/QS21.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS22.sql b/binsrc/tests/suite/tpc-d/QS22.sql index 25b55a634c..32c506a561 100644 --- a/binsrc/tests/suite/tpc-d/QS22.sql +++ b/binsrc/tests/suite/tpc-d/QS22.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS3.sql b/binsrc/tests/suite/tpc-d/QS3.sql index 8dde260b65..ea8a384e04 100644 --- a/binsrc/tests/suite/tpc-d/QS3.sql +++ b/binsrc/tests/suite/tpc-d/QS3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS4.sql b/binsrc/tests/suite/tpc-d/QS4.sql index e7ee339a96..f2cd672e8a 100644 --- a/binsrc/tests/suite/tpc-d/QS4.sql +++ b/binsrc/tests/suite/tpc-d/QS4.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS5.sql b/binsrc/tests/suite/tpc-d/QS5.sql index bdc394bbfe..90d43b9efb 100644 --- a/binsrc/tests/suite/tpc-d/QS5.sql +++ b/binsrc/tests/suite/tpc-d/QS5.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS6.sql b/binsrc/tests/suite/tpc-d/QS6.sql index 5387f2ada6..b23a21bab5 100644 --- a/binsrc/tests/suite/tpc-d/QS6.sql +++ b/binsrc/tests/suite/tpc-d/QS6.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS7.sql b/binsrc/tests/suite/tpc-d/QS7.sql index f68d79d465..7326e154e3 100644 --- a/binsrc/tests/suite/tpc-d/QS7.sql +++ b/binsrc/tests/suite/tpc-d/QS7.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS8.sql b/binsrc/tests/suite/tpc-d/QS8.sql index dc5554b509..9687cd22a4 100644 --- a/binsrc/tests/suite/tpc-d/QS8.sql +++ b/binsrc/tests/suite/tpc-d/QS8.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/QS9.sql b/binsrc/tests/suite/tpc-d/QS9.sql index 94b8466812..37d5d488e3 100644 --- a/binsrc/tests/suite/tpc-d/QS9.sql +++ b/binsrc/tests/suite/tpc-d/QS9.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q_dt.sql b/binsrc/tests/suite/tpc-d/Q_dt.sql index 7e6ff42359..be8d4cadde 100644 --- a/binsrc/tests/suite/tpc-d/Q_dt.sql +++ b/binsrc/tests/suite/tpc-d/Q_dt.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q_mysql.sql b/binsrc/tests/suite/tpc-d/Q_mysql.sql index bcaab61daf..12173c5319 100644 --- a/binsrc/tests/suite/tpc-d/Q_mysql.sql +++ b/binsrc/tests/suite/tpc-d/Q_mysql.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q_ora.sql b/binsrc/tests/suite/tpc-d/Q_ora.sql index 3a2f5ffc99..c188e7022a 100644 --- a/binsrc/tests/suite/tpc-d/Q_ora.sql +++ b/binsrc/tests/suite/tpc-d/Q_ora.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q_sparql_map.sql b/binsrc/tests/suite/tpc-d/Q_sparql_map.sql index e516c3ba1c..29930eb60f 100644 --- a/binsrc/tests/suite/tpc-d/Q_sparql_map.sql +++ b/binsrc/tests/suite/tpc-d/Q_sparql_map.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q_sparql_map_cmp.sql b/binsrc/tests/suite/tpc-d/Q_sparql_map_cmp.sql index 25d12119c9..6a5d3d8376 100644 --- a/binsrc/tests/suite/tpc-d/Q_sparql_map_cmp.sql +++ b/binsrc/tests/suite/tpc-d/Q_sparql_map_cmp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/Q_virt.sql b/binsrc/tests/suite/tpc-d/Q_virt.sql index b81ad6e03d..d543daf2f4 100644 --- a/binsrc/tests/suite/tpc-d/Q_virt.sql +++ b/binsrc/tests/suite/tpc-d/Q_virt.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/all_ms.sql b/binsrc/tests/suite/tpc-d/all_ms.sql index a785507f7c..194f213c51 100644 --- a/binsrc/tests/suite/tpc-d/all_ms.sql +++ b/binsrc/tests/suite/tpc-d/all_ms.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/attach_tpcd.sql b/binsrc/tests/suite/tpc-d/attach_tpcd.sql index e96c3b79b9..e95b9e7974 100644 --- a/binsrc/tests/suite/tpc-d/attach_tpcd.sql +++ b/binsrc/tests/suite/tpc-d/attach_tpcd.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/attach_tpcd_vdb.sql b/binsrc/tests/suite/tpc-d/attach_tpcd_vdb.sql index dc9fa14a17..caba9d2862 100644 --- a/binsrc/tests/suite/tpc-d/attach_tpcd_vdb.sql +++ b/binsrc/tests/suite/tpc-d/attach_tpcd_vdb.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/create_indexes.sql b/binsrc/tests/suite/tpc-d/create_indexes.sql index 51f1a77dc5..1eb7c232f3 100644 --- a/binsrc/tests/suite/tpc-d/create_indexes.sql +++ b/binsrc/tests/suite/tpc-d/create_indexes.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/create_procedures.sql b/binsrc/tests/suite/tpc-d/create_procedures.sql index 831be0a64c..0743d548f7 100644 --- a/binsrc/tests/suite/tpc-d/create_procedures.sql +++ b/binsrc/tests/suite/tpc-d/create_procedures.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/create_tables.sql b/binsrc/tests/suite/tpc-d/create_tables.sql index 0ec31ecada..9158b5109b 100644 --- a/binsrc/tests/suite/tpc-d/create_tables.sql +++ b/binsrc/tests/suite/tpc-d/create_tables.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/deattach_tpcd.sql b/binsrc/tests/suite/tpc-d/deattach_tpcd.sql index 7c8377af05..55c3fb47dc 100644 --- a/binsrc/tests/suite/tpc-d/deattach_tpcd.sql +++ b/binsrc/tests/suite/tpc-d/deattach_tpcd.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/load_query.sql b/binsrc/tests/suite/tpc-d/load_query.sql index 8151fc3c13..0d7299f9d1 100644 --- a/binsrc/tests/suite/tpc-d/load_query.sql +++ b/binsrc/tests/suite/tpc-d/load_query.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/msaccess.sql b/binsrc/tests/suite/tpc-d/msaccess.sql index c78a85e2e9..6f32bf8943 100644 --- a/binsrc/tests/suite/tpc-d/msaccess.sql +++ b/binsrc/tests/suite/tpc-d/msaccess.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/mssql.sql b/binsrc/tests/suite/tpc-d/mssql.sql index 42b0aae4df..2c39ce3c34 100644 --- a/binsrc/tests/suite/tpc-d/mssql.sql +++ b/binsrc/tests/suite/tpc-d/mssql.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/ora.sql b/binsrc/tests/suite/tpc-d/ora.sql index 67e61ab28d..2fb16594bc 100644 --- a/binsrc/tests/suite/tpc-d/ora.sql +++ b/binsrc/tests/suite/tpc-d/ora.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/q31.sql b/binsrc/tests/suite/tpc-d/q31.sql index d19d9a2ba1..027bc4ffb4 100644 --- a/binsrc/tests/suite/tpc-d/q31.sql +++ b/binsrc/tests/suite/tpc-d/q31.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/q32.sql b/binsrc/tests/suite/tpc-d/q32.sql index 072f73d5e3..ee23973082 100644 --- a/binsrc/tests/suite/tpc-d/q32.sql +++ b/binsrc/tests/suite/tpc-d/q32.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/q33.sql b/binsrc/tests/suite/tpc-d/q33.sql index d19d9a2ba1..027bc4ffb4 100644 --- a/binsrc/tests/suite/tpc-d/q33.sql +++ b/binsrc/tests/suite/tpc-d/q33.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/q34.sql b/binsrc/tests/suite/tpc-d/q34.sql index 9f073f47f2..bc084106f3 100644 --- a/binsrc/tests/suite/tpc-d/q34.sql +++ b/binsrc/tests/suite/tpc-d/q34.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/res.sh b/binsrc/tests/suite/tpc-d/res.sh index 78ebb92f28..b0189a24ea 100755 --- a/binsrc/tests/suite/tpc-d/res.sh +++ b/binsrc/tests/suite/tpc-d/res.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/runtests.sh b/binsrc/tests/suite/tpc-d/runtests.sh index 7156d23f40..231d6324bb 100755 --- a/binsrc/tests/suite/tpc-d/runtests.sh +++ b/binsrc/tests/suite/tpc-d/runtests.sh @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/stat-tpcd.sql b/binsrc/tests/suite/tpc-d/stat-tpcd.sql index fc3cee805f..02963f88f4 100644 --- a/binsrc/tests/suite/tpc-d/stat-tpcd.sql +++ b/binsrc/tests/suite/tpc-d/stat-tpcd.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/test_ms.sql b/binsrc/tests/suite/tpc-d/test_ms.sql index f626602d91..c9205e3bc8 100644 --- a/binsrc/tests/suite/tpc-d/test_ms.sql +++ b/binsrc/tests/suite/tpc-d/test_ms.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/test_tbl.sql b/binsrc/tests/suite/tpc-d/test_tbl.sql index 74209154e0..ffebbfa90e 100644 --- a/binsrc/tests/suite/tpc-d/test_tbl.sql +++ b/binsrc/tests/suite/tpc-d/test_tbl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpc-d/tpcd.sh b/binsrc/tests/suite/tpc-d/tpcd.sh index 3f886d55e5..f3299aa66f 100755 --- a/binsrc/tests/suite/tpc-d/tpcd.sh +++ b/binsrc/tests/suite/tpc-d/tpcd.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpcc_update.sql b/binsrc/tests/suite/tpcc_update.sql index 76f3ea6bc1..5b37b73735 100644 --- a/binsrc/tests/suite/tpcc_update.sql +++ b/binsrc/tests/suite/tpcc_update.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpcc_update1.sql b/binsrc/tests/suite/tpcc_update1.sql index 369bd4b898..f70147f1e2 100644 --- a/binsrc/tests/suite/tpcc_update1.sql +++ b/binsrc/tests/suite/tpcc_update1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpcc_update2.sql b/binsrc/tests/suite/tpcc_update2.sql index b18fa65855..db6243420c 100644 --- a/binsrc/tests/suite/tpcc_update2.sql +++ b/binsrc/tests/suite/tpcc_update2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpcd.sh b/binsrc/tests/suite/tpcd.sh index 07d8cb5fcf..a28fab9b3f 100755 --- a/binsrc/tests/suite/tpcd.sh +++ b/binsrc/tests/suite/tpcd.sh @@ -9,7 +9,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tping.sql b/binsrc/tests/suite/tping.sql index 8eeedcacd7..338b564f2a 100644 --- a/binsrc/tests/suite/tping.sql +++ b/binsrc/tests/suite/tping.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpkopt.sql b/binsrc/tests/suite/tpkopt.sql index 22e0f5219c..34f934e388 100644 --- a/binsrc/tests/suite/tpkopt.sql +++ b/binsrc/tests/suite/tpkopt.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tplinverse.sql b/binsrc/tests/suite/tplinverse.sql index 69d64b2d9b..7a1ba836e3 100644 --- a/binsrc/tests/suite/tplinverse.sql +++ b/binsrc/tests/suite/tplinverse.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tplmodule.sql b/binsrc/tests/suite/tplmodule.sql index 3f1d0589f4..1258a9f026 100644 --- a/binsrc/tests/suite/tplmodule.sql +++ b/binsrc/tests/suite/tplmodule.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tplscroll.sql b/binsrc/tests/suite/tplscroll.sql index bcf580ced1..c8a47c8cf5 100644 --- a/binsrc/tests/suite/tplscroll.sql +++ b/binsrc/tests/suite/tplscroll.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpm.sql b/binsrc/tests/suite/tpm.sql index 3f92ba52fd..d68ee70674 100644 --- a/binsrc/tests/suite/tpm.sql +++ b/binsrc/tests/suite/tpm.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpmfinal.sql b/binsrc/tests/suite/tpmfinal.sql index c8a053ee6e..59f1eff403 100644 --- a/binsrc/tests/suite/tpmfinal.sql +++ b/binsrc/tests/suite/tpmfinal.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpminit.sql b/binsrc/tests/suite/tpminit.sql index e86f19e521..1f151e5f5c 100644 --- a/binsrc/tests/suite/tpminit.sql +++ b/binsrc/tests/suite/tpminit.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tproviders.sh b/binsrc/tests/suite/tproviders.sh index 8ef5ea344f..eaf5673282 100755 --- a/binsrc/tests/suite/tproviders.sh +++ b/binsrc/tests/suite/tproviders.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tproxy.sh b/binsrc/tests/suite/tproxy.sh index 584520a5ff..a5d119a367 100755 --- a/binsrc/tests/suite/tproxy.sh +++ b/binsrc/tests/suite/tproxy.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tpview.sql b/binsrc/tests/suite/tpview.sql index c5c9945ed8..7c0573ad20 100644 --- a/binsrc/tests/suite/tpview.sql +++ b/binsrc/tests/suite/tpview.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trdf.sql b/binsrc/tests/suite/trdf.sql index 47c70f3592..48cc217188 100644 --- a/binsrc/tests/suite/trdf.sql +++ b/binsrc/tests/suite/trdf.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trdfbox.sql b/binsrc/tests/suite/trdfbox.sql index e21c060672..00c0ac5e9c 100644 --- a/binsrc/tests/suite/trdfbox.sql +++ b/binsrc/tests/suite/trdfbox.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trdfcol.sql b/binsrc/tests/suite/trdfcol.sql index 42dd3654f2..ed76be19a2 100644 --- a/binsrc/tests/suite/trdfcol.sql +++ b/binsrc/tests/suite/trdfcol.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trdferr.sql b/binsrc/tests/suite/trdferr.sql index 66d2f8455f..346cbecda3 100644 --- a/binsrc/tests/suite/trdferr.sql +++ b/binsrc/tests/suite/trdferr.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trdffti.sql b/binsrc/tests/suite/trdffti.sql index 9fc874f29f..43b575debd 100644 --- a/binsrc/tests/suite/trdffti.sql +++ b/binsrc/tests/suite/trdffti.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trdfinf.sql b/binsrc/tests/suite/trdfinf.sql index 449f9d8ce0..0af82a9b5c 100644 --- a/binsrc/tests/suite/trdfinf.sql +++ b/binsrc/tests/suite/trdfinf.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trdfinfifp.sql b/binsrc/tests/suite/trdfinfifp.sql index 058e437491..70c6e90e49 100644 --- a/binsrc/tests/suite/trdfinfifp.sql +++ b/binsrc/tests/suite/trdfinfifp.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trdfins.sql b/binsrc/tests/suite/trdfins.sql index 8f43c2e6bf..da68120d6c 100644 --- a/binsrc/tests/suite/trdfins.sql +++ b/binsrc/tests/suite/trdfins.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trdfld.sql b/binsrc/tests/suite/trdfld.sql index bbb970ec5d..9902832b5f 100644 --- a/binsrc/tests/suite/trdfld.sql +++ b/binsrc/tests/suite/trdfld.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trecov.sh b/binsrc/tests/suite/trecov.sh index e20a316fd2..f518fcf80c 100755 --- a/binsrc/tests/suite/trecov.sh +++ b/binsrc/tests/suite/trecov.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trecov_schema.sh b/binsrc/tests/suite/trecov_schema.sh index 64d041f447..af0f8b7213 100755 --- a/binsrc/tests/suite/trecov_schema.sh +++ b/binsrc/tests/suite/trecov_schema.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/treg1.sql b/binsrc/tests/suite/treg1.sql index af6d3803c5..abac115f99 100644 --- a/binsrc/tests/suite/treg1.sql +++ b/binsrc/tests/suite/treg1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/treg2.sql b/binsrc/tests/suite/treg2.sql index 8387d55c96..adb73303b4 100644 --- a/binsrc/tests/suite/treg2.sql +++ b/binsrc/tests/suite/treg2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tregexp.sql b/binsrc/tests/suite/tregexp.sql index 3646644ca3..59587ac8d9 100644 --- a/binsrc/tests/suite/tregexp.sql +++ b/binsrc/tests/suite/tregexp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tregexpN.sql b/binsrc/tests/suite/tregexpN.sql index ac1a14b690..a79ea22831 100644 --- a/binsrc/tests/suite/tregexpN.sql +++ b/binsrc/tests/suite/tregexpN.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trepl.sh b/binsrc/tests/suite/trepl.sh index 2421967e21..9a4112a739 100755 --- a/binsrc/tests/suite/trepl.sh +++ b/binsrc/tests/suite/trepl.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trepl.sql b/binsrc/tests/suite/trepl.sql index 35470cf917..6f008375b9 100644 --- a/binsrc/tests/suite/trepl.sql +++ b/binsrc/tests/suite/trepl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trepl_ddl.sql b/binsrc/tests/suite/trepl_ddl.sql index af6def2855..e33441d9e1 100644 --- a/binsrc/tests/suite/trepl_ddl.sql +++ b/binsrc/tests/suite/trepl_ddl.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trepl_p1.sql b/binsrc/tests/suite/trepl_p1.sql index b6f79aeadf..efb46c1210 100644 --- a/binsrc/tests/suite/trepl_p1.sql +++ b/binsrc/tests/suite/trepl_p1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trepl_rdf.sh b/binsrc/tests/suite/trepl_rdf.sh index 627fcb1775..8b845a500c 100755 --- a/binsrc/tests/suite/trepl_rdf.sh +++ b/binsrc/tests/suite/trepl_rdf.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/trepl_rdf.sql b/binsrc/tests/suite/trepl_rdf.sql index b625fb6294..6dbc8f5920 100644 --- a/binsrc/tests/suite/trepl_rdf.sql +++ b/binsrc/tests/suite/trepl_rdf.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -21,6 +21,7 @@ -- -- +-- SET ECHO ON; connect; ECHO BOTH "DSNs for subscriber: " $U{ds2} " publisher: " $U{ds1} "\n"; @@ -35,22 +36,30 @@ DB.DBA.RDF_REPL_START(); select registry_get ('DB.DBA.RDF_REPL'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://ttlp_0/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://ttlp_1/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://ttlp_mt_0/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://ttlp_mt_1/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://ttlp_ff_0/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://ttlp_ff_1/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://rdfxml_0/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://rdfxml_1/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://rdfxml_mt_0/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://rdfxml_mt_1/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://sparul_0/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://sparul_1/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://manip_0/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://manip_1/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://geo_0/'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://geo_1/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/ttlp_0/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/ttlp_1/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/ttlp_mt_0/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/ttlp_mt_1/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/ttlp_mt_0_norepl/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/ttlp_mt_1_norepl/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/trig_0/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/trig_1/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/trig_mt_0/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/trig_mt_1/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/ttlp_mt_0_norepl/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/ttlp_mt_1_norepl/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/ttlp_ff_0/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/ttlp_ff_1/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/rdfxml_0/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/rdfxml_1/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/rdfxml_mt_0/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/rdfxml_mt_1/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/sparul_0/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/sparul_1/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/manip_0/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/manip_1/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/geo_0/'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/geo_1/'); checkpoint; -- SUBSCRIBER @@ -66,69 +75,111 @@ set DSN=$U{ds1}; reconnect; ECHO BOTH "----- Reconnected to PUBLISHER " $U{ds1} ", will add RDF data by different methods\n"; -DB.DBA.TTLP (' , "plain_ttlp_0" , 100 , "qq_ttlp_0"^^ , "руÑ_ttlp_0"@ru , [ rdf:type ] .', 'http://ttlp_0/', 'http://ttlp_0/'); -DB.DBA.TTLP (' , "plain_ttlp_1" , 101 , "qq_ttlp_1"^^ , "руÑ_ttlp_1"@ru , [ rdf:type ] .', 'http://ttlp_1/', 'http://ttlp_1/'); -DB.DBA.TTLP_MT (' , "plain_ttlp_mt_0" , 100 , "qq_ttlp_mt_0"^^ , "руÑ_ttlp_mt_0"@ru , [ rdf:type ] .', 'http://ttlp_mt_0/', 'http://ttlp_mt_0/', log_mode=>1); -DB.DBA.TTLP_MT (' , "plain_ttlp_mt_1" , 101 , "qq_ttlp_mt_1"^^ , "руÑ_ttlp_mt_1"@ru , [ rdf:type ] .', 'http://ttlp_mt_1/', 'http://ttlp_mt_1/', log_mode=>1); +DB.DBA.TTLP (' , "plain_ttlp_0" , 100 , "qq_ttlp_0"^^ , "руÑ_ttlp_0"@ru , [ rdf:type ] .', 'http://trepl_rdf/ttlp_0/', 'http://trepl_rdf/ttlp_0/'); +DB.DBA.TTLP (' , "plain_ttlp_1" , 101 , "qq_ttlp_1"^^ , "руÑ_ttlp_1"@ru , [ rdf:type ] .', 'http://trepl_rdf/ttlp_1/', 'http://trepl_rdf/ttlp_1/'); +DB.DBA.TTLP (' , "plain_ttlp_8" , 109 , "qq_ttlp_', 'http://trepl_rdf/ttlp_8/', 'http://trepl_rdf/ttlp_8/'); -- Intentionally wrong, to check the recovery +DB.DBA.TTLP (' , "plain_ttlp_9" , 109 , "qq_ttlp_9"^^ , "руÑ_ttlp_9"@ru , [ rdf:type ] .', 'http://trepl_rdf/ttlp_9/', 'http://trepl_rdf/ttlp_9/'); +DB.DBA.TTLP_MT (' , "plain_ttlp_mt_0" , 100 , "qq_ttlp_mt_0"^^ , "руÑ_ttlp_mt_0"@ru , [ rdf:type ] .', 'http://trepl_rdf/ttlp_mt_0_norepl/', 'http://trepl_rdf/ttlp_mt_0_norepl/', log_mode => 0); +DB.DBA.TTLP_MT (' , "plain_ttlp_mt_1" , 101 , "qq_ttlp_mt_1"^^ , "руÑ_ttlp_mt_1"@ru , [ rdf:type ] .', 'http://trepl_rdf/ttlp_mt_1_norepl/', 'http://trepl_rdf/ttlp_mt_1_norepl/', log_mode => 0); +DB.DBA.TTLP_MT (' , "plain_ttlp_mt_9" , 109 , "qq_ttlp_mt_9"^^ , "руÑ_ttlp_mt_9"@ru , [ rdf:type ] .', 'http://trepl_rdf/ttlp_mt_9_norepl/', 'http://trepl_rdf/ttlp_mt_9_norepl/', log_mode => 0); +DB.DBA.TTLP_MT (' , "plain_ttlp_mt_0" , 100 , "qq_ttlp_mt_0"^^ , "руÑ_ttlp_mt_0"@ru , [ rdf:type ] .', 'http://trepl_rdf/ttlp_mt_0/', 'http://trepl_rdf/ttlp_mt_0/', log_mode => 1); +DB.DBA.TTLP_MT (' , "plain_ttlp_mt_1" , 101 , "qq_ttlp_mt_1"^^ , "руÑ_ttlp_mt_1"@ru , [ rdf:type ] .', 'http://trepl_rdf/ttlp_mt_1/', 'http://trepl_rdf/ttlp_mt_1/', log_mode => 1); +DB.DBA.TTLP_MT (' , "plain_ttlp_mt_9" , 109 , "qq_ttlp_mt_9"^^ , "руÑ_ttlp_mt_9"@ru , [ rdf:type ] .', 'http://trepl_rdf/ttlp_mt_9/', 'http://trepl_rdf/ttlp_mt_9/', log_mode => 1); + +DB.DBA.TTLP (' + { , "plain_trig_0" , 100 , "qq_trig_0"^^ , "руÑ_trig_0"@ru , [ rdf:type ] . } + { , "plain_trig_1" , 101 , "qq_trig_1"^^ , "руÑ_trig_1"@ru , [ rdf:type ] . } + { , "plain_trig_9" , 109 , "qq_trig_9"^^ , "руÑ_trig_9"@ru , [ rdf:type ] . } +', 'http://trepl_rdf/trig_XXX/', 'http://qq/', 256); +DB.DBA.TTLP_MT (' + { , "plain_trig_mt_0" , 100 , "qq_trig_mt_0"^^ , "руÑ_trig_mt_0"@ru , [ rdf:type ] . } + { , "plain_trig_mt_1" , 101 , "qq_trig_mt_1"^^ , "руÑ_trig_mt_1"@ru , [ rdf:type ] . } + { , "plain_trig_mt_9" , 109 , "qq_trig_mt_9"^^ , "руÑ_trig_mt_9"@ru , [ rdf:type ] . } +', 'http://trepl_rdf/trig_mt_9_norepl/', 'http://qq/', 256, log_mode => 0); +DB.DBA.TTLP_MT (' + { , "plain_trig_mt_0" , 100 , "qq_trig_mt_0"^^ , "руÑ_trig_mt_0"@ru , [ rdf:type ] . } + { , "plain_trig_mt_1" , 101 , "qq_trig_mt_1"^^ , "руÑ_trig_mt_1"@ru , [ rdf:type ] . } + { , "plain_trig_mt_9" , 109 , "qq_trig_mt_9"^^ , "руÑ_trig_mt_9"@ru , [ rdf:type ] . } +', 'http://trepl_rdf/trig_mt_9/', 'http://qq/', 256, log_mode => 1); + string_to_file ('ttlp_ff_0.ttl', ' , "plain_ttlp_ff_0" , 100 , "qq_ttlp_ff_0"^^ , "руÑ_ttlp_ff_0"@ru , [ rdf:type ] .', -2); string_to_file ('ttlp_ff_1.ttl', ' , "plain_ttlp_ff_1" , 101 , "qq_ttlp_ff_1"^^ , "руÑ_ttlp_ff_1"@ru , [ rdf:type ] .', -2); -DB.DBA.TTLP (file_open ('ttlp_ff_0.ttl'), 'http://ttlp_ff_0/', 'http://ttlp_ff_0/'); -ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED"; -ECHO BOTH ": TTLP : STATE=" $STATE " MESSAGE=" $MESSAGE "\n"; -DB.DBA.TTLP (file_open ('ttlp_ff_1.ttl'), 'http://ttlp_ff_1/', 'http://ttlp_ff_1/'); -ECHO BOTH $IF $EQU $STATE OK "PASSED" "***FAILED"; -ECHO BOTH ": TTLP : STATE=" $STATE " MESSAGE=" $MESSAGE "\n"; +string_to_file ('ttlp_ff_9.ttl', ' , "plain_ttlp_ff_9" , 109 , "qq_ttlp_ff_9"^^ , "руÑ_ttlp_ff_9"@ru , [ rdf:type ] .', -2); +DB.DBA.TTLP_MT (file_to_string_output ('ttlp_ff_0.ttl'), 'http://trepl_rdf/ttlp_ff_0/', 'http://trepl_rdf/ttlp_ff_0/'); +DB.DBA.TTLP_MT (file_to_string_output ('ttlp_ff_1.ttl'), 'http://trepl_rdf/ttlp_ff_1/', 'http://trepl_rdf/ttlp_ff_1/'); +DB.DBA.TTLP_MT (file_to_string_output ('ttlp_ff_9.ttl'), 'http://trepl_rdf/ttlp_ff_9/', 'http://trepl_rdf/ttlp_ff_9/'); DB.DBA.RDF_LOAD_RDFXML (' -', 'http://rdfxml_0/', 'http://rdfxml_0/' ); +', 'http://trepl_rdf/rdfxml_0/', 'http://trepl_rdf/rdfxml_0/' ); DB.DBA.RDF_LOAD_RDFXML (' -', 'http://rdfxml_1/', 'http://rdfxml_1/' ); +', 'http://trepl_rdf/rdfxml_1/', 'http://trepl_rdf/rdfxml_1/' ); + +DB.DBA.RDF_LOAD_RDFXML (' + + + +', 'http://trepl_rdf/rdfxml_9/', 'http://trepl_rdf/rdfxml_9/' ); DB.DBA.RDF_LOAD_RDFXML_MT (' -', 'http://rdfxml_mt_0/', 'http://rdfxml_mt_0/' ); +', 'http://trepl_rdf/rdfxml_mt_0/', 'http://trepl_rdf/rdfxml_mt_0/' ); DB.DBA.RDF_LOAD_RDFXML_MT (' -', 'http://rdfxml_mt_1/', 'http://rdfxml_mt_1/' ); +', 'http://trepl_rdf/rdfxml_mt_1/', 'http://trepl_rdf/rdfxml_mt_1/' ); + +DB.DBA.RDF_LOAD_RDFXML_MT (' + + + +', 'http://trepl_rdf/rdfxml_mt_9/', 'http://trepl_rdf/rdfxml_mt_9/' ); -sparql base insert in { +sparql base insert in { , "plain_sparul_0" , 100 , "qq_sparul_0"^^ , "\u0440\u0443\u0441_sparul_0"@ru , [ rdf:type ] . }; -sparql base insert in { - , "plain_sparul_1" , 100 , "qq_sparul_1"^^ , "\u0440\u0443\u0441_sparul_1"@ru , [ rdf:type ] . }; +sparql base insert in { + , "plain_sparul_1" , 101 , "qq_sparul_1"^^ , "\u0440\u0443\u0441_sparul_1"@ru , [ rdf:type ] . }; + +sparql base insert in { + , "plain_sparul_9" , 109 , "qq_sparul_9"^^ , "\u0440\u0443\u0441_sparul_9"@ru , [ rdf:type ] . }; + +DB.DBA.RDF_QUAD_URI ('http://trepl_rdf/manip_0/', 'http://trepl_rdf/manip_0/s_manip_0', 'http://trepl_rdf/manip_0/p_manip_0', 'http://trepl_rdf/manip_0/o_manip_0'); +DB.DBA.RDF_QUAD_URI_L ('http://trepl_rdf/manip_0/', 'http://trepl_rdf/manip_0/s_manip_0', 'http://trepl_rdf/manip_0/p_manip_0', 'plain_manip_0'); +DB.DBA.RDF_QUAD_URI_L_TYPED ('http://trepl_rdf/manip_0/', 'http://trepl_rdf/manip_0/s_manip_0', 'http://trepl_rdf/manip_0/p_manip_0', 'qq_manip_0', 'http://trepl_rdf/manip_0/t_manip_0', null); +DB.DBA.RDF_QUAD_URI_L_TYPED ('http://trepl_rdf/manip_0/', 'http://trepl_rdf/manip_0/s_manip_0', 'http://trepl_rdf/manip_0/p_manip_0', N'руÑ_manip_0', null, 'ru'); -DB.DBA.RDF_QUAD_URI ('http://manip_0/', 'http://manip_0/s_manip_0', 'http://manip_0/p_manip_0', 'http://manip_0/o_manip_0'); -DB.DBA.RDF_QUAD_URI_L ('http://manip_0/', 'http://manip_0/s_manip_0', 'http://manip_0/p_manip_0', 'plain_manip_0'); -DB.DBA.RDF_QUAD_URI_L_TYPED ('http://manip_0/', 'http://manip_0/s_manip_0', 'http://manip_0/p_manip_0', 'qq_manip_0', 'http://manip_0/t_manip_0', null); -DB.DBA.RDF_QUAD_URI_L_TYPED ('http://manip_0/', 'http://manip_0/s_manip_0', 'http://manip_0/p_manip_0', N'руÑ_manip_0', null, 'ru'); +DB.DBA.RDF_QUAD_URI ('http://trepl_rdf/manip_1/', 'http://trepl_rdf/manip_1/s_manip_1', 'http://trepl_rdf/manip_1/p_manip_1', 'http://trepl_rdf/manip_1/o_manip_1'); +DB.DBA.RDF_QUAD_URI_L ('http://trepl_rdf/manip_1/', 'http://trepl_rdf/manip_1/s_manip_1', 'http://trepl_rdf/manip_1/p_manip_1', 'plain_manip_1'); +DB.DBA.RDF_QUAD_URI_L_TYPED ('http://trepl_rdf/manip_1/', 'http://trepl_rdf/manip_1/s_manip_1', 'http://trepl_rdf/manip_1/p_manip_1', 'qq_manip_1', 'http://trepl_rdf/manip_1/t_manip_1', null); +DB.DBA.RDF_QUAD_URI_L_TYPED ('http://trepl_rdf/manip_1/', 'http://trepl_rdf/manip_1/s_manip_1', 'http://trepl_rdf/manip_1/p_manip_1', N'руÑ_manip_1', null, 'ru'); -DB.DBA.RDF_QUAD_URI ('http://manip_1/', 'http://manip_1/s_manip_1', 'http://manip_1/p_manip_1', 'http://manip_1/o_manip_1'); -DB.DBA.RDF_QUAD_URI_L ('http://manip_1/', 'http://manip_1/s_manip_1', 'http://manip_1/p_manip_1', 'plain_manip_1'); -DB.DBA.RDF_QUAD_URI_L_TYPED ('http://manip_1/', 'http://manip_1/s_manip_1', 'http://manip_1/p_manip_1', 'qq_manip_1', 'http://manip_1/t_manip_1', null); -DB.DBA.RDF_QUAD_URI_L_TYPED ('http://manip_1/', 'http://manip_1/s_manip_1', 'http://manip_1/p_manip_1', N'руÑ_manip_1', null, 'ru'); +DB.DBA.RDF_QUAD_URI ('http://trepl_rdf/manip_9/', 'http://trepl_rdf/manip_9/s_manip_9', 'http://trepl_rdf/manip_9/p_manip_9', 'http://trepl_rdf/manip_1/o_manip_9'); +DB.DBA.RDF_QUAD_URI_L ('http://trepl_rdf/manip_9/', 'http://trepl_rdf/manip_9/s_manip_9', 'http://trepl_rdf/manip_9/p_manip_9', 'plain_manip_9'); +DB.DBA.RDF_QUAD_URI_L_TYPED ('http://trepl_rdf/manip_9/', 'http://trepl_rdf/manip_9/s_manip_9', 'http://trepl_rdf/manip_9/p_manip_9', 'qq_manip_9', 'http://trepl_rdf/manip_9/t_manip_9', null); +DB.DBA.RDF_QUAD_URI_L_TYPED ('http://trepl_rdf/manip_9/', 'http://trepl_rdf/manip_9/s_manip_9', 'http://trepl_rdf/manip_9/p_manip_9', N'руÑ_manip_9', null, 'ru'); -DB.DBA.TTLP ('@prefix geo: . geo:lat 45 ; geo:long 135 .', 'http://geo_0/', 'http://geo_0/'); -DB.DBA.TTLP ('@prefix geo: . geo:lat 45 ; geo:long 135 .', 'http://geo_1/', 'http://geo_1/'); -rdf_geo_fill_single (); +DB.DBA.TTLP ('@prefix geo: . geo:lat 45 ; geo:long 135 .', 'http://trepl_rdf/geo_0/', 'http://trepl_rdf/geo_0/'); +DB.DBA.TTLP ('@prefix geo: . geo:lat 45 ; geo:long 135 .', 'http://trepl_rdf/geo_1/', 'http://trepl_rdf/geo_1/'); +DB.DBA.TTLP ('@prefix geo: . geo:lat 45 ; geo:long 135 .', 'http://trepl_rdf/geo_9/', 'http://trepl_rdf/geo_9/'); +DB.DBA.RDF_GEO_FILL_SINGLE (); ---sparql select ?g ?s ?p ?o where { graph ?g { ?s ?p ?o } . filter (?g != iri (sql:JSO_SYS_GRAPH ())) } order by asc (bif:replace(bif:concat(str(?g), ' ', str(?p), ' ', str(?o)), 'nodeID://', '_:rr')); +sparql select ?g ?s ?p ?o where { graph ?g { ?s ?p ?o } . filter (str(?g) like "http://trepl_rdf/%") } order by asc (bif:replace(bif:concat(str(?g), ' ', str(?p), ' ', str(?o)), 'nodeID://', '_:rr')); -sparql select (count(1)) where { graph ?g { ?s ?p ?o } . filter (?g != iri (sql:JSO_SYS_GRAPH ()) && !(str(?g) like 'http://%/DAV/%') && ?g != && !(str(?g) like 'http://%/sparql')) }; +sparql select (count(1)) where { graph ?g { ?s ?p ?o } . filter (str(?g) like "http://trepl_rdf/%") }; -ECHO BOTH $IF $EQU $LAST[1] 76 "PASSED" "***FAILED"; -ECHO BOTH ": " $LAST[1] " triples on publisher after all inserts\n"; +ECHO BOTH $IF $EQU $LAST[1] 204 "PASSED" "***FAILED"; +ECHO BOTH ": " $LAST[1] " returned, expected: 204 triples on publisher after all inserts\n"; checkpoint; @@ -140,34 +191,34 @@ ECHO BOTH "----- Reconnected to SUBSCRIBER " $U{ds2}", will sync and check what commit work; DB.DBA.RDF_REPL_SYNC ('trepl_rdf_1', 'dba', 'dba'); + status ('r'); ---sparql select ?g ?s ?p ?o where { graph ?g { ?s ?p ?o } . filter (?g != iri (sql:JSO_SYS_GRAPH ())) } order by asc (bif:replace(bif:concat(str(?g), ' ', str(?p), ' ', str(?o)), 'nodeID://', '_:rr')); +sparql select ?g ?s ?p ?o where { graph ?g { ?s ?p ?o } . filter (str(?g) like "http://trepl_rdf/%") } order by asc (bif:replace(bif:concat(str(?g), ' ', str(?p), ' ', str(?o)), 'nodeID://', '_:rr')); -sparql select (count(1)) where { graph ?g { ?s ?p ?o } . filter (?g != iri (sql:JSO_SYS_GRAPH ()) && !(str(?g) like 'http://%/DAV/%') && ?g != && !(str(?g) like 'http://%/sparql')) }; +sparql select (count(1)) where { graph ?g { ?s ?p ?o } . filter (str(?g) like "http://trepl_rdf/%") }; -ECHO BOTH $IF $EQU $LAST[1] 76 "PASSED" "***FAILED"; -ECHO BOTH ": " $LAST[1] " triples on subscriber after all inserts\n"; -checkpoint; +ECHO BOTH $IF $EQU $LAST[1] 92 "PASSED" "***FAILED"; +ECHO BOTH ": " $LAST[1] " returned, expected: 92 triples on subscriber after all inserts\n"; -- PUBLISHER set DSN=$U{ds1}; reconnect; ECHO BOTH "----- Reconnected to PUBLISHER " $U{ds1}", will delete RDF data by different methods\n"; -sparql clear graph ; +sparql clear graph ; -sparql base delete from { - , "plain_sparul_1" , 100 , "qq_sparul_1"^^ , "\u0440\u0443\u0441_sparul_1"@ru , ?bn . +sparql base delete from { + , "plain_sparul_1" , 101 , "qq_sparul_1"^^ , "\u0440\u0443\u0441_sparul_1"@ru , ?bn . ?bn rdf:type . } -from where { ?bn rdf:type . }; +from where { ?bn rdf:type . }; ---sparql select ?g ?s ?p ?o where { graph ?g { ?s ?p ?o } . filter (?g != iri (sql:JSO_SYS_GRAPH ())) } order by asc (bif:replace(bif:concat(str(?g), ' ', str(?p), ' ', str(?o)), 'nodeID://', '_:rr')); +sparql select ?g ?s ?p ?o where { graph ?g { ?s ?p ?o } . filter (str(?g) like "http://trepl_rdf/%") } order by asc (bif:replace(bif:concat(str(?g), ' ', str(?p), ' ', str(?o)), 'nodeID://', '_:rr')); -sparql select (count(1)) where { graph ?g { ?s ?p ?o } . filter (?g != iri (sql:JSO_SYS_GRAPH ()) && !(str(?g) like 'http://%/DAV/%') && ?g != && !(str(?g) like 'http://%/sparql')) }; +sparql select (count(1)) where { graph ?g { ?s ?p ?o } . filter (str(?g) like "http://trepl_rdf/%") }; -ECHO BOTH $IF $EQU $LAST[1] 62 "PASSED" "***FAILED"; -ECHO BOTH ": " $LAST[1] " triples on publisher after removals\n"; +ECHO BOTH $IF $EQU $LAST[1] 190 "PASSED" "***FAILED"; +ECHO BOTH ": " $LAST[1] " returned, expected: 190 triples on publisher after removals\n"; checkpoint; @@ -180,20 +231,22 @@ commit work; DB.DBA.RDF_REPL_SYNC ('trepl_rdf_1', 'dba', 'dba'); ---sparql select ?g ?s ?p ?o where { graph ?g { ?s ?p ?o } . filter (?g != iri (sql:JSO_SYS_GRAPH ())) } order by asc (bif:replace(bif:concat(str(?g), ' ', str(?p), ' ', str(?o)), 'nodeID://', '_:rr')); +status('r'); + +sparql select ?g ?s ?p ?o where { graph ?g { ?s ?p ?o } . filter (str(?g) like "http://trepl_rdf/%") } order by asc (bif:replace(bif:concat(str(?g), ' ', str(?p), ' ', str(?o)), 'nodeID://', '_:rr')); -sparql select (count(1)) where { graph ?g { ?s ?p ?o } . filter (?g != iri (sql:JSO_SYS_GRAPH ()) && !(str(?g) like 'http://%/DAV/%') && ?g != && !(str(?g) like 'http://%/sparql')) }; +sparql select (count(1)) where { graph ?g { ?s ?p ?o } . filter (str(?g) like "http://trepl_rdf/%") }; -ECHO BOTH $IF $EQU $LAST[1] 62 "PASSED" "***FAILED"; -ECHO BOTH ": " $LAST[1] " triples on subscriber after removals\n"; +ECHO BOTH $IF $EQU $LAST[1] 78 "PASSED" "***FAILED"; +ECHO BOTH ": " $LAST[1] " returned, expected: 78 triples on subscriber after removals\n"; -- PUBLISHER set DSN=$U{ds1}; reconnect; ECHO BOTH "----- Reconnected to PUBLISHER " $U{ds1}", will declare RDB2RDF and try all procedures and triggers\n"; -DB.DBA.RDF_REPL_GRAPH_INS ('http://sys'); -DB.DBA.RDF_REPL_GRAPH_INS ('http://sys/user?id=5'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/sys'); +DB.DBA.RDF_REPL_GRAPH_INS ('http://trepl_rdf/sys/user?id=5'); create table ZYZ_USERS ( U_ID integer, @@ -239,7 +292,7 @@ insert soft ZYZ_ROLE_GRANTS select * from SYS_ROLE_GRANTS where (GI_SUB <= 6 or GI_SUB between 100 and 106) and (GI_SUPER <= 6 or GI_SUPER between 100 and 106); -sparql alter quad storage virtrdf:SyncToQuads { create virtrdf:TPCD using storage virtrdf:DefaultQuadStorage }; +--sparql alter quad storage virtrdf:SyncToQuads { create virtrdf:TPCD using storage virtrdf:DefaultQuadStorage }; create function DB.DBA.RDF_DF_GRANTEE_ID_URI (in id integer) { @@ -524,32 +577,31 @@ create function DB.DBA.RDF_DF_MN_NUM_INV_2 (in mn_num integer) returns integer grant execute on DB.DBA.RDF_DF_MN_NUM_INV_2 to SPARQL_SELECT; -sparql drop quad map graph iri("http://sys"); +sparql drop quad map graph iri("http://trepl_rdf/sys"); sparql drop quad map virtrdf:SysUsers; sparql create quad storage virtrdf:sys { }; sparql drop quad storage virtrdf:sys; ---' DB.DBA.RDF_QM_END_ALTER_QUAD_STORAGE ( UNAME'http://www.openlinksw.com/schemas/virtrdf#sys' ); sparql prefix oplsioc: prefix sioc: -drop quad map graph iri("http://sys") . -create iri class oplsioc:user_iri "http://sys/user?id=%d" (in uid integer not null) . -create iri class oplsioc:user_name_iri "http://sys/user?name=%U" (in uname varchar not null) . -create iri class oplsioc:grp_iri "http://sys/group?id=%d" (in gid integer not null) . -create iri class oplsioc:grp_name_iri "http://sys/group?name=%U" (in gname varchar not null) . -create iri class oplsioc:membership_iri "http://sys/membersip?super=%d&sub=%d" (in super integer not null, in sub integer not null) . -create iri class oplsioc:membership_names_iri "http://sys/membersip?supername=%U&subname=%U" (in super varchar not null, in sub varchar not null) . -create iri class oplsioc:dav_iri "http://sys/%s" (in path varchar) . +drop quad map graph iri("http://trepl_rdf/sys") . +create iri class oplsioc:user_iri "http://trepl_rdf/sys/user?id=%d" (in uid integer not null) . +create iri class oplsioc:user_name_iri "http://trepl_rdf/sys/user?name=%U" (in uname varchar not null) . +create iri class oplsioc:grp_iri "http://trepl_rdf/sys/group?id=%d" (in gid integer not null) . +create iri class oplsioc:grp_name_iri "http://trepl_rdf/sys/group?name=%U" (in gname varchar not null) . +create iri class oplsioc:membership_iri "http://trepl_rdf/sys/membersip?super=%d&sub=%d" (in super integer not null, in sub integer not null) . +create iri class oplsioc:membership_names_iri "http://trepl_rdf/sys/membersip?supername=%U&subname=%U" (in super varchar not null, in sub varchar not null) . +create iri class oplsioc:dav_iri "http://trepl_rdf/sys/%s" (in path varchar) . create iri class oplsioc:grantee_iri using function DB.DBA.RDF_DF_GRANTEE_ID_URI (in id integer) returns varchar , function DB.DBA.RDF_DF_GRANTEE_ID_URI_INVERSE (in id_iri varchar) returns integer option ( bijection , - returns "http://sys/group?id=%d" - union "http://sys/user?id=%d" ) . + returns "http://trepl_rdf/sys/group?id=%d" + union "http://trepl_rdf/sys/user?id=%d" ) . make oplsioc:user_iri subclass of oplsioc:grantee_iri . make oplsioc:grp_iri subclass of oplsioc:grantee_iri . create iri class oplsioc:mn_iri using @@ -557,8 +609,8 @@ create iri class oplsioc:mn_iri using function DB.DBA.RDF_DF_MN_URI_INV_1 (in mn_iri varchar) returns integer , function DB.DBA.RDF_DF_MN_URI_INV_2 (in mn_iri varchar) returns integer option ( bijection , - returns "http://sys/mn?group=%d&role=%d" - union "http://sys/mn?user=%d&role=%d" ) . + returns "http://trepl_rdf/sys/mn?group=%d&role=%d" + union "http://trepl_rdf/sys/mn?user=%d&role=%d" ) . create literal class oplsioc:grantee_lit using function DB.DBA.RDF_DF_GRANTEE_ID_LIT (in id integer) returns varchar , @@ -618,7 +670,7 @@ from DB.DBA.ZYZ_ROLE_GRANTS as super_role_grant oplsioc:name user.U_FULL_NAME as virtrdf:SysUsersFullName-p . } . - create virtrdf:SysUsers as graph iri ("http://sys") option (exclusive) + create virtrdf:SysUsers as graph iri ("http://trepl_rdf/sys") option (exclusive) { oplsioc:user_iri (active_user.U_ID) a oplsioc:active-user @@ -682,7 +734,7 @@ from DB.DBA.ZYZ_ROLE_GRANTS as super_role_grant } } ; -sparql alter quad storage virtrdf:SyncToQuads { create virtrdf:TPCD using storage virtrdf:DefaultQuadStorage }; +--sparql alter quad storage virtrdf:SyncToQuads { create virtrdf:TPCD using storage virtrdf:DefaultQuadStorage }; sparql alter quad storage virtrdf:SyncToQuads { create virtrdf:SysUsers using storage virtrdf:sys }; sparql alter quad storage virtrdf:SyncToQuads { create virtrdf:SysUsers-p using storage virtrdf:sys }; @@ -695,13 +747,13 @@ create procedure codegen_for_table (in tbl varchar) for (ctr := 0; ctr <= 4; ctr := ctr+1 ) { outs[ctr] := sparql_rdb2rdf_codegen (tbl, ctr); --- if (__tag of vector = __tag (outs[ctr])) --- { --- string_to_file (sprintf ('outputs/Rdb2Rdf.%s.%d.sql', tbl, ctr), string_output_string (outs[ctr][0]) || '\n;\n', -2); --- string_to_file (sprintf ('outputs/Rdb2Rdf.%s.%dp.sql', tbl, ctr), string_output_string (outs[ctr][1]) || '\n;\n', -2); --- } --- else --- string_to_file (sprintf ('outputs/Rdb2Rdf.%s.%d.sql', tbl, ctr), string_output_string (outs[ctr]) || '\n;\n', -2); + if (__tag of vector = __tag (outs[ctr])) + { + string_to_file (sprintf ('Rdb2Rdf.%s.%d.sql', tbl, ctr), string_output_string (outs[ctr][0]) || '\n;\n', -2); + string_to_file (sprintf ('Rdb2Rdf.%s.%dp.sql', tbl, ctr), string_output_string (outs[ctr][1]) || '\n;\n', -2); + } + else + string_to_file (sprintf ('Rdb2Rdf.%s.%d.sql', tbl, ctr), string_output_string (outs[ctr]) || '\n;\n', -2); } for (ctr := 1; ctr <= 4; ctr := ctr+1 ) { @@ -712,13 +764,13 @@ create procedure codegen_for_table (in tbl varchar) exec (string_output_string (outs[ctr][0]), stat, msg); if ('00000' <> stat) signal (stat, sprintf ('codegen_for_table, ctr %d, 1/2', ctr) || msg); --- string_to_file (sprintf ('outputs/Rdb2Rdf.%s.%d.sql', tbl, ctr), '\n-----8<----- ' || stat || ' ' || msg, -1); + string_to_file (sprintf ('Rdb2Rdf.%s.%d.sql', tbl, ctr), '\n-----8<----- ' || stat || ' ' || msg, -1); stat := '00000'; msg := ''; exec (string_output_string (outs[ctr][1]), stat, msg); if ('00000' <> stat) signal (stat, sprintf ('codegen_for_table, ctr %d, 2/2', ctr) || msg); --- string_to_file (sprintf ('outputs/Rdb2Rdf.%s.%dp.sql', tbl, ctr), '\n-----8<----- ' || stat || ' ' || msg, -1); + string_to_file (sprintf ('Rdb2Rdf.%s.%dp.sql', tbl, ctr), '\n-----8<----- ' || stat || ' ' || msg, -1); } else { @@ -727,7 +779,7 @@ create procedure codegen_for_table (in tbl varchar) exec (string_output_string (outs[ctr]), stat, msg); if ('00000' <> stat) signal (stat, sprintf ('codegen_for_table, ctr %d, 1/1', ctr) || msg); --- string_to_file (sprintf ('outputs/Rdb2Rdf.%s.%d.sql', tbl, ctr), '\n-----8<----- ' || stat || ' ' || msg, -1); + string_to_file (sprintf ('Rdb2Rdf.%s.%d.sql', tbl, ctr), '\n-----8<----- ' || stat || ' ' || msg, -1); } } } @@ -736,13 +788,13 @@ create procedure codegen_for_table (in tbl varchar) codegen_for_table ('DB.DBA.ZYZ_USERS'); codegen_for_table ('DB.DBA.ZYZ_ROLE_GRANTS'); -sparql clear graph ; -DB.DBA.RDF_OBJ_FT_RULE_ADD ('http://sys', null, 'Rdb2Rdf.sql'); -DB.DBA.RDF_OBJ_FT_RULE_ADD ('http://sys/user?id=5', null, 'Rdb2Rdf.sql'); -DB.DBA.RDF_OBJ_FT_RULE_ADD ('http://sys/user?id=1001', null, 'Rdb2Rdf.sql'); -DB.DBA.RDF_OBJ_FT_RULE_ADD ('http://sys/user?id=1002', null, 'Rdb2Rdf.sql'); -DB.DBA."RDB2RDF_FILL__DB~DBA~ZYZ_USERS" (1); -DB.DBA."RDB2RDF_FILL__DB~DBA~ZYZ_ROLE_GRANTS" (1); +sparql clear graph ; +DB.DBA.RDF_OBJ_FT_RULE_ADD ('http://trepl_rdf/sys', null, 'Rdb2Rdf.sql'); +DB.DBA.RDF_OBJ_FT_RULE_ADD ('http://trepl_rdf/sys/user?id=5', null, 'Rdb2Rdf.sql'); +DB.DBA.RDF_OBJ_FT_RULE_ADD ('http://trepl_rdf/sys/user?id=1001', null, 'Rdb2Rdf.sql'); +DB.DBA.RDF_OBJ_FT_RULE_ADD ('http://trepl_rdf/sys/user?id=1002', null, 'Rdb2Rdf.sql'); +DB.DBA."RDB2RDF_FILL__DB~DBA~ZYZ_USERS" (3); +DB.DBA."RDB2RDF_FILL__DB~DBA~ZYZ_ROLE_GRANTS" (3); insert into ZYZ_USERS (U_ID, U_NAME) values (1001, 'u1001'); @@ -751,25 +803,25 @@ insert into ZYZ_USERS (U_ID, U_NAME) values (1003, 'u1003'); insert into ZYZ_USERS (U_ID, U_NAME) values (1011, 'u1011'); insert into ZYZ_USERS (U_ID, U_NAME) values (1012, 'u1012'); insert into ZYZ_USERS (U_ID, U_NAME) values (1013, 'u1013'); -sparql describe ; +sparql describe ; DB.DBA.VT_INC_INDEX_DB_DBA_RDF_OBJ(); -sparql select * from where { ?s ?p ?o . ?o bif:contains "Administrator" } ; -sparql describe ?s from where { ?s ?p ?o . ?o bif:contains "Administrator" }; -sparql select * from where { ?s ?p ?o . ?o bif:contains "nobody" } ; -sparql describe ?s from where { ?s ?p ?o . ?o bif:contains "nobody" }; ---update ZYZ_USERS set U_FULL_NAME = replace (U_FULL_NAME, 'Administrator', 'Adm') where U_FULL_NAME like '%Administrator%'; +sparql select * from where { ?s ?p ?o . ?o bif:contains "Administrator" } ; +sparql describe ?s from where { ?s ?p ?o . ?o bif:contains "Administrator" }; +sparql select * from where { ?s ?p ?o . ?o bif:contains "nobody" } ; +sparql describe ?s from where { ?s ?p ?o . ?o bif:contains "nobody" }; +update ZYZ_USERS set U_FULL_NAME = replace (U_FULL_NAME, 'Administrator', 'Adm') where U_FULL_NAME like '%Administrator%'; DB.DBA.VT_INC_INDEX_DB_DBA_RDF_OBJ(); -sparql select * from where { ?s ?p ?o . ?o bif:contains "Administrator" } ; -sparql select * from where { ?s ?p ?o . ?o bif:contains "Adm" } ; - ---update ZYZ_USERS set U_E_MAIL='u1001@qq' where U_ID=1001; ---update ZYZ_USERS set U_E_MAIL='u1002@qq' where U_ID=1002; ---update ZYZ_USERS set U_E_MAIL='u1011@qq' where U_ID=1011; ---update ZYZ_USERS set U_E_MAIL='u1012@qq' where U_ID=1012; ---update ZYZ_USERS set U_NAME='u1003_new' where U_ID=1003; ---update ZYZ_USERS set U_NAME='u1013_new' where U_ID=1013; ---delete from ZYZ_USERS where U_ID=1002; ---delete from ZYZ_USERS where U_ID=1012; +sparql select * from where { ?s ?p ?o . ?o bif:contains "Administrator" } ; +sparql select * from where { ?s ?p ?o . ?o bif:contains "Adm" } ; + +update ZYZ_USERS set U_E_MAIL='u1001@qq' where U_ID=1001; +update ZYZ_USERS set U_E_MAIL='u1002@qq' where U_ID=1002; +update ZYZ_USERS set U_E_MAIL='u1011@qq' where U_ID=1011; +update ZYZ_USERS set U_E_MAIL='u1012@qq' where U_ID=1012; +update ZYZ_USERS set U_NAME='u1003_new' where U_ID=1003; +update ZYZ_USERS set U_NAME='u1013_new' where U_ID=1013; +delete from ZYZ_USERS where U_ID=1002; +delete from ZYZ_USERS where U_ID=1012; select top 5 __ro2sq("mapg"), __ro2sq("maps"), __ro2sq("mapp"), __ro2sq("mapo") from (sparql define output:valmode "LONG" define input:storage virtrdf:sys select * where { graph ?mapg { ?maps ?mapp ?mapo }}) as map @@ -777,59 +829,71 @@ where not exists (sparql select (1) where { graph ?:mapg { ?:maps ?:mapp ?:mapo ; select top 5 __ro2sq("phys"), __ro2sq("phyp"), __ro2sq("phyo") -from (sparql define output:valmode "LONG" select * from where { ?phys ?phyp ?phyo }) as phy -where not exists (sparql define input:storage virtrdf:sys select (1) from where { ?:phys ?:phyp ?:phyo }) +from (sparql define output:valmode "LONG" select * from where { ?phys ?phyp ?phyo }) as phy +where not exists (sparql define input:storage virtrdf:sys select (1) from where { ?:phys ?:phyp ?:phyo }) ; select top 5 __ro2sq("phys"), __ro2sq("phyp"), __ro2sq("phyo") -from (sparql define output:valmode "LONG" select * from where { ?phys ?phyp ?phyo }) as phy -where not exists (sparql define input:storage virtrdf:sys select (1) from where { ?:phys ?:phyp ?:phyo }) +from (sparql define output:valmode "LONG" select * from where { ?phys ?phyp ?phyo }) as phy +where not exists (sparql define input:storage virtrdf:sys select (1) from where { ?:phys ?:phyp ?:phyo }) ; select top 5 __ro2sq("phys"), __ro2sq("phyp"), __ro2sq("phyo") -from (sparql define output:valmode "LONG" select * from where { ?phys ?phyp ?phyo }) as phy -where not exists (sparql define input:storage virtrdf:sys select (1) from where { ?ms ?mp ?mo . filter (str(?ms) = str(?:phys) && str(?mp) = str(?:phyp) && str(?mo) = str(?:phyo)) }) +from (sparql define output:valmode "LONG" select * from where { ?phys ?phyp ?phyo }) as phy +where not exists (sparql define input:storage virtrdf:sys select (1) from where { ?ms ?mp ?mo . filter (str(?ms) = str(?:phys) && str(?mp) = str(?:phyp) && str(?mo) = str(?:phyo)) }) ; select top 5 __ro2sq("phys"), __ro2sq("phyp"), __ro2sq("phyo") -from (sparql define output:valmode "LONG" select * from where { ?phys ?phyp ?phyo }) as phy -where not exists (sparql define input:storage virtrdf:sys select (1) from where { ?ms ?mp ?mo . filter (str(?ms) = str(?:phys) && str(?mp) = str(?:phyp) && str(?mo) = str(?:phyo)) }) +from (sparql define output:valmode "LONG" select * from where { ?phys ?phyp ?phyo }) as phy +where not exists (sparql define input:storage virtrdf:sys select (1) from where { ?ms ?mp ?mo . filter (str(?ms) = str(?:phys) && str(?mp) = str(?:phyp) && str(?mo) = str(?:phyo)) }) ; -sparql clear graph ; -sparql define input:storage virtrdf:sys insert in { ?maps ?mapp ?mapo } where { ?maps ?mapp ?mapo } +sparql clear graph ; +sparql define input:storage virtrdf:sys insert in { ?maps ?mapp ?mapo } where { ?maps ?mapp ?mapo } ; -sparql select ?s ?p ?o where { graph { ?s ?p ?o } optional { graph { ?s2 ?p ?o . filter (?s2 = ?s0) } } . filter (!bound(?s2)) }; -sparql select ?s ?p ?o where { graph { ?s ?p ?o } optional { graph { ?s2 ?p ?o . filter (?s2 = ?s0) } } . filter (!bound(?s2)) }; +sparql select ?s ?p ?o where { graph { ?s ?p ?o } optional { graph { ?s2 ?p ?o . filter (?s2 = ?s0) } } . filter (!bound(?s2)) }; +sparql select ?s ?p ?o where { graph { ?s ?p ?o } optional { graph { ?s2 ?p ?o . filter (?s2 = ?s0) } } . filter (!bound(?s2)) }; -sparql select (count(1)) from where { ?s ?p ?o }; +sparql select (count(1)) from where { ?s ?p ?o }; -ECHO BOTH $IF $EQU $LAST[1] 169 "PASSED" "***FAILED"; -ECHO BOTH ": " $LAST[1] " triples in http://sys on publisher after all rdb2rdf operations\n"; +ECHO BOTH $IF $EQU $LAST[1] 157 "PASSED" "***FAILED"; +ECHO BOTH ": " $LAST[1] " returned, expected: 157 triples in http://trepl_rdf/sys on publisher after all rdb2rdf operations\n"; -sparql select (count(1)) from where { ?s ?p ?o }; +sparql select (count(1)) from where { ?s ?p ?o }; ECHO BOTH $IF $EQU $LAST[1] 4 "PASSED" "***FAILED"; -ECHO BOTH ": " $LAST[1] " triples in http://sys/user?id=5 on publisher after all all rdb2rdf operations\n"; +ECHO BOTH ": " $LAST[1] " returned, expected: 4 triples in default http://trepl_rdf/sys/user?id=5 on publisher after all rdb2rdf operations\n"; + +sparql select (count(1)) where { graph { ?s ?p ?o }}; + +ECHO BOTH $IF $EQU $LAST[1] 4 "PASSED" "***FAILED"; +ECHO BOTH ": " $LAST[1] " returned, expected: 4 triples in named http://trepl_rdf/sys/user?id=5 on publisher after all rdb2rdf operations\n"; checkpoint; -- SUBSCRIBER set DSN=$U{ds2}; reconnect; -ECHO BOTH "----- Reconnected to SUBSCRIBER " $U{ds2}", will sync chd check what hsa been made by replication inside RDB2RDF triggers\n"; +ECHO BOTH "----- Reconnected to SUBSCRIBER " $U{ds2}", will sync and check what has been made by replication inside RDB2RDF triggers\n"; commit work; DB.DBA.RDF_REPL_SYNC ('trepl_rdf_1', 'dba', 'dba'); -sparql select (count(1)) from where { ?s ?p ?o }; +status('r'); + +sparql select (count(1)) from where { ?s ?p ?o }; + +ECHO BOTH $IF $EQU $LAST[1] 175 "PASSED" "***FAILED"; +ECHO BOTH ": " $LAST[1] " returned, expected: 175 triples in http://trepl_rdf/sys on subscriber after all rdb2rdf operations\n"; -ECHO BOTH $IF $EQU $LAST[1] 169 "PASSED" "***FAILED"; -ECHO BOTH ": " $LAST[1] " triples in http://sys on subscriber after all rdb2rdf operations\n"; +sparql select (count(1)) from where { ?s ?p ?o }; + +ECHO BOTH $IF $EQU $LAST[1] 4 "PASSED" "***FAILED"; +ECHO BOTH ": " $LAST[1] " returned, expected: 4 triples in default http://trepl_rdf/sys/user?id=5 on subscriber after all rdb2rdf operations\n"; -sparql select (count(1)) from where { ?s ?p ?o }; +sparql select (count(1)) where { graph { ?s ?p ?o }}; ECHO BOTH $IF $EQU $LAST[1] 4 "PASSED" "***FAILED"; -ECHO BOTH ": " $LAST[1] " triples in http://sys/user?id=5 on subscriber after all all rdb2rdf operations\n"; +ECHO BOTH ": " $LAST[1] " returned, expected: 4 triples in named http://trepl_rdf/sys/user?id=5 on subscriber after all rdb2rdf operations\n"; diff --git a/binsrc/tests/suite/trepl_t1.sql b/binsrc/tests/suite/trepl_t1.sql index 9df5041062..fe690580da 100644 --- a/binsrc/tests/suite/trepl_t1.sql +++ b/binsrc/tests/suite/trepl_t1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/treplh.sh b/binsrc/tests/suite/treplh.sh index 298e190ac9..0fcb076fc7 100755 --- a/binsrc/tests/suite/treplh.sh +++ b/binsrc/tests/suite/treplh.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tschema1.sql b/binsrc/tests/suite/tschema1.sql index 7147dea094..17f0d5a138 100644 --- a/binsrc/tests/suite/tschema1.sql +++ b/binsrc/tests/suite/tschema1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tschema2.sql b/binsrc/tests/suite/tschema2.sql index 5b1c64b97f..bfbffa5438 100644 --- a/binsrc/tests/suite/tschema2.sql +++ b/binsrc/tests/suite/tschema2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tschema3.sql b/binsrc/tests/suite/tschema3.sql index abcb437798..db1b92557e 100644 --- a/binsrc/tests/suite/tschema3.sql +++ b/binsrc/tests/suite/tschema3.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tschema4.sql b/binsrc/tests/suite/tschema4.sql index ceac58c77b..e48dde9579 100644 --- a/binsrc/tests/suite/tschema4.sql +++ b/binsrc/tests/suite/tschema4.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsec.sh b/binsrc/tests/suite/tsec.sh index 32a4aefb3f..82da938c67 100755 --- a/binsrc/tests/suite/tsec.sh +++ b/binsrc/tests/suite/tsec.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsec_proc.sql b/binsrc/tests/suite/tsec_proc.sql index 217027791b..5b3fb86e16 100644 --- a/binsrc/tests/suite/tsec_proc.sql +++ b/binsrc/tests/suite/tsec_proc.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsec_role.sql b/binsrc/tests/suite/tsec_role.sql index 066420129b..43ba7616fb 100644 --- a/binsrc/tests/suite/tsec_role.sql +++ b/binsrc/tests/suite/tsec_role.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsec_role1.sql b/binsrc/tests/suite/tsec_role1.sql index dd76b7d439..58385a12e6 100644 --- a/binsrc/tests/suite/tsec_role1.sql +++ b/binsrc/tests/suite/tsec_role1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsec_role2.sql b/binsrc/tests/suite/tsec_role2.sql index 4728a82cf3..0fa3e9154a 100644 --- a/binsrc/tests/suite/tsec_role2.sql +++ b/binsrc/tests/suite/tsec_role2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsecend.sql b/binsrc/tests/suite/tsecend.sql index 17fc33bee5..513e59bb19 100644 --- a/binsrc/tests/suite/tsecend.sql +++ b/binsrc/tests/suite/tsecend.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsecini-1.sql b/binsrc/tests/suite/tsecini-1.sql index 2f5f4005fa..fbd4ea64ee 100644 --- a/binsrc/tests/suite/tsecini-1.sql +++ b/binsrc/tests/suite/tsecini-1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsecini.sql b/binsrc/tests/suite/tsecini.sql index 5f3897907c..613afbdb64 100644 --- a/binsrc/tests/suite/tsecini.sql +++ b/binsrc/tests/suite/tsecini.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsecu1-1.sql b/binsrc/tests/suite/tsecu1-1.sql index 8c147359fd..e4187dfbed 100644 --- a/binsrc/tests/suite/tsecu1-1.sql +++ b/binsrc/tests/suite/tsecu1-1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsecu1-2.sql b/binsrc/tests/suite/tsecu1-2.sql index 23c103fab6..1111b18cbc 100644 --- a/binsrc/tests/suite/tsecu1-2.sql +++ b/binsrc/tests/suite/tsecu1-2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsecu3-1.sql b/binsrc/tests/suite/tsecu3-1.sql index 0f2e5f004b..f156c56dd6 100644 --- a/binsrc/tests/suite/tsecu3-1.sql +++ b/binsrc/tests/suite/tsecu3-1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsecu3-2.sql b/binsrc/tests/suite/tsecu3-2.sql index 9232d130d1..8c06e81965 100644 --- a/binsrc/tests/suite/tsecu3-2.sql +++ b/binsrc/tests/suite/tsecu3-2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsecu5-1.sql b/binsrc/tests/suite/tsecu5-1.sql index f36f741107..55d07b21c5 100644 --- a/binsrc/tests/suite/tsecu5-1.sql +++ b/binsrc/tests/suite/tsecu5-1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsnaprepl.sql b/binsrc/tests/suite/tsnaprepl.sql index 4b1dd32f78..04e680929f 100644 --- a/binsrc/tests/suite/tsnaprepl.sql +++ b/binsrc/tests/suite/tsnaprepl.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsoap.sql b/binsrc/tests/suite/tsoap.sql index 36baa2c3a8..724255b10e 100644 --- a/binsrc/tests/suite/tsoap.sql +++ b/binsrc/tests/suite/tsoap.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsoap12.sh b/binsrc/tests/suite/tsoap12.sh index 43c5336a40..e978e1d01c 100755 --- a/binsrc/tests/suite/tsoap12.sh +++ b/binsrc/tests/suite/tsoap12.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsoap_new.sql b/binsrc/tests/suite/tsoap_new.sql index 7ffca4e2e7..4038855835 100644 --- a/binsrc/tests/suite/tsoap_new.sql +++ b/binsrc/tests/suite/tsoap_new.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsoap_r3.sql b/binsrc/tests/suite/tsoap_r3.sql index 2bc07bf38f..f635be0694 100644 --- a/binsrc/tests/suite/tsoap_r3.sql +++ b/binsrc/tests/suite/tsoap_r3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsoap_r4.sql b/binsrc/tests/suite/tsoap_r4.sql index abb348b839..ec5719df85 100644 --- a/binsrc/tests/suite/tsoap_r4.sql +++ b/binsrc/tests/suite/tsoap_r4.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsoap_rpc.sql b/binsrc/tests/suite/tsoap_rpc.sql index 345bce12e7..51d0952097 100644 --- a/binsrc/tests/suite/tsoap_rpc.sql +++ b/binsrc/tests/suite/tsoap_rpc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsoapcpl.sql b/binsrc/tests/suite/tsoapcpl.sql index 312808bb5a..a7c852002a 100644 --- a/binsrc/tests/suite/tsoapcpl.sql +++ b/binsrc/tests/suite/tsoapcpl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsoapudt.sql b/binsrc/tests/suite/tsoapudt.sql index 6bf0026cda..8fc18a7954 100644 --- a/binsrc/tests/suite/tsoapudt.sql +++ b/binsrc/tests/suite/tsoapudt.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsparql_acid.sql b/binsrc/tests/suite/tsparql_acid.sql index 217bc0d66b..11cebaba59 100644 --- a/binsrc/tests/suite/tsparql_acid.sql +++ b/binsrc/tests/suite/tsparql_acid.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsponge.sql b/binsrc/tests/suite/tsponge.sql index f5173fbd1a..923996ea0a 100644 --- a/binsrc/tests/suite/tsponge.sql +++ b/binsrc/tests/suite/tsponge.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tspotlight.sql b/binsrc/tests/suite/tspotlight.sql index eccb7ede5b..a1a8e43eef 100644 --- a/binsrc/tests/suite/tspotlight.sql +++ b/binsrc/tests/suite/tspotlight.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -59,7 +59,7 @@ create procedure check_res (in dav_path varchar, in _what varchar) return 0; } -select check_res ('/DAV/u1/Image.jpg', 'JPEG image'); +select check_res ('/DAV/u1/Image.jpg', 'JPEG Image'); ECHO BOTH $IF $EQU $LAST[1] 1 "PASSED" "***FAILED"; SET ARGV[$LIF] $+ $ARGV[$LIF] 1; ECHO BOTH ": /DAV/u1/Image.jpg : JPEG Image $LAST[1]=" $LAST[1] " MESSAGE=" $MESSAGE "\n"; diff --git a/binsrc/tests/suite/tsql.sh b/binsrc/tests/suite/tsql.sh index 6da4199056..09a15526aa 100755 --- a/binsrc/tests/suite/tsql.sh +++ b/binsrc/tests/suite/tsql.sh @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsql2.sh b/binsrc/tests/suite/tsql2.sh index 0fe93a4a9e..0f7e15dbf2 100755 --- a/binsrc/tests/suite/tsql2.sh +++ b/binsrc/tests/suite/tsql2.sh @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -27,6 +27,7 @@ SCROLL=${SCROLL-$VIRTUOSO_TEST/../scroll} GETDATA=${GETDATA-$VIRTUOSO_TEST/../getdata} +BLOBS=${BLOBS-$VIRTUOSO_TEST/../blobs} LOGFILE=tsql2.output export LOGFILE . $VIRTUOSO_TEST/testlib.sh @@ -87,7 +88,7 @@ then exit 1 fi -$VIRTUOSO_TEST/../blobs $PORT +$BLOBS $PORT >> $LOGFILE LOG + running sql script terror RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < $VIRTUOSO_TEST/terror.sql diff --git a/binsrc/tests/suite/tsql3.sh b/binsrc/tests/suite/tsql3.sh index d689d03ada..0693af99d1 100755 --- a/binsrc/tests/suite/tsql3.sh +++ b/binsrc/tests/suite/tsql3.sh @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -244,6 +244,16 @@ then fi +LOG + running sql script tclforvec +RUN $ISQL $DSN PROMPT=OFF VERBOSE=OFF ERRORS=STDOUT < $VIRTUOSO_TEST/tclforvec.sql +if test $STATUS -ne 0 +then + LOG "***ABORTED: -- tclforvec.sql" + exit 1 +fi + + + # suite for bug #1092 - commented out for now if [ "x$SQLOPTIMIZE" = "x" ] diff --git a/binsrc/tests/suite/tsqllite.sh b/binsrc/tests/suite/tsqllite.sh index c73e7182b5..c75406b24b 100755 --- a/binsrc/tests/suite/tsqllite.sh +++ b/binsrc/tests/suite/tsqllite.sh @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsqlo.sh b/binsrc/tests/suite/tsqlo.sh index ab6e079c97..f292b69fc5 100755 --- a/binsrc/tests/suite/tsqlo.sh +++ b/binsrc/tests/suite/tsqlo.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsqlo2.sql b/binsrc/tests/suite/tsqlo2.sql index 91f4626d49..ce246aaa81 100644 --- a/binsrc/tests/suite/tsqlo2.sql +++ b/binsrc/tests/suite/tsqlo2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tstriping.sh b/binsrc/tests/suite/tstriping.sh index e5ed6e8466..5b66bd13f6 100755 --- a/binsrc/tests/suite/tstriping.sh +++ b/binsrc/tests/suite/tstriping.sh @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tstrses.sql b/binsrc/tests/suite/tstrses.sql index 27f7a1d18c..31d3d5398e 100644 --- a/binsrc/tests/suite/tstrses.sql +++ b/binsrc/tests/suite/tstrses.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsxml.sh b/binsrc/tests/suite/tsxml.sh index 270409749e..fc154ca3fc 100755 --- a/binsrc/tests/suite/tsxml.sh +++ b/binsrc/tests/suite/tsxml.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsxml.sql b/binsrc/tests/suite/tsxml.sql index af88e5deae..65182e58c6 100644 --- a/binsrc/tests/suite/tsxml.sql +++ b/binsrc/tests/suite/tsxml.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tsyncml.sql b/binsrc/tests/suite/tsyncml.sql index 5c5c8e7cac..dae451a088 100644 --- a/binsrc/tests/suite/tsyncml.sql +++ b/binsrc/tests/suite/tsyncml.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttext.sql b/binsrc/tests/suite/ttext.sql index ae5d35bb70..5dbe73baea 100644 --- a/binsrc/tests/suite/ttext.sql +++ b/binsrc/tests/suite/ttext.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttext_qual_hf.sql b/binsrc/tests/suite/ttext_qual_hf.sql index 703b763b0c..eb679ced1d 100644 --- a/binsrc/tests/suite/ttext_qual_hf.sql +++ b/binsrc/tests/suite/ttext_qual_hf.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttpch-load-check.sql b/binsrc/tests/suite/ttpch-load-check.sql index 6a74954a22..3640febd59 100644 --- a/binsrc/tests/suite/ttpch-load-check.sql +++ b/binsrc/tests/suite/ttpch-load-check.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttpch-load.sql b/binsrc/tests/suite/ttpch-load.sql index 9cd7a84f5f..44514b5b4b 100644 --- a/binsrc/tests/suite/ttpch-load.sql +++ b/binsrc/tests/suite/ttpch-load.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttpch.sh b/binsrc/tests/suite/ttpch.sh index 7401978687..4a1c4950dd 100755 --- a/binsrc/tests/suite/ttpch.sh +++ b/binsrc/tests/suite/ttpch.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttrans.sql b/binsrc/tests/suite/ttrans.sql index 80dfd50c1c..1ca7a7d7d1 100644 --- a/binsrc/tests/suite/ttrans.sql +++ b/binsrc/tests/suite/ttrans.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttrans1.sql b/binsrc/tests/suite/ttrans1.sql index a92a9349f8..811d302979 100644 --- a/binsrc/tests/suite/ttrans1.sql +++ b/binsrc/tests/suite/ttrans1.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttrans2.sql b/binsrc/tests/suite/ttrans2.sql index 8af046a5e2..80d6112b3a 100644 --- a/binsrc/tests/suite/ttrans2.sql +++ b/binsrc/tests/suite/ttrans2.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttrig1.sql b/binsrc/tests/suite/ttrig1.sql index 95c58c7969..a121deed6b 100644 --- a/binsrc/tests/suite/ttrig1.sql +++ b/binsrc/tests/suite/ttrig1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttrig2.sql b/binsrc/tests/suite/ttrig2.sql index fd7013985f..61b22e3722 100644 --- a/binsrc/tests/suite/ttrig2.sql +++ b/binsrc/tests/suite/ttrig2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttrigr.sql b/binsrc/tests/suite/ttrigr.sql index 1a728de88b..886a259bef 100644 --- a/binsrc/tests/suite/ttrigr.sql +++ b/binsrc/tests/suite/ttrigr.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttrigt.sql b/binsrc/tests/suite/ttrigt.sql index e0ce267564..a367dbf5c6 100644 --- a/binsrc/tests/suite/ttrigt.sql +++ b/binsrc/tests/suite/ttrigt.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttrigtrig.sql b/binsrc/tests/suite/ttrigtrig.sql index cba6f55aa2..d909976b56 100644 --- a/binsrc/tests/suite/ttrigtrig.sql +++ b/binsrc/tests/suite/ttrigtrig.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/ttutorial.sh b/binsrc/tests/suite/ttutorial.sh index e7e6e1428c..2c964a00d2 100755 --- a/binsrc/tests/suite/ttutorial.sh +++ b/binsrc/tests/suite/ttutorial.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tunder1.sql b/binsrc/tests/suite/tunder1.sql index 615ae44058..dbec108107 100644 --- a/binsrc/tests/suite/tunder1.sql +++ b/binsrc/tests/suite/tunder1.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tunder2.sql b/binsrc/tests/suite/tunder2.sql index b497afb51f..06da0a16de 100644 --- a/binsrc/tests/suite/tunder2.sql +++ b/binsrc/tests/suite/tunder2.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tunq.sql b/binsrc/tests/suite/tunq.sql index d0c6c2cb10..51ef22640e 100644 --- a/binsrc/tests/suite/tunq.sql +++ b/binsrc/tests/suite/tunq.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tupdate.sql b/binsrc/tests/suite/tupdate.sql index 639a13c5ba..7efb5e4496 100644 --- a/binsrc/tests/suite/tupdate.sql +++ b/binsrc/tests/suite/tupdate.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tupdg.sql b/binsrc/tests/suite/tupdg.sql index da42c10dc4..8e228dfba1 100644 --- a/binsrc/tests/suite/tupdg.sql +++ b/binsrc/tests/suite/tupdg.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tupgrade_recov.sh b/binsrc/tests/suite/tupgrade_recov.sh index 51459545b8..bc1e181b34 100755 --- a/binsrc/tests/suite/tupgrade_recov.sh +++ b/binsrc/tests/suite/tupgrade_recov.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tvad.sh b/binsrc/tests/suite/tvad.sh index 3bcddaeb6e..5b6da15698 100755 --- a/binsrc/tests/suite/tvad.sh +++ b/binsrc/tests/suite/tvad.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -96,7 +96,7 @@ GenVAD1 () - + @@ -135,7 +135,7 @@ GenVAD2 () - + @@ -172,7 +172,7 @@ GenVAD3 () - + @@ -208,7 +208,7 @@ GenVAD4 () - + diff --git a/binsrc/tests/suite/tvad2.sh b/binsrc/tests/suite/tvad2.sh index 6f5588dd8a..27d3735398 100755 --- a/binsrc/tests/suite/tvad2.sh +++ b/binsrc/tests/suite/tvad2.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tvec.sql b/binsrc/tests/suite/tvec.sql index 6a932bec0b..7aa00196c8 100644 --- a/binsrc/tests/suite/tvec.sql +++ b/binsrc/tests/suite/tvec.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tveccli.sql b/binsrc/tests/suite/tveccli.sql index c14d6c9a40..fd5d8cbb0e 100644 --- a/binsrc/tests/suite/tveccli.sql +++ b/binsrc/tests/suite/tveccli.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tview.sql b/binsrc/tests/suite/tview.sql index c7e50d283a..57b41333b2 100644 --- a/binsrc/tests/suite/tview.sql +++ b/binsrc/tests/suite/tview.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tviewqual.sql b/binsrc/tests/suite/tviewqual.sql index 3e3c787c7a..2983b65c3f 100644 --- a/binsrc/tests/suite/tviewqual.sql +++ b/binsrc/tests/suite/tviewqual.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tvsp.sh b/binsrc/tests/suite/tvsp.sh index 6df16250a5..e6249a8526 100755 --- a/binsrc/tests/suite/tvsp.sh +++ b/binsrc/tests/suite/tvsp.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tvsp.sql b/binsrc/tests/suite/tvsp.sql index 5b08dbe29b..33a855b80e 100644 --- a/binsrc/tests/suite/tvsp.sql +++ b/binsrc/tests/suite/tvsp.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tvspx.sh b/binsrc/tests/suite/tvspx.sh index 27f96306a6..b07e0927ee 100755 --- a/binsrc/tests/suite/tvspx.sh +++ b/binsrc/tests/suite/tvspx.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tvspxex.awk b/binsrc/tests/suite/tvspxex.awk index d11f03ae5b..87c00eb53f 100644 --- a/binsrc/tests/suite/tvspxex.awk +++ b/binsrc/tests/suite/tvspxex.awk @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/tvspxex.sh b/binsrc/tests/suite/tvspxex.sh index b7b9c847c4..12faeb4f81 100755 --- a/binsrc/tests/suite/tvspxex.sh +++ b/binsrc/tests/suite/tvspxex.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/twcopy.sh b/binsrc/tests/suite/twcopy.sh index 40f4631fc9..4d83e0aae4 100755 --- a/binsrc/tests/suite/twcopy.sh +++ b/binsrc/tests/suite/twcopy.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/twcopy.sql b/binsrc/tests/suite/twcopy.sql index 1da8911c71..ed8d228971 100644 --- a/binsrc/tests/suite/twcopy.sql +++ b/binsrc/tests/suite/twcopy.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/twiki.sh b/binsrc/tests/suite/twiki.sh index 1b12f1d06a..d48d82bebf 100755 --- a/binsrc/tests/suite/twiki.sh +++ b/binsrc/tests/suite/twiki.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/twiki.sql b/binsrc/tests/suite/twiki.sql index dee1ed10d9..71ca5e5f78 100644 --- a/binsrc/tests/suite/twiki.sql +++ b/binsrc/tests/suite/twiki.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/twiki_proc.sql b/binsrc/tests/suite/twiki_proc.sql index 264db7c141..d1d345a6f8 100644 --- a/binsrc/tests/suite/twiki_proc.sql +++ b/binsrc/tests/suite/twiki_proc.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/twords.sql b/binsrc/tests/suite/twords.sql index c0bdeac702..59e9bff38e 100644 --- a/binsrc/tests/suite/twords.sql +++ b/binsrc/tests/suite/twords.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/twsrm.sql b/binsrc/tests/suite/twsrm.sql index 7745ccd74c..0dad61a1ba 100644 --- a/binsrc/tests/suite/twsrm.sql +++ b/binsrc/tests/suite/twsrm.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/twsrp.sql b/binsrc/tests/suite/twsrp.sql index 2b661ab406..367574ffec 100644 --- a/binsrc/tests/suite/twsrp.sql +++ b/binsrc/tests/suite/twsrp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/twss.sql b/binsrc/tests/suite/twss.sql index be69378160..92309a7a62 100644 --- a/binsrc/tests/suite/twss.sql +++ b/binsrc/tests/suite/twss.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/twstr.sql b/binsrc/tests/suite/twstr.sql index 2e9fddf8c9..88fec0a419 100644 --- a/binsrc/tests/suite/twstr.sql +++ b/binsrc/tests/suite/twstr.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/txml.sql b/binsrc/tests/suite/txml.sql index d08dfef135..d24a82f820 100644 --- a/binsrc/tests/suite/txml.sql +++ b/binsrc/tests/suite/txml.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/txmla.sql b/binsrc/tests/suite/txmla.sql index 29a6d8cf4a..35013ff769 100644 --- a/binsrc/tests/suite/txmla.sql +++ b/binsrc/tests/suite/txmla.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/txmla3.sql b/binsrc/tests/suite/txmla3.sql index 5b11ec502c..49ef240fc7 100644 --- a/binsrc/tests/suite/txmla3.sql +++ b/binsrc/tests/suite/txmla3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/txmlload.sql b/binsrc/tests/suite/txmlload.sql index a1cc67b5a3..4441e4c96c 100644 --- a/binsrc/tests/suite/txmlload.sql +++ b/binsrc/tests/suite/txmlload.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/txsl.sql b/binsrc/tests/suite/txsl.sql index 69194afb81..764c43263b 100644 --- a/binsrc/tests/suite/txsl.sql +++ b/binsrc/tests/suite/txsl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/txslt.sh b/binsrc/tests/suite/txslt.sh index d763a5900a..0ca3c07997 100755 --- a/binsrc/tests/suite/txslt.sh +++ b/binsrc/tests/suite/txslt.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/txslt.sql b/binsrc/tests/suite/txslt.sql index 66d4a62236..249ece4ec3 100644 --- a/binsrc/tests/suite/txslt.sql +++ b/binsrc/tests/suite/txslt.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/txslt1.sql b/binsrc/tests/suite/txslt1.sql index 330b48589c..4475747330 100644 --- a/binsrc/tests/suite/txslt1.sql +++ b/binsrc/tests/suite/txslt1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/txslt_funcext.sql b/binsrc/tests/suite/txslt_funcext.sql index 1db0de2285..e904a51df4 100644 --- a/binsrc/tests/suite/txslt_funcext.sql +++ b/binsrc/tests/suite/txslt_funcext.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/uaggr_test.sql b/binsrc/tests/suite/uaggr_test.sql index 0f36b0da91..13cfbfc998 100644 --- a/binsrc/tests/suite/uaggr_test.sql +++ b/binsrc/tests/suite/uaggr_test.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/udtsec.sql b/binsrc/tests/suite/udtsec.sql index 2adee7669e..41773b7e59 100644 --- a/binsrc/tests/suite/udtsec.sql +++ b/binsrc/tests/suite/udtsec.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/udttest.sql b/binsrc/tests/suite/udttest.sql index 33da675883..c2558fc683 100644 --- a/binsrc/tests/suite/udttest.sql +++ b/binsrc/tests/suite/udttest.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/udttest1.sql b/binsrc/tests/suite/udttest1.sql index 387a5b2920..f9383afe4d 100644 --- a/binsrc/tests/suite/udttest1.sql +++ b/binsrc/tests/suite/udttest1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/uri_test.sql b/binsrc/tests/suite/uri_test.sql index b8063c7723..081dfee26f 100644 --- a/binsrc/tests/suite/uri_test.sql +++ b/binsrc/tests/suite/uri_test.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/uri_wide_test.sql b/binsrc/tests/suite/uri_wide_test.sql index 3a41dd40c5..8423310381 100644 --- a/binsrc/tests/suite/uri_wide_test.sql +++ b/binsrc/tests/suite/uri_wide_test.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/url_rewrite_test.sql b/binsrc/tests/suite/url_rewrite_test.sql index c0dd823aa7..8099aec796 100644 --- a/binsrc/tests/suite/url_rewrite_test.sql +++ b/binsrc/tests/suite/url_rewrite_test.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/vad_test/vsp/vad_test1/1.vsp b/binsrc/tests/suite/vad_test/vsp/vad_test1/1.vsp index 9d95d8401c..ed61501353 100644 --- a/binsrc/tests/suite/vad_test/vsp/vad_test1/1.vsp +++ b/binsrc/tests/suite/vad_test/vsp/vad_test1/1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/vad_test/vsp/vad_test1/2.vsp b/binsrc/tests/suite/vad_test/vsp/vad_test1/2.vsp index a71a398186..b5e9808161 100644 --- a/binsrc/tests/suite/vad_test/vsp/vad_test1/2.vsp +++ b/binsrc/tests/suite/vad_test/vsp/vad_test1/2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/vad_test/vsp/vad_test1/test.sql b/binsrc/tests/suite/vad_test/vsp/vad_test1/test.sql index 76f5d41b92..8f356b766d 100644 --- a/binsrc/tests/suite/vad_test/vsp/vad_test1/test.sql +++ b/binsrc/tests/suite/vad_test/vsp/vad_test1/test.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/vad_test/vsp/vad_test2/1.vsp b/binsrc/tests/suite/vad_test/vsp/vad_test2/1.vsp index 9d95d8401c..ed61501353 100644 --- a/binsrc/tests/suite/vad_test/vsp/vad_test2/1.vsp +++ b/binsrc/tests/suite/vad_test/vsp/vad_test2/1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/vad_test/vsp/vad_test2/2.vsp b/binsrc/tests/suite/vad_test/vsp/vad_test2/2.vsp index a71a398186..b5e9808161 100644 --- a/binsrc/tests/suite/vad_test/vsp/vad_test2/2.vsp +++ b/binsrc/tests/suite/vad_test/vsp/vad_test2/2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/vad_test/vsp/vad_test2/test.sql b/binsrc/tests/suite/vad_test/vsp/vad_test2/test.sql index d88918439a..9b3a253310 100644 --- a/binsrc/tests/suite/vad_test/vsp/vad_test2/test.sql +++ b/binsrc/tests/suite/vad_test/vsp/vad_test2/test.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/vad_test1.xml b/binsrc/tests/suite/vad_test1.xml index 34e12d2532..bc55bbf010 100644 --- a/binsrc/tests/suite/vad_test1.xml +++ b/binsrc/tests/suite/vad_test1.xml @@ -5,7 +5,7 @@ - + diff --git a/binsrc/tests/suite/vad_test2.xml b/binsrc/tests/suite/vad_test2.xml index e5a5abc1bf..2ca08f8b88 100644 --- a/binsrc/tests/suite/vad_test2.xml +++ b/binsrc/tests/suite/vad_test2.xml @@ -5,7 +5,7 @@ - + diff --git a/binsrc/tests/suite/vecset.sql b/binsrc/tests/suite/vecset.sql index 3bb90fade7..4874407b03 100644 --- a/binsrc/tests/suite/vecset.sql +++ b/binsrc/tests/suite/vecset.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/vspsoap.vsp b/binsrc/tests/suite/vspsoap.vsp index 2641640b02..4fbcbd4942 100644 --- a/binsrc/tests/suite/vspsoap.vsp +++ b/binsrc/tests/suite/vspsoap.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/vspsoap_mod.vsp b/binsrc/tests/suite/vspsoap_mod.vsp index 169b599a38..b7930bfa78 100644 --- a/binsrc/tests/suite/vspsoap_mod.vsp +++ b/binsrc/tests/suite/vspsoap_mod.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/wsdl_suite.sql b/binsrc/tests/suite/wsdl_suite.sql index 8e2d4c97af..bb204ed20c 100644 --- a/binsrc/tests/suite/wsdl_suite.sql +++ b/binsrc/tests/suite/wsdl_suite.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/wtf.sh b/binsrc/tests/suite/wtf.sh index a616e69b4e..aa0ee9e04c 100755 --- a/binsrc/tests/suite/wtf.sh +++ b/binsrc/tests/suite/wtf.sh @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xhtml1-testcases.sql b/binsrc/tests/suite/xhtml1-testcases.sql index dcc315b3fb..93349bafdc 100644 --- a/binsrc/tests/suite/xhtml1-testcases.sql +++ b/binsrc/tests/suite/xhtml1-testcases.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xmlsql.sql b/binsrc/tests/suite/xmlsql.sql index 1ce2046a5f..ec44736026 100644 --- a/binsrc/tests/suite/xmlsql.sql +++ b/binsrc/tests/suite/xmlsql.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -19,11 +19,15 @@ -- with this program; if not, write to the Free Software Foundation, Inc., -- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -- --- -create procedure INSERT_RESOURCE (in _stmt varchar, in _name varchar, in _root varchar, in _sty varchar, in _refresh integer) + +create procedure INSERT_RESOURCE ( + in _stmt varchar, + in _name varchar, + in _root varchar, + in _sty varchar, + in _refresh integer) { - declare _col_id, _r_id integer; - declare ses any; + declare _ses any; declare _res varchar; _name := concat (_name, '.xml'); @@ -33,15 +37,16 @@ create procedure INSERT_RESOURCE (in _stmt varchar, in _name varchar, in _root v if (_refresh = -1) { - ses := ''; + _ses := ''; } else { - ses := string_output (); - xml_auto (_stmt, vector(), ses); - ses := string_output_string (); + _ses := string_output (); + xml_auto (_stmt, vector(), _ses); + _ses := string_output_string (); if (_root <> '') - ses := concat ('<', _root, '>\n', ses, '\n'); + _ses := concat ('<', _root, '>\n', _ses, '\n'); + if (_refresh > 0) insert replacing DB.DBA.SYS_SCHEDULED_EVENT (SE_NAME, SE_START, SE_SQL, SE_INTERVAL) values (_res, now (), sprintf ('WS.WS.XML_AUTO_SCHED (''%s'')', _res), _refresh); @@ -49,118 +54,83 @@ create procedure INSERT_RESOURCE (in _stmt varchar, in _name varchar, in _root v delete from DB.DBA.SYS_SCHEDULED_EVENT where SE_NAME = _res; } - delete from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _res; - WS.WS.FINDCOL (vector ('DAV', 'xmlsql'), _col_id); - _r_id := WS.WS.GETID ('R'); - insert into WS.WS.SYS_DAV_RES - (RES_ID, - RES_NAME, - RES_COL, - RES_TYPE, - RES_CONTENT, - RES_CR_TIME, - RES_MOD_TIME, - RES_OWNER, - RES_GROUP, - RES_PERMS) - values (_r_id, - _name, - _col_id, - 'text/xml', - ses, - now (), - now (), - http_dav_uid(), - http_dav_uid()+1, - '110100100N'); + DB.DBA.DAV_DELETE_INT (_res, 1, null, null, 1); + DB.DBA.DAV_RES_UPLOAD_STRSES_INT (_res, _ses, 'text/xml', '110100100N', http_dav_uid (), http_dav_uid () + 1, null, null, 0); + if (_sty <> '' and exists (select 1 from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _sty)) - insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_TYPE, PROP_PARENT_ID, PROP_VALUE) - values (WS.WS.GETID ('P'), 'xml-stylesheet', 'R', _r_id, - concat ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:', _sty)); + DB.DBA.DAV_PROP_SET_INT (_res, 'xml-stylesheet', 'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:' || _sty, null, null, 0, 0, 1, http_dav_uid ()); + if (_stmt <> '') - insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_TYPE, PROP_PARENT_ID, PROP_VALUE) - values (WS.WS.GETID ('P'), 'xml-sql', 'R', _r_id, _stmt); + DB.DBA.DAV_PROP_SET_INT (_res, 'xml-sql', _stmt, null, null, 0, 0, 1, http_dav_uid ()); + if (_root <> '') - insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_TYPE, PROP_PARENT_ID, PROP_VALUE) - values (WS.WS.GETID ('P'), 'xml-sql-root', 'R', _r_id, _root); + DB.DBA.DAV_PROP_SET_INT (_res, 'xml-sql-root', _root, null, null, 0, 0, 1, http_dav_uid ()); } +; -create procedure INSERT_XSLT_REF (in _name varchar, in _sty varchar) +create procedure INSERT_XSLT_REF ( + in _name varchar, + in _sty varchar) { - declare _col_id, _r_id integer; declare _res varchar; + declare _ses any; _name := concat (_name, '.xml'); _res := concat ('/DAV/docsrc/', _name); _sty := coalesce (_sty, ''); + _ses := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_FULL_PATH = '/DAV/docsrc/virtdocs.xml'); + + DB.DBA.DAV_DELETE_INT (_res, 1, null, null, 1); + DB.DBA.DAV_RES_UPLOAD_STRSES_INT (_res, _ses, 'text/xml', '110100100N', http_dav_uid (), http_dav_uid () + 1, null, null, 0); - delete from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _res; - WS.WS.FINDCOL (vector ('DAV', 'docsrc'), _col_id); - _r_id := WS.WS.GETID ('R'); - insert into WS.WS.SYS_DAV_RES - (RES_ID, - RES_NAME, - RES_COL, - RES_TYPE, - RES_CONTENT, - RES_CR_TIME, - RES_MOD_TIME, - RES_OWNER, - RES_GROUP, - RES_PERMS) - - values (_r_id, - _name, - _col_id, - 'text/xml', - (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_FULL_PATH = '/DAV/docsrc/virtdocs.xml'), - now (), - now (), - http_dav_uid(), - http_dav_uid() + 1, - '110100100N'); if (_sty <> '' and exists (select 1 from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _sty)) - insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_TYPE, PROP_PARENT_ID, PROP_VALUE) - values (WS.WS.GETID ('P'), 'xml-stylesheet', 'R', _r_id, - concat ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:', _sty)); + DB.DBA.DAV_PROP_SET_INT (_res, 'xml-stylesheet', 'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:' || _sty, null, null, 0, 0, 1, http_dav_uid ()); } +; - -create procedure PUTFILE (in _file varchar, in _name varchar) +create procedure PUTFILE ( + in _file varchar, + in _name varchar) { - declare _col_id, _r_id integer; declare _res varchar; + declare _ses any; + _res := concat ('/DAV/xmlsql/', _name); - delete from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _res; - WS.WS.FINDCOL (vector ('DAV', 'xmlsql'), _col_id); - _r_id := WS.WS.GETID ('R'); - insert into WS.WS.SYS_DAV_RES - (RES_ID, - RES_NAME, - RES_COL, - RES_TYPE, - RES_CONTENT, - RES_CR_TIME, - RES_MOD_TIME, - RES_OWNER, - RES_GROUP, - RES_PERMS) - values (_r_id, - _name, - _col_id, - 'text/xsl', - file_to_string (_file), - now (), - now (), - http_dav_uid(), - http_dav_uid()+1, - '110100100N'); + _ses := file_to_string (_file); + + DB.DBA.DAV_DELETE_INT (_res, 1, null, null, 1); + DB.DBA.DAV_RES_UPLOAD_STRSES_INT (_res, _ses, 'text/xsl', '110100100N', http_dav_uid (), http_dav_uid () + 1, null, null, 0); } ; +create procedure DELETE_FOLDER ( + in _res varchar) +{ + declare N integer; + declare _ret any; + + _ret := DB.DBA.DAV_DIR_LIST (_res, 0, auth_uname=>'dav', auth_pwd=>DB.DBA.DAV_DET_PASSWORD (http_dav_uid ())); + if (not isnull (DB.DBA.DAV_HIDE_ERROR (_ret))) + { + for (N := 0; N < length (_ret); N := N + 1) + { + if (_ret[N][1] = 'R') + { + DB.DBA.DAV_DELETE_INT (_ret[N][0], 1, null, null, 0, 0); + commit work; + } + else + { + DELETE_FOLDER (_ret[N][0]); + } + } + } + DB.DBA.DAV_DELETE_INT (_res, 1, null, null, 0, 0); +} +; -delete from WS.WS.SYS_DAV_COL where COL_NAME = 'xmlsql'; -insert into WS.WS.SYS_DAV_COL (COL_ID, COL_NAME, COL_PARENT, COL_CR_TIME, COL_MOD_TIME, COL_OWNER, COL_GROUP, COL_PERMS) values (WS.WS.GETID ('C'), 'xmlsql', 1, now(), now(),http_dav_uid(),http_dav_uid()+1, '110100100N'); +DELETE_FOLDER ('/DAV/xmlsql/'); +DB.DBA.DAV_COL_CREATE ('/DAV/xmlsql/', '110100100N', auth_uid=>'dav', auth_pwd=>DB.DBA.DAV_DET_PASSWORD (http_dav_uid ())); INSERT_RESOURCE ('SELECT CustomerID,ContactName FROM Demo.demo.Customers FOR XML RAW', 'URLSimpleQuery', NULL, NULL, -1); --select xml_uri_get ('http://localhost:6666/DAV/xmlsql', 'URLSimpleQuery.xml'); @@ -188,7 +158,8 @@ create procedure CATEGORY_INFO () result_names (CategoryName); for select CategoryName from Demo..Categories do result (CategoryName); -}; +} +; --- NOT SUPPORTED : INSERT_RESOURCE ('CATEGORY_INFO() FOR XML AUTO', 'URLProc', NULL, NULL, -1); diff --git a/binsrc/tests/suite/xmlsql_vad.sql b/binsrc/tests/suite/xmlsql_vad.sql index efa8e5e144..87155c85c2 100644 --- a/binsrc/tests/suite/xmlsql_vad.sql +++ b/binsrc/tests/suite/xmlsql_vad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -19,11 +19,15 @@ -- with this program; if not, write to the Free Software Foundation, Inc., -- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -- --- -create procedure INSERT_RESOURCE (in _stmt varchar, in _name varchar, in _root varchar, in _sty varchar, in _refresh integer) + +create procedure INSERT_RESOURCE ( + in _stmt varchar, + in _name varchar, + in _root varchar, + in _sty varchar, + in _refresh integer) { - declare _col_id, _r_id integer; - declare ses any; + declare _ses any; declare _res varchar; _name := concat (_name, '.xml'); @@ -33,15 +37,16 @@ create procedure INSERT_RESOURCE (in _stmt varchar, in _name varchar, in _root v if (_refresh = -1) { - ses := ''; + _ses := ''; } else { - ses := string_output (); - xml_auto (_stmt, vector(), ses); - ses := string_output_string (); + _ses := string_output (); + xml_auto (_stmt, vector(), _ses); + _ses := string_output_string (); if (_root <> '') - ses := concat ('<', _root, '>\n', ses, '\n'); + _ses := concat ('<', _root, '>\n', _ses, '\n'); + if (_refresh > 0) insert replacing DB.DBA.SYS_SCHEDULED_EVENT (SE_NAME, SE_START, SE_SQL, SE_INTERVAL) values (_res, now (), sprintf ('WS.WS.XML_AUTO_SCHED (''%s'')', _res), _refresh); @@ -49,118 +54,83 @@ create procedure INSERT_RESOURCE (in _stmt varchar, in _name varchar, in _root v delete from DB.DBA.SYS_SCHEDULED_EVENT where SE_NAME = _res; } - delete from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _res; - WS.WS.FINDCOL (vector ('DAV', 'xmlsql'), _col_id); - _r_id := WS.WS.GETID ('R'); - insert into WS.WS.SYS_DAV_RES - (RES_ID, - RES_NAME, - RES_COL, - RES_TYPE, - RES_CONTENT, - RES_CR_TIME, - RES_MOD_TIME, - RES_OWNER, - RES_GROUP, - RES_PERMS) - values (_r_id, - _name, - _col_id, - 'text/xml', - ses, - now (), - now (), - http_dav_uid(), - http_dav_uid()+1, - '110100100N'); + DB.DBA.DAV_DELETE_INT (_res, 1, null, null, 1); + DB.DBA.DAV_RES_UPLOAD_STRSES_INT (_res, _ses, 'text/xml', '110100100N', http_dav_uid (), http_dav_uid () + 1, null, null, 0); + if (_sty <> '' and exists (select 1 from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _sty)) - insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_TYPE, PROP_PARENT_ID, PROP_VALUE) - values (WS.WS.GETID ('P'), 'xml-stylesheet', 'R', _r_id, - concat ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:', _sty)); + DB.DBA.DAV_PROP_SET_INT (_res, 'xml-stylesheet', 'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:' || _sty, null, null, 0, 0, 1, http_dav_uid ()); + if (_stmt <> '') - insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_TYPE, PROP_PARENT_ID, PROP_VALUE) - values (WS.WS.GETID ('P'), 'xml-sql', 'R', _r_id, _stmt); + DB.DBA.DAV_PROP_SET_INT (_res, 'xml-sql', _stmt, null, null, 0, 0, 1, http_dav_uid ()); + if (_root <> '') - insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_TYPE, PROP_PARENT_ID, PROP_VALUE) - values (WS.WS.GETID ('P'), 'xml-sql-root', 'R', _r_id, _root); + DB.DBA.DAV_PROP_SET_INT (_res, 'xml-sql-root', _root, null, null, 0, 0, 1, http_dav_uid ()); } ; -create procedure INSERT_XSLT_REF (in _name varchar, in _sty varchar) + +create procedure INSERT_XSLT_REF ( + in _name varchar, + in _sty varchar) { - declare _col_id, _r_id integer; declare _res varchar; + declare _ses any; _name := concat (_name, '.xml'); _res := concat ('/DAV/docsrc/', _name); _sty := coalesce (_sty, ''); + _ses := (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_FULL_PATH = '/DAV/docsrc/virtdocs.xml'); + + DB.DBA.DAV_DELETE_INT (_res, 1, null, null, 1); + DB.DBA.DAV_RES_UPLOAD_STRSES_INT (_res, _ses, 'text/xml', '110100100N', http_dav_uid (), http_dav_uid () + 1, null, null, 0); - delete from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _res; - WS.WS.FINDCOL (vector ('DAV', 'docsrc'), _col_id); - _r_id := WS.WS.GETID ('R'); - insert into WS.WS.SYS_DAV_RES - (RES_ID, - RES_NAME, - RES_COL, - RES_TYPE, - RES_CONTENT, - RES_CR_TIME, - RES_MOD_TIME, - RES_OWNER, - RES_GROUP, - RES_PERMS) - - values (_r_id, - _name, - _col_id, - 'text/xml', - (select RES_CONTENT from WS.WS.SYS_DAV_RES where RES_FULL_PATH = '/DAV/docsrc/virtdocs.xml'), - now (), - now (), - http_dav_uid(), - http_dav_uid() + 1, - '110100100N'); if (_sty <> '' and exists (select 1 from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _sty)) - insert replacing WS.WS.SYS_DAV_PROP (PROP_ID, PROP_NAME, PROP_TYPE, PROP_PARENT_ID, PROP_VALUE) - values (WS.WS.GETID ('P'), 'xml-stylesheet', 'R', _r_id, - concat ('virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:', _sty)); + DB.DBA.DAV_PROP_SET_INT (_res, 'xml-stylesheet', 'virt://WS.WS.SYS_DAV_RES.RES_FULL_PATH.RES_CONTENT:' || _sty, null, null, 0, 0, 1, http_dav_uid ()); } ; -create procedure PUTFILE (in _file varchar, in _name varchar) +create procedure PUTFILE ( + in _file varchar, + in _name varchar) { - declare _col_id, _r_id integer; declare _res varchar; + declare _ses any; + _res := concat ('/DAV/xmlsql/', _name); - delete from WS.WS.SYS_DAV_RES where RES_FULL_PATH = _res; - WS.WS.FINDCOL (vector ('DAV', 'xmlsql'), _col_id); - _r_id := WS.WS.GETID ('R'); - insert into WS.WS.SYS_DAV_RES - (RES_ID, - RES_NAME, - RES_COL, - RES_TYPE, - RES_CONTENT, - RES_CR_TIME, - RES_MOD_TIME, - RES_OWNER, - RES_GROUP, - RES_PERMS) - values (_r_id, - _name, - _col_id, - 'text/xsl', - file_to_string (_file), - now (), - now (), - http_dav_uid(), - http_dav_uid()+1, - '110100100N'); + _ses := file_to_string (_file); + + DB.DBA.DAV_DELETE_INT (_res, 1, null, null, 1); + DB.DBA.DAV_RES_UPLOAD_STRSES_INT (_res, _ses, 'text/xsl', '110100100N', http_dav_uid (), http_dav_uid () + 1, null, null, 0); } ; +create procedure DELETE_FOLDER ( + in _res varchar) +{ + declare N integer; + declare _ret any; -delete from WS.WS.SYS_DAV_COL where COL_NAME = 'xmlsql'; -insert into WS.WS.SYS_DAV_COL (COL_ID, COL_NAME, COL_PARENT, COL_CR_TIME, COL_MOD_TIME, COL_OWNER, COL_GROUP, COL_PERMS) values (WS.WS.GETID ('C'), 'xmlsql', 1, now(), now(),http_dav_uid(),http_dav_uid()+1, '110100100N'); + _ret := DB.DBA.DAV_DIR_LIST (_res, 0, auth_uname=>'dav', auth_pwd=>DB.DBA.DAV_DET_PASSWORD (http_dav_uid ())); + if (not isnull (DB.DBA.DAV_HIDE_ERROR (_ret))) + { + for (N := 0; N < length (_ret); N := N + 1) + { + if (_ret[N][1] = 'R') + { + DB.DBA.DAV_DELETE_INT (_ret[N][0], 1, null, null, 0, 0); + commit work; + } + else + { + DELETE_FOLDER (_ret[N][0]); + } + } + } + DB.DBA.DAV_DELETE_INT (_res, 1, null, null, 0, 0); +} +; + +DELETE_FOLDER ('/DAV/xmlsql/'); +DB.DBA.DAV_COL_CREATE ('/DAV/xmlsql/', '110100100N', auth_uid=>'dav', auth_pwd=>DB.DBA.DAV_DET_PASSWORD (http_dav_uid ())); INSERT_RESOURCE ('SELECT CustomerID,ContactName FROM Demo.demo.Customers FOR XML RAW', 'URLSimpleQuery', NULL, NULL, -1); --select xml_uri_get ('http://localhost:6666/DAV/xmlsql', 'URLSimpleQuery.xml'); @@ -188,7 +158,8 @@ create procedure CATEGORY_INFO () result_names (CategoryName); for select CategoryName from Demo..Categories do result (CategoryName); -}; +} +; --- NOT SUPPORTED : INSERT_RESOURCE ('CATEGORY_INFO() FOR XML AUTO', 'URLProc', NULL, NULL, -1); diff --git a/binsrc/tests/suite/xmlsupp.sql b/binsrc/tests/suite/xmlsupp.sql index 4e95d361ee..8b33498d43 100644 --- a/binsrc/tests/suite/xmlsupp.sql +++ b/binsrc/tests/suite/xmlsupp.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/attr_entity.xml b/binsrc/tests/suite/xsl_samples/attr_entity.xml index bf281daa86..8d109a60d5 100644 --- a/binsrc/tests/suite/xsl_samples/attr_entity.xml +++ b/binsrc/tests/suite/xsl_samples/attr_entity.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/attr_entity.xsl b/binsrc/tests/suite/xsl_samples/attr_entity.xsl index 1cd44662d7..47e545f1cf 100644 --- a/binsrc/tests/suite/xsl_samples/attr_entity.xsl +++ b/binsrc/tests/suite/xsl_samples/attr_entity.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/auction1.xml b/binsrc/tests/suite/xsl_samples/auction1.xml index fd54bd0014..c66e1cb44b 100644 --- a/binsrc/tests/suite/xsl_samples/auction1.xml +++ b/binsrc/tests/suite/xsl_samples/auction1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/auction2.xml b/binsrc/tests/suite/xsl_samples/auction2.xml index 2f089e8c52..f271b15e28 100644 --- a/binsrc/tests/suite/xsl_samples/auction2.xml +++ b/binsrc/tests/suite/xsl_samples/auction2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/auction3.xml b/binsrc/tests/suite/xsl_samples/auction3.xml index 8670f49558..1c29bc20da 100644 --- a/binsrc/tests/suite/xsl_samples/auction3.xml +++ b/binsrc/tests/suite/xsl_samples/auction3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/authors.xml b/binsrc/tests/suite/xsl_samples/authors.xml index bba17c30fc..a0d96df01f 100644 --- a/binsrc/tests/suite/xsl_samples/authors.xml +++ b/binsrc/tests/suite/xsl_samples/authors.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/bids-table.xsl b/binsrc/tests/suite/xsl_samples/bids-table.xsl index 659b418117..18573d48f1 100644 --- a/binsrc/tests/suite/xsl_samples/bids-table.xsl +++ b/binsrc/tests/suite/xsl_samples/bids-table.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/bids-table2.xsl b/binsrc/tests/suite/xsl_samples/bids-table2.xsl index 0d42ca7f74..182a86db85 100644 --- a/binsrc/tests/suite/xsl_samples/bids-table2.xsl +++ b/binsrc/tests/suite/xsl_samples/bids-table2.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/booksshort.xml b/binsrc/tests/suite/xsl_samples/booksshort.xml index eca14cbd9c..76be739243 100644 --- a/binsrc/tests/suite/xsl_samples/booksshort.xml +++ b/binsrc/tests/suite/xsl_samples/booksshort.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/bug1174.xml b/binsrc/tests/suite/xsl_samples/bug1174.xml index 8ecc4fffe6..27b6d9d4e1 100644 --- a/binsrc/tests/suite/xsl_samples/bug1174.xml +++ b/binsrc/tests/suite/xsl_samples/bug1174.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/bug1174.xsl b/binsrc/tests/suite/xsl_samples/bug1174.xsl index 746de7c0ce..c8bf20fd06 100644 --- a/binsrc/tests/suite/xsl_samples/bug1174.xsl +++ b/binsrc/tests/suite/xsl_samples/bug1174.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/bug3342.xml b/binsrc/tests/suite/xsl_samples/bug3342.xml index d7f88dde25..bf39705498 100644 --- a/binsrc/tests/suite/xsl_samples/bug3342.xml +++ b/binsrc/tests/suite/xsl_samples/bug3342.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/bug3342.xsl b/binsrc/tests/suite/xsl_samples/bug3342.xsl index babdca749e..500ba1a5e0 100644 --- a/binsrc/tests/suite/xsl_samples/bug3342.xsl +++ b/binsrc/tests/suite/xsl_samples/bug3342.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/convert.xsl b/binsrc/tests/suite/xsl_samples/convert.xsl index eb9f9e9a74..104e658196 100644 --- a/binsrc/tests/suite/xsl_samples/convert.xsl +++ b/binsrc/tests/suite/xsl_samples/convert.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/defaultss.xsl b/binsrc/tests/suite/xsl_samples/defaultss.xsl index 3bbdc22ea6..ad4b4b44b7 100644 --- a/binsrc/tests/suite/xsl_samples/defaultss.xsl +++ b/binsrc/tests/suite/xsl_samples/defaultss.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/empty_comment.xml b/binsrc/tests/suite/xsl_samples/empty_comment.xml index 54d1ef985f..88b0b432f4 100644 --- a/binsrc/tests/suite/xsl_samples/empty_comment.xml +++ b/binsrc/tests/suite/xsl_samples/empty_comment.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/empty_comment.xsl b/binsrc/tests/suite/xsl_samples/empty_comment.xsl index 325e5e39c1..150f738b30 100644 --- a/binsrc/tests/suite/xsl_samples/empty_comment.xsl +++ b/binsrc/tests/suite/xsl_samples/empty_comment.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/externalScript.xml b/binsrc/tests/suite/xsl_samples/externalScript.xml index c795b66cba..a4891f9fa5 100644 --- a/binsrc/tests/suite/xsl_samples/externalScript.xml +++ b/binsrc/tests/suite/xsl_samples/externalScript.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/family.xml b/binsrc/tests/suite/xsl_samples/family.xml index 7c7dc0bd9b..58405bacaa 100644 --- a/binsrc/tests/suite/xsl_samples/family.xml +++ b/binsrc/tests/suite/xsl_samples/family.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/family.xsl b/binsrc/tests/suite/xsl_samples/family.xsl index 9c8c980da3..f6b566f502 100644 --- a/binsrc/tests/suite/xsl_samples/family.xsl +++ b/binsrc/tests/suite/xsl_samples/family.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/grocery-list.xml b/binsrc/tests/suite/xsl_samples/grocery-list.xml index ac79eb4b60..7cb1da2814 100644 --- a/binsrc/tests/suite/xsl_samples/grocery-list.xml +++ b/binsrc/tests/suite/xsl_samples/grocery-list.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/grocery-list.xsl b/binsrc/tests/suite/xsl_samples/grocery-list.xsl index 199b63fa5a..add7d4d898 100644 --- a/binsrc/tests/suite/xsl_samples/grocery-list.xsl +++ b/binsrc/tests/suite/xsl_samples/grocery-list.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/grocery-list2.xml b/binsrc/tests/suite/xsl_samples/grocery-list2.xml index 1634696019..0bd6a03bd8 100644 --- a/binsrc/tests/suite/xsl_samples/grocery-list2.xml +++ b/binsrc/tests/suite/xsl_samples/grocery-list2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/grocery-list2.xsl b/binsrc/tests/suite/xsl_samples/grocery-list2.xsl index 0fe2a414b5..09465581d2 100644 --- a/binsrc/tests/suite/xsl_samples/grocery-list2.xsl +++ b/binsrc/tests/suite/xsl_samples/grocery-list2.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/hilite-xml.xsl b/binsrc/tests/suite/xsl_samples/hilite-xml.xsl index fc4ba55d8b..281f598629 100644 --- a/binsrc/tests/suite/xsl_samples/hilite-xml.xsl +++ b/binsrc/tests/suite/xsl_samples/hilite-xml.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/identityxfm.xsl b/binsrc/tests/suite/xsl_samples/identityxfm.xsl index 3ff6b9fb0d..e56b10847d 100644 --- a/binsrc/tests/suite/xsl_samples/identityxfm.xsl +++ b/binsrc/tests/suite/xsl_samples/identityxfm.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/identityxfm1.xsl b/binsrc/tests/suite/xsl_samples/identityxfm1.xsl index d8636ffd3d..e19ec4cbf7 100644 --- a/binsrc/tests/suite/xsl_samples/identityxfm1.xsl +++ b/binsrc/tests/suite/xsl_samples/identityxfm1.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/investments-to-portfolio.xsl b/binsrc/tests/suite/xsl_samples/investments-to-portfolio.xsl index 99e14d7bf9..ae7e635b09 100644 --- a/binsrc/tests/suite/xsl_samples/investments-to-portfolio.xsl +++ b/binsrc/tests/suite/xsl_samples/investments-to-portfolio.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/investments.xml b/binsrc/tests/suite/xsl_samples/investments.xml index 4879c2b7a6..8631598779 100644 --- a/binsrc/tests/suite/xsl_samples/investments.xml +++ b/binsrc/tests/suite/xsl_samples/investments.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/invoice.xml b/binsrc/tests/suite/xsl_samples/invoice.xml index 88a0578b97..2741ef7214 100644 --- a/binsrc/tests/suite/xsl_samples/invoice.xml +++ b/binsrc/tests/suite/xsl_samples/invoice.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/invoice.xsl b/binsrc/tests/suite/xsl_samples/invoice.xsl index 844cd04e73..dafe5067f6 100644 --- a/binsrc/tests/suite/xsl_samples/invoice.xsl +++ b/binsrc/tests/suite/xsl_samples/invoice.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/ledger.xml b/binsrc/tests/suite/xsl_samples/ledger.xml index 3b666c2aa6..2f3cd020c7 100644 --- a/binsrc/tests/suite/xsl_samples/ledger.xml +++ b/binsrc/tests/suite/xsl_samples/ledger.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/ledger.xsl b/binsrc/tests/suite/xsl_samples/ledger.xsl index 594618d0e5..f650b98020 100644 --- a/binsrc/tests/suite/xsl_samples/ledger.xsl +++ b/binsrc/tests/suite/xsl_samples/ledger.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/number_format.xml b/binsrc/tests/suite/xsl_samples/number_format.xml index be860a19ef..87443d7425 100644 --- a/binsrc/tests/suite/xsl_samples/number_format.xml +++ b/binsrc/tests/suite/xsl_samples/number_format.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/number_format.xsl b/binsrc/tests/suite/xsl_samples/number_format.xsl index d7fa07d71b..70839651c2 100644 --- a/binsrc/tests/suite/xsl_samples/number_format.xsl +++ b/binsrc/tests/suite/xsl_samples/number_format.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/number_format1.xsl b/binsrc/tests/suite/xsl_samples/number_format1.xsl index f42faeaaa1..7d7be5f462 100644 --- a/binsrc/tests/suite/xsl_samples/number_format1.xsl +++ b/binsrc/tests/suite/xsl_samples/number_format1.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/pole.xml b/binsrc/tests/suite/xsl_samples/pole.xml index 87e82012d8..5e9a4f5e7f 100644 --- a/binsrc/tests/suite/xsl_samples/pole.xml +++ b/binsrc/tests/suite/xsl_samples/pole.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/pole.xsl b/binsrc/tests/suite/xsl_samples/pole.xsl index 80257ca640..29634af3e3 100644 --- a/binsrc/tests/suite/xsl_samples/pole.xsl +++ b/binsrc/tests/suite/xsl_samples/pole.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/pole2.xml b/binsrc/tests/suite/xsl_samples/pole2.xml index 449972ffbe..4f7a4b4027 100644 --- a/binsrc/tests/suite/xsl_samples/pole2.xml +++ b/binsrc/tests/suite/xsl_samples/pole2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/pole2.xsl b/binsrc/tests/suite/xsl_samples/pole2.xsl index 70695a593f..736bafa0e7 100644 --- a/binsrc/tests/suite/xsl_samples/pole2.xsl +++ b/binsrc/tests/suite/xsl_samples/pole2.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/pole3.xml b/binsrc/tests/suite/xsl_samples/pole3.xml index c811fc8634..7d3ed48d64 100644 --- a/binsrc/tests/suite/xsl_samples/pole3.xml +++ b/binsrc/tests/suite/xsl_samples/pole3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/pole3.xsl b/binsrc/tests/suite/xsl_samples/pole3.xsl index 8560ed50cb..7567e20081 100644 --- a/binsrc/tests/suite/xsl_samples/pole3.xsl +++ b/binsrc/tests/suite/xsl_samples/pole3.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/pole4.xml b/binsrc/tests/suite/xsl_samples/pole4.xml index d8044ab2f2..716db7adcd 100644 --- a/binsrc/tests/suite/xsl_samples/pole4.xml +++ b/binsrc/tests/suite/xsl_samples/pole4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/pole4.xsl b/binsrc/tests/suite/xsl_samples/pole4.xsl index 078a6db9a2..315431ba3a 100644 --- a/binsrc/tests/suite/xsl_samples/pole4.xsl +++ b/binsrc/tests/suite/xsl_samples/pole4.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio-attributes.xml b/binsrc/tests/suite/xsl_samples/portfolio-attributes.xml index e71766db62..4713336755 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio-attributes.xml +++ b/binsrc/tests/suite/xsl_samples/portfolio-attributes.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio-attributes.xsl b/binsrc/tests/suite/xsl_samples/portfolio-attributes.xsl index 2c02f7c496..e3f475dbe2 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio-attributes.xsl +++ b/binsrc/tests/suite/xsl_samples/portfolio-attributes.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio-choose.xml b/binsrc/tests/suite/xsl_samples/portfolio-choose.xml index 2fceeb657b..e99b105a5f 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio-choose.xml +++ b/binsrc/tests/suite/xsl_samples/portfolio-choose.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio-choose.xsl b/binsrc/tests/suite/xsl_samples/portfolio-choose.xsl index dd6f50f8e6..cc21912dbf 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio-choose.xsl +++ b/binsrc/tests/suite/xsl_samples/portfolio-choose.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio-cp.xsl b/binsrc/tests/suite/xsl_samples/portfolio-cp.xsl index fb8ce12077..3f242433f5 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio-cp.xsl +++ b/binsrc/tests/suite/xsl_samples/portfolio-cp.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio-if.xml b/binsrc/tests/suite/xsl_samples/portfolio-if.xml index 47b7d97741..5a16d70a01 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio-if.xml +++ b/binsrc/tests/suite/xsl_samples/portfolio-if.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio-if.xsl b/binsrc/tests/suite/xsl_samples/portfolio-if.xsl index d04fc7ec01..d4b3f02af6 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio-if.xsl +++ b/binsrc/tests/suite/xsl_samples/portfolio-if.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio-schema.xml b/binsrc/tests/suite/xsl_samples/portfolio-schema.xml index 2097310fde..c87b8a8cb2 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio-schema.xml +++ b/binsrc/tests/suite/xsl_samples/portfolio-schema.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio-sort1.xsl b/binsrc/tests/suite/xsl_samples/portfolio-sort1.xsl index 7b44d51f69..ea6aaaa1d1 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio-sort1.xsl +++ b/binsrc/tests/suite/xsl_samples/portfolio-sort1.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio-sort2.xml b/binsrc/tests/suite/xsl_samples/portfolio-sort2.xml index b6f682b52c..b55f3e585a 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio-sort2.xml +++ b/binsrc/tests/suite/xsl_samples/portfolio-sort2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio-sort2.xsl b/binsrc/tests/suite/xsl_samples/portfolio-sort2.xsl index ea081eb8e1..3531c28e57 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio-sort2.xsl +++ b/binsrc/tests/suite/xsl_samples/portfolio-sort2.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio-to-investments.xsl b/binsrc/tests/suite/xsl_samples/portfolio-to-investments.xsl index 64ff2bd6c9..401665f6a2 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio-to-investments.xsl +++ b/binsrc/tests/suite/xsl_samples/portfolio-to-investments.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio.xml b/binsrc/tests/suite/xsl_samples/portfolio.xml index d35981bb6d..46a6f68f9d 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio.xml +++ b/binsrc/tests/suite/xsl_samples/portfolio.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio.xsl b/binsrc/tests/suite/xsl_samples/portfolio.xsl index 182eef0ecf..c2a0d5855b 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio.xsl +++ b/binsrc/tests/suite/xsl_samples/portfolio.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio2.xml b/binsrc/tests/suite/xsl_samples/portfolio2.xml index 9e86f0f551..4104a2f458 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio2.xml +++ b/binsrc/tests/suite/xsl_samples/portfolio2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/portfolio2.xsl b/binsrc/tests/suite/xsl_samples/portfolio2.xsl index cd24327acb..72be48c2dc 100644 --- a/binsrc/tests/suite/xsl_samples/portfolio2.xsl +++ b/binsrc/tests/suite/xsl_samples/portfolio2.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/price-graph.xsl b/binsrc/tests/suite/xsl_samples/price-graph.xsl index 03ad17b1c5..93a2c52fb1 100644 --- a/binsrc/tests/suite/xsl_samples/price-graph.xsl +++ b/binsrc/tests/suite/xsl_samples/price-graph.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/product-list.xml b/binsrc/tests/suite/xsl_samples/product-list.xml index 88604c1e36..5c1c3b1d5d 100644 --- a/binsrc/tests/suite/xsl_samples/product-list.xml +++ b/binsrc/tests/suite/xsl_samples/product-list.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/product-list.xsl b/binsrc/tests/suite/xsl_samples/product-list.xsl index 5792be6ebb..15320e99ea 100644 --- a/binsrc/tests/suite/xsl_samples/product-list.xsl +++ b/binsrc/tests/suite/xsl_samples/product-list.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/product-list2.xml b/binsrc/tests/suite/xsl_samples/product-list2.xml index aa3f3bcd9e..40eb1428d0 100644 --- a/binsrc/tests/suite/xsl_samples/product-list2.xml +++ b/binsrc/tests/suite/xsl_samples/product-list2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/product-list2.xsl b/binsrc/tests/suite/xsl_samples/product-list2.xsl index 6b8360ccbb..e569575fe5 100644 --- a/binsrc/tests/suite/xsl_samples/product-list2.xsl +++ b/binsrc/tests/suite/xsl_samples/product-list2.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/raw-xml.xsl b/binsrc/tests/suite/xsl_samples/raw-xml.xsl index 58f478f01e..09c5ca2c95 100644 --- a/binsrc/tests/suite/xsl_samples/raw-xml.xsl +++ b/binsrc/tests/suite/xsl_samples/raw-xml.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/rename.xsl b/binsrc/tests/suite/xsl_samples/rename.xsl index 13d9ce4ad4..4bfc7c2b88 100644 --- a/binsrc/tests/suite/xsl_samples/rename.xsl +++ b/binsrc/tests/suite/xsl_samples/rename.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/review-bad-pattern.xsl b/binsrc/tests/suite/xsl_samples/review-bad-pattern.xsl index c5c81f57c1..b63d7f66ac 100644 --- a/binsrc/tests/suite/xsl_samples/review-bad-pattern.xsl +++ b/binsrc/tests/suite/xsl_samples/review-bad-pattern.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/review-bad-script.xsl b/binsrc/tests/suite/xsl_samples/review-bad-script.xsl index 2c6df3ada9..59a79cf4c3 100644 --- a/binsrc/tests/suite/xsl_samples/review-bad-script.xsl +++ b/binsrc/tests/suite/xsl_samples/review-bad-script.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/review-bad.xml b/binsrc/tests/suite/xsl_samples/review-bad.xml index bdd370d8e5..ed8a16c09b 100644 --- a/binsrc/tests/suite/xsl_samples/review-bad.xml +++ b/binsrc/tests/suite/xsl_samples/review-bad.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/review-bad.xsl b/binsrc/tests/suite/xsl_samples/review-bad.xsl index 12aedec806..fe3b7c07e6 100644 --- a/binsrc/tests/suite/xsl_samples/review-bad.xsl +++ b/binsrc/tests/suite/xsl_samples/review-bad.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/review-css.xml b/binsrc/tests/suite/xsl_samples/review-css.xml index 52d16aa7a2..f7c3d5a585 100644 --- a/binsrc/tests/suite/xsl_samples/review-css.xml +++ b/binsrc/tests/suite/xsl_samples/review-css.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/review-embedded-css.xml b/binsrc/tests/suite/xsl_samples/review-embedded-css.xml index 41a3fa3742..ab7a51c84f 100644 --- a/binsrc/tests/suite/xsl_samples/review-embedded-css.xml +++ b/binsrc/tests/suite/xsl_samples/review-embedded-css.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/review-simple.xsl b/binsrc/tests/suite/xsl_samples/review-simple.xsl index afce9149d9..8312509613 100644 --- a/binsrc/tests/suite/xsl_samples/review-simple.xsl +++ b/binsrc/tests/suite/xsl_samples/review-simple.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/review.xml b/binsrc/tests/suite/xsl_samples/review.xml index bc556f39bd..85b7aeb83f 100644 --- a/binsrc/tests/suite/xsl_samples/review.xml +++ b/binsrc/tests/suite/xsl_samples/review.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/review.xsl b/binsrc/tests/suite/xsl_samples/review.xsl index c20b527c04..91d404a357 100644 --- a/binsrc/tests/suite/xsl_samples/review.xsl +++ b/binsrc/tests/suite/xsl_samples/review.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/simple.xml b/binsrc/tests/suite/xsl_samples/simple.xml index 38449ff4ca..0e48b58c7f 100644 --- a/binsrc/tests/suite/xsl_samples/simple.xml +++ b/binsrc/tests/suite/xsl_samples/simple.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/simple.xsl b/binsrc/tests/suite/xsl_samples/simple.xsl index dddbd66786..1f555166a1 100644 --- a/binsrc/tests/suite/xsl_samples/simple.xsl +++ b/binsrc/tests/suite/xsl_samples/simple.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/sort-bidder-.xsl b/binsrc/tests/suite/xsl_samples/sort-bidder-.xsl index 1238a56d58..ea65213f05 100644 --- a/binsrc/tests/suite/xsl_samples/sort-bidder-.xsl +++ b/binsrc/tests/suite/xsl_samples/sort-bidder-.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/sort-bidder-price-.xsl b/binsrc/tests/suite/xsl_samples/sort-bidder-price-.xsl index ab950dd618..4d600d206c 100644 --- a/binsrc/tests/suite/xsl_samples/sort-bidder-price-.xsl +++ b/binsrc/tests/suite/xsl_samples/sort-bidder-price-.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/sort-bidder-price.xsl b/binsrc/tests/suite/xsl_samples/sort-bidder-price.xsl index e21df4aee3..7e401f1bd7 100644 --- a/binsrc/tests/suite/xsl_samples/sort-bidder-price.xsl +++ b/binsrc/tests/suite/xsl_samples/sort-bidder-price.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/sort-bidder.xsl b/binsrc/tests/suite/xsl_samples/sort-bidder.xsl index 23eebf48fe..1eaab6246c 100644 --- a/binsrc/tests/suite/xsl_samples/sort-bidder.xsl +++ b/binsrc/tests/suite/xsl_samples/sort-bidder.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/sort.xsl b/binsrc/tests/suite/xsl_samples/sort.xsl index 08ad07d229..682ec9ac37 100644 --- a/binsrc/tests/suite/xsl_samples/sort.xsl +++ b/binsrc/tests/suite/xsl_samples/sort.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xml b/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xml index a7cae2737a..657fa053eb 100644 --- a/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xml +++ b/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xsl b/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xsl index 3a965010dd..81374e8e2e 100644 --- a/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xsl +++ b/binsrc/tests/suite/xsl_samples/stock-sorter-vb.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/stock-sorter.xml b/binsrc/tests/suite/xsl_samples/stock-sorter.xml index f95fa84b88..252cd7c0e7 100644 --- a/binsrc/tests/suite/xsl_samples/stock-sorter.xml +++ b/binsrc/tests/suite/xsl_samples/stock-sorter.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/stock-sorter.xsl b/binsrc/tests/suite/xsl_samples/stock-sorter.xsl index 7b779e54ca..c8d1db43c4 100644 --- a/binsrc/tests/suite/xsl_samples/stock-sorter.xsl +++ b/binsrc/tests/suite/xsl_samples/stock-sorter.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/utf8.xml b/binsrc/tests/suite/xsl_samples/utf8.xml index 665946565e..39dd52fbc9 100644 --- a/binsrc/tests/suite/xsl_samples/utf8.xml +++ b/binsrc/tests/suite/xsl_samples/utf8.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/utf8.xsl b/binsrc/tests/suite/xsl_samples/utf8.xsl index a46804172e..25a6d2d6b9 100644 --- a/binsrc/tests/suite/xsl_samples/utf8.xsl +++ b/binsrc/tests/suite/xsl_samples/utf8.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/xmlspec-toc.xsl b/binsrc/tests/suite/xsl_samples/xmlspec-toc.xsl index 5ea33d57f2..9e1d3e00c0 100644 --- a/binsrc/tests/suite/xsl_samples/xmlspec-toc.xsl +++ b/binsrc/tests/suite/xsl_samples/xmlspec-toc.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/xsl-toc.xml b/binsrc/tests/suite/xsl_samples/xsl-toc.xml index 481b6e860c..d968a102e3 100644 --- a/binsrc/tests/suite/xsl_samples/xsl-toc.xml +++ b/binsrc/tests/suite/xsl_samples/xsl-toc.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/suite/xsl_samples/xsl.xml b/binsrc/tests/suite/xsl_samples/xsl.xml index ee0991cc02..1dc39c4968 100644 --- a/binsrc/tests/suite/xsl_samples/xsl.xml +++ b/binsrc/tests/suite/xsl_samples/xsl.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/testlock.c b/binsrc/tests/testlock.c index 3f82722e56..6fd10f4048 100644 --- a/binsrc/tests/testlock.c +++ b/binsrc/tests/testlock.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/time.c b/binsrc/tests/time.c index 562ceade43..1c945e685e 100644 --- a/binsrc/tests/time.c +++ b/binsrc/tests/time.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/timeacct.h b/binsrc/tests/timeacct.h index 4f97f13876..623d1cd4c1 100644 --- a/binsrc/tests/timeacct.h +++ b/binsrc/tests/timeacct.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tkset.c b/binsrc/tests/tkset.c index 44dfced3e1..b09c35b7c4 100644 --- a/binsrc/tests/tkset.c +++ b/binsrc/tests/tkset.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcc.c b/binsrc/tests/tpcc.c index 997d1d7481..4026101034 100644 --- a/binsrc/tests/tpcc.c +++ b/binsrc/tests/tpcc.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcc.h b/binsrc/tests/tpcc.h index 0704be107d..cfe7d51b6d 100644 --- a/binsrc/tests/tpcc.h +++ b/binsrc/tests/tpcc.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcc.sql b/binsrc/tests/tpcc.sql index 5e05fcc1f0..8f4c00d0a7 100644 --- a/binsrc/tests/tpcc.sql +++ b/binsrc/tests/tpcc.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpccddk.sql b/binsrc/tests/tpccddk.sql index cb09e96923..9909f89afb 100644 --- a/binsrc/tests/tpccddk.sql +++ b/binsrc/tests/tpccddk.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpccoci.c b/binsrc/tests/tpccoci.c index a8da2dd98c..3b3160332b 100644 --- a/binsrc/tests/tpccoci.c +++ b/binsrc/tests/tpccoci.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpccodbc.c b/binsrc/tests/tpccodbc.c index 3e8897c3a2..e85ea85c55 100644 --- a/binsrc/tests/tpccodbc.c +++ b/binsrc/tests/tpccodbc.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcctrx.c b/binsrc/tests/tpcctrx.c index 4cf0c86b7b..e58300738b 100644 --- a/binsrc/tests/tpcctrx.c +++ b/binsrc/tests/tpcctrx.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcrun/Makefile.am b/binsrc/tests/tpcrun/Makefile.am index d005f78dbb..254c93bf5f 100644 --- a/binsrc/tests/tpcrun/Makefile.am +++ b/binsrc/tests/tpcrun/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcrun/checkdb.sql b/binsrc/tests/tpcrun/checkdb.sql index 00a6d68afb..c5722adc9e 100644 --- a/binsrc/tests/tpcrun/checkdb.sql +++ b/binsrc/tests/tpcrun/checkdb.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcrun/repl_ck.sql b/binsrc/tests/tpcrun/repl_ck.sql index cc9c44613a..7fd326077e 100644 --- a/binsrc/tests/tpcrun/repl_ck.sql +++ b/binsrc/tests/tpcrun/repl_ck.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcrun/repl_ck_init.sql b/binsrc/tests/tpcrun/repl_ck_init.sql index 7201e0ffda..19902291c5 100644 --- a/binsrc/tests/tpcrun/repl_ck_init.sql +++ b/binsrc/tests/tpcrun/repl_ck_init.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcrun/repl_pub_tpcc.sql b/binsrc/tests/tpcrun/repl_pub_tpcc.sql index 13a2e15014..0590ac7b6a 100644 --- a/binsrc/tests/tpcrun/repl_pub_tpcc.sql +++ b/binsrc/tests/tpcrun/repl_pub_tpcc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcrun/repl_sub_tpcc.sql b/binsrc/tests/tpcrun/repl_sub_tpcc.sql index ab352cde97..11b6061d3e 100644 --- a/binsrc/tests/tpcrun/repl_sub_tpcc.sql +++ b/binsrc/tests/tpcrun/repl_sub_tpcc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcrun/test_server.sh b/binsrc/tests/tpcrun/test_server.sh index 608547904f..a59b65f1b9 100755 --- a/binsrc/tests/tpcrun/test_server.sh +++ b/binsrc/tests/tpcrun/test_server.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcrun/tpc_back.sql b/binsrc/tests/tpcrun/tpc_back.sql index 971ca2280b..470f9e6191 100644 --- a/binsrc/tests/tpcrun/tpc_back.sql +++ b/binsrc/tests/tpcrun/tpc_back.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcrun/tpc_cpts.sql b/binsrc/tests/tpcrun/tpc_cpts.sql index c13ae2a167..b91bda0f04 100644 --- a/binsrc/tests/tpcrun/tpc_cpts.sql +++ b/binsrc/tests/tpcrun/tpc_cpts.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpcrun/tpc_run.sh b/binsrc/tests/tpcrun/tpc_run.sh index fa1da44b25..47a6ebfc93 100755 --- a/binsrc/tests/tpcrun/tpc_run.sh +++ b/binsrc/tests/tpcrun/tpc_run.sh @@ -7,7 +7,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/tpm.sql b/binsrc/tests/tpm.sql index 60e350d574..f67a14e4fe 100644 --- a/binsrc/tests/tpm.sql +++ b/binsrc/tests/tpm.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/urlsimu.c b/binsrc/tests/urlsimu.c index d874d5fda3..37a25347a7 100644 --- a/binsrc/tests/urlsimu.c +++ b/binsrc/tests/urlsimu.c @@ -10,7 +10,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/virtdriver.c b/binsrc/tests/virtdriver.c index 712ca0034c..d6cc1583cc 100644 --- a/binsrc/tests/virtdriver.c +++ b/binsrc/tests/virtdriver.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/virtdriver.sql b/binsrc/tests/virtdriver.sql index ae3431d67c..efb8022a57 100644 --- a/binsrc/tests/virtdriver.sql +++ b/binsrc/tests/virtdriver.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/Makefile.am b/binsrc/tests/wb/Makefile.am index c9e8395d69..c9ffefaa37 100644 --- a/binsrc/tests/wb/Makefile.am +++ b/binsrc/tests/wb/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/20010215.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/20010215.xml index 5cf2bc6736..7bfd96128d 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/20010215.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/20010215.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/20010608.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/20010608.xml index 871a244965..c0f237fcef 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/20010608.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/20010608.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/20010608a1.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/20010608a1.xml index c069f70dcf..2cf717ae8f 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/20010608a1.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/20010608a1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/30010608.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/30010608.xml index 99db7417ba..324f908f3a 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/30010608.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/30010608.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/auction.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/auction.xml index f7b4598dc9..fa6691e708 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/auction.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/auction.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/bib.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/bib.xml index 0742c04f6c..3b3c376cb3 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/bib.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/bib.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/bids.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/bids.xml index 25f99e9c1f..96e962e47a 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/bids.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/bids.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/book.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/book.xml index 0bf3a1e161..c0fd9a051e 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/book.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/book.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/book1.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/book1.xml index 0bf3a1e161..c0fd9a051e 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/book1.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/book1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/books.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/books.xml index 10880d4d85..0eff01504a 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/books.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/books.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/census.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/census.xml index c428e673aa..e5a633f067 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/census.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/census.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/company.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/company.xml index 759215c5f6..620c7d9056 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/company.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/company.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/items.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/items.xml index 606caabd2b..ff4f45276f 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/items.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/items.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/news.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/news.xml index 5ba539ba48..0250fe2be7 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/news.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/news.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/partlist.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/partlist.xml index 9ff2fb1a90..00b1fab5b4 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/partlist.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/partlist.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/prices.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/prices.xml index 589c63d25b..9d1e97d1fb 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/prices.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/prices.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/report1.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/report1.xml index f8ec52b180..eb532563c9 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/report1.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/report1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/reviews.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/reviews.xml index caf22772c8..b388a21754 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/reviews.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/reviews.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/sgml_intro.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/sgml_intro.xml index 4ad0250a37..e78cab90c0 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/sgml_intro.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/sgml_intro.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tests/wb/inputs/XqW3cUseCases/users.xml b/binsrc/tests/wb/inputs/XqW3cUseCases/users.xml index 8e887062aa..2994213838 100644 --- a/binsrc/tests/wb/inputs/XqW3cUseCases/users.xml +++ b/binsrc/tests/wb/inputs/XqW3cUseCases/users.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/1x1.html b/binsrc/tutorial/1x1.html index fc21aaee29..af7e14cf8b 100644 --- a/binsrc/tutorial/1x1.html +++ b/binsrc/tutorial/1x1.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/Makefile.am b/binsrc/tutorial/Makefile.am index 0d0427ae92..f3327a4add 100644 --- a/binsrc/tutorial/Makefile.am +++ b/binsrc/tutorial/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/Makefile.am b/binsrc/tutorial/apps/Makefile.am index 1f8d47cc87..4eec07c127 100644 --- a/binsrc/tutorial/apps/Makefile.am +++ b/binsrc/tutorial/apps/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog/blog.sql b/binsrc/tutorial/apps/blog/blog.sql index acac69b0bb..e8361d37a2 100644 --- a/binsrc/tutorial/apps/blog/blog.sql +++ b/binsrc/tutorial/apps/blog/blog.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog/blog.xml b/binsrc/tutorial/apps/blog/blog.xml index 881b61f65f..308b8a7871 100644 --- a/binsrc/tutorial/apps/blog/blog.xml +++ b/binsrc/tutorial/apps/blog/blog.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog/blog_home.vspx b/binsrc/tutorial/apps/blog/blog_home.vspx index 914256b5cb..04994e088f 100644 --- a/binsrc/tutorial/apps/blog/blog_home.vspx +++ b/binsrc/tutorial/apps/blog/blog_home.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog/blog_login.vspx b/binsrc/tutorial/apps/blog/blog_login.vspx index 89936a4bf3..e4d06e6e47 100644 --- a/binsrc/tutorial/apps/blog/blog_login.vspx +++ b/binsrc/tutorial/apps/blog/blog_login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog/blog_setup.vspx b/binsrc/tutorial/apps/blog/blog_setup.vspx index b546fa25ec..c014729d4a 100644 --- a/binsrc/tutorial/apps/blog/blog_setup.vspx +++ b/binsrc/tutorial/apps/blog/blog_setup.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog/get_blogs.vspx b/binsrc/tutorial/apps/blog/get_blogs.vspx index 11158c2a90..ae1e7bbd80 100644 --- a/binsrc/tutorial/apps/blog/get_blogs.vspx +++ b/binsrc/tutorial/apps/blog/get_blogs.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog/options.xml b/binsrc/tutorial/apps/blog/options.xml index a7735c03b9..6091c793d2 100644 --- a/binsrc/tutorial/apps/blog/options.xml +++ b/binsrc/tutorial/apps/blog/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog/register.vspx b/binsrc/tutorial/apps/blog/register.vspx index e9d9655417..ae6ed14f34 100644 --- a/binsrc/tutorial/apps/blog/register.vspx +++ b/binsrc/tutorial/apps/blog/register.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog_bridge/blog.vspx b/binsrc/tutorial/apps/blog_bridge/blog.vspx index f2fc59b06e..eb9619d828 100644 --- a/binsrc/tutorial/apps/blog_bridge/blog.vspx +++ b/binsrc/tutorial/apps/blog_bridge/blog.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog_bridge/blog_bridge.sql b/binsrc/tutorial/apps/blog_bridge/blog_bridge.sql index 0a6a99cb74..94c82dcf01 100644 --- a/binsrc/tutorial/apps/blog_bridge/blog_bridge.sql +++ b/binsrc/tutorial/apps/blog_bridge/blog_bridge.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog_bridge/blog_bridge.xml b/binsrc/tutorial/apps/blog_bridge/blog_bridge.xml index 8c1ec7ece1..5284969438 100644 --- a/binsrc/tutorial/apps/blog_bridge/blog_bridge.xml +++ b/binsrc/tutorial/apps/blog_bridge/blog_bridge.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog_bridge/bridge.vspx b/binsrc/tutorial/apps/blog_bridge/bridge.vspx index d97e561b6b..2cd1761c72 100644 --- a/binsrc/tutorial/apps/blog_bridge/bridge.vspx +++ b/binsrc/tutorial/apps/blog_bridge/bridge.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog_bridge/get_blogs.vspx b/binsrc/tutorial/apps/blog_bridge/get_blogs.vspx index 49e8b53884..21919a9e4d 100644 --- a/binsrc/tutorial/apps/blog_bridge/get_blogs.vspx +++ b/binsrc/tutorial/apps/blog_bridge/get_blogs.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog_bridge/login.vspx b/binsrc/tutorial/apps/blog_bridge/login.vspx index ad676e0bc9..ce58f8ebc1 100644 --- a/binsrc/tutorial/apps/blog_bridge/login.vspx +++ b/binsrc/tutorial/apps/blog_bridge/login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog_bridge/options.xml b/binsrc/tutorial/apps/blog_bridge/options.xml index c76c76df96..5f367c8468 100644 --- a/binsrc/tutorial/apps/blog_bridge/options.xml +++ b/binsrc/tutorial/apps/blog_bridge/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog_bridge/register.vspx b/binsrc/tutorial/apps/blog_bridge/register.vspx index 3f5cd151c4..828d0fa1eb 100644 --- a/binsrc/tutorial/apps/blog_bridge/register.vspx +++ b/binsrc/tutorial/apps/blog_bridge/register.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog_query/blog_query.sql b/binsrc/tutorial/apps/blog_query/blog_query.sql index 789e4f3d43..c72f9aaefd 100644 --- a/binsrc/tutorial/apps/blog_query/blog_query.sql +++ b/binsrc/tutorial/apps/blog_query/blog_query.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog_query/blog_query.xml b/binsrc/tutorial/apps/blog_query/blog_query.xml index 5a1dab8387..764cfef0dd 100644 --- a/binsrc/tutorial/apps/blog_query/blog_query.xml +++ b/binsrc/tutorial/apps/blog_query/blog_query.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog_query/opml.xml b/binsrc/tutorial/apps/blog_query/opml.xml index 7f25998cb4..46bb920922 100644 --- a/binsrc/tutorial/apps/blog_query/opml.xml +++ b/binsrc/tutorial/apps/blog_query/opml.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/blog_query/options.xml b/binsrc/tutorial/apps/blog_query/options.xml index 2a9bc3a3fa..a8de9b20ce 100644 --- a/binsrc/tutorial/apps/blog_query/options.xml +++ b/binsrc/tutorial/apps/blog_query/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/demo.css b/binsrc/tutorial/apps/demo.css index b0570dc54c..4a38f4be01 100644 --- a/binsrc/tutorial/apps/demo.css +++ b/binsrc/tutorial/apps/demo.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/forums/forums.xml b/binsrc/tutorial/apps/forums/forums.xml index 5e5adcfd47..2990ef2a3c 100644 --- a/binsrc/tutorial/apps/forums/forums.xml +++ b/binsrc/tutorial/apps/forums/forums.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/forums/options.xml b/binsrc/tutorial/apps/forums/options.xml index d7b11aaa96..fc22955c0f 100644 --- a/binsrc/tutorial/apps/forums/options.xml +++ b/binsrc/tutorial/apps/forums/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/ibuyspy/ibuyspy.xml b/binsrc/tutorial/apps/ibuyspy/ibuyspy.xml index 332396c719..00661ce9cc 100644 --- a/binsrc/tutorial/apps/ibuyspy/ibuyspy.xml +++ b/binsrc/tutorial/apps/ibuyspy/ibuyspy.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/ibuyspy/options.xml b/binsrc/tutorial/apps/ibuyspy/options.xml index bd48c3911b..6b40dd2362 100644 --- a/binsrc/tutorial/apps/ibuyspy/options.xml +++ b/binsrc/tutorial/apps/ibuyspy/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/index.xml b/binsrc/tutorial/apps/index.xml index bbe90da45c..308273d610 100644 --- a/binsrc/tutorial/apps/index.xml +++ b/binsrc/tutorial/apps/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/petshop/options.xml b/binsrc/tutorial/apps/petshop/options.xml index 951df48efb..5fc3f110e0 100644 --- a/binsrc/tutorial/apps/petshop/options.xml +++ b/binsrc/tutorial/apps/petshop/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/petshop/petshop.xml b/binsrc/tutorial/apps/petshop/petshop.xml index 4e9586b15a..088c08d0b9 100644 --- a/binsrc/tutorial/apps/petshop/petshop.xml +++ b/binsrc/tutorial/apps/petshop/petshop.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/petshop/petshopinit.sql b/binsrc/tutorial/apps/petshop/petshopinit.sql index a68b4a8bdc..3efd140e8e 100644 --- a/binsrc/tutorial/apps/petshop/petshopinit.sql +++ b/binsrc/tutorial/apps/petshop/petshopinit.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/rss_feed/blog.vspx b/binsrc/tutorial/apps/rss_feed/blog.vspx index b859c929ac..8f35831e91 100644 --- a/binsrc/tutorial/apps/rss_feed/blog.vspx +++ b/binsrc/tutorial/apps/rss_feed/blog.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/rss_feed/blogs.sql b/binsrc/tutorial/apps/rss_feed/blogs.sql index 2b8d818f3a..dbfc134801 100644 --- a/binsrc/tutorial/apps/rss_feed/blogs.sql +++ b/binsrc/tutorial/apps/rss_feed/blogs.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/rss_feed/options.xml b/binsrc/tutorial/apps/rss_feed/options.xml index ac877547f1..94ab246db9 100644 --- a/binsrc/tutorial/apps/rss_feed/options.xml +++ b/binsrc/tutorial/apps/rss_feed/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/rss_feed/rss.vsp b/binsrc/tutorial/apps/rss_feed/rss.vsp index 8dfc567db1..6ea8943dd1 100644 --- a/binsrc/tutorial/apps/rss_feed/rss.vsp +++ b/binsrc/tutorial/apps/rss_feed/rss.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/rss_feed/rss2upg.xsl b/binsrc/tutorial/apps/rss_feed/rss2upg.xsl index 5947b723c8..f6576041d2 100644 --- a/binsrc/tutorial/apps/rss_feed/rss2upg.xsl +++ b/binsrc/tutorial/apps/rss_feed/rss2upg.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/apps/rss_feed/rss_feed.xml b/binsrc/tutorial/apps/rss_feed/rss_feed.xml index cd8eaa155e..a50b6823a0 100644 --- a/binsrc/tutorial/apps/rss_feed/rss_feed.xml +++ b/binsrc/tutorial/apps/rss_feed/rss_feed.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/atom.vsp b/binsrc/tutorial/atom.vsp index 702d8083df..269ef19b69 100644 --- a/binsrc/tutorial/atom.vsp +++ b/binsrc/tutorial/atom.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/dev.sql b/binsrc/tutorial/dev.sql index 2278b33fd8..a871677689 100644 --- a/binsrc/tutorial/dev.sql +++ b/binsrc/tutorial/dev.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/dev.vsp b/binsrc/tutorial/dev.vsp index 537f37fd35..2e7d23de2c 100644 --- a/binsrc/tutorial/dev.vsp +++ b/binsrc/tutorial/dev.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/example.js b/binsrc/tutorial/example.js index 5600032a2f..3ed5dafdf1 100644 --- a/binsrc/tutorial/example.js +++ b/binsrc/tutorial/example.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/guide.vsp b/binsrc/tutorial/guide.vsp index 30ac6ec036..c8b843e3a0 100644 --- a/binsrc/tutorial/guide.vsp +++ b/binsrc/tutorial/guide.vsp @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/Makefile.am b/binsrc/tutorial/hosting/Makefile.am index db8ac71a7e..33e035f846 100644 --- a/binsrc/tutorial/hosting/Makefile.am +++ b/binsrc/tutorial/hosting/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/demo.css b/binsrc/tutorial/hosting/demo.css index 10a5eb5a13..a0f373157f 100644 --- a/binsrc/tutorial/hosting/demo.css +++ b/binsrc/tutorial/hosting/demo.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_1/Point.java b/binsrc/tutorial/hosting/ho_s_1/Point.java index b46931f649..682ea1981f 100644 --- a/binsrc/tutorial/hosting/ho_s_1/Point.java +++ b/binsrc/tutorial/hosting/ho_s_1/Point.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_1/ho_s_1.sql b/binsrc/tutorial/hosting/ho_s_1/ho_s_1.sql index 7d2423095d..3f2081603a 100644 --- a/binsrc/tutorial/hosting/ho_s_1/ho_s_1.sql +++ b/binsrc/tutorial/hosting/ho_s_1/ho_s_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_1/ho_s_1.xml b/binsrc/tutorial/hosting/ho_s_1/ho_s_1.xml index 57d7b60690..80a3f2e61e 100644 --- a/binsrc/tutorial/hosting/ho_s_1/ho_s_1.xml +++ b/binsrc/tutorial/hosting/ho_s_1/ho_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_1/my_finances.java b/binsrc/tutorial/hosting/ho_s_1/my_finances.java index 459a03d42e..d19f7d9724 100644 --- a/binsrc/tutorial/hosting/ho_s_1/my_finances.java +++ b/binsrc/tutorial/hosting/ho_s_1/my_finances.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_1/options.xml b/binsrc/tutorial/hosting/ho_s_1/options.xml index 568a7b8eda..d41c070ff9 100644 --- a/binsrc/tutorial/hosting/ho_s_1/options.xml +++ b/binsrc/tutorial/hosting/ho_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_1/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_1/vsp1.vsp index bde112ddca..c27c3aae9b 100644 --- a/binsrc/tutorial/hosting/ho_s_1/vsp1.vsp +++ b/binsrc/tutorial/hosting/ho_s_1/vsp1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_1/vsp2.vsp b/binsrc/tutorial/hosting/ho_s_1/vsp2.vsp index fd2ad46583..4f2716fa13 100644 --- a/binsrc/tutorial/hosting/ho_s_1/vsp2.vsp +++ b/binsrc/tutorial/hosting/ho_s_1/vsp2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_1/vsp3.vsp b/binsrc/tutorial/hosting/ho_s_1/vsp3.vsp index 88362494d7..433e2befe3 100644 --- a/binsrc/tutorial/hosting/ho_s_1/vsp3.vsp +++ b/binsrc/tutorial/hosting/ho_s_1/vsp3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_1/vsp4.vsp b/binsrc/tutorial/hosting/ho_s_1/vsp4.vsp index 4724b48b97..6faeaa0b35 100644 --- a/binsrc/tutorial/hosting/ho_s_1/vsp4.vsp +++ b/binsrc/tutorial/hosting/ho_s_1/vsp4.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_10/Point_ho_s_10.cs b/binsrc/tutorial/hosting/ho_s_10/Point_ho_s_10.cs index 619b46bbcd..7bb4e7d11b 100644 --- a/binsrc/tutorial/hosting/ho_s_10/Point_ho_s_10.cs +++ b/binsrc/tutorial/hosting/ho_s_10/Point_ho_s_10.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_10/ho_s_10.sql b/binsrc/tutorial/hosting/ho_s_10/ho_s_10.sql index 55220e026d..d0ee1be151 100644 --- a/binsrc/tutorial/hosting/ho_s_10/ho_s_10.sql +++ b/binsrc/tutorial/hosting/ho_s_10/ho_s_10.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_10/ho_s_10.xml b/binsrc/tutorial/hosting/ho_s_10/ho_s_10.xml index c6131448d6..8a52fad3d0 100644 --- a/binsrc/tutorial/hosting/ho_s_10/ho_s_10.xml +++ b/binsrc/tutorial/hosting/ho_s_10/ho_s_10.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_10/options.xml b/binsrc/tutorial/hosting/ho_s_10/options.xml index 82603c588e..9642473294 100644 --- a/binsrc/tutorial/hosting/ho_s_10/options.xml +++ b/binsrc/tutorial/hosting/ho_s_10/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_10/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_10/vsp1.vsp index e455d95a5b..0a9b1c605a 100644 --- a/binsrc/tutorial/hosting/ho_s_10/vsp1.vsp +++ b/binsrc/tutorial/hosting/ho_s_10/vsp1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_11/ho_s_11.sql b/binsrc/tutorial/hosting/ho_s_11/ho_s_11.sql index 92d2912f2b..49a72e16ad 100644 --- a/binsrc/tutorial/hosting/ho_s_11/ho_s_11.sql +++ b/binsrc/tutorial/hosting/ho_s_11/ho_s_11.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_11/ho_s_11.xml b/binsrc/tutorial/hosting/ho_s_11/ho_s_11.xml index cb9d4a35f2..857e606acb 100644 --- a/binsrc/tutorial/hosting/ho_s_11/ho_s_11.xml +++ b/binsrc/tutorial/hosting/ho_s_11/ho_s_11.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_11/options.xml b/binsrc/tutorial/hosting/ho_s_11/options.xml index bb6e72ebe0..ef0a6049a8 100644 --- a/binsrc/tutorial/hosting/ho_s_11/options.xml +++ b/binsrc/tutorial/hosting/ho_s_11/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_11/restricted.cs b/binsrc/tutorial/hosting/ho_s_11/restricted.cs index 083adadd76..264ff64407 100644 --- a/binsrc/tutorial/hosting/ho_s_11/restricted.cs +++ b/binsrc/tutorial/hosting/ho_s_11/restricted.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_11/restricted.vsp b/binsrc/tutorial/hosting/ho_s_11/restricted.vsp index 7fa8fa019d..405d506119 100644 --- a/binsrc/tutorial/hosting/ho_s_11/restricted.vsp +++ b/binsrc/tutorial/hosting/ho_s_11/restricted.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_11/unrestricted.cs b/binsrc/tutorial/hosting/ho_s_11/unrestricted.cs index a8b08315ac..4c5b5ff29c 100644 --- a/binsrc/tutorial/hosting/ho_s_11/unrestricted.cs +++ b/binsrc/tutorial/hosting/ho_s_11/unrestricted.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_11/unrestricted.vsp b/binsrc/tutorial/hosting/ho_s_11/unrestricted.vsp index bf94457d38..2a27320255 100644 --- a/binsrc/tutorial/hosting/ho_s_11/unrestricted.vsp +++ b/binsrc/tutorial/hosting/ho_s_11/unrestricted.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_12/Global.asax.cs b/binsrc/tutorial/hosting/ho_s_12/Global.asax.cs index 2ad465035a..88375b99de 100644 --- a/binsrc/tutorial/hosting/ho_s_12/Global.asax.cs +++ b/binsrc/tutorial/hosting/ho_s_12/Global.asax.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_12/Service1.asmx.cs b/binsrc/tutorial/hosting/ho_s_12/Service1.asmx.cs index 8e176bd093..24eaa6a085 100644 --- a/binsrc/tutorial/hosting/ho_s_12/Service1.asmx.cs +++ b/binsrc/tutorial/hosting/ho_s_12/Service1.asmx.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_12/asmx_tutorial.vsp b/binsrc/tutorial/hosting/ho_s_12/asmx_tutorial.vsp index 32511a9af9..45d10508fb 100644 --- a/binsrc/tutorial/hosting/ho_s_12/asmx_tutorial.vsp +++ b/binsrc/tutorial/hosting/ho_s_12/asmx_tutorial.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_12/ho_s_12.sql b/binsrc/tutorial/hosting/ho_s_12/ho_s_12.sql index 0cc9714234..ef721301ba 100644 --- a/binsrc/tutorial/hosting/ho_s_12/ho_s_12.sql +++ b/binsrc/tutorial/hosting/ho_s_12/ho_s_12.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_12/ho_s_12.xml b/binsrc/tutorial/hosting/ho_s_12/ho_s_12.xml index d035af3677..ef0ee47072 100644 --- a/binsrc/tutorial/hosting/ho_s_12/ho_s_12.xml +++ b/binsrc/tutorial/hosting/ho_s_12/ho_s_12.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_12/options.xml b/binsrc/tutorial/hosting/ho_s_12/options.xml index 6ac75d8858..4c554f24b0 100644 --- a/binsrc/tutorial/hosting/ho_s_12/options.xml +++ b/binsrc/tutorial/hosting/ho_s_12/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_13/Restricted.java b/binsrc/tutorial/hosting/ho_s_13/Restricted.java index a5134cee96..ac7f5ccf21 100644 --- a/binsrc/tutorial/hosting/ho_s_13/Restricted.java +++ b/binsrc/tutorial/hosting/ho_s_13/Restricted.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_13/Unrestricted.java b/binsrc/tutorial/hosting/ho_s_13/Unrestricted.java index 584ac5b8b6..53c68f1c34 100644 --- a/binsrc/tutorial/hosting/ho_s_13/Unrestricted.java +++ b/binsrc/tutorial/hosting/ho_s_13/Unrestricted.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_13/ho_s_13.sql b/binsrc/tutorial/hosting/ho_s_13/ho_s_13.sql index aec6e41f5c..6c7fff576b 100644 --- a/binsrc/tutorial/hosting/ho_s_13/ho_s_13.sql +++ b/binsrc/tutorial/hosting/ho_s_13/ho_s_13.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_13/ho_s_13.xml b/binsrc/tutorial/hosting/ho_s_13/ho_s_13.xml index aab95a697c..6855790d40 100644 --- a/binsrc/tutorial/hosting/ho_s_13/ho_s_13.xml +++ b/binsrc/tutorial/hosting/ho_s_13/ho_s_13.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_13/options.xml b/binsrc/tutorial/hosting/ho_s_13/options.xml index 568a7b8eda..d41c070ff9 100644 --- a/binsrc/tutorial/hosting/ho_s_13/options.xml +++ b/binsrc/tutorial/hosting/ho_s_13/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_13/restricted.vsp b/binsrc/tutorial/hosting/ho_s_13/restricted.vsp index bd8facc31d..48b01426ec 100644 --- a/binsrc/tutorial/hosting/ho_s_13/restricted.vsp +++ b/binsrc/tutorial/hosting/ho_s_13/restricted.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_13/unrestricted.vsp b/binsrc/tutorial/hosting/ho_s_13/unrestricted.vsp index 984dce8f78..ca90978cde 100644 --- a/binsrc/tutorial/hosting/ho_s_13/unrestricted.vsp +++ b/binsrc/tutorial/hosting/ho_s_13/unrestricted.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_14/ho_s_14.cs b/binsrc/tutorial/hosting/ho_s_14/ho_s_14.cs index 06d529310d..98445df218 100644 --- a/binsrc/tutorial/hosting/ho_s_14/ho_s_14.cs +++ b/binsrc/tutorial/hosting/ho_s_14/ho_s_14.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_14/ho_s_14.sql b/binsrc/tutorial/hosting/ho_s_14/ho_s_14.sql index a1dff282bb..df3dd40143 100644 --- a/binsrc/tutorial/hosting/ho_s_14/ho_s_14.sql +++ b/binsrc/tutorial/hosting/ho_s_14/ho_s_14.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_14/ho_s_14.xml b/binsrc/tutorial/hosting/ho_s_14/ho_s_14.xml index 5476c88972..923e110803 100644 --- a/binsrc/tutorial/hosting/ho_s_14/ho_s_14.xml +++ b/binsrc/tutorial/hosting/ho_s_14/ho_s_14.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_14/options.xml b/binsrc/tutorial/hosting/ho_s_14/options.xml index 6dc4f7c335..f21696a642 100644 --- a/binsrc/tutorial/hosting/ho_s_14/options.xml +++ b/binsrc/tutorial/hosting/ho_s_14/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_14/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_14/vsp1.vsp index 1242266a24..2e2f181109 100644 --- a/binsrc/tutorial/hosting/ho_s_14/vsp1.vsp +++ b/binsrc/tutorial/hosting/ho_s_14/vsp1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/Resource.h b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/Resource.h index 274534dd1c..d8c484af24 100644 --- a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/Resource.h +++ b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/Resource.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.cpp b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.cpp index 813738eb1a..532dd531b1 100644 --- a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.cpp +++ b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.cpp @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.h b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.h index 7637c1e465..bf42c1839a 100644 --- a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.h +++ b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMObject.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMServer.cpp b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMServer.cpp index 8af6edc98f..0258726d53 100644 --- a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMServer.cpp +++ b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/VirtCOMServer.cpp @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.cpp b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.cpp index 4c27c9b857..1395690a0c 100644 --- a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.cpp +++ b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.cpp @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.h b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.h index a6d2a6a47b..8b2787eac6 100644 --- a/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.h +++ b/binsrc/tutorial/hosting/ho_s_15/COM/VirtCOMServer/stdafx.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.cpp b/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.cpp index 813738eb1a..532dd531b1 100644 --- a/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.cpp +++ b/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.cpp @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.h b/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.h index 7637c1e465..bf42c1839a 100644 --- a/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.h +++ b/binsrc/tutorial/hosting/ho_s_15/VirtCOMObject.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_15/ho_s_15.sql b/binsrc/tutorial/hosting/ho_s_15/ho_s_15.sql index d955eed8a3..75d023aa50 100644 --- a/binsrc/tutorial/hosting/ho_s_15/ho_s_15.sql +++ b/binsrc/tutorial/hosting/ho_s_15/ho_s_15.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_15/ho_s_15.xml b/binsrc/tutorial/hosting/ho_s_15/ho_s_15.xml index 1b64f0757c..3af1d02079 100644 --- a/binsrc/tutorial/hosting/ho_s_15/ho_s_15.xml +++ b/binsrc/tutorial/hosting/ho_s_15/ho_s_15.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_15/options.xml b/binsrc/tutorial/hosting/ho_s_15/options.xml index ccd839e3e7..d78f5ffa01 100644 --- a/binsrc/tutorial/hosting/ho_s_15/options.xml +++ b/binsrc/tutorial/hosting/ho_s_15/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_15/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_15/vsp1.vsp index 6b55315963..56937ece54 100644 --- a/binsrc/tutorial/hosting/ho_s_15/vsp1.vsp +++ b/binsrc/tutorial/hosting/ho_s_15/vsp1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_16/cgitest.rb b/binsrc/tutorial/hosting/ho_s_16/cgitest.rb index 6eb8f87d8b..2f44287bd8 100644 --- a/binsrc/tutorial/hosting/ho_s_16/cgitest.rb +++ b/binsrc/tutorial/hosting/ho_s_16/cgitest.rb @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_16/ho_s_16.xml b/binsrc/tutorial/hosting/ho_s_16/ho_s_16.xml index 27adfed38c..729162858e 100644 --- a/binsrc/tutorial/hosting/ho_s_16/ho_s_16.xml +++ b/binsrc/tutorial/hosting/ho_s_16/ho_s_16.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_16/options.xml b/binsrc/tutorial/hosting/ho_s_16/options.xml index cffc714c64..c609b3ec75 100644 --- a/binsrc/tutorial/hosting/ho_s_16/options.xml +++ b/binsrc/tutorial/hosting/ho_s_16/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_17/ho_s_17.xml b/binsrc/tutorial/hosting/ho_s_17/ho_s_17.xml index d7e1ec8f0f..32ddfc3b12 100644 --- a/binsrc/tutorial/hosting/ho_s_17/ho_s_17.xml +++ b/binsrc/tutorial/hosting/ho_s_17/ho_s_17.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_17/options.xml b/binsrc/tutorial/hosting/ho_s_17/options.xml index 568a7b8eda..d41c070ff9 100644 --- a/binsrc/tutorial/hosting/ho_s_17/options.xml +++ b/binsrc/tutorial/hosting/ho_s_17/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_2/MyFinances.cs b/binsrc/tutorial/hosting/ho_s_2/MyFinances.cs index e9f7f0f88f..ccc486219f 100644 --- a/binsrc/tutorial/hosting/ho_s_2/MyFinances.cs +++ b/binsrc/tutorial/hosting/ho_s_2/MyFinances.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_2/Point.cs b/binsrc/tutorial/hosting/ho_s_2/Point.cs index 2c614a7429..31c6881fd1 100644 --- a/binsrc/tutorial/hosting/ho_s_2/Point.cs +++ b/binsrc/tutorial/hosting/ho_s_2/Point.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_2/ho_s_2.sql b/binsrc/tutorial/hosting/ho_s_2/ho_s_2.sql index 4703bf05a6..e5931e82e0 100644 --- a/binsrc/tutorial/hosting/ho_s_2/ho_s_2.sql +++ b/binsrc/tutorial/hosting/ho_s_2/ho_s_2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_2/ho_s_2.xml b/binsrc/tutorial/hosting/ho_s_2/ho_s_2.xml index f5a129e42f..d47c4907b3 100644 --- a/binsrc/tutorial/hosting/ho_s_2/ho_s_2.xml +++ b/binsrc/tutorial/hosting/ho_s_2/ho_s_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_2/options.xml b/binsrc/tutorial/hosting/ho_s_2/options.xml index 6dc4f7c335..f21696a642 100644 --- a/binsrc/tutorial/hosting/ho_s_2/options.xml +++ b/binsrc/tutorial/hosting/ho_s_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_2/vsp1.vsp b/binsrc/tutorial/hosting/ho_s_2/vsp1.vsp index 7f7f8acb82..806856075e 100644 --- a/binsrc/tutorial/hosting/ho_s_2/vsp1.vsp +++ b/binsrc/tutorial/hosting/ho_s_2/vsp1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_2/vsp2.vsp b/binsrc/tutorial/hosting/ho_s_2/vsp2.vsp index 2c0908a29f..de69dcc6c9 100644 --- a/binsrc/tutorial/hosting/ho_s_2/vsp2.vsp +++ b/binsrc/tutorial/hosting/ho_s_2/vsp2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_2/vsp3.vsp b/binsrc/tutorial/hosting/ho_s_2/vsp3.vsp index 0ef4012de9..d890fb78af 100644 --- a/binsrc/tutorial/hosting/ho_s_2/vsp3.vsp +++ b/binsrc/tutorial/hosting/ho_s_2/vsp3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_2/vsp4.vsp b/binsrc/tutorial/hosting/ho_s_2/vsp4.vsp index 437265c236..d4b1ba4c8d 100644 --- a/binsrc/tutorial/hosting/ho_s_2/vsp4.vsp +++ b/binsrc/tutorial/hosting/ho_s_2/vsp4.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_3/handler.vsp b/binsrc/tutorial/hosting/ho_s_3/handler.vsp index abf3d1bffe..33f48519e4 100644 --- a/binsrc/tutorial/hosting/ho_s_3/handler.vsp +++ b/binsrc/tutorial/hosting/ho_s_3/handler.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_3/ho_s_3.sql b/binsrc/tutorial/hosting/ho_s_3/ho_s_3.sql index 4e93d8b603..fbcf07bdc8 100644 --- a/binsrc/tutorial/hosting/ho_s_3/ho_s_3.sql +++ b/binsrc/tutorial/hosting/ho_s_3/ho_s_3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_3/ho_s_3.xml b/binsrc/tutorial/hosting/ho_s_3/ho_s_3.xml index 6e94f9cd36..0fb075fd1c 100644 --- a/binsrc/tutorial/hosting/ho_s_3/ho_s_3.xml +++ b/binsrc/tutorial/hosting/ho_s_3/ho_s_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_3/options.xml b/binsrc/tutorial/hosting/ho_s_3/options.xml index ccd839e3e7..d78f5ffa01 100644 --- a/binsrc/tutorial/hosting/ho_s_3/options.xml +++ b/binsrc/tutorial/hosting/ho_s_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_3/redcoalsms.cs b/binsrc/tutorial/hosting/ho_s_3/redcoalsms.cs index f55079e636..c378172477 100644 --- a/binsrc/tutorial/hosting/ho_s_3/redcoalsms.cs +++ b/binsrc/tutorial/hosting/ho_s_3/redcoalsms.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_3/redcoalsmsref.cs b/binsrc/tutorial/hosting/ho_s_3/redcoalsmsref.cs index 0ae50b9093..f9e46dd8d2 100644 --- a/binsrc/tutorial/hosting/ho_s_3/redcoalsmsref.cs +++ b/binsrc/tutorial/hosting/ho_s_3/redcoalsmsref.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_3/setup_sms.vsp b/binsrc/tutorial/hosting/ho_s_3/setup_sms.vsp index c912a03147..a67cfdf31f 100644 --- a/binsrc/tutorial/hosting/ho_s_3/setup_sms.vsp +++ b/binsrc/tutorial/hosting/ho_s_3/setup_sms.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/FAQ.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/FAQ.html index 7839c7324a..3376b06ed6 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/FAQ.html +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/FAQ.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/INSTALL.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/INSTALL.html index 831fed700f..02e9d3bedc 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/INSTALL.html +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/INSTALL.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/README.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/README.html index 4ac166ba1c..ee081c934f 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/README.html +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/README.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/UPGRADING.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/UPGRADING.html index f144b6a3ce..94bcf28690 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/UPGRADING.html +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/UPGRADING.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/activity_log.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/activity_log.php index 0b0380fd32..41f9bcf897 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/activity_log.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/activity_log.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/add_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/add_entry.php index b3ccaafeb3..dbe07ff6c1 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/add_entry.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/add_entry.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin.php index 17831507f0..7c8691a169 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin_handler.php index c60639f96c..0b82719f94 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin_handler.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/admin_handler.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/approve_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/approve_entry.php index 6cac515b92..c45246c210 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/approve_entry.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/approve_entry.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit.php index a0d6f7c413..b462c00f25 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit_handler.php index 0ac4cf5a77..632008af3b 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit_handler.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/assistant_edit_handler.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category.php index be1a72728f..628896d0e0 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category_handler.php index bbc656f936..7909ac2bdb 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category_handler.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/category_handler.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/colors.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/colors.php index 53223f66da..d4d33f58ec 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/colors.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/colors.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/datesel.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/datesel.php index 8eab7cd8d0..298255077a 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/datesel.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/datesel.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/day.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/day.php index b302534720..410406c979 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/day.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/day.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_entry.php index a138c0afaa..b67d353446 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_entry.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_entry.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_layer.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_layer.php index 95e2b54375..6e4a7ce285 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_layer.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/del_layer.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/docs/php2html.pl b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/docs/php2html.pl index 86c3eaacf5..6fd70ba62a 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/docs/php2html.pl +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/docs/php2html.pl @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/drop-tables-odbc.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/drop-tables-odbc.sql index 24cea88a73..24e855d5fb 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/drop-tables-odbc.sql +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/drop-tables-odbc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry.php index efae17083b..054756e417 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry_handler.php index eb3e15753b..28def0709c 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry_handler.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_entry_handler.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer.php index 1340443c16..447b28a315 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer_handler.php index e93f3497bf..b13596e802 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer_handler.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_layer_handler.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user.php index 8469ec4c28..af1d6c6a44 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user_handler.php index 7fa9a951a5..cbcf895448 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user_handler.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/edit_user_handler.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export.php index 0e51ab6a7b..fae6612aa0 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export_handler.php index 3ba6f192ce..b8abbf1f90 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export_handler.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/export_handler.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit.php index bcc0ebf8bb..122d3d9a53 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit_handler.php index e6e74eefc1..874608e309 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit_handler.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/group_edit_handler.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/groups.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/groups.php index f06a437681..ef1b5bdd79 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/groups.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/groups.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_admin.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_admin.php index 552bee16e1..3c92bb1aeb 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_admin.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_admin.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_bug.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_bug.php index 5cbcf0408b..f3a83d7f26 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_bug.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_bug.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_edit_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_edit_entry.php index 062da71e54..d0cd0ed452 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_edit_entry.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_edit_entry.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_index.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_index.php index 214a99ace9..3157fa5a23 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_index.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_index.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_layers.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_layers.php index 5b924b542b..935d6976cf 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_layers.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_layers.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_pref.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_pref.php index 6b9e15a16e..e78dc66c14 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_pref.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/help_pref.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/config.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/config.php index 1f016e63ef..e9053ad73c 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/config.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/config.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/connect.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/connect.php index 202998dc18..7508c1294a 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/connect.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/connect.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/dbtable.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/dbtable.php index 1fe46ce29e..416ef8f5bd 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/dbtable.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/dbtable.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/functions.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/functions.php index e90f543135..dd92e6b949 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/functions.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/functions.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/help_trailer.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/help_trailer.php index 04221918d3..7253481a06 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/help_trailer.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/help_trailer.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.html b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.html index 0a9fa268c0..0fa7d156e1 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.html +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.php index b99cfd8543..88105cee32 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/index.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/js.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/js.php index 999dfe16d1..32d7353407 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/js.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/js.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/php-dbi.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/php-dbi.php index 72334c1a10..e9c5a1d899 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/php-dbi.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/php-dbi.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/site_extras.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/site_extras.php index dadef67496..6625b19c66 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/site_extras.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/site_extras.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/styles.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/styles.php index 304f59a4e7..04132a32e5 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/styles.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/styles.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/trailer.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/trailer.php index c2280c2160..5bd76eb420 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/trailer.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/trailer.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/translate.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/translate.php index ebeaddf60f..53781c0a19 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/translate.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/translate.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-ldap.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-ldap.php index ac33fd565b..bb10933d23 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-ldap.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-ldap.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-nis.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-nis.php index c30a572d35..94bcf6996f 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-nis.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user-nis.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user.php index 75eaa4aa43..966d67debc 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/user.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/validate.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/validate.php index bc00802c4e..da7bd06479 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/validate.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/includes/validate.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/index.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/index.php index e23ead6cdb..d3ee8954a7 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/index.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/index.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers.php index ba848f2ed2..42c567ede8 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers_toggle.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers_toggle.php index a9209213ba..c2311bb54a 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers_toggle.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/layers_toggle.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/list_unapproved.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/list_unapproved.php index 2b06b6787e..570b52478b 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/list_unapproved.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/list_unapproved.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/login.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/login.php index 0d7568700a..1fd8879cbc 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/login.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/login.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/month.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/month.php index 7d1f174cae..ec331724b6 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/month.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/month.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref.php index 9ca991399a..5e9821e378 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref_handler.php index 7d7b191978..666c523e0a 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref_handler.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/pref_handler.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/purge.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/purge.php index ae912dffcf..ccd0ca4313 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/purge.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/purge.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/reject_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/reject_entry.php index c00097970c..5be0026ff1 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/reject_entry.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/reject_entry.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search.php index 50ab7fe5e8..48d3dd8737 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search_handler.php index ff8a704222..0307ecd4e6 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search_handler.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/search_handler.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/select_user.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/select_user.php index 993065620a..8842575fee 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/select_user.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/select_user.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/set_entry_cat.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/set_entry_cat.php index 509110b10d..85be28c268 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/set_entry_cat.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/set_entry_cat.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-db2.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-db2.sql index 09762fee8f..6fe23ade45 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-db2.sql +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-db2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-ibase.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-ibase.sql index a46102e5e7..516ac92aa6 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-ibase.sql +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-ibase.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-mysql.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-mysql.sql index 58aeb758c2..f5d980f1c5 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-mysql.sql +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-mysql.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-odbc.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-odbc.sql index 22fd66a24e..8bab2e86f3 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-odbc.sql +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-odbc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-oracle.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-oracle.sql index 6e85b84cf1..ba2dd8d9c6 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-oracle.sql +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-oracle.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-postgres.sql b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-postgres.sql index 7cdab62313..bafd159e9d 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-postgres.sql +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tables-postgres.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/check_translation.pl b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/check_translation.pl index 0cde7cf66d..64ee22e7fd 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/check_translation.pl +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/check_translation.pl @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/send_reminders.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/send_reminders.php index 0fedb3abce..e2be1641dc 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/send_reminders.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/send_reminders.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/translation_summary.pl b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/translation_summary.pl index ca04310b19..72042a621a 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/translation_summary.pl +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/translation_summary.pl @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_all.pl b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_all.pl index 8472abbf8f..75f6c31ac3 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_all.pl +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_all.pl @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_translation.pl b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_translation.pl index 193745e27b..c19f6dc37a 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_translation.pl +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/update_translation.pl @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/upgrade_to_0.9.7.pl b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/upgrade_to_0.9.7.pl index ffba9260ac..e2b09f59f2 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/upgrade_to_0.9.7.pl +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/tools/upgrade_to_0.9.7.pl @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/users.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/users.php index 9b40888b6d..4bb6ab6222 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/users.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/users.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/usersel.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/usersel.php index fa21422c85..30000e1894 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/usersel.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/usersel.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_entry.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_entry.php index 8b91fa9db4..a212cc767b 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_entry.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_entry.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_m.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_m.php index c09832671b..a7d481d07d 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_m.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_m.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_v.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_v.php index cc8e483615..bf51ce855d 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_v.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_v.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_w.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_w.php index d2d9b77c8a..f37b01cbef 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_w.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/view_w.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views.php index d94b42db1a..b29cfdd987 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit.php index 581b5c6abc..9c9e10e080 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit_handler.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit_handler.php index c7837929cd..a609ecaa82 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit_handler.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/views_edit_handler.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week.php index 7ff0f0c158..c7db5598ff 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_details.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_details.php index e301dd7f63..b60932ef56 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_details.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_details.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_ssi.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_ssi.php index 83ebfd8db4..f10f98f3cf 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_ssi.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/week_ssi.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/year.php b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/year.php index c64ac048db..3c23c494c7 100644 --- a/binsrc/tutorial/hosting/ho_s_30/WebCalendar/year.php +++ b/binsrc/tutorial/hosting/ho_s_30/WebCalendar/year.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/create_local_dsn.sql b/binsrc/tutorial/hosting/ho_s_30/create_local_dsn.sql index 20e3908988..20f8c0df17 100644 --- a/binsrc/tutorial/hosting/ho_s_30/create_local_dsn.sql +++ b/binsrc/tutorial/hosting/ho_s_30/create_local_dsn.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/ho_s_30.sql b/binsrc/tutorial/hosting/ho_s_30/ho_s_30.sql index d9bc458c7c..842a51fdf6 100644 --- a/binsrc/tutorial/hosting/ho_s_30/ho_s_30.sql +++ b/binsrc/tutorial/hosting/ho_s_30/ho_s_30.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/ho_s_30.xml b/binsrc/tutorial/hosting/ho_s_30/ho_s_30.xml index 95ede99354..1729c606f4 100644 --- a/binsrc/tutorial/hosting/ho_s_30/ho_s_30.xml +++ b/binsrc/tutorial/hosting/ho_s_30/ho_s_30.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/odbc-sample.php b/binsrc/tutorial/hosting/ho_s_30/odbc-sample.php index 2ea65f2ed4..23d4d4a189 100644 --- a/binsrc/tutorial/hosting/ho_s_30/odbc-sample.php +++ b/binsrc/tutorial/hosting/ho_s_30/odbc-sample.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/options.xml b/binsrc/tutorial/hosting/ho_s_30/options.xml index 7a507cd056..d5710eae01 100644 --- a/binsrc/tutorial/hosting/ho_s_30/options.xml +++ b/binsrc/tutorial/hosting/ho_s_30/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_30/webcalendar.php b/binsrc/tutorial/hosting/ho_s_30/webcalendar.php index c3ac5fa377..dfe8eec3fa 100644 --- a/binsrc/tutorial/hosting/ho_s_30/webcalendar.php +++ b/binsrc/tutorial/hosting/ho_s_30/webcalendar.php @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_4/handler.vspx b/binsrc/tutorial/hosting/ho_s_4/handler.vspx index b453b8c1f8..74d8696619 100644 --- a/binsrc/tutorial/hosting/ho_s_4/handler.vspx +++ b/binsrc/tutorial/hosting/ho_s_4/handler.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_4/ho_s_4.xml b/binsrc/tutorial/hosting/ho_s_4/ho_s_4.xml index 50facb1a7e..c3bd47f307 100644 --- a/binsrc/tutorial/hosting/ho_s_4/ho_s_4.xml +++ b/binsrc/tutorial/hosting/ho_s_4/ho_s_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_4/options.xml b/binsrc/tutorial/hosting/ho_s_4/options.xml index d704f90250..66309a8fc0 100644 --- a/binsrc/tutorial/hosting/ho_s_4/options.xml +++ b/binsrc/tutorial/hosting/ho_s_4/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_4/redcoalsms.cs b/binsrc/tutorial/hosting/ho_s_4/redcoalsms.cs index f55079e636..c378172477 100644 --- a/binsrc/tutorial/hosting/ho_s_4/redcoalsms.cs +++ b/binsrc/tutorial/hosting/ho_s_4/redcoalsms.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_4/redcoalsms.sql b/binsrc/tutorial/hosting/ho_s_4/redcoalsms.sql index 4630f87d43..0e23501bf1 100644 --- a/binsrc/tutorial/hosting/ho_s_4/redcoalsms.sql +++ b/binsrc/tutorial/hosting/ho_s_4/redcoalsms.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_4/redcoalsmsref.cs b/binsrc/tutorial/hosting/ho_s_4/redcoalsmsref.cs index 0ae50b9093..f9e46dd8d2 100644 --- a/binsrc/tutorial/hosting/ho_s_4/redcoalsmsref.cs +++ b/binsrc/tutorial/hosting/ho_s_4/redcoalsmsref.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_4/setup_sms.vspx b/binsrc/tutorial/hosting/ho_s_4/setup_sms.vspx index 974754061b..ebbf76aca2 100644 --- a/binsrc/tutorial/hosting/ho_s_4/setup_sms.vspx +++ b/binsrc/tutorial/hosting/ho_s_4/setup_sms.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_5/handler.vspx b/binsrc/tutorial/hosting/ho_s_5/handler.vspx index 15f6a32f07..c503baeb9d 100644 --- a/binsrc/tutorial/hosting/ho_s_5/handler.vspx +++ b/binsrc/tutorial/hosting/ho_s_5/handler.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_5/ho_s_5.xml b/binsrc/tutorial/hosting/ho_s_5/ho_s_5.xml index f7b098e05e..a1b0059f4c 100644 --- a/binsrc/tutorial/hosting/ho_s_5/ho_s_5.xml +++ b/binsrc/tutorial/hosting/ho_s_5/ho_s_5.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_5/options.xml b/binsrc/tutorial/hosting/ho_s_5/options.xml index 6e9be1f91f..837eaee528 100644 --- a/binsrc/tutorial/hosting/ho_s_5/options.xml +++ b/binsrc/tutorial/hosting/ho_s_5/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.cs b/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.cs index 99f596171c..1934e4ca1f 100644 --- a/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.cs +++ b/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.sql b/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.sql index ceb604ada4..91ff6688b5 100644 --- a/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.sql +++ b/binsrc/tutorial/hosting/ho_s_5/redcoalsms_dom.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_5/setup_sms.vspx b/binsrc/tutorial/hosting/ho_s_5/setup_sms.vspx index 0e021c4f24..e96ca15851 100644 --- a/binsrc/tutorial/hosting/ho_s_5/setup_sms.vspx +++ b/binsrc/tutorial/hosting/ho_s_5/setup_sms.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/admin_style.css b/binsrc/tutorial/hosting/ho_s_6/admin_style.css index 34bb699c67..e873c4e8cb 100644 --- a/binsrc/tutorial/hosting/ho_s_6/admin_style.css +++ b/binsrc/tutorial/hosting/ho_s_6/admin_style.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/button.aspx b/binsrc/tutorial/hosting/ho_s_6/button.aspx index 5d76a46e18..b4dae5066e 100644 --- a/binsrc/tutorial/hosting/ho_s_6/button.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/button.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/calendar.aspx b/binsrc/tutorial/hosting/ho_s_6/calendar.aspx index 8aae3bf0da..61f4df7ca3 100644 --- a/binsrc/tutorial/hosting/ho_s_6/calendar.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/calendar.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/code-render.aspx b/binsrc/tutorial/hosting/ho_s_6/code-render.aspx index 8d4ae9876e..acca807e43 100644 --- a/binsrc/tutorial/hosting/ho_s_6/code-render.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/code-render.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/databind-arraylist.aspx b/binsrc/tutorial/hosting/ho_s_6/databind-arraylist.aspx index a60fe63b18..f3f24d0e13 100644 --- a/binsrc/tutorial/hosting/ho_s_6/databind-arraylist.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/databind-arraylist.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/databind-attribute.aspx b/binsrc/tutorial/hosting/ho_s_6/databind-attribute.aspx index 5cbdaaf173..80a9aaf750 100644 --- a/binsrc/tutorial/hosting/ho_s_6/databind-attribute.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/databind-attribute.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/databind-class.aspx b/binsrc/tutorial/hosting/ho_s_6/databind-class.aspx index bcba2387d3..6e51bd717b 100644 --- a/binsrc/tutorial/hosting/ho_s_6/databind-class.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/databind-class.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/databind-template.aspx b/binsrc/tutorial/hosting/ho_s_6/databind-template.aspx index 5b446f5918..4a19002bed 100644 --- a/binsrc/tutorial/hosting/ho_s_6/databind-template.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/databind-template.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/ho_s_6.xml b/binsrc/tutorial/hosting/ho_s_6/ho_s_6.xml index bcd993a2d6..de5f643fb3 100644 --- a/binsrc/tutorial/hosting/ho_s_6/ho_s_6.xml +++ b/binsrc/tutorial/hosting/ho_s_6/ho_s_6.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlanchor.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlanchor.aspx index 8d4ff6ea49..09b7d54379 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmlanchor.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmlanchor.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlbutton.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlbutton.aspx index 3ec68f92dd..48b8c27d72 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmlbutton.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmlbutton.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlgeneric.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlgeneric.aspx index 57f2ac73de..7f2507a1b2 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmlgeneric.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmlgeneric.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlimage.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlimage.aspx index b2998a30c8..85dc9bf5c5 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmlimage.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmlimage.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputbutton.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputbutton.aspx index 9eb7c3785b..f95180a780 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmlinputbutton.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputbutton.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputcheckbox.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputcheckbox.aspx index 4bbfbf5276..eaf345e069 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmlinputcheckbox.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputcheckbox.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputfile.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputfile.aspx index 56c7eb9516..d083bf7e37 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmlinputfile.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputfile.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputhidden.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputhidden.aspx index f3d4922563..c763fd01b3 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmlinputhidden.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputhidden.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputimage.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputimage.aspx index 6133a6d660..7da29dcda8 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmlinputimage.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputimage.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputradiobutton.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputradiobutton.aspx index 5c9ce5661c..dac429b7ed 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmlinputradiobutton.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputradiobutton.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlinputtext.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlinputtext.aspx index 13b8a37d47..267d918d6c 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmlinputtext.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmlinputtext.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmlselect.aspx b/binsrc/tutorial/hosting/ho_s_6/htmlselect.aspx index c3f5c24901..a8c7934f8f 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmlselect.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmlselect.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmltable.aspx b/binsrc/tutorial/hosting/ho_s_6/htmltable.aspx index ca09021970..7fa5805b82 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmltable.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmltable.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/htmltextarea.aspx b/binsrc/tutorial/hosting/ho_s_6/htmltextarea.aspx index e36836d6be..2315d2cc9d 100644 --- a/binsrc/tutorial/hosting/ho_s_6/htmltextarea.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/htmltextarea.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/listitem.aspx b/binsrc/tutorial/hosting/ho_s_6/listitem.aspx index 24b8a4ab42..3b7c183d4c 100644 --- a/binsrc/tutorial/hosting/ho_s_6/listitem.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/listitem.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/options.xml b/binsrc/tutorial/hosting/ho_s_6/options.xml index 67c4d8e046..c2bcae352c 100644 --- a/binsrc/tutorial/hosting/ho_s_6/options.xml +++ b/binsrc/tutorial/hosting/ho_s_6/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/server-side-object.aspx b/binsrc/tutorial/hosting/ho_s_6/server-side-object.aspx index 5a7300f867..b27a6b0d9a 100644 --- a/binsrc/tutorial/hosting/ho_s_6/server-side-object.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/server-side-object.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/session1.aspx b/binsrc/tutorial/hosting/ho_s_6/session1.aspx index ab13654ab4..572d883d34 100644 --- a/binsrc/tutorial/hosting/ho_s_6/session1.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/session1.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/tabcontrol.aspx b/binsrc/tutorial/hosting/ho_s_6/tabcontrol.aspx index dc3079755a..118e567d92 100644 --- a/binsrc/tutorial/hosting/ho_s_6/tabcontrol.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/tabcontrol.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/tabcontrol.cs b/binsrc/tutorial/hosting/ho_s_6/tabcontrol.cs index a25c8d0d6d..d3e1f9e9c0 100644 --- a/binsrc/tutorial/hosting/ho_s_6/tabcontrol.cs +++ b/binsrc/tutorial/hosting/ho_s_6/tabcontrol.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.aspx b/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.aspx index 4a3fc53d7c..07c15d99d0 100644 --- a/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.cs b/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.cs index e5d05f3470..80bc3a4f45 100644 --- a/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.cs +++ b/binsrc/tutorial/hosting/ho_s_6/tabcontrol2.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/temperature.aspx b/binsrc/tutorial/hosting/ho_s_6/temperature.aspx index 1b8523dd5c..cc504b7026 100644 --- a/binsrc/tutorial/hosting/ho_s_6/temperature.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/temperature.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/validator1.aspx b/binsrc/tutorial/hosting/ho_s_6/validator1.aspx index 8aa9d5cea8..53397cedcd 100644 --- a/binsrc/tutorial/hosting/ho_s_6/validator1.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/validator1.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_adrotator.aspx b/binsrc/tutorial/hosting/ho_s_6/web_adrotator.aspx index 1251bc78f5..924c877720 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_adrotator.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_adrotator.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_adrotator.xml b/binsrc/tutorial/hosting/ho_s_6/web_adrotator.xml index 25de74c4e7..a7d4bac84a 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_adrotator.xml +++ b/binsrc/tutorial/hosting/ho_s_6/web_adrotator.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_button.aspx b/binsrc/tutorial/hosting/ho_s_6/web_button.aspx index a6877c944a..70d53a107c 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_button.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_button.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_checkbox.aspx b/binsrc/tutorial/hosting/ho_s_6/web_checkbox.aspx index 7c06954115..0e278fc4a6 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_checkbox.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_checkbox.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_checkboxlist.aspx b/binsrc/tutorial/hosting/ho_s_6/web_checkboxlist.aspx index 07de50ed62..a15c006943 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_checkboxlist.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_checkboxlist.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_dropdownlist.aspx b/binsrc/tutorial/hosting/ho_s_6/web_dropdownlist.aspx index 9bb0374429..d15de9e607 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_dropdownlist.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_dropdownlist.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_hyperlink.aspx b/binsrc/tutorial/hosting/ho_s_6/web_hyperlink.aspx index 677a413b92..c35440068b 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_hyperlink.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_hyperlink.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_image.aspx b/binsrc/tutorial/hosting/ho_s_6/web_image.aspx index 793cd3b44d..868ef6fbe5 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_image.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_image.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_imagebutton.aspx b/binsrc/tutorial/hosting/ho_s_6/web_imagebutton.aspx index a5e06c21c9..59bfe3b65d 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_imagebutton.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_imagebutton.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_label.aspx b/binsrc/tutorial/hosting/ho_s_6/web_label.aspx index 102c11107e..6c90ea5873 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_label.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_label.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_linkbutton.aspx b/binsrc/tutorial/hosting/ho_s_6/web_linkbutton.aspx index 9e6223ef9b..5bb1c1198c 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_linkbutton.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_linkbutton.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_listbox.aspx b/binsrc/tutorial/hosting/ho_s_6/web_listbox.aspx index 216e5d4b5b..8746952495 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_listbox.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_listbox.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_literal.aspx b/binsrc/tutorial/hosting/ho_s_6/web_literal.aspx index 722fc341b1..0e6adcd06d 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_literal.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_literal.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_panel.aspx b/binsrc/tutorial/hosting/ho_s_6/web_panel.aspx index 2b4de57e66..ca3f2a5ac1 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_panel.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_panel.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_placeholder.aspx b/binsrc/tutorial/hosting/ho_s_6/web_placeholder.aspx index cad1ae8934..cff10f1cb2 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_placeholder.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_placeholder.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_radiobutton.aspx b/binsrc/tutorial/hosting/ho_s_6/web_radiobutton.aspx index 99d97c4ba5..2dff95b42b 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_radiobutton.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_radiobutton.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_radiobuttonlist.aspx b/binsrc/tutorial/hosting/ho_s_6/web_radiobuttonlist.aspx index 8d4cf0cb6b..3bd1619346 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_radiobuttonlist.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_radiobuttonlist.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_repeater.aspx b/binsrc/tutorial/hosting/ho_s_6/web_repeater.aspx index a07dcdf6fa..741654f039 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_repeater.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_repeater.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_table.aspx b/binsrc/tutorial/hosting/ho_s_6/web_table.aspx index 94be0238d7..d57531e6e6 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_table.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_table.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_6/web_textbox.aspx b/binsrc/tutorial/hosting/ho_s_6/web_textbox.aspx index 158f009a6f..4b41c05045 100644 --- a/binsrc/tutorial/hosting/ho_s_6/web_textbox.aspx +++ b/binsrc/tutorial/hosting/ho_s_6/web_textbox.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_7/VirtSample.aspx b/binsrc/tutorial/hosting/ho_s_7/VirtSample.aspx index a316e441c8..03bc6ff1f0 100644 --- a/binsrc/tutorial/hosting/ho_s_7/VirtSample.aspx +++ b/binsrc/tutorial/hosting/ho_s_7/VirtSample.aspx @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_7/VirtSample.sql b/binsrc/tutorial/hosting/ho_s_7/VirtSample.sql index 0c4f24f479..03fc381452 100644 --- a/binsrc/tutorial/hosting/ho_s_7/VirtSample.sql +++ b/binsrc/tutorial/hosting/ho_s_7/VirtSample.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_7/ho_s_7.xml b/binsrc/tutorial/hosting/ho_s_7/ho_s_7.xml index ecc6f57601..c9ddae6b37 100644 --- a/binsrc/tutorial/hosting/ho_s_7/ho_s_7.xml +++ b/binsrc/tutorial/hosting/ho_s_7/ho_s_7.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_7/options.xml b/binsrc/tutorial/hosting/ho_s_7/options.xml index f475fc142f..61cd0d1f1c 100644 --- a/binsrc/tutorial/hosting/ho_s_7/options.xml +++ b/binsrc/tutorial/hosting/ho_s_7/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_8/cgi.pl b/binsrc/tutorial/hosting/ho_s_8/cgi.pl index 95d33d66fa..80a5e6dd53 100644 --- a/binsrc/tutorial/hosting/ho_s_8/cgi.pl +++ b/binsrc/tutorial/hosting/ho_s_8/cgi.pl @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_8/cgidb.pl b/binsrc/tutorial/hosting/ho_s_8/cgidb.pl index 15a8d64133..105c85669f 100644 --- a/binsrc/tutorial/hosting/ho_s_8/cgidb.pl +++ b/binsrc/tutorial/hosting/ho_s_8/cgidb.pl @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_8/ho_s_8.xml b/binsrc/tutorial/hosting/ho_s_8/ho_s_8.xml index f62d9f5801..afd14111ba 100644 --- a/binsrc/tutorial/hosting/ho_s_8/ho_s_8.xml +++ b/binsrc/tutorial/hosting/ho_s_8/ho_s_8.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_8/options.xml b/binsrc/tutorial/hosting/ho_s_8/options.xml index 0dd351ba09..d94d809ded 100644 --- a/binsrc/tutorial/hosting/ho_s_8/options.xml +++ b/binsrc/tutorial/hosting/ho_s_8/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_9/cgitest.py b/binsrc/tutorial/hosting/ho_s_9/cgitest.py index 91ed6eb823..68d55d0421 100644 --- a/binsrc/tutorial/hosting/ho_s_9/cgitest.py +++ b/binsrc/tutorial/hosting/ho_s_9/cgitest.py @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_9/ho_s_9.xml b/binsrc/tutorial/hosting/ho_s_9/ho_s_9.xml index abfd5d2aca..dde8762788 100644 --- a/binsrc/tutorial/hosting/ho_s_9/ho_s_9.xml +++ b/binsrc/tutorial/hosting/ho_s_9/ho_s_9.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/ho_s_9/options.xml b/binsrc/tutorial/hosting/ho_s_9/options.xml index 53be877810..d19e026de6 100644 --- a/binsrc/tutorial/hosting/ho_s_9/options.xml +++ b/binsrc/tutorial/hosting/ho_s_9/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/hosting/index.xml b/binsrc/tutorial/hosting/index.xml index 1b296e0219..a63fe5a319 100644 --- a/binsrc/tutorial/hosting/index.xml +++ b/binsrc/tutorial/hosting/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/demo.css b/binsrc/tutorial/intprot/demo.css index 96e5c76b0d..45b267d45a 100644 --- a/binsrc/tutorial/intprot/demo.css +++ b/binsrc/tutorial/intprot/demo.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/index.xml b/binsrc/tutorial/intprot/index.xml index 1dc71f1f5d..44e3edfd13 100644 --- a/binsrc/tutorial/intprot/index.xml +++ b/binsrc/tutorial/intprot/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/nn_s_1/nn_s_1.xml b/binsrc/tutorial/intprot/nn_s_1/nn_s_1.xml index 141ebd4459..cc6915b891 100644 --- a/binsrc/tutorial/intprot/nn_s_1/nn_s_1.xml +++ b/binsrc/tutorial/intprot/nn_s_1/nn_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/nn_s_1/nn_s_1_sample_1.vsp b/binsrc/tutorial/intprot/nn_s_1/nn_s_1_sample_1.vsp index 93b05b1462..758b33e025 100644 --- a/binsrc/tutorial/intprot/nn_s_1/nn_s_1_sample_1.vsp +++ b/binsrc/tutorial/intprot/nn_s_1/nn_s_1_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/nn_s_2/nn_s_2.xml b/binsrc/tutorial/intprot/nn_s_2/nn_s_2.xml index b07f7bc18a..cee8c4c715 100644 --- a/binsrc/tutorial/intprot/nn_s_2/nn_s_2.xml +++ b/binsrc/tutorial/intprot/nn_s_2/nn_s_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/nn_s_2/nn_s_2_sample_1.vsp b/binsrc/tutorial/intprot/nn_s_2/nn_s_2_sample_1.vsp index 465b50f49f..53760053d2 100644 --- a/binsrc/tutorial/intprot/nn_s_2/nn_s_2_sample_1.vsp +++ b/binsrc/tutorial/intprot/nn_s_2/nn_s_2_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_1/sm_s_1.xml b/binsrc/tutorial/intprot/sm_s_1/sm_s_1.xml index 4f229cb005..802794fa8f 100644 --- a/binsrc/tutorial/intprot/sm_s_1/sm_s_1.xml +++ b/binsrc/tutorial/intprot/sm_s_1/sm_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_1/sm_s_1_sample_1.vsp b/binsrc/tutorial/intprot/sm_s_1/sm_s_1_sample_1.vsp index f2a571e5f4..ffe18668f6 100644 --- a/binsrc/tutorial/intprot/sm_s_1/sm_s_1_sample_1.vsp +++ b/binsrc/tutorial/intprot/sm_s_1/sm_s_1_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_2/sm_s_2.xml b/binsrc/tutorial/intprot/sm_s_2/sm_s_2.xml index b266603a98..3f515ea8c0 100644 --- a/binsrc/tutorial/intprot/sm_s_2/sm_s_2.xml +++ b/binsrc/tutorial/intprot/sm_s_2/sm_s_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_3/sm_s_3.sql b/binsrc/tutorial/intprot/sm_s_3/sm_s_3.sql index e7b7413031..45ef4b9257 100644 --- a/binsrc/tutorial/intprot/sm_s_3/sm_s_3.sql +++ b/binsrc/tutorial/intprot/sm_s_3/sm_s_3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_3/sm_s_3.xml b/binsrc/tutorial/intprot/sm_s_3/sm_s_3.xml index 97c3407ab7..222deeceba 100644 --- a/binsrc/tutorial/intprot/sm_s_3/sm_s_3.xml +++ b/binsrc/tutorial/intprot/sm_s_3/sm_s_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_4/sm_s_4.sql b/binsrc/tutorial/intprot/sm_s_4/sm_s_4.sql index 0eecc29bee..a74fc2475f 100644 --- a/binsrc/tutorial/intprot/sm_s_4/sm_s_4.sql +++ b/binsrc/tutorial/intprot/sm_s_4/sm_s_4.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_4/sm_s_4.xml b/binsrc/tutorial/intprot/sm_s_4/sm_s_4.xml index fc2e575311..37e9e76485 100644 --- a/binsrc/tutorial/intprot/sm_s_4/sm_s_4.xml +++ b/binsrc/tutorial/intprot/sm_s_4/sm_s_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_4/sm_s_4_sample_1.vsp b/binsrc/tutorial/intprot/sm_s_4/sm_s_4_sample_1.vsp index 9367084f2e..f2e8940d0b 100644 --- a/binsrc/tutorial/intprot/sm_s_4/sm_s_4_sample_1.vsp +++ b/binsrc/tutorial/intprot/sm_s_4/sm_s_4_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_5/options.xml b/binsrc/tutorial/intprot/sm_s_5/options.xml index 6b528a416c..c1ccfdd9da 100644 --- a/binsrc/tutorial/intprot/sm_s_5/options.xml +++ b/binsrc/tutorial/intprot/sm_s_5/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_5/sm_s_5.sql b/binsrc/tutorial/intprot/sm_s_5/sm_s_5.sql index 20c58748f6..b3ba55ff11 100644 --- a/binsrc/tutorial/intprot/sm_s_5/sm_s_5.sql +++ b/binsrc/tutorial/intprot/sm_s_5/sm_s_5.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_5/sm_s_5.xml b/binsrc/tutorial/intprot/sm_s_5/sm_s_5.xml index e12e6fb884..abd0e3a3eb 100644 --- a/binsrc/tutorial/intprot/sm_s_5/sm_s_5.xml +++ b/binsrc/tutorial/intprot/sm_s_5/sm_s_5.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_1.vsp b/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_1.vsp index 478a29daf6..e24c7e16ab 100644 --- a/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_1.vsp +++ b/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_2.vsp b/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_2.vsp index 0415a630b3..7e6b9beb3e 100644 --- a/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_2.vsp +++ b/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_3.vsp b/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_3.vsp index 826987c89a..da48ead0e9 100644 --- a/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_3.vsp +++ b/binsrc/tutorial/intprot/sm_s_5/sm_s_5_sample_3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_6/sm_s_6.xml b/binsrc/tutorial/intprot/sm_s_6/sm_s_6.xml index 170f772b11..d7830550fa 100644 --- a/binsrc/tutorial/intprot/sm_s_6/sm_s_6.xml +++ b/binsrc/tutorial/intprot/sm_s_6/sm_s_6.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_6/sm_s_6_sample_1.vsp b/binsrc/tutorial/intprot/sm_s_6/sm_s_6_sample_1.vsp index 639674669e..a9a58752dc 100644 --- a/binsrc/tutorial/intprot/sm_s_6/sm_s_6_sample_1.vsp +++ b/binsrc/tutorial/intprot/sm_s_6/sm_s_6_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_7/sm_s_7.xml b/binsrc/tutorial/intprot/sm_s_7/sm_s_7.xml index 64bf62851a..bb0a20090e 100644 --- a/binsrc/tutorial/intprot/sm_s_7/sm_s_7.xml +++ b/binsrc/tutorial/intprot/sm_s_7/sm_s_7.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/intprot/sm_s_7/sm_s_7_sample_1.vsp b/binsrc/tutorial/intprot/sm_s_7/sm_s_7_sample_1.vsp index ba6d9cbeca..0c72c17ddb 100644 --- a/binsrc/tutorial/intprot/sm_s_7/sm_s_7_sample_1.vsp +++ b/binsrc/tutorial/intprot/sm_s_7/sm_s_7_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/linkeddata/index.xml b/binsrc/tutorial/linkeddata/index.xml index 02a4d8f2b6..7c0be12093 100644 --- a/binsrc/tutorial/linkeddata/index.xml +++ b/binsrc/tutorial/linkeddata/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/linkeddata/sem_s_1/options.xml b/binsrc/tutorial/linkeddata/sem_s_1/options.xml index 11d28ddcc4..fcf596949c 100644 --- a/binsrc/tutorial/linkeddata/sem_s_1/options.xml +++ b/binsrc/tutorial/linkeddata/sem_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/linkeddata/sem_s_1/sem_s_1.xml b/binsrc/tutorial/linkeddata/sem_s_1/sem_s_1.xml index c39759b159..3ac7901672 100644 --- a/binsrc/tutorial/linkeddata/sem_s_1/sem_s_1.xml +++ b/binsrc/tutorial/linkeddata/sem_s_1/sem_s_1.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/make_vad.sh b/binsrc/tutorial/make_vad.sh index 094e2fde2a..796704232a 100755 --- a/binsrc/tutorial/make_vad.sh +++ b/binsrc/tutorial/make_vad.sh @@ -336,7 +336,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/binsrc/tutorial/page.xsl b/binsrc/tutorial/page.xsl index 0f9e0718bf..9031b1c11d 100644 --- a/binsrc/tutorial/page.xsl +++ b/binsrc/tutorial/page.xsl @@ -9,7 +9,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/page_common.xsl b/binsrc/tutorial/page_common.xsl index 2ca88dc2e1..614d87928a 100644 --- a/binsrc/tutorial/page_common.xsl +++ b/binsrc/tutorial/page_common.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/page_html_common.xsl b/binsrc/tutorial/page_html_common.xsl index b3fd519e85..f2757d308e 100644 --- a/binsrc/tutorial/page_html_common.xsl +++ b/binsrc/tutorial/page_html_common.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/page_ocs_output.xsl b/binsrc/tutorial/page_ocs_output.xsl index fc34e0bf76..9f818f9ae2 100644 --- a/binsrc/tutorial/page_ocs_output.xsl +++ b/binsrc/tutorial/page_ocs_output.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/page_opml_output.xsl b/binsrc/tutorial/page_opml_output.xsl index 3b8873d37a..043fb8483d 100644 --- a/binsrc/tutorial/page_opml_output.xsl +++ b/binsrc/tutorial/page_opml_output.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/page_rss_output.xsl b/binsrc/tutorial/page_rss_output.xsl index 74774cef32..c56f712c20 100644 --- a/binsrc/tutorial/page_rss_output.xsl +++ b/binsrc/tutorial/page_rss_output.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/page_sioc_output.xsl b/binsrc/tutorial/page_sioc_output.xsl index 648dbaf677..ed63da058e 100644 --- a/binsrc/tutorial/page_sioc_output.xsl +++ b/binsrc/tutorial/page_sioc_output.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf.vsp b/binsrc/tutorial/rdf.vsp index e256f7c199..adc332c6f1 100644 --- a/binsrc/tutorial/rdf.vsp +++ b/binsrc/tutorial/rdf.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/fs_s_1/foaf_ssl_client.vsp b/binsrc/tutorial/rdf/fs_s_1/foaf_ssl_client.vsp index e29b71ad5e..63978f1a29 100644 --- a/binsrc/tutorial/rdf/fs_s_1/foaf_ssl_client.vsp +++ b/binsrc/tutorial/rdf/fs_s_1/foaf_ssl_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/fs_s_1/fs_s_1.xml b/binsrc/tutorial/rdf/fs_s_1/fs_s_1.xml index 79cb93eee4..de37f27830 100644 --- a/binsrc/tutorial/rdf/fs_s_1/fs_s_1.xml +++ b/binsrc/tutorial/rdf/fs_s_1/fs_s_1.xml @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/fs_s_1/register_cert.vsp b/binsrc/tutorial/rdf/fs_s_1/register_cert.vsp index 3f2d1cb050..cca4a74f36 100644 --- a/binsrc/tutorial/rdf/fs_s_1/register_cert.vsp +++ b/binsrc/tutorial/rdf/fs_s_1/register_cert.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/index.xml b/binsrc/tutorial/rdf/index.xml index 79e43b8ced..478b15d98f 100644 --- a/binsrc/tutorial/rdf/index.xml +++ b/binsrc/tutorial/rdf/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/rd_s_1/options.xml b/binsrc/tutorial/rdf/rd_s_1/options.xml index fd9d15bbe5..a07e18f3fb 100644 --- a/binsrc/tutorial/rdf/rd_s_1/options.xml +++ b/binsrc/tutorial/rdf/rd_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/rd_s_1/rd_s_1.xml b/binsrc/tutorial/rdf/rd_s_1/rd_s_1.xml index 357a8ecc24..d3d742d4cb 100644 --- a/binsrc/tutorial/rdf/rd_s_1/rd_s_1.xml +++ b/binsrc/tutorial/rdf/rd_s_1/rd_s_1.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/rd_s_2/options.xml b/binsrc/tutorial/rdf/rd_s_2/options.xml index bb1b030e22..c0222fe464 100644 --- a/binsrc/tutorial/rdf/rd_s_2/options.xml +++ b/binsrc/tutorial/rdf/rd_s_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/rd_s_2/rd_s_2.xml b/binsrc/tutorial/rdf/rd_s_2/rd_s_2.xml index 4596f9d81c..22debc2e1c 100644 --- a/binsrc/tutorial/rdf/rd_s_2/rd_s_2.xml +++ b/binsrc/tutorial/rdf/rd_s_2/rd_s_2.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/ri_s_1/options.xml b/binsrc/tutorial/rdf/ri_s_1/options.xml index bf7164ed89..c4a1cf5d77 100644 --- a/binsrc/tutorial/rdf/ri_s_1/options.xml +++ b/binsrc/tutorial/rdf/ri_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/ri_s_1/ri_s_1.xml b/binsrc/tutorial/rdf/ri_s_1/ri_s_1.xml index ac1bcedb93..bedf8fa800 100644 --- a/binsrc/tutorial/rdf/ri_s_1/ri_s_1.xml +++ b/binsrc/tutorial/rdf/ri_s_1/ri_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/rq_s_2/create_local_dsn.sql b/binsrc/tutorial/rdf/rq_s_2/create_local_dsn.sql index ad8d4b6704..7b45e2ceae 100644 --- a/binsrc/tutorial/rdf/rq_s_2/create_local_dsn.sql +++ b/binsrc/tutorial/rdf/rq_s_2/create_local_dsn.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/rq_s_2/options.xml b/binsrc/tutorial/rdf/rq_s_2/options.xml index 7a507cd056..d5710eae01 100644 --- a/binsrc/tutorial/rdf/rq_s_2/options.xml +++ b/binsrc/tutorial/rdf/rq_s_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/rq_s_2/rq_s_2.xml b/binsrc/tutorial/rdf/rq_s_2/rq_s_2.xml index d4af0d3610..e6c826458d 100644 --- a/binsrc/tutorial/rdf/rq_s_2/rq_s_2.xml +++ b/binsrc/tutorial/rdf/rq_s_2/rq_s_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/rq_s_2/sparql_query.php b/binsrc/tutorial/rdf/rq_s_2/sparql_query.php index 61f78f0f3a..b08df126cc 100644 --- a/binsrc/tutorial/rdf/rq_s_2/sparql_query.php +++ b/binsrc/tutorial/rdf/rq_s_2/sparql_query.php @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/rq_s_3/create_local_dsn.sql b/binsrc/tutorial/rdf/rq_s_3/create_local_dsn.sql index d0c1b0bfae..4ce4e5099d 100644 --- a/binsrc/tutorial/rdf/rq_s_3/create_local_dsn.sql +++ b/binsrc/tutorial/rdf/rq_s_3/create_local_dsn.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/rq_s_3/options.xml b/binsrc/tutorial/rdf/rq_s_3/options.xml index 1991e986df..40e73b840d 100644 --- a/binsrc/tutorial/rdf/rq_s_3/options.xml +++ b/binsrc/tutorial/rdf/rq_s_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/rq_s_3/rdf_import.php b/binsrc/tutorial/rdf/rq_s_3/rdf_import.php index 544f73d565..10524367cf 100644 --- a/binsrc/tutorial/rdf/rq_s_3/rdf_import.php +++ b/binsrc/tutorial/rdf/rq_s_3/rdf_import.php @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdf/rq_s_3/rq_s_3.xml b/binsrc/tutorial/rdf/rq_s_3/rq_s_3.xml index b87143c3f9..0c52321ad8 100644 --- a/binsrc/tutorial/rdf/rq_s_3/rq_s_3.xml +++ b/binsrc/tutorial/rdf/rq_s_3/rq_s_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdfview/index.xml b/binsrc/tutorial/rdfview/index.xml index b5aebf386e..6860037a31 100644 --- a/binsrc/tutorial/rdfview/index.xml +++ b/binsrc/tutorial/rdfview/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdfview/rd_v_1/options.xml b/binsrc/tutorial/rdfview/rd_v_1/options.xml index 4ca317430d..7f693de5a9 100644 --- a/binsrc/tutorial/rdfview/rd_v_1/options.xml +++ b/binsrc/tutorial/rdfview/rd_v_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.owl b/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.owl index a43037ef98..b7c134f70a 100644 --- a/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.owl +++ b/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.owl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.xml b/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.xml index 3fb34bccb8..8eba008b6a 100644 --- a/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.xml +++ b/binsrc/tutorial/rdfview/rd_v_1/rd_v_1.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/demo.css b/binsrc/tutorial/repl/demo.css index 96e5c76b0d..45b267d45a 100644 --- a/binsrc/tutorial/repl/demo.css +++ b/binsrc/tutorial/repl/demo.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/index.xml b/binsrc/tutorial/repl/index.xml index dc6cc86877..ae22f45647 100644 --- a/binsrc/tutorial/repl/index.xml +++ b/binsrc/tutorial/repl/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_ds_1/options.xml b/binsrc/tutorial/repl/re_ds_1/options.xml index 6108d6f18d..06485d48b6 100644 --- a/binsrc/tutorial/repl/re_ds_1/options.xml +++ b/binsrc/tutorial/repl/re_ds_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_ds_1/re_ds_1.sql b/binsrc/tutorial/repl/re_ds_1/re_ds_1.sql index 01c448ba2e..546f74d9b0 100644 --- a/binsrc/tutorial/repl/re_ds_1/re_ds_1.sql +++ b/binsrc/tutorial/repl/re_ds_1/re_ds_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_ds_1/re_ds_1.xml b/binsrc/tutorial/repl/re_ds_1/re_ds_1.xml index 2c060c3f5b..6e6bb29e8b 100644 --- a/binsrc/tutorial/repl/re_ds_1/re_ds_1.xml +++ b/binsrc/tutorial/repl/re_ds_1/re_ds_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_init.vsp b/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_init.vsp index 43d681f79b..e0cf2acaed 100644 --- a/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_init.vsp +++ b/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_init.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_repl.vsp b/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_repl.vsp index 3bf36e4dd1..115578429f 100644 --- a/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_repl.vsp +++ b/binsrc/tutorial/repl/re_ds_1/re_ds_1_sample_repl.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_1/options.xml b/binsrc/tutorial/repl/re_sb_1/options.xml index 6a7d9e95d0..4562fbb9cc 100644 --- a/binsrc/tutorial/repl/re_sb_1/options.xml +++ b/binsrc/tutorial/repl/re_sb_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_1/re_sb_1.sql b/binsrc/tutorial/repl/re_sb_1/re_sb_1.sql index 59c8eb5f08..49a035b9e8 100644 --- a/binsrc/tutorial/repl/re_sb_1/re_sb_1.sql +++ b/binsrc/tutorial/repl/re_sb_1/re_sb_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_1/re_sb_1.xml b/binsrc/tutorial/repl/re_sb_1/re_sb_1.xml index cb4823e0fd..3d5e1c4f06 100644 --- a/binsrc/tutorial/repl/re_sb_1/re_sb_1.xml +++ b/binsrc/tutorial/repl/re_sb_1/re_sb_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_2/options.xml b/binsrc/tutorial/repl/re_sb_2/options.xml index 438e81ec1b..1693e6c4fc 100644 --- a/binsrc/tutorial/repl/re_sb_2/options.xml +++ b/binsrc/tutorial/repl/re_sb_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_2/re_sb_2.sql b/binsrc/tutorial/repl/re_sb_2/re_sb_2.sql index 188991152b..0e6db72c30 100644 --- a/binsrc/tutorial/repl/re_sb_2/re_sb_2.sql +++ b/binsrc/tutorial/repl/re_sb_2/re_sb_2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_2/re_sb_2.xml b/binsrc/tutorial/repl/re_sb_2/re_sb_2.xml index 26b154b7a4..5c9e8538fb 100644 --- a/binsrc/tutorial/repl/re_sb_2/re_sb_2.xml +++ b/binsrc/tutorial/repl/re_sb_2/re_sb_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_3/options.xml b/binsrc/tutorial/repl/re_sb_3/options.xml index 18ddbcee55..988cc7aac4 100644 --- a/binsrc/tutorial/repl/re_sb_3/options.xml +++ b/binsrc/tutorial/repl/re_sb_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_3/re_sb_3.sql b/binsrc/tutorial/repl/re_sb_3/re_sb_3.sql index 987d5c7e02..85249e5b77 100644 --- a/binsrc/tutorial/repl/re_sb_3/re_sb_3.sql +++ b/binsrc/tutorial/repl/re_sb_3/re_sb_3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_3/re_sb_3.xml b/binsrc/tutorial/repl/re_sb_3/re_sb_3.xml index d5db1eea32..4966450266 100644 --- a/binsrc/tutorial/repl/re_sb_3/re_sb_3.xml +++ b/binsrc/tutorial/repl/re_sb_3/re_sb_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_4/options.xml b/binsrc/tutorial/repl/re_sb_4/options.xml index b4e3b3d2b4..66b74c03af 100644 --- a/binsrc/tutorial/repl/re_sb_4/options.xml +++ b/binsrc/tutorial/repl/re_sb_4/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_4/re_sb_4.sql b/binsrc/tutorial/repl/re_sb_4/re_sb_4.sql index 46e67cfcf1..f36c7f8f23 100644 --- a/binsrc/tutorial/repl/re_sb_4/re_sb_4.sql +++ b/binsrc/tutorial/repl/re_sb_4/re_sb_4.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_4/re_sb_4.xml b/binsrc/tutorial/repl/re_sb_4/re_sb_4.xml index 02752a52ee..a327a50e90 100644 --- a/binsrc/tutorial/repl/re_sb_4/re_sb_4.xml +++ b/binsrc/tutorial/repl/re_sb_4/re_sb_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sb_4/re_sb_4_sample_1.vsp b/binsrc/tutorial/repl/re_sb_4/re_sb_4_sample_1.vsp index 3b0bb81def..16832a5171 100644 --- a/binsrc/tutorial/repl/re_sb_4/re_sb_4_sample_1.vsp +++ b/binsrc/tutorial/repl/re_sb_4/re_sb_4_sample_1.vsp @@ -3,7 +3,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sd_1/options.xml b/binsrc/tutorial/repl/re_sd_1/options.xml index 25e0570aa2..779b0f6286 100644 --- a/binsrc/tutorial/repl/re_sd_1/options.xml +++ b/binsrc/tutorial/repl/re_sd_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sd_1/re_sd_1.sql b/binsrc/tutorial/repl/re_sd_1/re_sd_1.sql index 815e45eb33..5dff0d1766 100644 --- a/binsrc/tutorial/repl/re_sd_1/re_sd_1.sql +++ b/binsrc/tutorial/repl/re_sd_1/re_sd_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sd_1/re_sd_1.xml b/binsrc/tutorial/repl/re_sd_1/re_sd_1.xml index 63e55a14a7..b18bf3d499 100644 --- a/binsrc/tutorial/repl/re_sd_1/re_sd_1.xml +++ b/binsrc/tutorial/repl/re_sd_1/re_sd_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sd_2/options.xml b/binsrc/tutorial/repl/re_sd_2/options.xml index 036472a95a..ce7ff10c9e 100644 --- a/binsrc/tutorial/repl/re_sd_2/options.xml +++ b/binsrc/tutorial/repl/re_sd_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sd_2/re_sd_2.sql b/binsrc/tutorial/repl/re_sd_2/re_sd_2.sql index 9464d5a8fa..5b0616045e 100644 --- a/binsrc/tutorial/repl/re_sd_2/re_sd_2.sql +++ b/binsrc/tutorial/repl/re_sd_2/re_sd_2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sd_2/re_sd_2.xml b/binsrc/tutorial/repl/re_sd_2/re_sd_2.xml index 50fc4a0377..0ff6486e67 100644 --- a/binsrc/tutorial/repl/re_sd_2/re_sd_2.xml +++ b/binsrc/tutorial/repl/re_sd_2/re_sd_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sd_3/options.xml b/binsrc/tutorial/repl/re_sd_3/options.xml index b0991dcb4c..fdc9d9256b 100644 --- a/binsrc/tutorial/repl/re_sd_3/options.xml +++ b/binsrc/tutorial/repl/re_sd_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sd_3/re_sd_3.sql b/binsrc/tutorial/repl/re_sd_3/re_sd_3.sql index 89412279f0..7e8247dba4 100644 --- a/binsrc/tutorial/repl/re_sd_3/re_sd_3.sql +++ b/binsrc/tutorial/repl/re_sd_3/re_sd_3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sd_3/re_sd_3.xml b/binsrc/tutorial/repl/re_sd_3/re_sd_3.xml index 5d0b316575..9a2c5cc511 100644 --- a/binsrc/tutorial/repl/re_sd_3/re_sd_3.xml +++ b/binsrc/tutorial/repl/re_sd_3/re_sd_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sm_1/options.xml b/binsrc/tutorial/repl/re_sm_1/options.xml index 73c30269d5..322ebe4857 100644 --- a/binsrc/tutorial/repl/re_sm_1/options.xml +++ b/binsrc/tutorial/repl/re_sm_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_sm_1/re_sm_1.xml b/binsrc/tutorial/repl/re_sm_1/re_sm_1.xml index f26dc951fc..5b273233be 100644 --- a/binsrc/tutorial/repl/re_sm_1/re_sm_1.xml +++ b/binsrc/tutorial/repl/re_sm_1/re_sm_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_xb_1/options.xml b/binsrc/tutorial/repl/re_xb_1/options.xml index cb844968af..d06059fe05 100644 --- a/binsrc/tutorial/repl/re_xb_1/options.xml +++ b/binsrc/tutorial/repl/re_xb_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_xb_1/re_xb_1.sql b/binsrc/tutorial/repl/re_xb_1/re_xb_1.sql index da1a5aab03..4ef3e715f8 100644 --- a/binsrc/tutorial/repl/re_xb_1/re_xb_1.sql +++ b/binsrc/tutorial/repl/re_xb_1/re_xb_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_xb_1/re_xb_1.xml b/binsrc/tutorial/repl/re_xb_1/re_xb_1.xml index 4804d83aef..c91b597c1c 100644 --- a/binsrc/tutorial/repl/re_xb_1/re_xb_1.xml +++ b/binsrc/tutorial/repl/re_xb_1/re_xb_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_xb_2/options.xml b/binsrc/tutorial/repl/re_xb_2/options.xml index ddb8a42ffe..eb5a67d095 100644 --- a/binsrc/tutorial/repl/re_xb_2/options.xml +++ b/binsrc/tutorial/repl/re_xb_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_xb_2/re_xb_2.sql b/binsrc/tutorial/repl/re_xb_2/re_xb_2.sql index 57b88e4a6a..34a277fc90 100644 --- a/binsrc/tutorial/repl/re_xb_2/re_xb_2.sql +++ b/binsrc/tutorial/repl/re_xb_2/re_xb_2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_xb_2/re_xb_2.xml b/binsrc/tutorial/repl/re_xb_2/re_xb_2.xml index e06016abcd..9036f76aa8 100644 --- a/binsrc/tutorial/repl/re_xb_2/re_xb_2.xml +++ b/binsrc/tutorial/repl/re_xb_2/re_xb_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_xb_3/options.xml b/binsrc/tutorial/repl/re_xb_3/options.xml index 052bcf431f..feaae93d77 100644 --- a/binsrc/tutorial/repl/re_xb_3/options.xml +++ b/binsrc/tutorial/repl/re_xb_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_xb_3/re_xb_3.sql b/binsrc/tutorial/repl/re_xb_3/re_xb_3.sql index be4dc9c7b0..0d5d7dec61 100644 --- a/binsrc/tutorial/repl/re_xb_3/re_xb_3.sql +++ b/binsrc/tutorial/repl/re_xb_3/re_xb_3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_xb_3/re_xb_3.xml b/binsrc/tutorial/repl/re_xb_3/re_xb_3.xml index ad602c24f6..9ca0d9b946 100644 --- a/binsrc/tutorial/repl/re_xb_3/re_xb_3.xml +++ b/binsrc/tutorial/repl/re_xb_3/re_xb_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_xb_4/options.xml b/binsrc/tutorial/repl/re_xb_4/options.xml index e23575217d..175717fef4 100644 --- a/binsrc/tutorial/repl/re_xb_4/options.xml +++ b/binsrc/tutorial/repl/re_xb_4/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_xb_4/re_xb_4.sql b/binsrc/tutorial/repl/re_xb_4/re_xb_4.sql index 66f2ea7b35..4d44fd3e28 100644 --- a/binsrc/tutorial/repl/re_xb_4/re_xb_4.sql +++ b/binsrc/tutorial/repl/re_xb_4/re_xb_4.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/repl/re_xb_4/re_xb_4.xml b/binsrc/tutorial/repl/re_xb_4/re_xb_4.xml index 99c574bf4f..d54e85dfb6 100644 --- a/binsrc/tutorial/repl/re_xb_4/re_xb_4.xml +++ b/binsrc/tutorial/repl/re_xb_4/re_xb_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/rss2xbel.xsl b/binsrc/tutorial/rss2xbel.xsl index a7b393b6a2..1baf0d697f 100644 --- a/binsrc/tutorial/rss2xbel.xsl +++ b/binsrc/tutorial/rss2xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/semweb/index.xml b/binsrc/tutorial/semweb/index.xml index ef1701e3dc..504b58855b 100644 --- a/binsrc/tutorial/semweb/index.xml +++ b/binsrc/tutorial/semweb/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/semweb/sem_s_1/options.xml b/binsrc/tutorial/semweb/sem_s_1/options.xml index 11d28ddcc4..fcf596949c 100644 --- a/binsrc/tutorial/semweb/sem_s_1/options.xml +++ b/binsrc/tutorial/semweb/sem_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/semweb/sem_s_1/sem_s_1.xml b/binsrc/tutorial/semweb/sem_s_1/sem_s_1.xml index c39759b159..3ac7901672 100644 --- a/binsrc/tutorial/semweb/sem_s_1/sem_s_1.xml +++ b/binsrc/tutorial/semweb/sem_s_1/sem_s_1.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/Makefile.am b/binsrc/tutorial/services/Makefile.am index 44fb5a4aaa..d37056ea55 100644 --- a/binsrc/tutorial/services/Makefile.am +++ b/binsrc/tutorial/services/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ajax_inc/ajax.js b/binsrc/tutorial/services/ajax_inc/ajax.js index 247e6b1989..236191cf81 100644 --- a/binsrc/tutorial/services/ajax_inc/ajax.js +++ b/binsrc/tutorial/services/ajax_inc/ajax.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ajax_inc/proxy.vsp b/binsrc/tutorial/services/ajax_inc/proxy.vsp index 47ddce9804..eb91f6f443 100644 --- a/binsrc/tutorial/services/ajax_inc/proxy.vsp +++ b/binsrc/tutorial/services/ajax_inc/proxy.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ajax_inc/wsdl2js.xsl b/binsrc/tutorial/services/ajax_inc/wsdl2js.xsl index 6ef91a64a1..5d189d436f 100644 --- a/binsrc/tutorial/services/ajax_inc/wsdl2js.xsl +++ b/binsrc/tutorial/services/ajax_inc/wsdl2js.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ajax_inc/wsdl2js_udt.xsl b/binsrc/tutorial/services/ajax_inc/wsdl2js_udt.xsl index c38fa143ff..fe081ba01a 100644 --- a/binsrc/tutorial/services/ajax_inc/wsdl2js_udt.xsl +++ b/binsrc/tutorial/services/ajax_inc/wsdl2js_udt.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/dc_s_1/dc_s_1.xml b/binsrc/tutorial/services/dc_s_1/dc_s_1.xml index c285af61db..c9ef0aa52e 100644 --- a/binsrc/tutorial/services/dc_s_1/dc_s_1.xml +++ b/binsrc/tutorial/services/dc_s_1/dc_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/dc_s_1/options.xml b/binsrc/tutorial/services/dc_s_1/options.xml index ebdda4a749..9c499b5ef4 100644 --- a/binsrc/tutorial/services/dc_s_1/options.xml +++ b/binsrc/tutorial/services/dc_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/demo.css b/binsrc/tutorial/services/demo.css index c25033f12f..a7e9f92747 100644 --- a/binsrc/tutorial/services/demo.css +++ b/binsrc/tutorial/services/demo.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/idp_s_1/idp_s_1.vsp b/binsrc/tutorial/services/idp_s_1/idp_s_1.vsp index 65ef561067..396dbb8bc1 100644 --- a/binsrc/tutorial/services/idp_s_1/idp_s_1.vsp +++ b/binsrc/tutorial/services/idp_s_1/idp_s_1.vsp @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/idp_s_1/idp_s_1.xml b/binsrc/tutorial/services/idp_s_1/idp_s_1.xml index 46e52acbfe..62b5f3486c 100644 --- a/binsrc/tutorial/services/idp_s_1/idp_s_1.xml +++ b/binsrc/tutorial/services/idp_s_1/idp_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/idp_s_1/options.xml b/binsrc/tutorial/services/idp_s_1/options.xml index 2accd61851..4799c40b40 100644 --- a/binsrc/tutorial/services/idp_s_1/options.xml +++ b/binsrc/tutorial/services/idp_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/index.xml b/binsrc/tutorial/services/index.xml index 5d8fa7030c..be8ef2fce7 100644 --- a/binsrc/tutorial/services/index.xml +++ b/binsrc/tutorial/services/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/raw.xsl b/binsrc/tutorial/services/raw.xsl index 5fe3a754ce..2b175c55ec 100644 --- a/binsrc/tutorial/services/raw.xsl +++ b/binsrc/tutorial/services/raw.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rm_s_1/rm_s_1.sql b/binsrc/tutorial/services/rm_s_1/rm_s_1.sql index b8765efc86..75e1bec493 100644 --- a/binsrc/tutorial/services/rm_s_1/rm_s_1.sql +++ b/binsrc/tutorial/services/rm_s_1/rm_s_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rm_s_1/rm_s_1.xml b/binsrc/tutorial/services/rm_s_1/rm_s_1.xml index 6f2b0984cd..4b0de9fcda 100644 --- a/binsrc/tutorial/services/rm_s_1/rm_s_1.xml +++ b/binsrc/tutorial/services/rm_s_1/rm_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rm_s_1/rmcli.vsp b/binsrc/tutorial/services/rm_s_1/rmcli.vsp index 58ae4e7846..4092b71497 100644 --- a/binsrc/tutorial/services/rm_s_1/rmcli.vsp +++ b/binsrc/tutorial/services/rm_s_1/rmcli.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rm_s_1/rmcli_sec.vsp b/binsrc/tutorial/services/rm_s_1/rmcli_sec.vsp index 02a9ea8f39..0df5b526ee 100644 --- a/binsrc/tutorial/services/rm_s_1/rmcli_sec.vsp +++ b/binsrc/tutorial/services/rm_s_1/rmcli_sec.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rn_s_1/options.xml b/binsrc/tutorial/services/rn_s_1/options.xml index 370c3e64b1..a9c515a5e6 100644 --- a/binsrc/tutorial/services/rn_s_1/options.xml +++ b/binsrc/tutorial/services/rn_s_1/options.xml @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rn_s_1/res.vsp b/binsrc/tutorial/services/rn_s_1/res.vsp index 08b4c10d50..d819b2609f 100644 --- a/binsrc/tutorial/services/rn_s_1/res.vsp +++ b/binsrc/tutorial/services/rn_s_1/res.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rn_s_1/rn_s_1.xml b/binsrc/tutorial/services/rn_s_1/rn_s_1.xml index 83041d7df9..022b5a906a 100644 --- a/binsrc/tutorial/services/rn_s_1/rn_s_1.xml +++ b/binsrc/tutorial/services/rn_s_1/rn_s_1.xml @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rn_s_1/rn_s_1_run.vsp b/binsrc/tutorial/services/rn_s_1/rn_s_1_run.vsp index d9f565f5af..b22668aea6 100644 --- a/binsrc/tutorial/services/rn_s_1/rn_s_1_run.vsp +++ b/binsrc/tutorial/services/rn_s_1/rn_s_1_run.vsp @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rp_s_1/RoutingClient.cs b/binsrc/tutorial/services/rp_s_1/RoutingClient.cs index aef6845833..3e337d5536 100644 --- a/binsrc/tutorial/services/rp_s_1/RoutingClient.cs +++ b/binsrc/tutorial/services/rp_s_1/RoutingClient.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rp_s_1/options.xml b/binsrc/tutorial/services/rp_s_1/options.xml index 39df1dac32..a948764714 100644 --- a/binsrc/tutorial/services/rp_s_1/options.xml +++ b/binsrc/tutorial/services/rp_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rp_s_1/rp_s_1.xml b/binsrc/tutorial/services/rp_s_1/rp_s_1.xml index 3ac7666a02..c2155b0acc 100644 --- a/binsrc/tutorial/services/rp_s_1/rp_s_1.xml +++ b/binsrc/tutorial/services/rp_s_1/rp_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rp_s_1/wsrp.vsp b/binsrc/tutorial/services/rp_s_1/wsrp.vsp index 3de4177354..2bfca96bfb 100644 --- a/binsrc/tutorial/services/rp_s_1/wsrp.vsp +++ b/binsrc/tutorial/services/rp_s_1/wsrp.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rp_s_1/wsrp_setup.sql b/binsrc/tutorial/services/rp_s_1/wsrp_setup.sql index 9eca304755..0db2215fbb 100644 --- a/binsrc/tutorial/services/rp_s_1/wsrp_setup.sql +++ b/binsrc/tutorial/services/rp_s_1/wsrp_setup.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rp_s_1/wsrptargets.vsp b/binsrc/tutorial/services/rp_s_1/wsrptargets.vsp index 12a172286b..3017d46668 100644 --- a/binsrc/tutorial/services/rp_s_1/wsrptargets.vsp +++ b/binsrc/tutorial/services/rp_s_1/wsrptargets.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rp_s_2/options.xml b/binsrc/tutorial/services/rp_s_2/options.xml index fbb67c3737..25b4ab0c31 100644 --- a/binsrc/tutorial/services/rp_s_2/options.xml +++ b/binsrc/tutorial/services/rp_s_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rp_s_2/rp_s_2.xml b/binsrc/tutorial/services/rp_s_2/rp_s_2.xml index f09ef1038b..ebd9d3782e 100644 --- a/binsrc/tutorial/services/rp_s_2/rp_s_2.xml +++ b/binsrc/tutorial/services/rp_s_2/rp_s_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/rp_s_2/wsrf.vsp b/binsrc/tutorial/services/rp_s_2/wsrf.vsp index 734dbcba14..e6d86b3050 100644 --- a/binsrc/tutorial/services/rp_s_2/wsrf.vsp +++ b/binsrc/tutorial/services/rp_s_2/wsrf.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_1/options.xml b/binsrc/tutorial/services/so_s_1/options.xml index 8b262fcb2e..3ccfed6a4e 100644 --- a/binsrc/tutorial/services/so_s_1/options.xml +++ b/binsrc/tutorial/services/so_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_1/so_s_1.sql b/binsrc/tutorial/services/so_s_1/so_s_1.sql index 45c09a8e25..0866a50bc2 100644 --- a/binsrc/tutorial/services/so_s_1/so_s_1.sql +++ b/binsrc/tutorial/services/so_s_1/so_s_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_1/so_s_1.xml b/binsrc/tutorial/services/so_s_1/so_s_1.xml index e63653f65e..62f2da182b 100644 --- a/binsrc/tutorial/services/so_s_1/so_s_1.xml +++ b/binsrc/tutorial/services/so_s_1/so_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_1/so_s_1_sample_1.vsp b/binsrc/tutorial/services/so_s_1/so_s_1_sample_1.vsp index 5720d125b5..0ff19d17f6 100644 --- a/binsrc/tutorial/services/so_s_1/so_s_1_sample_1.vsp +++ b/binsrc/tutorial/services/so_s_1/so_s_1_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_10/get_NasdaqQuotes.html b/binsrc/tutorial/services/so_s_10/get_NasdaqQuotes.html index 8728c95a32..f8275aec3e 100644 --- a/binsrc/tutorial/services/so_s_10/get_NasdaqQuotes.html +++ b/binsrc/tutorial/services/so_s_10/get_NasdaqQuotes.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_10/options.xml b/binsrc/tutorial/services/so_s_10/options.xml index a6680213f4..58a3e8b7e1 100644 --- a/binsrc/tutorial/services/so_s_10/options.xml +++ b/binsrc/tutorial/services/so_s_10/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_10/so_s_10.sql b/binsrc/tutorial/services/so_s_10/so_s_10.sql index ffb55b06ff..3063b9f008 100644 --- a/binsrc/tutorial/services/so_s_10/so_s_10.sql +++ b/binsrc/tutorial/services/so_s_10/so_s_10.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_10/so_s_10.xml b/binsrc/tutorial/services/so_s_10/so_s_10.xml index ffe627f097..4fb6438cc0 100644 --- a/binsrc/tutorial/services/so_s_10/so_s_10.xml +++ b/binsrc/tutorial/services/so_s_10/so_s_10.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_10/sr.xsl b/binsrc/tutorial/services/so_s_10/sr.xsl index 879c5b4508..53975f9fb4 100644 --- a/binsrc/tutorial/services/so_s_10/sr.xsl +++ b/binsrc/tutorial/services/so_s_10/sr.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/array2d.xsd b/binsrc/tutorial/services/so_s_11/array2d.xsd index 5c8e04bc67..f6dd8d7eb5 100644 --- a/binsrc/tutorial/services/so_s_11/array2d.xsd +++ b/binsrc/tutorial/services/so_s_11/array2d.xsd @@ -9,7 +9,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/array_div.xsd b/binsrc/tutorial/services/so_s_11/array_div.xsd index 96089ea53a..9290ed126b 100644 --- a/binsrc/tutorial/services/so_s_11/array_div.xsd +++ b/binsrc/tutorial/services/so_s_11/array_div.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/division.xsd b/binsrc/tutorial/services/so_s_11/division.xsd index df38faddec..d19a4ba48e 100644 --- a/binsrc/tutorial/services/so_s_11/division.xsd +++ b/binsrc/tutorial/services/so_s_11/division.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/factbook.xml b/binsrc/tutorial/services/so_s_11/factbook.xml index f5222ba715..f8f7d29336 100644 --- a/binsrc/tutorial/services/so_s_11/factbook.xml +++ b/binsrc/tutorial/services/so_s_11/factbook.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/moz.xsl b/binsrc/tutorial/services/so_s_11/moz.xsl index eaf520e1de..df07253cf9 100644 --- a/binsrc/tutorial/services/so_s_11/moz.xsl +++ b/binsrc/tutorial/services/so_s_11/moz.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/options.xml b/binsrc/tutorial/services/so_s_11/options.xml index a81cdf23c2..58c8182b0c 100644 --- a/binsrc/tutorial/services/so_s_11/options.xml +++ b/binsrc/tutorial/services/so_s_11/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/provinces.xsd b/binsrc/tutorial/services/so_s_11/provinces.xsd index ef119df6f2..faa2b5d56f 100644 --- a/binsrc/tutorial/services/so_s_11/provinces.xsd +++ b/binsrc/tutorial/services/so_s_11/provinces.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/provinces_ajax.html b/binsrc/tutorial/services/so_s_11/provinces_ajax.html index bbc7d43063..581c65f721 100644 --- a/binsrc/tutorial/services/so_s_11/provinces_ajax.html +++ b/binsrc/tutorial/services/so_s_11/provinces_ajax.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/raw.xsl b/binsrc/tutorial/services/so_s_11/raw.xsl index b61126b832..31fe7b63bc 100644 --- a/binsrc/tutorial/services/so_s_11/raw.xsl +++ b/binsrc/tutorial/services/so_s_11/raw.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/so_s_11.sql b/binsrc/tutorial/services/so_s_11/so_s_11.sql index aa04ce40ca..422a6d6adb 100644 --- a/binsrc/tutorial/services/so_s_11/so_s_11.sql +++ b/binsrc/tutorial/services/so_s_11/so_s_11.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/so_s_11.xml b/binsrc/tutorial/services/so_s_11/so_s_11.xml index 81825266f2..fd8ed2f54a 100644 --- a/binsrc/tutorial/services/so_s_11/so_s_11.xml +++ b/binsrc/tutorial/services/so_s_11/so_s_11.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/so_s_11_array_client.vsp b/binsrc/tutorial/services/so_s_11/so_s_11_array_client.vsp index 1b52de8e6c..b30f8fc880 100644 --- a/binsrc/tutorial/services/so_s_11/so_s_11_array_client.vsp +++ b/binsrc/tutorial/services/so_s_11/so_s_11_array_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/so_s_11_client.vsp b/binsrc/tutorial/services/so_s_11/so_s_11_client.vsp index 2e24f2db6f..ba398ae4c8 100644 --- a/binsrc/tutorial/services/so_s_11/so_s_11_client.vsp +++ b/binsrc/tutorial/services/so_s_11/so_s_11_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/sr.xsl b/binsrc/tutorial/services/so_s_11/sr.xsl index 77fa093c2d..95cc5adf42 100644 --- a/binsrc/tutorial/services/so_s_11/sr.xsl +++ b/binsrc/tutorial/services/so_s_11/sr.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_11/sr2d.xsl b/binsrc/tutorial/services/so_s_11/sr2d.xsl index 651636b629..672f1f53a2 100644 --- a/binsrc/tutorial/services/so_s_11/sr2d.xsl +++ b/binsrc/tutorial/services/so_s_11/sr2d.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_12/administrative_divisions.html b/binsrc/tutorial/services/so_s_12/administrative_divisions.html index 583ba5cdbf..7889d79132 100644 --- a/binsrc/tutorial/services/so_s_12/administrative_divisions.html +++ b/binsrc/tutorial/services/so_s_12/administrative_divisions.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_12/administrative_divisions_ch.html b/binsrc/tutorial/services/so_s_12/administrative_divisions_ch.html index 432ba5b307..7da8ff9f8b 100644 --- a/binsrc/tutorial/services/so_s_12/administrative_divisions_ch.html +++ b/binsrc/tutorial/services/so_s_12/administrative_divisions_ch.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_12/options.xml b/binsrc/tutorial/services/so_s_12/options.xml index 72bce0af0a..0078fc6427 100644 --- a/binsrc/tutorial/services/so_s_12/options.xml +++ b/binsrc/tutorial/services/so_s_12/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_12/so_s_12.xml b/binsrc/tutorial/services/so_s_12/so_s_12.xml index f5231c1fdf..dcb50672d1 100644 --- a/binsrc/tutorial/services/so_s_12/so_s_12.xml +++ b/binsrc/tutorial/services/so_s_12/so_s_12.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_12/sr.xsl b/binsrc/tutorial/services/so_s_12/sr.xsl index 7c4facc687..58a73689ed 100644 --- a/binsrc/tutorial/services/so_s_12/sr.xsl +++ b/binsrc/tutorial/services/so_s_12/sr.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_13/options.xml b/binsrc/tutorial/services/so_s_13/options.xml index ac093e7d41..54a7dc2de9 100644 --- a/binsrc/tutorial/services/so_s_13/options.xml +++ b/binsrc/tutorial/services/so_s_13/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_13/so_s_13.sql b/binsrc/tutorial/services/so_s_13/so_s_13.sql index f318f60614..eeb08e2ae9 100644 --- a/binsrc/tutorial/services/so_s_13/so_s_13.sql +++ b/binsrc/tutorial/services/so_s_13/so_s_13.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_13/so_s_13.xml b/binsrc/tutorial/services/so_s_13/so_s_13.xml index dd10b6473b..2342ccdc28 100644 --- a/binsrc/tutorial/services/so_s_13/so_s_13.xml +++ b/binsrc/tutorial/services/so_s_13/so_s_13.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_13/so_s_13_secure_SOAP_client.vsp b/binsrc/tutorial/services/so_s_13/so_s_13_secure_SOAP_client.vsp index aa830733d8..0aecf10cea 100644 --- a/binsrc/tutorial/services/so_s_13/so_s_13_secure_SOAP_client.vsp +++ b/binsrc/tutorial/services/so_s_13/so_s_13_secure_SOAP_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_13/sr.xsl b/binsrc/tutorial/services/so_s_13/sr.xsl index e5b9527631..b4eb0be829 100644 --- a/binsrc/tutorial/services/so_s_13/sr.xsl +++ b/binsrc/tutorial/services/so_s_13/sr.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_14/ms.sql b/binsrc/tutorial/services/so_s_14/ms.sql index 96c955e172..79ca3a9913 100644 --- a/binsrc/tutorial/services/so_s_14/ms.sql +++ b/binsrc/tutorial/services/so_s_14/ms.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_14/ms.xsl b/binsrc/tutorial/services/so_s_14/ms.xsl index 747db1f202..d796ffa58e 100644 --- a/binsrc/tutorial/services/so_s_14/ms.xsl +++ b/binsrc/tutorial/services/so_s_14/ms.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_14/options.xml b/binsrc/tutorial/services/so_s_14/options.xml index d0d558cc7e..e7851d7d2f 100644 --- a/binsrc/tutorial/services/so_s_14/options.xml +++ b/binsrc/tutorial/services/so_s_14/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_14/ora.sql b/binsrc/tutorial/services/so_s_14/ora.sql index f0026b921b..190bb579be 100644 --- a/binsrc/tutorial/services/so_s_14/ora.sql +++ b/binsrc/tutorial/services/so_s_14/ora.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_14/ora.xsl b/binsrc/tutorial/services/so_s_14/ora.xsl index 179e3a085c..f0b86f3de7 100644 --- a/binsrc/tutorial/services/so_s_14/ora.xsl +++ b/binsrc/tutorial/services/so_s_14/ora.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_14/so_s_14.sql b/binsrc/tutorial/services/so_s_14/so_s_14.sql index 65385a6f32..9d44cc6b70 100644 --- a/binsrc/tutorial/services/so_s_14/so_s_14.sql +++ b/binsrc/tutorial/services/so_s_14/so_s_14.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_14/so_s_14.xml b/binsrc/tutorial/services/so_s_14/so_s_14.xml index 6e712e2729..5ff9ca92a0 100644 --- a/binsrc/tutorial/services/so_s_14/so_s_14.xml +++ b/binsrc/tutorial/services/so_s_14/so_s_14.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_14/so_s_14_ms_client.vsp b/binsrc/tutorial/services/so_s_14/so_s_14_ms_client.vsp index 120cd57ab9..5cb85d629e 100644 --- a/binsrc/tutorial/services/so_s_14/so_s_14_ms_client.vsp +++ b/binsrc/tutorial/services/so_s_14/so_s_14_ms_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_14/so_s_14_ora_client.vsp b/binsrc/tutorial/services/so_s_14/so_s_14_ora_client.vsp index 44282243f4..d810ad29c0 100644 --- a/binsrc/tutorial/services/so_s_14/so_s_14_ora_client.vsp +++ b/binsrc/tutorial/services/so_s_14/so_s_14_ora_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_15/conversion.vsp b/binsrc/tutorial/services/so_s_15/conversion.vsp index d7ab7ff256..0ff16b7bfb 100644 --- a/binsrc/tutorial/services/so_s_15/conversion.vsp +++ b/binsrc/tutorial/services/so_s_15/conversion.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_15/converted_value.xsl b/binsrc/tutorial/services/so_s_15/converted_value.xsl index e8fde178f9..f91204fd55 100644 --- a/binsrc/tutorial/services/so_s_15/converted_value.xsl +++ b/binsrc/tutorial/services/so_s_15/converted_value.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_15/converted_value_ajax.xsl b/binsrc/tutorial/services/so_s_15/converted_value_ajax.xsl index 67a67b7f5a..e7986b1969 100644 --- a/binsrc/tutorial/services/so_s_15/converted_value_ajax.xsl +++ b/binsrc/tutorial/services/so_s_15/converted_value_ajax.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_15/currency_list.vsp b/binsrc/tutorial/services/so_s_15/currency_list.vsp index 4949a33967..248cb86c61 100644 --- a/binsrc/tutorial/services/so_s_15/currency_list.vsp +++ b/binsrc/tutorial/services/so_s_15/currency_list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_15/currency_list.xsl b/binsrc/tutorial/services/so_s_15/currency_list.xsl index ca763e3736..b74779d607 100644 --- a/binsrc/tutorial/services/so_s_15/currency_list.xsl +++ b/binsrc/tutorial/services/so_s_15/currency_list.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_15/currency_list_ajax.xsl b/binsrc/tutorial/services/so_s_15/currency_list_ajax.xsl index e268ca973a..c9ce2e8deb 100644 --- a/binsrc/tutorial/services/so_s_15/currency_list_ajax.xsl +++ b/binsrc/tutorial/services/so_s_15/currency_list_ajax.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_15/exchange.sql b/binsrc/tutorial/services/so_s_15/exchange.sql index 7dec9e8ae2..193f6be269 100644 --- a/binsrc/tutorial/services/so_s_15/exchange.sql +++ b/binsrc/tutorial/services/so_s_15/exchange.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_15/exchange_rates.vsp b/binsrc/tutorial/services/so_s_15/exchange_rates.vsp index 0e693a4fed..79e315ec75 100644 --- a/binsrc/tutorial/services/so_s_15/exchange_rates.vsp +++ b/binsrc/tutorial/services/so_s_15/exchange_rates.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_15/exchange_rates_ajax.html b/binsrc/tutorial/services/so_s_15/exchange_rates_ajax.html index 33b21ad762..9a552f8822 100644 --- a/binsrc/tutorial/services/so_s_15/exchange_rates_ajax.html +++ b/binsrc/tutorial/services/so_s_15/exchange_rates_ajax.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_15/options.xml b/binsrc/tutorial/services/so_s_15/options.xml index b4ad444c1c..852d0105a3 100644 --- a/binsrc/tutorial/services/so_s_15/options.xml +++ b/binsrc/tutorial/services/so_s_15/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_15/so_s_15.xml b/binsrc/tutorial/services/so_s_15/so_s_15.xml index 08c0cb4c15..542637bed6 100644 --- a/binsrc/tutorial/services/so_s_15/so_s_15.xml +++ b/binsrc/tutorial/services/so_s_15/so_s_15.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_16/options.xml b/binsrc/tutorial/services/so_s_16/options.xml index 3b4f74b1c7..ed0cb3dd69 100644 --- a/binsrc/tutorial/services/so_s_16/options.xml +++ b/binsrc/tutorial/services/so_s_16/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_16/registration.html b/binsrc/tutorial/services/so_s_16/registration.html index 4f97cda650..9af43edb24 100644 --- a/binsrc/tutorial/services/so_s_16/registration.html +++ b/binsrc/tutorial/services/so_s_16/registration.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_16/so_s_16.xml b/binsrc/tutorial/services/so_s_16/so_s_16.xml index 3c66d18385..8fa79b5798 100644 --- a/binsrc/tutorial/services/so_s_16/so_s_16.xml +++ b/binsrc/tutorial/services/so_s_16/so_s_16.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_17/mail_validate.html b/binsrc/tutorial/services/so_s_17/mail_validate.html index b9602540d6..420bd23fa0 100644 --- a/binsrc/tutorial/services/so_s_17/mail_validate.html +++ b/binsrc/tutorial/services/so_s_17/mail_validate.html @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_17/mail_validate.xsl b/binsrc/tutorial/services/so_s_17/mail_validate.xsl index a32a9f96a7..5127a55e41 100644 --- a/binsrc/tutorial/services/so_s_17/mail_validate.xsl +++ b/binsrc/tutorial/services/so_s_17/mail_validate.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_17/options.xml b/binsrc/tutorial/services/so_s_17/options.xml index 185445dc0b..e277eca563 100644 --- a/binsrc/tutorial/services/so_s_17/options.xml +++ b/binsrc/tutorial/services/so_s_17/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_17/so_s_17.sql b/binsrc/tutorial/services/so_s_17/so_s_17.sql index de24107d47..57533f3d7e 100644 --- a/binsrc/tutorial/services/so_s_17/so_s_17.sql +++ b/binsrc/tutorial/services/so_s_17/so_s_17.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_17/so_s_17.xml b/binsrc/tutorial/services/so_s_17/so_s_17.xml index 606992f094..247d1f9784 100644 --- a/binsrc/tutorial/services/so_s_17/so_s_17.xml +++ b/binsrc/tutorial/services/so_s_17/so_s_17.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_18/options.xml b/binsrc/tutorial/services/so_s_18/options.xml index 707d4c6b41..5f5a29090f 100644 --- a/binsrc/tutorial/services/so_s_18/options.xml +++ b/binsrc/tutorial/services/so_s_18/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_18/so_s_18.xml b/binsrc/tutorial/services/so_s_18/so_s_18.xml index 195ef7e9a9..b79e17eca8 100644 --- a/binsrc/tutorial/services/so_s_18/so_s_18.xml +++ b/binsrc/tutorial/services/so_s_18/so_s_18.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_18/wsdl_import.sql b/binsrc/tutorial/services/so_s_18/wsdl_import.sql index fc06382917..02b9e76c20 100644 --- a/binsrc/tutorial/services/so_s_18/wsdl_import.sql +++ b/binsrc/tutorial/services/so_s_18/wsdl_import.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_18/wsdl_import.vsp b/binsrc/tutorial/services/so_s_18/wsdl_import.vsp index ef3b1d4333..bfe5ba72a1 100644 --- a/binsrc/tutorial/services/so_s_18/wsdl_import.vsp +++ b/binsrc/tutorial/services/so_s_18/wsdl_import.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_19/array4d.xsd b/binsrc/tutorial/services/so_s_19/array4d.xsd index 7ebc69ff15..e2b2f37284 100644 --- a/binsrc/tutorial/services/so_s_19/array4d.xsd +++ b/binsrc/tutorial/services/so_s_19/array4d.xsd @@ -9,7 +9,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_19/contact.xsl b/binsrc/tutorial/services/so_s_19/contact.xsl index 25af90a845..9f7c0d10d4 100644 --- a/binsrc/tutorial/services/so_s_19/contact.xsl +++ b/binsrc/tutorial/services/so_s_19/contact.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_19/contacts.html b/binsrc/tutorial/services/so_s_19/contacts.html index b077b56e40..ef6edc1ad2 100644 --- a/binsrc/tutorial/services/so_s_19/contacts.html +++ b/binsrc/tutorial/services/so_s_19/contacts.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_19/contacts.sql b/binsrc/tutorial/services/so_s_19/contacts.sql index d9ce784f08..cb6e7cbdd8 100644 --- a/binsrc/tutorial/services/so_s_19/contacts.sql +++ b/binsrc/tutorial/services/so_s_19/contacts.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_19/options.xml b/binsrc/tutorial/services/so_s_19/options.xml index 4c30245a9b..468c9be5b2 100644 --- a/binsrc/tutorial/services/so_s_19/options.xml +++ b/binsrc/tutorial/services/so_s_19/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_19/so_s_19.xml b/binsrc/tutorial/services/so_s_19/so_s_19.xml index fd8a6553d4..b5f080b1da 100644 --- a/binsrc/tutorial/services/so_s_19/so_s_19.xml +++ b/binsrc/tutorial/services/so_s_19/so_s_19.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_2/options.xml b/binsrc/tutorial/services/so_s_2/options.xml index 7da8de026a..037daf2465 100644 --- a/binsrc/tutorial/services/so_s_2/options.xml +++ b/binsrc/tutorial/services/so_s_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_2/so_s_2.sql b/binsrc/tutorial/services/so_s_2/so_s_2.sql index 274f00e670..5832a4a204 100644 --- a/binsrc/tutorial/services/so_s_2/so_s_2.sql +++ b/binsrc/tutorial/services/so_s_2/so_s_2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_2/so_s_2.xml b/binsrc/tutorial/services/so_s_2/so_s_2.xml index 47f64ea13e..f407579562 100644 --- a/binsrc/tutorial/services/so_s_2/so_s_2.xml +++ b/binsrc/tutorial/services/so_s_2/so_s_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_2/so_s_2_sample_1.vsp b/binsrc/tutorial/services/so_s_2/so_s_2_sample_1.vsp index ce7a8aeebd..7bef12ceb3 100644 --- a/binsrc/tutorial/services/so_s_2/so_s_2_sample_1.vsp +++ b/binsrc/tutorial/services/so_s_2/so_s_2_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/Extensibility.vsp b/binsrc/tutorial/services/so_s_20/Extensibility.vsp index 43492d8699..4335450032 100644 --- a/binsrc/tutorial/services/so_s_20/Extensibility.vsp +++ b/binsrc/tutorial/services/so_s_20/Extensibility.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/ExtensibilityRequired.vsp b/binsrc/tutorial/services/so_s_20/ExtensibilityRequired.vsp index e20649759b..6937d010c1 100644 --- a/binsrc/tutorial/services/so_s_20/ExtensibilityRequired.vsp +++ b/binsrc/tutorial/services/so_s_20/ExtensibilityRequired.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/echoDocument.vsp b/binsrc/tutorial/services/so_s_20/echoDocument.vsp index f4df8f84c0..d077a7928d 100644 --- a/binsrc/tutorial/services/so_s_20/echoDocument.vsp +++ b/binsrc/tutorial/services/so_s_20/echoDocument.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/echoEmployee.vsp b/binsrc/tutorial/services/so_s_20/echoEmployee.vsp index 06130113f1..a9afd18c81 100644 --- a/binsrc/tutorial/services/so_s_20/echoEmployee.vsp +++ b/binsrc/tutorial/services/so_s_20/echoEmployee.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/echoPerson.vsp b/binsrc/tutorial/services/so_s_20/echoPerson.vsp index e79840ab7f..94c6b3fbf5 100644 --- a/binsrc/tutorial/services/so_s_20/echoPerson.vsp +++ b/binsrc/tutorial/services/so_s_20/echoPerson.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/echoString.vsp b/binsrc/tutorial/services/so_s_20/echoString.vsp index bfa1b1bdc6..8308cada1a 100644 --- a/binsrc/tutorial/services/so_s_20/echoString.vsp +++ b/binsrc/tutorial/services/so_s_20/echoString.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/echoStringArray.vsp b/binsrc/tutorial/services/so_s_20/echoStringArray.vsp index 9529289c2a..cffe7aa045 100644 --- a/binsrc/tutorial/services/so_s_20/echoStringArray.vsp +++ b/binsrc/tutorial/services/so_s_20/echoStringArray.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/echoStruct.vsp b/binsrc/tutorial/services/so_s_20/echoStruct.vsp index 76225f984f..b6f821ed5a 100644 --- a/binsrc/tutorial/services/so_s_20/echoStruct.vsp +++ b/binsrc/tutorial/services/so_s_20/echoStruct.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/echoStructArray.vsp b/binsrc/tutorial/services/so_s_20/echoStructArray.vsp index 673895dc15..17939f0c3a 100644 --- a/binsrc/tutorial/services/so_s_20/echoStructArray.vsp +++ b/binsrc/tutorial/services/so_s_20/echoStructArray.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/echoStructLit.vsp b/binsrc/tutorial/services/so_s_20/echoStructLit.vsp index 2889ffc39e..183b0b8784 100644 --- a/binsrc/tutorial/services/so_s_20/echoStructLit.vsp +++ b/binsrc/tutorial/services/so_s_20/echoStructLit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/interop3_clients.vsp b/binsrc/tutorial/services/so_s_20/interop3_clients.vsp index 2d3775dad1..4654ac01f1 100644 --- a/binsrc/tutorial/services/so_s_20/interop3_clients.vsp +++ b/binsrc/tutorial/services/so_s_20/interop3_clients.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/options.xml b/binsrc/tutorial/services/so_s_20/options.xml index 9d89c9e9d7..1296b0283a 100644 --- a/binsrc/tutorial/services/so_s_20/options.xml +++ b/binsrc/tutorial/services/so_s_20/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_20/so_s_20.xml b/binsrc/tutorial/services/so_s_20/so_s_20.xml index 1f85010af2..70087ef19f 100644 --- a/binsrc/tutorial/services/so_s_20/so_s_20.xml +++ b/binsrc/tutorial/services/so_s_20/so_s_20.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_21/google_api.sql b/binsrc/tutorial/services/so_s_21/google_api.sql index 2344f15e83..53bc7ba34b 100644 --- a/binsrc/tutorial/services/so_s_21/google_api.sql +++ b/binsrc/tutorial/services/so_s_21/google_api.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_21/google_api.vsp b/binsrc/tutorial/services/so_s_21/google_api.vsp index 9f8cdeb51d..544a581b13 100644 --- a/binsrc/tutorial/services/so_s_21/google_api.vsp +++ b/binsrc/tutorial/services/so_s_21/google_api.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_21/options.xml b/binsrc/tutorial/services/so_s_21/options.xml index b6f0fbdfcf..b76db91c3a 100644 --- a/binsrc/tutorial/services/so_s_21/options.xml +++ b/binsrc/tutorial/services/so_s_21/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_21/raw.xsl b/binsrc/tutorial/services/so_s_21/raw.xsl index 43d0c000c4..cd548638ae 100644 --- a/binsrc/tutorial/services/so_s_21/raw.xsl +++ b/binsrc/tutorial/services/so_s_21/raw.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_21/so_s_21.xml b/binsrc/tutorial/services/so_s_21/so_s_21.xml index 8b6b62c0d9..37652edd7d 100644 --- a/binsrc/tutorial/services/so_s_21/so_s_21.xml +++ b/binsrc/tutorial/services/so_s_21/so_s_21.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_22/options.xml b/binsrc/tutorial/services/so_s_22/options.xml index 746d74de55..afa5760959 100644 --- a/binsrc/tutorial/services/so_s_22/options.xml +++ b/binsrc/tutorial/services/so_s_22/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_22/so_s_22.sql b/binsrc/tutorial/services/so_s_22/so_s_22.sql index 5a76e9ebab..67a3d1dfbe 100644 --- a/binsrc/tutorial/services/so_s_22/so_s_22.sql +++ b/binsrc/tutorial/services/so_s_22/so_s_22.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_22/so_s_22.xml b/binsrc/tutorial/services/so_s_22/so_s_22.xml index d6fafa1c19..77c4a2fba5 100644 --- a/binsrc/tutorial/services/so_s_22/so_s_22.xml +++ b/binsrc/tutorial/services/so_s_22/so_s_22.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_22/so_s_22_sample.vsp b/binsrc/tutorial/services/so_s_22/so_s_22_sample.vsp index 1bb15eef18..dc9e02c50f 100644 --- a/binsrc/tutorial/services/so_s_22/so_s_22_sample.vsp +++ b/binsrc/tutorial/services/so_s_22/so_s_22_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_23/java_pl_wrapper.sql b/binsrc/tutorial/services/so_s_23/java_pl_wrapper.sql index 5855f76311..7efaaa3dbe 100644 --- a/binsrc/tutorial/services/so_s_23/java_pl_wrapper.sql +++ b/binsrc/tutorial/services/so_s_23/java_pl_wrapper.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_23/java_server.java b/binsrc/tutorial/services/so_s_23/java_server.java index 5e9b157266..478d4210f1 100644 --- a/binsrc/tutorial/services/so_s_23/java_server.java +++ b/binsrc/tutorial/services/so_s_23/java_server.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_23/javavm_pl.xsl b/binsrc/tutorial/services/so_s_23/javavm_pl.xsl index 11270f1a16..9c13d76d41 100644 --- a/binsrc/tutorial/services/so_s_23/javavm_pl.xsl +++ b/binsrc/tutorial/services/so_s_23/javavm_pl.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_23/javavm_xml.sql b/binsrc/tutorial/services/so_s_23/javavm_xml.sql index cb6d12e883..1a328cb98c 100644 --- a/binsrc/tutorial/services/so_s_23/javavm_xml.sql +++ b/binsrc/tutorial/services/so_s_23/javavm_xml.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_23/options.xml b/binsrc/tutorial/services/so_s_23/options.xml index bd09afd5a2..3243d2365b 100644 --- a/binsrc/tutorial/services/so_s_23/options.xml +++ b/binsrc/tutorial/services/so_s_23/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_23/so_s_23.xml b/binsrc/tutorial/services/so_s_23/so_s_23.xml index fa0a5a173e..c1e800380c 100644 --- a/binsrc/tutorial/services/so_s_23/so_s_23.xml +++ b/binsrc/tutorial/services/so_s_23/so_s_23.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_24/amazon.html b/binsrc/tutorial/services/so_s_24/amazon.html index 425042313f..3d3d977a78 100644 --- a/binsrc/tutorial/services/so_s_24/amazon.html +++ b/binsrc/tutorial/services/so_s_24/amazon.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_24/amazon.sql b/binsrc/tutorial/services/so_s_24/amazon.sql index b7678c7ffd..de8eba1139 100644 --- a/binsrc/tutorial/services/so_s_24/amazon.sql +++ b/binsrc/tutorial/services/so_s_24/amazon.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_24/options.xml b/binsrc/tutorial/services/so_s_24/options.xml index 59005260f9..88efae34a4 100644 --- a/binsrc/tutorial/services/so_s_24/options.xml +++ b/binsrc/tutorial/services/so_s_24/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_24/so_s_24.xml b/binsrc/tutorial/services/so_s_24/so_s_24.xml index c2aa9774f0..7bcc824c62 100644 --- a/binsrc/tutorial/services/so_s_24/so_s_24.xml +++ b/binsrc/tutorial/services/so_s_24/so_s_24.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_24/viewhtml.xsl b/binsrc/tutorial/services/so_s_24/viewhtml.xsl index 43416b4e76..1a9f9884c0 100644 --- a/binsrc/tutorial/services/so_s_24/viewhtml.xsl +++ b/binsrc/tutorial/services/so_s_24/viewhtml.xsl @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_24/viewraw.xsl b/binsrc/tutorial/services/so_s_24/viewraw.xsl index b61126b832..31fe7b63bc 100644 --- a/binsrc/tutorial/services/so_s_24/viewraw.xsl +++ b/binsrc/tutorial/services/so_s_24/viewraw.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_25/XSD.vsp b/binsrc/tutorial/services/so_s_25/XSD.vsp index 079fe7d5bf..72afc48685 100644 --- a/binsrc/tutorial/services/so_s_25/XSD.vsp +++ b/binsrc/tutorial/services/so_s_25/XSD.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_25/complex-rpc.vsp b/binsrc/tutorial/services/so_s_25/complex-rpc.vsp index 26b142799d..49782dfda6 100644 --- a/binsrc/tutorial/services/so_s_25/complex-rpc.vsp +++ b/binsrc/tutorial/services/so_s_25/complex-rpc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_25/dime-doc.vsp b/binsrc/tutorial/services/so_s_25/dime-doc.vsp index 94d76b7be8..b3699d488a 100644 --- a/binsrc/tutorial/services/so_s_25/dime-doc.vsp +++ b/binsrc/tutorial/services/so_s_25/dime-doc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_25/dime-rpc.vsp b/binsrc/tutorial/services/so_s_25/dime-rpc.vsp index b3dada2150..c2960fb89a 100644 --- a/binsrc/tutorial/services/so_s_25/dime-rpc.vsp +++ b/binsrc/tutorial/services/so_s_25/dime-rpc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_25/mime-doc.vsp b/binsrc/tutorial/services/so_s_25/mime-doc.vsp index 12cc83c76b..f1765f2405 100644 --- a/binsrc/tutorial/services/so_s_25/mime-doc.vsp +++ b/binsrc/tutorial/services/so_s_25/mime-doc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_25/mime-rpc.vsp b/binsrc/tutorial/services/so_s_25/mime-rpc.vsp index d2ba590350..10b7da69d8 100644 --- a/binsrc/tutorial/services/so_s_25/mime-rpc.vsp +++ b/binsrc/tutorial/services/so_s_25/mime-rpc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_25/simple-doc.vsp b/binsrc/tutorial/services/so_s_25/simple-doc.vsp index 5859ef4146..3fd988dd3a 100644 --- a/binsrc/tutorial/services/so_s_25/simple-doc.vsp +++ b/binsrc/tutorial/services/so_s_25/simple-doc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_25/simple-rpc.vsp b/binsrc/tutorial/services/so_s_25/simple-rpc.vsp index 2541d0e87d..d1349eb9e7 100644 --- a/binsrc/tutorial/services/so_s_25/simple-rpc.vsp +++ b/binsrc/tutorial/services/so_s_25/simple-rpc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_25/so_s_25.xml b/binsrc/tutorial/services/so_s_25/so_s_25.xml index aaa09e7591..032780edf7 100644 --- a/binsrc/tutorial/services/so_s_25/so_s_25.xml +++ b/binsrc/tutorial/services/so_s_25/so_s_25.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_26/handler.vspx b/binsrc/tutorial/services/so_s_26/handler.vspx index 3535cb145a..c165048a2f 100644 --- a/binsrc/tutorial/services/so_s_26/handler.vspx +++ b/binsrc/tutorial/services/so_s_26/handler.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_26/options.xml b/binsrc/tutorial/services/so_s_26/options.xml index d2629cd9db..a7f524d567 100644 --- a/binsrc/tutorial/services/so_s_26/options.xml +++ b/binsrc/tutorial/services/so_s_26/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_26/redcoalsms.sql b/binsrc/tutorial/services/so_s_26/redcoalsms.sql index a5496f8184..32a69e570b 100644 --- a/binsrc/tutorial/services/so_s_26/redcoalsms.sql +++ b/binsrc/tutorial/services/so_s_26/redcoalsms.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_26/setup_sms.vspx b/binsrc/tutorial/services/so_s_26/setup_sms.vspx index 9820a03755..fcd156b353 100644 --- a/binsrc/tutorial/services/so_s_26/setup_sms.vspx +++ b/binsrc/tutorial/services/so_s_26/setup_sms.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_26/so_s_26.xml b/binsrc/tutorial/services/so_s_26/so_s_26.xml index edc05a4c5f..a731b3d3a6 100644 --- a/binsrc/tutorial/services/so_s_26/so_s_26.xml +++ b/binsrc/tutorial/services/so_s_26/so_s_26.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_27/options.xml b/binsrc/tutorial/services/so_s_27/options.xml index 647d6106fe..2310e140cd 100644 --- a/binsrc/tutorial/services/so_s_27/options.xml +++ b/binsrc/tutorial/services/so_s_27/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_27/raw.xsl b/binsrc/tutorial/services/so_s_27/raw.xsl index d8217cea39..687f703333 100644 --- a/binsrc/tutorial/services/so_s_27/raw.xsl +++ b/binsrc/tutorial/services/so_s_27/raw.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_27/so_s_27.xml b/binsrc/tutorial/services/so_s_27/so_s_27.xml index f82703cc3d..105f963726 100644 --- a/binsrc/tutorial/services/so_s_27/so_s_27.xml +++ b/binsrc/tutorial/services/so_s_27/so_s_27.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_27/yahoo_geocode.html b/binsrc/tutorial/services/so_s_27/yahoo_geocode.html index 344f2c900f..3782d30c66 100644 --- a/binsrc/tutorial/services/so_s_27/yahoo_geocode.html +++ b/binsrc/tutorial/services/so_s_27/yahoo_geocode.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_27/yahoo_geocode.sql b/binsrc/tutorial/services/so_s_27/yahoo_geocode.sql index 0b87c41dce..0998d7b056 100644 --- a/binsrc/tutorial/services/so_s_27/yahoo_geocode.sql +++ b/binsrc/tutorial/services/so_s_27/yahoo_geocode.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_28/data_xml.vsp b/binsrc/tutorial/services/so_s_28/data_xml.vsp index 648af7d754..79105984d4 100644 --- a/binsrc/tutorial/services/so_s_28/data_xml.vsp +++ b/binsrc/tutorial/services/so_s_28/data_xml.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_28/googlemaps.vsp b/binsrc/tutorial/services/so_s_28/googlemaps.vsp index 8362125d7a..9c0ecd9558 100644 --- a/binsrc/tutorial/services/so_s_28/googlemaps.vsp +++ b/binsrc/tutorial/services/so_s_28/googlemaps.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_28/options.xml b/binsrc/tutorial/services/so_s_28/options.xml index 12ae801b1f..b5e750d4a2 100644 --- a/binsrc/tutorial/services/so_s_28/options.xml +++ b/binsrc/tutorial/services/so_s_28/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_28/so_s_28.sql b/binsrc/tutorial/services/so_s_28/so_s_28.sql index 8d061c8b59..5123c33961 100644 --- a/binsrc/tutorial/services/so_s_28/so_s_28.sql +++ b/binsrc/tutorial/services/so_s_28/so_s_28.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_28/so_s_28.xml b/binsrc/tutorial/services/so_s_28/so_s_28.xml index 82e14e1292..12fa6b50b7 100644 --- a/binsrc/tutorial/services/so_s_28/so_s_28.xml +++ b/binsrc/tutorial/services/so_s_28/so_s_28.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_29/options.xml b/binsrc/tutorial/services/so_s_29/options.xml index 12ae801b1f..b5e750d4a2 100644 --- a/binsrc/tutorial/services/so_s_29/options.xml +++ b/binsrc/tutorial/services/so_s_29/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_29/so_s_29.xml b/binsrc/tutorial/services/so_s_29/so_s_29.xml index 39af06ed0c..1377993652 100644 --- a/binsrc/tutorial/services/so_s_29/so_s_29.xml +++ b/binsrc/tutorial/services/so_s_29/so_s_29.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_29/yahoomaps.vsp b/binsrc/tutorial/services/so_s_29/yahoomaps.vsp index ab7cca5f7c..2a2bb10c30 100644 --- a/binsrc/tutorial/services/so_s_29/yahoomaps.vsp +++ b/binsrc/tutorial/services/so_s_29/yahoomaps.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_3/options.xml b/binsrc/tutorial/services/so_s_3/options.xml index a49c286323..b11b36d4ff 100644 --- a/binsrc/tutorial/services/so_s_3/options.xml +++ b/binsrc/tutorial/services/so_s_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_3/so_s_3.xml b/binsrc/tutorial/services/so_s_3/so_s_3.xml index 5bf2bf619d..168b73909b 100644 --- a/binsrc/tutorial/services/so_s_3/so_s_3.xml +++ b/binsrc/tutorial/services/so_s_3/so_s_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_3/so_s_3.xsl b/binsrc/tutorial/services/so_s_3/so_s_3.xsl index db5021fe62..aeb7bf67a0 100644 --- a/binsrc/tutorial/services/so_s_3/so_s_3.xsl +++ b/binsrc/tutorial/services/so_s_3/so_s_3.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_3/so_s_3_sample_1.vsp b/binsrc/tutorial/services/so_s_3/so_s_3_sample_1.vsp index 68ff68f105..30c7358a3a 100644 --- a/binsrc/tutorial/services/so_s_3/so_s_3_sample_1.vsp +++ b/binsrc/tutorial/services/so_s_3/so_s_3_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_3/so_s_3_sample_2.vsp b/binsrc/tutorial/services/so_s_3/so_s_3_sample_2.vsp index 2837168590..9ec740d15a 100644 --- a/binsrc/tutorial/services/so_s_3/so_s_3_sample_2.vsp +++ b/binsrc/tutorial/services/so_s_3/so_s_3_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_3/so_s_3_sample_3.vsp b/binsrc/tutorial/services/so_s_3/so_s_3_sample_3.vsp index 66c7706c48..f7ea80c227 100644 --- a/binsrc/tutorial/services/so_s_3/so_s_3_sample_3.vsp +++ b/binsrc/tutorial/services/so_s_3/so_s_3_sample_3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_30/options.xml b/binsrc/tutorial/services/so_s_30/options.xml index 2c4b62f61b..b795f86607 100644 --- a/binsrc/tutorial/services/so_s_30/options.xml +++ b/binsrc/tutorial/services/so_s_30/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_30/so_s_30.java b/binsrc/tutorial/services/so_s_30/so_s_30.java index 9284778766..ce9ad546bb 100644 --- a/binsrc/tutorial/services/so_s_30/so_s_30.java +++ b/binsrc/tutorial/services/so_s_30/so_s_30.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_30/so_s_30.sql b/binsrc/tutorial/services/so_s_30/so_s_30.sql index c152d4c0e6..8dd799dba1 100644 --- a/binsrc/tutorial/services/so_s_30/so_s_30.sql +++ b/binsrc/tutorial/services/so_s_30/so_s_30.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_30/so_s_30.xml b/binsrc/tutorial/services/so_s_30/so_s_30.xml index 08c4583b1a..49793f23c9 100644 --- a/binsrc/tutorial/services/so_s_30/so_s_30.xml +++ b/binsrc/tutorial/services/so_s_30/so_s_30.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_31/options.xml b/binsrc/tutorial/services/so_s_31/options.xml index 727ff6df83..4ccd1285bb 100644 --- a/binsrc/tutorial/services/so_s_31/options.xml +++ b/binsrc/tutorial/services/so_s_31/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_31/so_s_31.sql b/binsrc/tutorial/services/so_s_31/so_s_31.sql index 75ce6bc5b2..3b35bcc09d 100644 --- a/binsrc/tutorial/services/so_s_31/so_s_31.sql +++ b/binsrc/tutorial/services/so_s_31/so_s_31.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_31/so_s_31.xml b/binsrc/tutorial/services/so_s_31/so_s_31.xml index 05486accc4..bc6b0c7b3d 100644 --- a/binsrc/tutorial/services/so_s_31/so_s_31.xml +++ b/binsrc/tutorial/services/so_s_31/so_s_31.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_32/options.xml b/binsrc/tutorial/services/so_s_32/options.xml index f422ed2f23..0af091207d 100644 --- a/binsrc/tutorial/services/so_s_32/options.xml +++ b/binsrc/tutorial/services/so_s_32/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_32/so_s_32.cs b/binsrc/tutorial/services/so_s_32/so_s_32.cs index 492899c899..30fd7da182 100644 --- a/binsrc/tutorial/services/so_s_32/so_s_32.cs +++ b/binsrc/tutorial/services/so_s_32/so_s_32.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_32/so_s_32.sql b/binsrc/tutorial/services/so_s_32/so_s_32.sql index eb0ab0abd7..3a64725056 100644 --- a/binsrc/tutorial/services/so_s_32/so_s_32.sql +++ b/binsrc/tutorial/services/so_s_32/so_s_32.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_32/so_s_32.xml b/binsrc/tutorial/services/so_s_32/so_s_32.xml index d4a1bead89..751c21d997 100644 --- a/binsrc/tutorial/services/so_s_32/so_s_32.xml +++ b/binsrc/tutorial/services/so_s_32/so_s_32.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_33/redcoal.sql b/binsrc/tutorial/services/so_s_33/redcoal.sql index ed22e13423..49a7713890 100644 --- a/binsrc/tutorial/services/so_s_33/redcoal.sql +++ b/binsrc/tutorial/services/so_s_33/redcoal.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_33/sms.vsp b/binsrc/tutorial/services/so_s_33/sms.vsp index 1824668456..dff1bb4adf 100644 --- a/binsrc/tutorial/services/so_s_33/sms.vsp +++ b/binsrc/tutorial/services/so_s_33/sms.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_33/so_s_33.xml b/binsrc/tutorial/services/so_s_33/so_s_33.xml index 12fba8fb64..579721a10c 100644 --- a/binsrc/tutorial/services/so_s_33/so_s_33.xml +++ b/binsrc/tutorial/services/so_s_33/so_s_33.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_34/options.xml b/binsrc/tutorial/services/so_s_34/options.xml index 55a06829d1..4207546fdb 100644 --- a/binsrc/tutorial/services/so_s_34/options.xml +++ b/binsrc/tutorial/services/so_s_34/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_34/so_s_34.sql b/binsrc/tutorial/services/so_s_34/so_s_34.sql index dfc5253829..eea850bb02 100644 --- a/binsrc/tutorial/services/so_s_34/so_s_34.sql +++ b/binsrc/tutorial/services/so_s_34/so_s_34.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_34/so_s_34.xml b/binsrc/tutorial/services/so_s_34/so_s_34.xml index 6a8f6f8bdd..016be0b9e9 100644 --- a/binsrc/tutorial/services/so_s_34/so_s_34.xml +++ b/binsrc/tutorial/services/so_s_34/so_s_34.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_35/mappoint.sql b/binsrc/tutorial/services/so_s_35/mappoint.sql index c233d34ef4..bc843d6255 100644 --- a/binsrc/tutorial/services/so_s_35/mappoint.sql +++ b/binsrc/tutorial/services/so_s_35/mappoint.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_35/mappoint.vsp b/binsrc/tutorial/services/so_s_35/mappoint.vsp index f64e515dc6..8306bd5a33 100644 --- a/binsrc/tutorial/services/so_s_35/mappoint.vsp +++ b/binsrc/tutorial/services/so_s_35/mappoint.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_35/mappoint.xsd b/binsrc/tutorial/services/so_s_35/mappoint.xsd index 0521aa65fb..60fdcc76f0 100644 --- a/binsrc/tutorial/services/so_s_35/mappoint.xsd +++ b/binsrc/tutorial/services/so_s_35/mappoint.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_35/so_s_35.xml b/binsrc/tutorial/services/so_s_35/so_s_35.xml index 559b06d9b7..e565938fe2 100644 --- a/binsrc/tutorial/services/so_s_35/so_s_35.xml +++ b/binsrc/tutorial/services/so_s_35/so_s_35.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_36/eBay.sql b/binsrc/tutorial/services/so_s_36/eBay.sql index e83a651576..4dc0530f6c 100644 --- a/binsrc/tutorial/services/so_s_36/eBay.sql +++ b/binsrc/tutorial/services/so_s_36/eBay.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_36/eBayCategories.vspx b/binsrc/tutorial/services/so_s_36/eBayCategories.vspx index ef6dd75beb..eab274a5ad 100644 --- a/binsrc/tutorial/services/so_s_36/eBayCategories.vspx +++ b/binsrc/tutorial/services/so_s_36/eBayCategories.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_36/eBaySvc.wsdl b/binsrc/tutorial/services/so_s_36/eBaySvc.wsdl index 6bc4599a45..184f38e6e4 100644 --- a/binsrc/tutorial/services/so_s_36/eBaySvc.wsdl +++ b/binsrc/tutorial/services/so_s_36/eBaySvc.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_36/eBayTypes.wsdl b/binsrc/tutorial/services/so_s_36/eBayTypes.wsdl index 13dcdfb2e5..b5efdb77d2 100644 --- a/binsrc/tutorial/services/so_s_36/eBayTypes.wsdl +++ b/binsrc/tutorial/services/so_s_36/eBayTypes.wsdl @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_36/ebay_demo.sql b/binsrc/tutorial/services/so_s_36/ebay_demo.sql index 03493b81b4..a1aead6929 100644 --- a/binsrc/tutorial/services/so_s_36/ebay_demo.sql +++ b/binsrc/tutorial/services/so_s_36/ebay_demo.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_36/options.xml b/binsrc/tutorial/services/so_s_36/options.xml index d17af3d847..824dc7d208 100644 --- a/binsrc/tutorial/services/so_s_36/options.xml +++ b/binsrc/tutorial/services/so_s_36/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_36/so_s_36.xml b/binsrc/tutorial/services/so_s_36/so_s_36.xml index dd8cfa98f5..f9b8067507 100644 --- a/binsrc/tutorial/services/so_s_36/so_s_36.xml +++ b/binsrc/tutorial/services/so_s_36/so_s_36.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_37/nwsetup.sql b/binsrc/tutorial/services/so_s_37/nwsetup.sql index ba82850ca1..1ee014656c 100644 --- a/binsrc/tutorial/services/so_s_37/nwsetup.sql +++ b/binsrc/tutorial/services/so_s_37/nwsetup.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_37/options.xml b/binsrc/tutorial/services/so_s_37/options.xml index 45e7736c58..3a6f500027 100644 --- a/binsrc/tutorial/services/so_s_37/options.xml +++ b/binsrc/tutorial/services/so_s_37/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_37/so_s_37.xml b/binsrc/tutorial/services/so_s_37/so_s_37.xml index 5d8350643e..af41b8b6e5 100644 --- a/binsrc/tutorial/services/so_s_37/so_s_37.xml +++ b/binsrc/tutorial/services/so_s_37/so_s_37.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_4/options.xml b/binsrc/tutorial/services/so_s_4/options.xml index 005d89e0b8..49e2b1aefa 100644 --- a/binsrc/tutorial/services/so_s_4/options.xml +++ b/binsrc/tutorial/services/so_s_4/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_4/so_s_4.sql b/binsrc/tutorial/services/so_s_4/so_s_4.sql index 7ccc394352..0562d7744c 100644 --- a/binsrc/tutorial/services/so_s_4/so_s_4.sql +++ b/binsrc/tutorial/services/so_s_4/so_s_4.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_4/so_s_4.xml b/binsrc/tutorial/services/so_s_4/so_s_4.xml index b19f88ebaa..dd596534a2 100644 --- a/binsrc/tutorial/services/so_s_4/so_s_4.xml +++ b/binsrc/tutorial/services/so_s_4/so_s_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_4/so_s_4_sample_1.vsp b/binsrc/tutorial/services/so_s_4/so_s_4_sample_1.vsp index 2cd4ef73d8..688c9b4177 100644 --- a/binsrc/tutorial/services/so_s_4/so_s_4_sample_1.vsp +++ b/binsrc/tutorial/services/so_s_4/so_s_4_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_5/so_s_5.xml b/binsrc/tutorial/services/so_s_5/so_s_5.xml index d409c222e5..0878e550bd 100644 --- a/binsrc/tutorial/services/so_s_5/so_s_5.xml +++ b/binsrc/tutorial/services/so_s_5/so_s_5.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_6/options.xml b/binsrc/tutorial/services/so_s_6/options.xml index a3df5d8529..f3cae5c7a3 100644 --- a/binsrc/tutorial/services/so_s_6/options.xml +++ b/binsrc/tutorial/services/so_s_6/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_6/so_s_6.sql b/binsrc/tutorial/services/so_s_6/so_s_6.sql index 2fb02fd622..c5061d14a7 100644 --- a/binsrc/tutorial/services/so_s_6/so_s_6.sql +++ b/binsrc/tutorial/services/so_s_6/so_s_6.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_6/so_s_6.xml b/binsrc/tutorial/services/so_s_6/so_s_6.xml index cbbee75617..38263bfe4b 100644 --- a/binsrc/tutorial/services/so_s_6/so_s_6.xml +++ b/binsrc/tutorial/services/so_s_6/so_s_6.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_6/so_s_6_sample_1.vsp b/binsrc/tutorial/services/so_s_6/so_s_6_sample_1.vsp index 7d15ae4765..b990c8ba0d 100644 --- a/binsrc/tutorial/services/so_s_6/so_s_6_sample_1.vsp +++ b/binsrc/tutorial/services/so_s_6/so_s_6_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_6/so_s_6_sample_2.vsp b/binsrc/tutorial/services/so_s_6/so_s_6_sample_2.vsp index 5f4999a9ae..09a27d7190 100644 --- a/binsrc/tutorial/services/so_s_6/so_s_6_sample_2.vsp +++ b/binsrc/tutorial/services/so_s_6/so_s_6_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_6/so_s_6_sample_3.vsp b/binsrc/tutorial/services/so_s_6/so_s_6_sample_3.vsp index 19dc5d361b..9df6ed03ff 100644 --- a/binsrc/tutorial/services/so_s_6/so_s_6_sample_3.vsp +++ b/binsrc/tutorial/services/so_s_6/so_s_6_sample_3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_6/wsdl_call.xsl b/binsrc/tutorial/services/so_s_6/wsdl_call.xsl index 82874643d0..6bda574efe 100644 --- a/binsrc/tutorial/services/so_s_6/wsdl_call.xsl +++ b/binsrc/tutorial/services/so_s_6/wsdl_call.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_6/wsdl_oper.xsl b/binsrc/tutorial/services/so_s_6/wsdl_oper.xsl index ccfe0f4bc3..30603a1f7c 100644 --- a/binsrc/tutorial/services/so_s_6/wsdl_oper.xsl +++ b/binsrc/tutorial/services/so_s_6/wsdl_oper.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_7/nasdaq_ajax.html b/binsrc/tutorial/services/so_s_7/nasdaq_ajax.html index a0d62de0b9..7366e22fb5 100644 --- a/binsrc/tutorial/services/so_s_7/nasdaq_ajax.html +++ b/binsrc/tutorial/services/so_s_7/nasdaq_ajax.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_7/options.xml b/binsrc/tutorial/services/so_s_7/options.xml index 2873a996a0..ee98ad72aa 100644 --- a/binsrc/tutorial/services/so_s_7/options.xml +++ b/binsrc/tutorial/services/so_s_7/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_7/so_s_7.sql b/binsrc/tutorial/services/so_s_7/so_s_7.sql index beaaf1c906..616920333f 100644 --- a/binsrc/tutorial/services/so_s_7/so_s_7.sql +++ b/binsrc/tutorial/services/so_s_7/so_s_7.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_7/so_s_7.xml b/binsrc/tutorial/services/so_s_7/so_s_7.xml index fb5f34f213..6df12e26a3 100644 --- a/binsrc/tutorial/services/so_s_7/so_s_7.xml +++ b/binsrc/tutorial/services/so_s_7/so_s_7.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_7/so_s_7_client.vsp b/binsrc/tutorial/services/so_s_7/so_s_7_client.vsp index 6dd93a3dde..d5dffac95b 100644 --- a/binsrc/tutorial/services/so_s_7/so_s_7_client.vsp +++ b/binsrc/tutorial/services/so_s_7/so_s_7_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_7/so_s_7_server.vsp b/binsrc/tutorial/services/so_s_7/so_s_7_server.vsp index 54bc8c6d2a..aa39d3420e 100644 --- a/binsrc/tutorial/services/so_s_7/so_s_7_server.vsp +++ b/binsrc/tutorial/services/so_s_7/so_s_7_server.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_7/so_s_7_wsdl.vsp b/binsrc/tutorial/services/so_s_7/so_s_7_wsdl.vsp index 9bb057a931..184952f36c 100644 --- a/binsrc/tutorial/services/so_s_7/so_s_7_wsdl.vsp +++ b/binsrc/tutorial/services/so_s_7/so_s_7_wsdl.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_7/sr.xsl b/binsrc/tutorial/services/so_s_7/sr.xsl index 67a335305d..400aa6e39f 100644 --- a/binsrc/tutorial/services/so_s_7/sr.xsl +++ b/binsrc/tutorial/services/so_s_7/sr.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_8/options.xml b/binsrc/tutorial/services/so_s_8/options.xml index 58d582c7a0..d5ecff5fa4 100644 --- a/binsrc/tutorial/services/so_s_8/options.xml +++ b/binsrc/tutorial/services/so_s_8/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_8/so_s_8.sql b/binsrc/tutorial/services/so_s_8/so_s_8.sql index 6420d4f3e4..5d3cc1b3ac 100644 --- a/binsrc/tutorial/services/so_s_8/so_s_8.sql +++ b/binsrc/tutorial/services/so_s_8/so_s_8.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_8/so_s_8.xml b/binsrc/tutorial/services/so_s_8/so_s_8.xml index 9ff5fe9699..dec84b3463 100644 --- a/binsrc/tutorial/services/so_s_8/so_s_8.xml +++ b/binsrc/tutorial/services/so_s_8/so_s_8.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_8/so_s_8_client.vsp b/binsrc/tutorial/services/so_s_8/so_s_8_client.vsp index 0fb08918ed..f0a12dbdf3 100644 --- a/binsrc/tutorial/services/so_s_8/so_s_8_client.vsp +++ b/binsrc/tutorial/services/so_s_8/so_s_8_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_8/so_s_8_server.vsp b/binsrc/tutorial/services/so_s_8/so_s_8_server.vsp index 5afa31e8ee..6861c7e3fa 100644 --- a/binsrc/tutorial/services/so_s_8/so_s_8_server.vsp +++ b/binsrc/tutorial/services/so_s_8/so_s_8_server.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_8/so_s_8_wsdl.vsp b/binsrc/tutorial/services/so_s_8/so_s_8_wsdl.vsp index 2629a05941..5567ea2466 100644 --- a/binsrc/tutorial/services/so_s_8/so_s_8_wsdl.vsp +++ b/binsrc/tutorial/services/so_s_8/so_s_8_wsdl.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_8/sr.xsl b/binsrc/tutorial/services/so_s_8/sr.xsl index ee7245d99b..73d0f1158f 100644 --- a/binsrc/tutorial/services/so_s_8/sr.xsl +++ b/binsrc/tutorial/services/so_s_8/sr.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_9/options.xml b/binsrc/tutorial/services/so_s_9/options.xml index 9a76efe5c6..e2c79a043d 100644 --- a/binsrc/tutorial/services/so_s_9/options.xml +++ b/binsrc/tutorial/services/so_s_9/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_9/so_s_9.sql b/binsrc/tutorial/services/so_s_9/so_s_9.sql index c2a73a0102..e2daca2888 100644 --- a/binsrc/tutorial/services/so_s_9/so_s_9.sql +++ b/binsrc/tutorial/services/so_s_9/so_s_9.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_9/so_s_9.xml b/binsrc/tutorial/services/so_s_9/so_s_9.xml index 04211f328c..461e60674f 100644 --- a/binsrc/tutorial/services/so_s_9/so_s_9.xml +++ b/binsrc/tutorial/services/so_s_9/so_s_9.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_9/so_s_9_client.vsp b/binsrc/tutorial/services/so_s_9/so_s_9_client.vsp index cf2e137c62..d61cc44e2a 100644 --- a/binsrc/tutorial/services/so_s_9/so_s_9_client.vsp +++ b/binsrc/tutorial/services/so_s_9/so_s_9_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/so_s_9/sr.xsl b/binsrc/tutorial/services/so_s_9/sr.xsl index 771609fbc7..5fed087c96 100644 --- a/binsrc/tutorial/services/so_s_9/sr.xsl +++ b/binsrc/tutorial/services/so_s_9/sr.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/soap.js b/binsrc/tutorial/services/soap.js index db99c64efb..9573679168 100644 --- a/binsrc/tutorial/services/soap.js +++ b/binsrc/tutorial/services/soap.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_1/options.xml b/binsrc/tutorial/services/ud_s_1/options.xml index c9cba68627..c1578b2d85 100644 --- a/binsrc/tutorial/services/ud_s_1/options.xml +++ b/binsrc/tutorial/services/ud_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_1/ud_s_1.sql b/binsrc/tutorial/services/ud_s_1/ud_s_1.sql index 62747730cc..98026a2503 100644 --- a/binsrc/tutorial/services/ud_s_1/ud_s_1.sql +++ b/binsrc/tutorial/services/ud_s_1/ud_s_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_1/ud_s_1.xml b/binsrc/tutorial/services/ud_s_1/ud_s_1.xml index 5aa1d839af..89260ec80e 100644 --- a/binsrc/tutorial/services/ud_s_1/ud_s_1.xml +++ b/binsrc/tutorial/services/ud_s_1/ud_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_1/ud_s_1.xsl b/binsrc/tutorial/services/ud_s_1/ud_s_1.xsl index 4a6be48e59..39ef1c7fd6 100644 --- a/binsrc/tutorial/services/ud_s_1/ud_s_1.xsl +++ b/binsrc/tutorial/services/ud_s_1/ud_s_1.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_1/ud_s_1_result.xsl b/binsrc/tutorial/services/ud_s_1/ud_s_1_result.xsl index 68cc0e4c9e..10bae696c4 100644 --- a/binsrc/tutorial/services/ud_s_1/ud_s_1_result.xsl +++ b/binsrc/tutorial/services/ud_s_1/ud_s_1_result.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_1/ud_s_1_sample_1.vsp b/binsrc/tutorial/services/ud_s_1/ud_s_1_sample_1.vsp index bb7b344add..13f7787a89 100644 --- a/binsrc/tutorial/services/ud_s_1/ud_s_1_sample_1.vsp +++ b/binsrc/tutorial/services/ud_s_1/ud_s_1_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_2/options.xml b/binsrc/tutorial/services/ud_s_2/options.xml index a903e64b57..0e113ed3d1 100644 --- a/binsrc/tutorial/services/ud_s_2/options.xml +++ b/binsrc/tutorial/services/ud_s_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_2/ud_s_2.sql b/binsrc/tutorial/services/ud_s_2/ud_s_2.sql index 86410b518b..3c7893ac38 100644 --- a/binsrc/tutorial/services/ud_s_2/ud_s_2.sql +++ b/binsrc/tutorial/services/ud_s_2/ud_s_2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_2/ud_s_2.xml b/binsrc/tutorial/services/ud_s_2/ud_s_2.xml index 978c2f4c5a..e6e18bc366 100644 --- a/binsrc/tutorial/services/ud_s_2/ud_s_2.xml +++ b/binsrc/tutorial/services/ud_s_2/ud_s_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_2/ud_s_2.xsl b/binsrc/tutorial/services/ud_s_2/ud_s_2.xsl index c02ca05183..a3e4d24103 100644 --- a/binsrc/tutorial/services/ud_s_2/ud_s_2.xsl +++ b/binsrc/tutorial/services/ud_s_2/ud_s_2.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_2/ud_s_2_sample_1.vsp b/binsrc/tutorial/services/ud_s_2/ud_s_2_sample_1.vsp index dc7251d90a..57833a539a 100644 --- a/binsrc/tutorial/services/ud_s_2/ud_s_2_sample_1.vsp +++ b/binsrc/tutorial/services/ud_s_2/ud_s_2_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/be.xml b/binsrc/tutorial/services/ud_s_3/be.xml index 2742453215..dfd5f6ab3f 100644 --- a/binsrc/tutorial/services/ud_s_3/be.xml +++ b/binsrc/tutorial/services/ud_s_3/be.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/bnd.xml b/binsrc/tutorial/services/ud_s_3/bnd.xml index deb1a17069..2607735384 100644 --- a/binsrc/tutorial/services/ud_s_3/bnd.xml +++ b/binsrc/tutorial/services/ud_s_3/bnd.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/bs.xml b/binsrc/tutorial/services/ud_s_3/bs.xml index a8733beb9a..68c6c7932c 100644 --- a/binsrc/tutorial/services/ud_s_3/bs.xml +++ b/binsrc/tutorial/services/ud_s_3/bs.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/options.xml b/binsrc/tutorial/services/ud_s_3/options.xml index 3edfcf6e54..305960d4e7 100644 --- a/binsrc/tutorial/services/ud_s_3/options.xml +++ b/binsrc/tutorial/services/ud_s_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/tm.xml b/binsrc/tutorial/services/ud_s_3/tm.xml index 3e766ee1c0..3144ee275e 100644 --- a/binsrc/tutorial/services/ud_s_3/tm.xml +++ b/binsrc/tutorial/services/ud_s_3/tm.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3.sql b/binsrc/tutorial/services/ud_s_3/ud_s_3.sql index 530132aae8..d43eabf9e9 100644 --- a/binsrc/tutorial/services/ud_s_3/ud_s_3.sql +++ b/binsrc/tutorial/services/ud_s_3/ud_s_3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3.xml b/binsrc/tutorial/services/ud_s_3/ud_s_3.xml index 46c1832d26..103d8bf032 100644 --- a/binsrc/tutorial/services/ud_s_3/ud_s_3.xml +++ b/binsrc/tutorial/services/ud_s_3/ud_s_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3.xsl b/binsrc/tutorial/services/ud_s_3/ud_s_3.xsl index a36e995115..6e61611eb1 100644 --- a/binsrc/tutorial/services/ud_s_3/ud_s_3.xsl +++ b/binsrc/tutorial/services/ud_s_3/ud_s_3.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_find.vsp b/binsrc/tutorial/services/ud_s_3/ud_s_3_find.vsp index f295656bec..ad5b573c40 100644 --- a/binsrc/tutorial/services/ud_s_3/ud_s_3_find.vsp +++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_find.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_sample_1.sql b/binsrc/tutorial/services/ud_s_3/ud_s_3_sample_1.sql index 3fc623f345..0e98c8e9c9 100644 --- a/binsrc/tutorial/services/ud_s_3/ud_s_3_sample_1.sql +++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_sample_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_1.vsp b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_1.vsp index 66386cf737..71de677cb0 100644 --- a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_1.vsp +++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_2.vsp b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_2.vsp index cef55331ac..ada2ad8e5b 100644 --- a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_2.vsp +++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_3.vsp b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_3.vsp index 6fe0ccab8b..27d68cd1c2 100644 --- a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_3.vsp +++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_4.vsp b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_4.vsp index e332fa9a5e..3ba7604273 100644 --- a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_4.vsp +++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_4.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_5.vsp b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_5.vsp index 9697af0182..4058f652cc 100644 --- a/binsrc/tutorial/services/ud_s_3/ud_s_3_step_5.vsp +++ b/binsrc/tutorial/services/ud_s_3/ud_s_3_step_5.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_1/register_client_create.vsp b/binsrc/tutorial/services/ws_s_1/register_client_create.vsp index 534c3b8a78..de9cc7df1f 100644 --- a/binsrc/tutorial/services/ws_s_1/register_client_create.vsp +++ b/binsrc/tutorial/services/ws_s_1/register_client_create.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_1/ws_s_1.sql b/binsrc/tutorial/services/ws_s_1/ws_s_1.sql index 126990cb75..ea8ad02d0f 100644 --- a/binsrc/tutorial/services/ws_s_1/ws_s_1.sql +++ b/binsrc/tutorial/services/ws_s_1/ws_s_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_1/ws_s_1.xml b/binsrc/tutorial/services/ws_s_1/ws_s_1.xml index a8d323c1c7..43cc7f961b 100644 --- a/binsrc/tutorial/services/ws_s_1/ws_s_1.xml +++ b/binsrc/tutorial/services/ws_s_1/ws_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_2/SymClient.cs b/binsrc/tutorial/services/ws_s_2/SymClient.cs index 930e558b03..a71f148b62 100644 --- a/binsrc/tutorial/services/ws_s_2/SymClient.cs +++ b/binsrc/tutorial/services/ws_s_2/SymClient.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_2/symmeric_encryption_client.vsp b/binsrc/tutorial/services/ws_s_2/symmeric_encryption_client.vsp index 66eae790af..6b2dbf6bb3 100644 --- a/binsrc/tutorial/services/ws_s_2/symmeric_encryption_client.vsp +++ b/binsrc/tutorial/services/ws_s_2/symmeric_encryption_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_2/virt_symmeric_encryption_client.vsp b/binsrc/tutorial/services/ws_s_2/virt_symmeric_encryption_client.vsp index 5779c821e0..e648b3925d 100644 --- a/binsrc/tutorial/services/ws_s_2/virt_symmeric_encryption_client.vsp +++ b/binsrc/tutorial/services/ws_s_2/virt_symmeric_encryption_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_2/ws_s_2.xml b/binsrc/tutorial/services/ws_s_2/ws_s_2.xml index 9ec17ea81f..d199f5cb60 100644 --- a/binsrc/tutorial/services/ws_s_2/ws_s_2.xml +++ b/binsrc/tutorial/services/ws_s_2/ws_s_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_3/ASymClient.cs b/binsrc/tutorial/services/ws_s_3/ASymClient.cs index c83cceff52..ee01cca35b 100644 --- a/binsrc/tutorial/services/ws_s_3/ASymClient.cs +++ b/binsrc/tutorial/services/ws_s_3/ASymClient.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_3/ASymClient2.cs b/binsrc/tutorial/services/ws_s_3/ASymClient2.cs index a45a4b0a99..535232a212 100644 --- a/binsrc/tutorial/services/ws_s_3/ASymClient2.cs +++ b/binsrc/tutorial/services/ws_s_3/ASymClient2.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_3/asymmeric_encryption_client.vsp b/binsrc/tutorial/services/ws_s_3/asymmeric_encryption_client.vsp index bddc3771a8..864f23f15e 100644 --- a/binsrc/tutorial/services/ws_s_3/asymmeric_encryption_client.vsp +++ b/binsrc/tutorial/services/ws_s_3/asymmeric_encryption_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_3/virt_asymmeric_encryption_client.vsp b/binsrc/tutorial/services/ws_s_3/virt_asymmeric_encryption_client.vsp index 4063272437..76e01bc1ef 100644 --- a/binsrc/tutorial/services/ws_s_3/virt_asymmeric_encryption_client.vsp +++ b/binsrc/tutorial/services/ws_s_3/virt_asymmeric_encryption_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_3/ws_s_3.xml b/binsrc/tutorial/services/ws_s_3/ws_s_3.xml index b461531676..f0fe72c82d 100644 --- a/binsrc/tutorial/services/ws_s_3/ws_s_3.xml +++ b/binsrc/tutorial/services/ws_s_3/ws_s_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_3/wse_asymmeric_encryption_client.vsp b/binsrc/tutorial/services/ws_s_3/wse_asymmeric_encryption_client.vsp index d9a8a82849..cf16b04927 100644 --- a/binsrc/tutorial/services/ws_s_3/wse_asymmeric_encryption_client.vsp +++ b/binsrc/tutorial/services/ws_s_3/wse_asymmeric_encryption_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_4/virt_x509signing_client.vsp b/binsrc/tutorial/services/ws_s_4/virt_x509signing_client.vsp index 91c6ada0da..1c5b075ded 100644 --- a/binsrc/tutorial/services/ws_s_4/virt_x509signing_client.vsp +++ b/binsrc/tutorial/services/ws_s_4/virt_x509signing_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_4/ws_s_4.xml b/binsrc/tutorial/services/ws_s_4/ws_s_4.xml index 87c5702312..fa8224619c 100644 --- a/binsrc/tutorial/services/ws_s_4/ws_s_4.xml +++ b/binsrc/tutorial/services/ws_s_4/ws_s_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_4/wse_x509_signing_client.vsp b/binsrc/tutorial/services/ws_s_4/wse_x509_signing_client.vsp index 815cae9459..fe4899b443 100644 --- a/binsrc/tutorial/services/ws_s_4/wse_x509_signing_client.vsp +++ b/binsrc/tutorial/services/ws_s_4/wse_x509_signing_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_4/x509.xml b/binsrc/tutorial/services/ws_s_4/x509.xml index 6bbf34671e..fb2c5dbd92 100644 --- a/binsrc/tutorial/services/ws_s_4/x509.xml +++ b/binsrc/tutorial/services/ws_s_4/x509.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_4/x509Client.cs b/binsrc/tutorial/services/ws_s_4/x509Client.cs index d71d97b0ba..75bfb1c103 100644 --- a/binsrc/tutorial/services/ws_s_4/x509Client.cs +++ b/binsrc/tutorial/services/ws_s_4/x509Client.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_4/x509_signing_client.vsp b/binsrc/tutorial/services/ws_s_4/x509_signing_client.vsp index 09ba0556fb..25ecbc4a6f 100644 --- a/binsrc/tutorial/services/ws_s_4/x509_signing_client.vsp +++ b/binsrc/tutorial/services/ws_s_4/x509_signing_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_4a/UsernameClient.cs b/binsrc/tutorial/services/ws_s_4a/UsernameClient.cs index c52c28b707..17e1efbbde 100644 --- a/binsrc/tutorial/services/ws_s_4a/UsernameClient.cs +++ b/binsrc/tutorial/services/ws_s_4a/UsernameClient.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_4a/UsernameClient2.cs b/binsrc/tutorial/services/ws_s_4a/UsernameClient2.cs index 86357cd528..ba86669790 100644 --- a/binsrc/tutorial/services/ws_s_4a/UsernameClient2.cs +++ b/binsrc/tutorial/services/ws_s_4a/UsernameClient2.cs @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_4a/username_signing_client.vsp b/binsrc/tutorial/services/ws_s_4a/username_signing_client.vsp index db4dee33cb..30f7dfb97b 100644 --- a/binsrc/tutorial/services/ws_s_4a/username_signing_client.vsp +++ b/binsrc/tutorial/services/ws_s_4a/username_signing_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_4a/ws_s_4a.xml b/binsrc/tutorial/services/ws_s_4a/ws_s_4a.xml index 135651d0d3..b8ff3b5e11 100644 --- a/binsrc/tutorial/services/ws_s_4a/ws_s_4a.xml +++ b/binsrc/tutorial/services/ws_s_4a/ws_s_4a.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_5/trust_client.vsp b/binsrc/tutorial/services/ws_s_5/trust_client.vsp index 2d9cf07b60..6b33223f55 100644 --- a/binsrc/tutorial/services/ws_s_5/trust_client.vsp +++ b/binsrc/tutorial/services/ws_s_5/trust_client.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_5/ws_s_5.sql b/binsrc/tutorial/services/ws_s_5/ws_s_5.sql index fadeec9e12..5e9a0fb9e7 100644 --- a/binsrc/tutorial/services/ws_s_5/ws_s_5.sql +++ b/binsrc/tutorial/services/ws_s_5/ws_s_5.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/ws_s_5/ws_s_5.xml b/binsrc/tutorial/services/ws_s_5/ws_s_5.xml index ef74490408..6116871277 100644 --- a/binsrc/tutorial/services/ws_s_5/ws_s_5.xml +++ b/binsrc/tutorial/services/ws_s_5/ws_s_5.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/xa_s_1/options.xml b/binsrc/tutorial/services/xa_s_1/options.xml index 6c93be8df0..e87c42716b 100644 --- a/binsrc/tutorial/services/xa_s_1/options.xml +++ b/binsrc/tutorial/services/xa_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/xa_s_1/xa_s_1.xml b/binsrc/tutorial/services/xa_s_1/xa_s_1.xml index da844ac8e9..a60d8026aa 100644 --- a/binsrc/tutorial/services/xa_s_1/xa_s_1.xml +++ b/binsrc/tutorial/services/xa_s_1/xa_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/xa_s_1/xars.xsl b/binsrc/tutorial/services/xa_s_1/xars.xsl index c9d799d138..662e6f50fc 100644 --- a/binsrc/tutorial/services/xa_s_1/xars.xsl +++ b/binsrc/tutorial/services/xa_s_1/xars.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/xa_s_1/xmla.vsp b/binsrc/tutorial/services/xa_s_1/xmla.vsp index 2f133bbe1a..4ba1efe863 100644 --- a/binsrc/tutorial/services/xa_s_1/xmla.vsp +++ b/binsrc/tutorial/services/xa_s_1/xmla.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/xa_s_1/xmla_dsn_add.vsp b/binsrc/tutorial/services/xa_s_1/xmla_dsn_add.vsp index f84cf530d4..6821b69302 100644 --- a/binsrc/tutorial/services/xa_s_1/xmla_dsn_add.vsp +++ b/binsrc/tutorial/services/xa_s_1/xmla_dsn_add.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/services/xa_s_1/xmla_setup.sql b/binsrc/tutorial/services/xa_s_1/xmla_setup.sql index 3d202c4b09..c20a625e41 100644 --- a/binsrc/tutorial/services/xa_s_1/xmla_setup.sql +++ b/binsrc/tutorial/services/xa_s_1/xmla_setup.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/setup_search.sql b/binsrc/tutorial/setup_search.sql index c130704e9a..ecd61c4f28 100644 --- a/binsrc/tutorial/setup_search.sql +++ b/binsrc/tutorial/setup_search.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/setup_tutorial.sql b/binsrc/tutorial/setup_tutorial.sql index 002389ee52..084596f416 100644 --- a/binsrc/tutorial/setup_tutorial.sql +++ b/binsrc/tutorial/setup_tutorial.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/sioc_ttl.vsp b/binsrc/tutorial/sioc_ttl.vsp index 076b344fc3..cc9ac377f0 100644 --- a/binsrc/tutorial/sioc_ttl.vsp +++ b/binsrc/tutorial/sioc_ttl.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/syntax/SyntaxHighlighter.css b/binsrc/tutorial/syntax/SyntaxHighlighter.css index cd9bd2cd92..0f6b483b82 100644 --- a/binsrc/tutorial/syntax/SyntaxHighlighter.css +++ b/binsrc/tutorial/syntax/SyntaxHighlighter.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/syntax/shBrushCSharp.js b/binsrc/tutorial/syntax/shBrushCSharp.js index 8f3ca222d8..e41550d5e0 100644 --- a/binsrc/tutorial/syntax/shBrushCSharp.js +++ b/binsrc/tutorial/syntax/shBrushCSharp.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/syntax/shBrushDelphi.js b/binsrc/tutorial/syntax/shBrushDelphi.js index 5df09c6c91..010651b3c7 100644 --- a/binsrc/tutorial/syntax/shBrushDelphi.js +++ b/binsrc/tutorial/syntax/shBrushDelphi.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/syntax/shBrushJScript.js b/binsrc/tutorial/syntax/shBrushJScript.js index c8926c1ea5..0a7c991bfa 100644 --- a/binsrc/tutorial/syntax/shBrushJScript.js +++ b/binsrc/tutorial/syntax/shBrushJScript.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/syntax/shBrushPhp.js b/binsrc/tutorial/syntax/shBrushPhp.js index 5f28ac7e11..3f9898f5a6 100644 --- a/binsrc/tutorial/syntax/shBrushPhp.js +++ b/binsrc/tutorial/syntax/shBrushPhp.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/syntax/shBrushPython.js b/binsrc/tutorial/syntax/shBrushPython.js index f9af858b63..63f0611335 100644 --- a/binsrc/tutorial/syntax/shBrushPython.js +++ b/binsrc/tutorial/syntax/shBrushPython.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/syntax/shBrushSql.js b/binsrc/tutorial/syntax/shBrushSql.js index 3d6c8e5f1e..52f4bbe780 100644 --- a/binsrc/tutorial/syntax/shBrushSql.js +++ b/binsrc/tutorial/syntax/shBrushSql.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/syntax/shBrushVb.js b/binsrc/tutorial/syntax/shBrushVb.js index 02749da42c..fe4bd096a8 100644 --- a/binsrc/tutorial/syntax/shBrushVb.js +++ b/binsrc/tutorial/syntax/shBrushVb.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/syntax/shBrushXml.js b/binsrc/tutorial/syntax/shBrushXml.js index e6d2089101..5998a3f559 100644 --- a/binsrc/tutorial/syntax/shBrushXml.js +++ b/binsrc/tutorial/syntax/shBrushXml.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/tutorial.owl b/binsrc/tutorial/tutorial.owl index f913e2e963..795b9ac5f1 100644 --- a/binsrc/tutorial/tutorial.owl +++ b/binsrc/tutorial/tutorial.owl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/tutorial.xml b/binsrc/tutorial/tutorial.xml index 49820f1823..b73f13b9ea 100644 --- a/binsrc/tutorial/tutorial.xml +++ b/binsrc/tutorial/tutorial.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/tutorial3.css b/binsrc/tutorial/tutorial3.css index e4223aeb41..ddcccbc143 100644 --- a/binsrc/tutorial/tutorial3.css +++ b/binsrc/tutorial/tutorial3.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/demo.css b/binsrc/tutorial/wap/demo.css index 96e5c76b0d..45b267d45a 100644 --- a/binsrc/tutorial/wap/demo.css +++ b/binsrc/tutorial/wap/demo.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/index.xml b/binsrc/tutorial/wap/index.xml index 40635e24e0..834c109839 100644 --- a/binsrc/tutorial/wap/index.xml +++ b/binsrc/tutorial/wap/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_1/RunHtml2wml.vsp b/binsrc/tutorial/wap/wa_b_1/RunHtml2wml.vsp index fed61471b3..85cdaef5e7 100644 --- a/binsrc/tutorial/wap/wa_b_1/RunHtml2wml.vsp +++ b/binsrc/tutorial/wap/wa_b_1/RunHtml2wml.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_1/html2wml.vsp b/binsrc/tutorial/wap/wa_b_1/html2wml.vsp index dee2c3599c..6627415c5e 100644 --- a/binsrc/tutorial/wap/wa_b_1/html2wml.vsp +++ b/binsrc/tutorial/wap/wa_b_1/html2wml.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_1/html2wml.xsl b/binsrc/tutorial/wap/wa_b_1/html2wml.xsl index f3fc1e099a..c56846f2c6 100644 --- a/binsrc/tutorial/wap/wa_b_1/html2wml.xsl +++ b/binsrc/tutorial/wap/wa_b_1/html2wml.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_1/options.xml b/binsrc/tutorial/wap/wa_b_1/options.xml index 5c52f8451d..999e69b83e 100644 --- a/binsrc/tutorial/wap/wa_b_1/options.xml +++ b/binsrc/tutorial/wap/wa_b_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_1/wa_b_1.xml b/binsrc/tutorial/wap/wa_b_1/wa_b_1.xml index 2da3c12aac..48e63b83e3 100644 --- a/binsrc/tutorial/wap/wa_b_1/wa_b_1.xml +++ b/binsrc/tutorial/wap/wa_b_1/wa_b_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_2/wa_b_2.xml b/binsrc/tutorial/wap/wa_b_2/wa_b_2.xml index 630e268169..286779dc2f 100644 --- a/binsrc/tutorial/wap/wa_b_2/wa_b_2.xml +++ b/binsrc/tutorial/wap/wa_b_2/wa_b_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_2/wapphone.vsp b/binsrc/tutorial/wap/wa_b_2/wapphone.vsp index f012de348a..62b6b4fc9a 100644 --- a/binsrc/tutorial/wap/wa_b_2/wapphone.vsp +++ b/binsrc/tutorial/wap/wa_b_2/wapphone.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_2/wapphone.xsl b/binsrc/tutorial/wap/wa_b_2/wapphone.xsl index 953b603052..cd93b2b1ab 100644 --- a/binsrc/tutorial/wap/wa_b_2/wapphone.xsl +++ b/binsrc/tutorial/wap/wa_b_2/wapphone.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/RunWapEmail.vsp b/binsrc/tutorial/wap/wa_b_3/RunWapEmail.vsp index 987ac1d6dc..3c635aae1e 100644 --- a/binsrc/tutorial/wap/wa_b_3/RunWapEmail.vsp +++ b/binsrc/tutorial/wap/wa_b_3/RunWapEmail.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/addressbook.vsp b/binsrc/tutorial/wap/wa_b_3/addressbook.vsp index c4522b0943..ef0f2f2cbe 100644 --- a/binsrc/tutorial/wap/wa_b_3/addressbook.vsp +++ b/binsrc/tutorial/wap/wa_b_3/addressbook.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/checkmail.vsp b/binsrc/tutorial/wap/wa_b_3/checkmail.vsp index 4ecb4270d3..ddc8f5867a 100644 --- a/binsrc/tutorial/wap/wa_b_3/checkmail.vsp +++ b/binsrc/tutorial/wap/wa_b_3/checkmail.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/compose.vsp b/binsrc/tutorial/wap/wa_b_3/compose.vsp index 775fc78899..4e04fec976 100644 --- a/binsrc/tutorial/wap/wa_b_3/compose.vsp +++ b/binsrc/tutorial/wap/wa_b_3/compose.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/delete.vsp b/binsrc/tutorial/wap/wa_b_3/delete.vsp index b8cf618b33..bc0f60a8a4 100644 --- a/binsrc/tutorial/wap/wa_b_3/delete.vsp +++ b/binsrc/tutorial/wap/wa_b_3/delete.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/folder.vsp b/binsrc/tutorial/wap/wa_b_3/folder.vsp index 90012633db..238cd08b05 100644 --- a/binsrc/tutorial/wap/wa_b_3/folder.vsp +++ b/binsrc/tutorial/wap/wa_b_3/folder.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/folder_add.vsp b/binsrc/tutorial/wap/wa_b_3/folder_add.vsp index 752adecdd5..87484a89f6 100644 --- a/binsrc/tutorial/wap/wa_b_3/folder_add.vsp +++ b/binsrc/tutorial/wap/wa_b_3/folder_add.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/folders.vsp b/binsrc/tutorial/wap/wa_b_3/folders.vsp index a68f4a8e9c..5c63274b34 100644 --- a/binsrc/tutorial/wap/wa_b_3/folders.vsp +++ b/binsrc/tutorial/wap/wa_b_3/folders.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/forward.vsp b/binsrc/tutorial/wap/wa_b_3/forward.vsp index 41879e59f7..7f462a7087 100644 --- a/binsrc/tutorial/wap/wa_b_3/forward.vsp +++ b/binsrc/tutorial/wap/wa_b_3/forward.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/getmail.vsp b/binsrc/tutorial/wap/wa_b_3/getmail.vsp index ad832737e1..c4459726b1 100644 --- a/binsrc/tutorial/wap/wa_b_3/getmail.vsp +++ b/binsrc/tutorial/wap/wa_b_3/getmail.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/handset.vsp b/binsrc/tutorial/wap/wa_b_3/handset.vsp index 8f84365346..2bf2f36d0e 100644 --- a/binsrc/tutorial/wap/wa_b_3/handset.vsp +++ b/binsrc/tutorial/wap/wa_b_3/handset.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/handset_update.vsp b/binsrc/tutorial/wap/wa_b_3/handset_update.vsp index 83815611b4..8e15a3e659 100644 --- a/binsrc/tutorial/wap/wa_b_3/handset_update.vsp +++ b/binsrc/tutorial/wap/wa_b_3/handset_update.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/index.vsp b/binsrc/tutorial/wap/wa_b_3/index.vsp index bd5b47a84f..76efffc799 100644 --- a/binsrc/tutorial/wap/wa_b_3/index.vsp +++ b/binsrc/tutorial/wap/wa_b_3/index.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/login.vsp b/binsrc/tutorial/wap/wa_b_3/login.vsp index 8858e3dc90..846a21c91c 100644 --- a/binsrc/tutorial/wap/wa_b_3/login.vsp +++ b/binsrc/tutorial/wap/wa_b_3/login.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/logout.vsp b/binsrc/tutorial/wap/wa_b_3/logout.vsp index 724fe6715d..85628bf7da 100644 --- a/binsrc/tutorial/wap/wa_b_3/logout.vsp +++ b/binsrc/tutorial/wap/wa_b_3/logout.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/move.vsp b/binsrc/tutorial/wap/wa_b_3/move.vsp index c8d3f2c81c..a56c6e2365 100644 --- a/binsrc/tutorial/wap/wa_b_3/move.vsp +++ b/binsrc/tutorial/wap/wa_b_3/move.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/options.xml b/binsrc/tutorial/wap/wa_b_3/options.xml index fb008b6911..f4a0e9fb51 100644 --- a/binsrc/tutorial/wap/wa_b_3/options.xml +++ b/binsrc/tutorial/wap/wa_b_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/password.vsp b/binsrc/tutorial/wap/wa_b_3/password.vsp index bd26122633..6bfd8ec48e 100644 --- a/binsrc/tutorial/wap/wa_b_3/password.vsp +++ b/binsrc/tutorial/wap/wa_b_3/password.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/personal.vsp b/binsrc/tutorial/wap/wa_b_3/personal.vsp index 0bb1c5e7d5..37cac1650c 100644 --- a/binsrc/tutorial/wap/wa_b_3/personal.vsp +++ b/binsrc/tutorial/wap/wa_b_3/personal.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/personal_update.vsp b/binsrc/tutorial/wap/wa_b_3/personal_update.vsp index 341488ea44..fa7bd8322b 100644 --- a/binsrc/tutorial/wap/wa_b_3/personal_update.vsp +++ b/binsrc/tutorial/wap/wa_b_3/personal_update.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/pop3account.vsp b/binsrc/tutorial/wap/wa_b_3/pop3account.vsp index f3b7cd2724..13c038ea94 100644 --- a/binsrc/tutorial/wap/wa_b_3/pop3account.vsp +++ b/binsrc/tutorial/wap/wa_b_3/pop3account.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/pop3account_add.vsp b/binsrc/tutorial/wap/wa_b_3/pop3account_add.vsp index 76a2210d56..14ead066f4 100644 --- a/binsrc/tutorial/wap/wa_b_3/pop3account_add.vsp +++ b/binsrc/tutorial/wap/wa_b_3/pop3account_add.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/pop3account_options.vsp b/binsrc/tutorial/wap/wa_b_3/pop3account_options.vsp index 3d90310f15..b4e39741fa 100644 --- a/binsrc/tutorial/wap/wa_b_3/pop3account_options.vsp +++ b/binsrc/tutorial/wap/wa_b_3/pop3account_options.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/read.vsp b/binsrc/tutorial/wap/wa_b_3/read.vsp index 71aeb17cf6..5cc2448346 100644 --- a/binsrc/tutorial/wap/wa_b_3/read.vsp +++ b/binsrc/tutorial/wap/wa_b_3/read.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/reply.vsp b/binsrc/tutorial/wap/wa_b_3/reply.vsp index f55c0b5139..4c6f91d9b5 100644 --- a/binsrc/tutorial/wap/wa_b_3/reply.vsp +++ b/binsrc/tutorial/wap/wa_b_3/reply.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/save_draft.vsp b/binsrc/tutorial/wap/wa_b_3/save_draft.vsp index 9f717f07c9..65b63b54d9 100644 --- a/binsrc/tutorial/wap/wa_b_3/save_draft.vsp +++ b/binsrc/tutorial/wap/wa_b_3/save_draft.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/send.vsp b/binsrc/tutorial/wap/wa_b_3/send.vsp index 563a972077..de5782f41f 100644 --- a/binsrc/tutorial/wap/wa_b_3/send.vsp +++ b/binsrc/tutorial/wap/wa_b_3/send.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/setting.vsp b/binsrc/tutorial/wap/wa_b_3/setting.vsp index 0ffb364614..48463e12ae 100644 --- a/binsrc/tutorial/wap/wa_b_3/setting.vsp +++ b/binsrc/tutorial/wap/wa_b_3/setting.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/signup.vsp b/binsrc/tutorial/wap/wa_b_3/signup.vsp index b3f5977748..3521850e2b 100644 --- a/binsrc/tutorial/wap/wa_b_3/signup.vsp +++ b/binsrc/tutorial/wap/wa_b_3/signup.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/wa_b_3.sql b/binsrc/tutorial/wap/wa_b_3/wa_b_3.sql index 469c8882ff..645f43aedf 100644 --- a/binsrc/tutorial/wap/wa_b_3/wa_b_3.sql +++ b/binsrc/tutorial/wap/wa_b_3/wa_b_3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/wap/wa_b_3/wa_b_3.xml b/binsrc/tutorial/wap/wa_b_3/wa_b_3.xml index f884809d1d..b3a600fbe7 100644 --- a/binsrc/tutorial/wap/wa_b_3/wa_b_3.xml +++ b/binsrc/tutorial/wap/wa_b_3/wa_b_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/Makefile.am b/binsrc/tutorial/web/Makefile.am index d7cab6b984..7399005ff1 100644 --- a/binsrc/tutorial/web/Makefile.am +++ b/binsrc/tutorial/web/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/demo.css b/binsrc/tutorial/web/demo.css index 1361a2b16c..6c079ddcb7 100644 --- a/binsrc/tutorial/web/demo.css +++ b/binsrc/tutorial/web/demo.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/index.xml b/binsrc/tutorial/web/index.xml index 50aca0bcb0..1a462850f3 100644 --- a/binsrc/tutorial/web/index.xml +++ b/binsrc/tutorial/web/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_1/options.xml b/binsrc/tutorial/web/vs_b_1/options.xml index 0dcfa31cda..5cac65da56 100644 --- a/binsrc/tutorial/web/vs_b_1/options.xml +++ b/binsrc/tutorial/web/vs_b_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_1/vs_b_1.sql b/binsrc/tutorial/web/vs_b_1/vs_b_1.sql index 523efa68dc..359cf178b7 100644 --- a/binsrc/tutorial/web/vs_b_1/vs_b_1.sql +++ b/binsrc/tutorial/web/vs_b_1/vs_b_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_1/vs_b_1.xml b/binsrc/tutorial/web/vs_b_1/vs_b_1.xml index e48c58004e..4cfe4d8138 100644 --- a/binsrc/tutorial/web/vs_b_1/vs_b_1.xml +++ b/binsrc/tutorial/web/vs_b_1/vs_b_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_2/options.xml b/binsrc/tutorial/web/vs_b_2/options.xml index 727907a59e..e90f39318b 100644 --- a/binsrc/tutorial/web/vs_b_2/options.xml +++ b/binsrc/tutorial/web/vs_b_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_2/vs_b_2.xml b/binsrc/tutorial/web/vs_b_2/vs_b_2.xml index 3cb0a2588f..c346b7ea64 100644 --- a/binsrc/tutorial/web/vs_b_2/vs_b_2.xml +++ b/binsrc/tutorial/web/vs_b_2/vs_b_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_2/vs_b_2_sample_1.vsp b/binsrc/tutorial/web/vs_b_2/vs_b_2_sample_1.vsp index c76daeee4d..be9625bce6 100644 --- a/binsrc/tutorial/web/vs_b_2/vs_b_2_sample_1.vsp +++ b/binsrc/tutorial/web/vs_b_2/vs_b_2_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_3/vs_b_3.xml b/binsrc/tutorial/web/vs_b_3/vs_b_3.xml index bb935e8388..1b3114d643 100644 --- a/binsrc/tutorial/web/vs_b_3/vs_b_3.xml +++ b/binsrc/tutorial/web/vs_b_3/vs_b_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_1.vsp b/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_1.vsp index da1a1495d5..ce3037f368 100644 --- a/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_1.vsp +++ b/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.sql b/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.sql index dbc1e77cde..50a3b0d519 100644 --- a/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.sql +++ b/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.vsp b/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.vsp index 03b5a7af43..65fb3d2777 100644 --- a/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.vsp +++ b/binsrc/tutorial/web/vs_b_3/vs_b_3_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4.xml b/binsrc/tutorial/web/vs_b_4/vs_b_4.xml index d7e075d5e0..d047d9fa56 100644 --- a/binsrc/tutorial/web/vs_b_4/vs_b_4.xml +++ b/binsrc/tutorial/web/vs_b_4/vs_b_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_1.vsp b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_1.vsp index 1a4b748245..ba25d7e0d6 100644 --- a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_1.vsp +++ b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_2.vsp b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_2.vsp index 05f15b9d44..f5b47c861c 100644 --- a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_2.vsp +++ b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_3.vsp b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_3.vsp index 2dcd254021..e5e9ae09d0 100644 --- a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_3.vsp +++ b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_4.vsp b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_4.vsp index a24ee56f77..081360fd7d 100644 --- a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_4.vsp +++ b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_4.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_5.vsp b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_5.vsp index 504326adff..90c83c9d28 100644 --- a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_5.vsp +++ b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_5.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_6.vsp b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_6.vsp index 10932f7e10..34e5b50ccd 100644 --- a/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_6.vsp +++ b/binsrc/tutorial/web/vs_b_4/vs_b_4_sample_6.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_5/vs_b_5.xml b/binsrc/tutorial/web/vs_b_5/vs_b_5.xml index 453ecd0202..5ff90e5580 100644 --- a/binsrc/tutorial/web/vs_b_5/vs_b_5.xml +++ b/binsrc/tutorial/web/vs_b_5/vs_b_5.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.html b/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.html index 8a36b56098..e9d2d6525c 100644 --- a/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.html +++ b/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.vsp b/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.vsp index ac54a35154..f34b569968 100644 --- a/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.vsp +++ b/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_2.vsp b/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_2.vsp index a4a938497a..7ed3989f0d 100644 --- a/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_2.vsp +++ b/binsrc/tutorial/web/vs_b_5/vs_b_5_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_6/deadlock_handler.vsp b/binsrc/tutorial/web/vs_b_6/deadlock_handler.vsp index 4f0d98d245..4dc53e5a73 100644 --- a/binsrc/tutorial/web/vs_b_6/deadlock_handler.vsp +++ b/binsrc/tutorial/web/vs_b_6/deadlock_handler.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_6/options.xml b/binsrc/tutorial/web/vs_b_6/options.xml index 0d5918a3ea..0788d27330 100644 --- a/binsrc/tutorial/web/vs_b_6/options.xml +++ b/binsrc/tutorial/web/vs_b_6/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_6/vs_b_6.xml b/binsrc/tutorial/web/vs_b_6/vs_b_6.xml index d66b71654a..4b7f21ad66 100644 --- a/binsrc/tutorial/web/vs_b_6/vs_b_6.xml +++ b/binsrc/tutorial/web/vs_b_6/vs_b_6.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_1.vsp b/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_1.vsp index 7d0ca48673..f1fb249944 100644 --- a/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_1.vsp +++ b/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_2.vsp b/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_2.vsp index 4c19df0b30..b575e29dc7 100644 --- a/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_2.vsp +++ b/binsrc/tutorial/web/vs_b_6/vs_b_6_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_7/vs_b_7.xml b/binsrc/tutorial/web/vs_b_7/vs_b_7.xml index 858026e581..bf3fa040b6 100644 --- a/binsrc/tutorial/web/vs_b_7/vs_b_7.xml +++ b/binsrc/tutorial/web/vs_b_7/vs_b_7.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_7/vs_b_7_ddl.sql b/binsrc/tutorial/web/vs_b_7/vs_b_7_ddl.sql index f071906934..627e04c973 100644 --- a/binsrc/tutorial/web/vs_b_7/vs_b_7_ddl.sql +++ b/binsrc/tutorial/web/vs_b_7/vs_b_7_ddl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_7/vs_b_7_login.vsp b/binsrc/tutorial/web/vs_b_7/vs_b_7_login.vsp index af1503c751..3d340ff534 100644 --- a/binsrc/tutorial/web/vs_b_7/vs_b_7_login.vsp +++ b/binsrc/tutorial/web/vs_b_7/vs_b_7_login.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_7/vs_b_7_query.vsp b/binsrc/tutorial/web/vs_b_7/vs_b_7_query.vsp index 86d4660a0a..95b88ae069 100644 --- a/binsrc/tutorial/web/vs_b_7/vs_b_7_query.vsp +++ b/binsrc/tutorial/web/vs_b_7/vs_b_7_query.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_7/vs_b_7_register.vsp b/binsrc/tutorial/web/vs_b_7/vs_b_7_register.vsp index 17d94c38e1..8cdf7e3a12 100644 --- a/binsrc/tutorial/web/vs_b_7/vs_b_7_register.vsp +++ b/binsrc/tutorial/web/vs_b_7/vs_b_7_register.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_8/vs_b_8.xml b/binsrc/tutorial/web/vs_b_8/vs_b_8.xml index 57d78fd6d1..1696f2dfda 100644 --- a/binsrc/tutorial/web/vs_b_8/vs_b_8.xml +++ b/binsrc/tutorial/web/vs_b_8/vs_b_8.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_8/vs_b_8_ddl.sql b/binsrc/tutorial/web/vs_b_8/vs_b_8_ddl.sql index 27eb322f7e..6b3570e314 100644 --- a/binsrc/tutorial/web/vs_b_8/vs_b_8_ddl.sql +++ b/binsrc/tutorial/web/vs_b_8/vs_b_8_ddl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_8/vs_b_8_media.vsp b/binsrc/tutorial/web/vs_b_8/vs_b_8_media.vsp index 4c5a5d9134..323731524e 100644 --- a/binsrc/tutorial/web/vs_b_8/vs_b_8_media.vsp +++ b/binsrc/tutorial/web/vs_b_8/vs_b_8_media.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_9/vs_b_9.xml b/binsrc/tutorial/web/vs_b_9/vs_b_9.xml index 6b65177a17..6d93d9c494 100644 --- a/binsrc/tutorial/web/vs_b_9/vs_b_9.xml +++ b/binsrc/tutorial/web/vs_b_9/vs_b_9.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_b_9/vs_b_9_sample_1.vsp b/binsrc/tutorial/web/vs_b_9/vs_b_9_sample_1.vsp index ad83401ac7..9aa52fe096 100644 --- a/binsrc/tutorial/web/vs_b_9/vs_b_9_sample_1.vsp +++ b/binsrc/tutorial/web/vs_b_9/vs_b_9_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_c_1/long_task.vsp b/binsrc/tutorial/web/vs_c_1/long_task.vsp index 87c1bc142c..6074bbb404 100644 --- a/binsrc/tutorial/web/vs_c_1/long_task.vsp +++ b/binsrc/tutorial/web/vs_c_1/long_task.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_c_1/vs_c_1.xml b/binsrc/tutorial/web/vs_c_1/vs_c_1.xml index c3eec27a31..60672dabf0 100644 --- a/binsrc/tutorial/web/vs_c_1/vs_c_1.xml +++ b/binsrc/tutorial/web/vs_c_1/vs_c_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_c_1/vs_c_1_sample_1.vsp b/binsrc/tutorial/web/vs_c_1/vs_c_1_sample_1.vsp index 993877e89a..174778c0ee 100644 --- a/binsrc/tutorial/web/vs_c_1/vs_c_1_sample_1.vsp +++ b/binsrc/tutorial/web/vs_c_1/vs_c_1_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_1/vs_d_1.xml b/binsrc/tutorial/web/vs_d_1/vs_d_1.xml index 536df2e3a7..a94ebe6b4f 100644 --- a/binsrc/tutorial/web/vs_d_1/vs_d_1.xml +++ b/binsrc/tutorial/web/vs_d_1/vs_d_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_2/propfind.vsp b/binsrc/tutorial/web/vs_d_2/propfind.vsp index f1cef029dc..bcc5cba962 100644 --- a/binsrc/tutorial/web/vs_d_2/propfind.vsp +++ b/binsrc/tutorial/web/vs_d_2/propfind.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_2/proppatch.vsp b/binsrc/tutorial/web/vs_d_2/proppatch.vsp index b6b9caf22b..3651a32e09 100644 --- a/binsrc/tutorial/web/vs_d_2/proppatch.vsp +++ b/binsrc/tutorial/web/vs_d_2/proppatch.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_3/options.xml b/binsrc/tutorial/web/vs_d_3/options.xml index 064bd46085..bfa170b3eb 100644 --- a/binsrc/tutorial/web/vs_d_3/options.xml +++ b/binsrc/tutorial/web/vs_d_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_3/vs_d_3.xml b/binsrc/tutorial/web/vs_d_3/vs_d_3.xml index 0e313cd07f..35b83fce51 100644 --- a/binsrc/tutorial/web/vs_d_3/vs_d_3.xml +++ b/binsrc/tutorial/web/vs_d_3/vs_d_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_3/vs_d_3_sample.sql b/binsrc/tutorial/web/vs_d_3/vs_d_3_sample.sql index ce1e267024..0efefa2b22 100644 --- a/binsrc/tutorial/web/vs_d_3/vs_d_3_sample.sql +++ b/binsrc/tutorial/web/vs_d_3/vs_d_3_sample.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_4/options.xml b/binsrc/tutorial/web/vs_d_4/options.xml index ec10de2508..d614656a51 100644 --- a/binsrc/tutorial/web/vs_d_4/options.xml +++ b/binsrc/tutorial/web/vs_d_4/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_4/vs_d_4.xml b/binsrc/tutorial/web/vs_d_4/vs_d_4.xml index 1d24e4b147..1d1d21a070 100644 --- a/binsrc/tutorial/web/vs_d_4/vs_d_4.xml +++ b/binsrc/tutorial/web/vs_d_4/vs_d_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_5/vs_d_5.xml b/binsrc/tutorial/web/vs_d_5/vs_d_5.xml index 2f33166f0d..25cdc1ccee 100644 --- a/binsrc/tutorial/web/vs_d_5/vs_d_5.xml +++ b/binsrc/tutorial/web/vs_d_5/vs_d_5.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_5/vs_d_5_sample_1.vsp b/binsrc/tutorial/web/vs_d_5/vs_d_5_sample_1.vsp index e22d16dc1b..63c6b20419 100644 --- a/binsrc/tutorial/web/vs_d_5/vs_d_5_sample_1.vsp +++ b/binsrc/tutorial/web/vs_d_5/vs_d_5_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_6/vs_d_6.xml b/binsrc/tutorial/web/vs_d_6/vs_d_6.xml index a531612afc..48beb5fb0b 100644 --- a/binsrc/tutorial/web/vs_d_6/vs_d_6.xml +++ b/binsrc/tutorial/web/vs_d_6/vs_d_6.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_6/vs_d_6_sample_1.vsp b/binsrc/tutorial/web/vs_d_6/vs_d_6_sample_1.vsp index 00180c90e6..ca59843372 100644 --- a/binsrc/tutorial/web/vs_d_6/vs_d_6_sample_1.vsp +++ b/binsrc/tutorial/web/vs_d_6/vs_d_6_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_7/options.xml b/binsrc/tutorial/web/vs_d_7/options.xml index e36ab4eeec..846908c8ec 100644 --- a/binsrc/tutorial/web/vs_d_7/options.xml +++ b/binsrc/tutorial/web/vs_d_7/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_7/vs_d_7.sql b/binsrc/tutorial/web/vs_d_7/vs_d_7.sql index 1268f07344..ba51c78491 100644 --- a/binsrc/tutorial/web/vs_d_7/vs_d_7.sql +++ b/binsrc/tutorial/web/vs_d_7/vs_d_7.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_7/vs_d_7.xml b/binsrc/tutorial/web/vs_d_7/vs_d_7.xml index 1e4db0324f..a093ded654 100644 --- a/binsrc/tutorial/web/vs_d_7/vs_d_7.xml +++ b/binsrc/tutorial/web/vs_d_7/vs_d_7.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_8/default.vsp b/binsrc/tutorial/web/vs_d_8/default.vsp index a06a9ac0b3..f4953f4e60 100644 --- a/binsrc/tutorial/web/vs_d_8/default.vsp +++ b/binsrc/tutorial/web/vs_d_8/default.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_8/front.vsp b/binsrc/tutorial/web/vs_d_8/front.vsp index 991532b8fd..1a261d0ef8 100644 --- a/binsrc/tutorial/web/vs_d_8/front.vsp +++ b/binsrc/tutorial/web/vs_d_8/front.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_8/login.vsp b/binsrc/tutorial/web/vs_d_8/login.vsp index 340e6e2e68..6ef6eb0856 100644 --- a/binsrc/tutorial/web/vs_d_8/login.vsp +++ b/binsrc/tutorial/web/vs_d_8/login.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_8/options.xml b/binsrc/tutorial/web/vs_d_8/options.xml index 7c590343fd..741907da84 100644 --- a/binsrc/tutorial/web/vs_d_8/options.xml +++ b/binsrc/tutorial/web/vs_d_8/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_8/query_gen.vsp b/binsrc/tutorial/web/vs_d_8/query_gen.vsp index c7a48f0b10..88a80b17dc 100644 --- a/binsrc/tutorial/web/vs_d_8/query_gen.vsp +++ b/binsrc/tutorial/web/vs_d_8/query_gen.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_8/register.vsp b/binsrc/tutorial/web/vs_d_8/register.vsp index 71b5f4a19e..1176184483 100644 --- a/binsrc/tutorial/web/vs_d_8/register.vsp +++ b/binsrc/tutorial/web/vs_d_8/register.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_8/vs_d_8.sql b/binsrc/tutorial/web/vs_d_8/vs_d_8.sql index 7424a4cb48..53558834d5 100644 --- a/binsrc/tutorial/web/vs_d_8/vs_d_8.sql +++ b/binsrc/tutorial/web/vs_d_8/vs_d_8.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_d_8/vs_d_8.xml b/binsrc/tutorial/web/vs_d_8/vs_d_8.xml index db9bc76bf9..234185c164 100644 --- a/binsrc/tutorial/web/vs_d_8/vs_d_8.xml +++ b/binsrc/tutorial/web/vs_d_8/vs_d_8.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_r_1/vs_r_1.sql b/binsrc/tutorial/web/vs_r_1/vs_r_1.sql index 06c2660dc3..572a2e93d7 100644 --- a/binsrc/tutorial/web/vs_r_1/vs_r_1.sql +++ b/binsrc/tutorial/web/vs_r_1/vs_r_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_r_1/vs_r_1.xml b/binsrc/tutorial/web/vs_r_1/vs_r_1.xml index ee6d59560f..e8ca26c29f 100644 --- a/binsrc/tutorial/web/vs_r_1/vs_r_1.xml +++ b/binsrc/tutorial/web/vs_r_1/vs_r_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_r_1/vs_r_1_run.vsp b/binsrc/tutorial/web/vs_r_1/vs_r_1_run.vsp index 109dceb082..81ec806ab3 100644 --- a/binsrc/tutorial/web/vs_r_1/vs_r_1_run.vsp +++ b/binsrc/tutorial/web/vs_r_1/vs_r_1_run.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_r_1/vs_r_1_stat.vsp b/binsrc/tutorial/web/vs_r_1/vs_r_1_stat.vsp index 4a33ce6ad9..61eda95afb 100644 --- a/binsrc/tutorial/web/vs_r_1/vs_r_1_stat.vsp +++ b/binsrc/tutorial/web/vs_r_1/vs_r_1_stat.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_1/vs_s_1.xml b/binsrc/tutorial/web/vs_s_1/vs_s_1.xml index 7baa7c616f..e1316f9e06 100644 --- a/binsrc/tutorial/web/vs_s_1/vs_s_1.xml +++ b/binsrc/tutorial/web/vs_s_1/vs_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_2/options.xml b/binsrc/tutorial/web/vs_s_2/options.xml index 28b8c4b531..f9c961a7f2 100644 --- a/binsrc/tutorial/web/vs_s_2/options.xml +++ b/binsrc/tutorial/web/vs_s_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_2/vs_s_2.xml b/binsrc/tutorial/web/vs_s_2/vs_s_2.xml index 8a2ad70f0a..d8e6974bfc 100644 --- a/binsrc/tutorial/web/vs_s_2/vs_s_2.xml +++ b/binsrc/tutorial/web/vs_s_2/vs_s_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.sql b/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.sql index 917312da46..57ba49b021 100644 --- a/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.sql +++ b/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.vsp b/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.vsp index 983c5c9fbb..c66d541e3b 100644 --- a/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.vsp +++ b/binsrc/tutorial/web/vs_s_2/vs_s_2_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_3/vs_s_3.sql b/binsrc/tutorial/web/vs_s_3/vs_s_3.sql index 028928c901..dc086fa4ea 100644 --- a/binsrc/tutorial/web/vs_s_3/vs_s_3.sql +++ b/binsrc/tutorial/web/vs_s_3/vs_s_3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_3/vs_s_3.xml b/binsrc/tutorial/web/vs_s_3/vs_s_3.xml index 6dd68cb8dd..443965a791 100644 --- a/binsrc/tutorial/web/vs_s_3/vs_s_3.xml +++ b/binsrc/tutorial/web/vs_s_3/vs_s_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_4/options.xml b/binsrc/tutorial/web/vs_s_4/options.xml index e36ab4eeec..846908c8ec 100644 --- a/binsrc/tutorial/web/vs_s_4/options.xml +++ b/binsrc/tutorial/web/vs_s_4/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_4/vs_s_4.sql b/binsrc/tutorial/web/vs_s_4/vs_s_4.sql index fb86daba1d..05646f68c9 100644 --- a/binsrc/tutorial/web/vs_s_4/vs_s_4.sql +++ b/binsrc/tutorial/web/vs_s_4/vs_s_4.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_4/vs_s_4.xml b/binsrc/tutorial/web/vs_s_4/vs_s_4.xml index 04b583b91e..4ae3a2bb62 100644 --- a/binsrc/tutorial/web/vs_s_4/vs_s_4.xml +++ b/binsrc/tutorial/web/vs_s_4/vs_s_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_5/options.xml b/binsrc/tutorial/web/vs_s_5/options.xml index fd9d15bbe5..a07e18f3fb 100644 --- a/binsrc/tutorial/web/vs_s_5/options.xml +++ b/binsrc/tutorial/web/vs_s_5/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_5/vs_s_5.sql b/binsrc/tutorial/web/vs_s_5/vs_s_5.sql index 409d573ec4..99b25f4cde 100644 --- a/binsrc/tutorial/web/vs_s_5/vs_s_5.sql +++ b/binsrc/tutorial/web/vs_s_5/vs_s_5.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_5/vs_s_5.xml b/binsrc/tutorial/web/vs_s_5/vs_s_5.xml index b6fe3a7008..084721fa1f 100644 --- a/binsrc/tutorial/web/vs_s_5/vs_s_5.xml +++ b/binsrc/tutorial/web/vs_s_5/vs_s_5.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_6/options.xml b/binsrc/tutorial/web/vs_s_6/options.xml index fd9d15bbe5..a07e18f3fb 100644 --- a/binsrc/tutorial/web/vs_s_6/options.xml +++ b/binsrc/tutorial/web/vs_s_6/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_6/vs_s_6.sql b/binsrc/tutorial/web/vs_s_6/vs_s_6.sql index bf6b97fa15..cac7850a79 100644 --- a/binsrc/tutorial/web/vs_s_6/vs_s_6.sql +++ b/binsrc/tutorial/web/vs_s_6/vs_s_6.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_6/vs_s_6.xml b/binsrc/tutorial/web/vs_s_6/vs_s_6.xml index 56a936caaf..b06587ffd7 100644 --- a/binsrc/tutorial/web/vs_s_6/vs_s_6.xml +++ b/binsrc/tutorial/web/vs_s_6/vs_s_6.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_s_7/vs_s_7.xml b/binsrc/tutorial/web/vs_s_7/vs_s_7.xml index 465a858541..338b29804d 100644 --- a/binsrc/tutorial/web/vs_s_7/vs_s_7.xml +++ b/binsrc/tutorial/web/vs_s_7/vs_s_7.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_1/vs_u_1.xml b/binsrc/tutorial/web/vs_u_1/vs_u_1.xml index 90b1fb8396..43d4dca9f0 100644 --- a/binsrc/tutorial/web/vs_u_1/vs_u_1.xml +++ b/binsrc/tutorial/web/vs_u_1/vs_u_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_2/default.vsp b/binsrc/tutorial/web/vs_u_2/default.vsp index f5c3b59ab5..551098bcef 100644 --- a/binsrc/tutorial/web/vs_u_2/default.vsp +++ b/binsrc/tutorial/web/vs_u_2/default.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_2/front.vsp b/binsrc/tutorial/web/vs_u_2/front.vsp index 98c8395d66..bbd04dd4dc 100644 --- a/binsrc/tutorial/web/vs_u_2/front.vsp +++ b/binsrc/tutorial/web/vs_u_2/front.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_2/login.vsp b/binsrc/tutorial/web/vs_u_2/login.vsp index 94f2547583..966e4b9a0a 100644 --- a/binsrc/tutorial/web/vs_u_2/login.vsp +++ b/binsrc/tutorial/web/vs_u_2/login.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_2/options.xml b/binsrc/tutorial/web/vs_u_2/options.xml index 1cf2c2a5c5..f9395b817a 100644 --- a/binsrc/tutorial/web/vs_u_2/options.xml +++ b/binsrc/tutorial/web/vs_u_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_2/register.vsp b/binsrc/tutorial/web/vs_u_2/register.vsp index f2415fb1fa..d926b760ac 100644 --- a/binsrc/tutorial/web/vs_u_2/register.vsp +++ b/binsrc/tutorial/web/vs_u_2/register.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_2/vs_u_2.sql b/binsrc/tutorial/web/vs_u_2/vs_u_2.sql index 605fab901a..178077ca11 100644 --- a/binsrc/tutorial/web/vs_u_2/vs_u_2.sql +++ b/binsrc/tutorial/web/vs_u_2/vs_u_2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_2/vs_u_2.xml b/binsrc/tutorial/web/vs_u_2/vs_u_2.xml index 61cb413d0a..dfdfe6eea5 100644 --- a/binsrc/tutorial/web/vs_u_2/vs_u_2.xml +++ b/binsrc/tutorial/web/vs_u_2/vs_u_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_3/default.vsp b/binsrc/tutorial/web/vs_u_3/default.vsp index b7dec230f7..ecfc5757a0 100644 --- a/binsrc/tutorial/web/vs_u_3/default.vsp +++ b/binsrc/tutorial/web/vs_u_3/default.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_3/front.vsp b/binsrc/tutorial/web/vs_u_3/front.vsp index e4c4094c8b..63f2ee9087 100644 --- a/binsrc/tutorial/web/vs_u_3/front.vsp +++ b/binsrc/tutorial/web/vs_u_3/front.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_3/login.vsp b/binsrc/tutorial/web/vs_u_3/login.vsp index 0d8fa852e3..1809a8dac3 100644 --- a/binsrc/tutorial/web/vs_u_3/login.vsp +++ b/binsrc/tutorial/web/vs_u_3/login.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_3/options.xml b/binsrc/tutorial/web/vs_u_3/options.xml index c3d9d264b3..b695ff765b 100644 --- a/binsrc/tutorial/web/vs_u_3/options.xml +++ b/binsrc/tutorial/web/vs_u_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_3/register.vsp b/binsrc/tutorial/web/vs_u_3/register.vsp index 452f81fc36..f6cc7f3c5f 100644 --- a/binsrc/tutorial/web/vs_u_3/register.vsp +++ b/binsrc/tutorial/web/vs_u_3/register.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_3/vs_u_3.sql b/binsrc/tutorial/web/vs_u_3/vs_u_3.sql index 3dfd750fa3..f742a2caed 100644 --- a/binsrc/tutorial/web/vs_u_3/vs_u_3.sql +++ b/binsrc/tutorial/web/vs_u_3/vs_u_3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_3/vs_u_3.xml b/binsrc/tutorial/web/vs_u_3/vs_u_3.xml index d3a45c0af7..a66ee75fc1 100644 --- a/binsrc/tutorial/web/vs_u_3/vs_u_3.xml +++ b/binsrc/tutorial/web/vs_u_3/vs_u_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_4/default.vsp b/binsrc/tutorial/web/vs_u_4/default.vsp index 1905e5b2ca..be200fb74f 100644 --- a/binsrc/tutorial/web/vs_u_4/default.vsp +++ b/binsrc/tutorial/web/vs_u_4/default.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_4/front.vsp b/binsrc/tutorial/web/vs_u_4/front.vsp index d59fdc4346..29a4d6382e 100644 --- a/binsrc/tutorial/web/vs_u_4/front.vsp +++ b/binsrc/tutorial/web/vs_u_4/front.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_4/logout.vsp b/binsrc/tutorial/web/vs_u_4/logout.vsp index b5427032cd..01ad46c3ac 100644 --- a/binsrc/tutorial/web/vs_u_4/logout.vsp +++ b/binsrc/tutorial/web/vs_u_4/logout.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_4/options.xml b/binsrc/tutorial/web/vs_u_4/options.xml index 08468fb539..657c1751dd 100644 --- a/binsrc/tutorial/web/vs_u_4/options.xml +++ b/binsrc/tutorial/web/vs_u_4/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_4/register.vsp b/binsrc/tutorial/web/vs_u_4/register.vsp index b4befb2d6f..40d7c9511b 100644 --- a/binsrc/tutorial/web/vs_u_4/register.vsp +++ b/binsrc/tutorial/web/vs_u_4/register.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_4/vs_u_4.sql b/binsrc/tutorial/web/vs_u_4/vs_u_4.sql index f0c3445f68..f9baf09408 100644 --- a/binsrc/tutorial/web/vs_u_4/vs_u_4.sql +++ b/binsrc/tutorial/web/vs_u_4/vs_u_4.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_4/vs_u_4.xml b/binsrc/tutorial/web/vs_u_4/vs_u_4.xml index 409624cf2c..247a015c73 100644 --- a/binsrc/tutorial/web/vs_u_4/vs_u_4.xml +++ b/binsrc/tutorial/web/vs_u_4/vs_u_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_5/default.vsp b/binsrc/tutorial/web/vs_u_5/default.vsp index a69147574c..f9261cd6b9 100644 --- a/binsrc/tutorial/web/vs_u_5/default.vsp +++ b/binsrc/tutorial/web/vs_u_5/default.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_5/front.vsp b/binsrc/tutorial/web/vs_u_5/front.vsp index 53ae2812a9..5e6f019a26 100644 --- a/binsrc/tutorial/web/vs_u_5/front.vsp +++ b/binsrc/tutorial/web/vs_u_5/front.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_5/login.vsp b/binsrc/tutorial/web/vs_u_5/login.vsp index 662f0549ad..267adadb82 100644 --- a/binsrc/tutorial/web/vs_u_5/login.vsp +++ b/binsrc/tutorial/web/vs_u_5/login.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_5/options.xml b/binsrc/tutorial/web/vs_u_5/options.xml index 061f6618a9..2425a293e4 100644 --- a/binsrc/tutorial/web/vs_u_5/options.xml +++ b/binsrc/tutorial/web/vs_u_5/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_5/register.vsp b/binsrc/tutorial/web/vs_u_5/register.vsp index 44d2732164..208a59afb4 100644 --- a/binsrc/tutorial/web/vs_u_5/register.vsp +++ b/binsrc/tutorial/web/vs_u_5/register.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_5/vs_u_5.sql b/binsrc/tutorial/web/vs_u_5/vs_u_5.sql index 2b06a2d155..cbe7824ed7 100644 --- a/binsrc/tutorial/web/vs_u_5/vs_u_5.sql +++ b/binsrc/tutorial/web/vs_u_5/vs_u_5.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_5/vs_u_5.xml b/binsrc/tutorial/web/vs_u_5/vs_u_5.xml index 2ed2dd80cb..4858d6beb9 100644 --- a/binsrc/tutorial/web/vs_u_5/vs_u_5.xml +++ b/binsrc/tutorial/web/vs_u_5/vs_u_5.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_7/options.xml b/binsrc/tutorial/web/vs_u_7/options.xml index ef7e7b50ed..d591fdf201 100644 --- a/binsrc/tutorial/web/vs_u_7/options.xml +++ b/binsrc/tutorial/web/vs_u_7/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_7/vs_u_7.sql b/binsrc/tutorial/web/vs_u_7/vs_u_7.sql index a70bd8d7de..ed668f71d6 100644 --- a/binsrc/tutorial/web/vs_u_7/vs_u_7.sql +++ b/binsrc/tutorial/web/vs_u_7/vs_u_7.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_7/vs_u_7.xml b/binsrc/tutorial/web/vs_u_7/vs_u_7.xml index 428aeec509..646083b6e3 100644 --- a/binsrc/tutorial/web/vs_u_7/vs_u_7.xml +++ b/binsrc/tutorial/web/vs_u_7/vs_u_7.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_1.vsp b/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_1.vsp index b8e6bdfed9..19e0490800 100644 --- a/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_1.vsp +++ b/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_2.vsp b/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_2.vsp index b248fdf2c1..96600edab4 100644 --- a/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_2.vsp +++ b/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_3.vsp b/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_3.vsp index 93bc11b109..72088b988f 100644 --- a/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_3.vsp +++ b/binsrc/tutorial/web/vs_u_7/vs_u_7_sample_3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_1/options.xml b/binsrc/tutorial/web/vs_x_1/options.xml index 48de3576fb..172e32869d 100644 --- a/binsrc/tutorial/web/vs_x_1/options.xml +++ b/binsrc/tutorial/web/vs_x_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_1/shippers.vsp b/binsrc/tutorial/web/vs_x_1/shippers.vsp index 99839e398b..5edf265452 100644 --- a/binsrc/tutorial/web/vs_x_1/shippers.vsp +++ b/binsrc/tutorial/web/vs_x_1/shippers.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_1/shippers.xsl b/binsrc/tutorial/web/vs_x_1/shippers.xsl index 0777b817c0..aa41fbb25e 100644 --- a/binsrc/tutorial/web/vs_x_1/shippers.xsl +++ b/binsrc/tutorial/web/vs_x_1/shippers.xsl @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_1/tsales.vsp b/binsrc/tutorial/web/vs_x_1/tsales.vsp index 8bc02ee1ac..233bc7c47a 100644 --- a/binsrc/tutorial/web/vs_x_1/tsales.vsp +++ b/binsrc/tutorial/web/vs_x_1/tsales.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_1/tsales.xsl b/binsrc/tutorial/web/vs_x_1/tsales.xsl index b30dd3abf7..b6bc9e620c 100644 --- a/binsrc/tutorial/web/vs_x_1/tsales.xsl +++ b/binsrc/tutorial/web/vs_x_1/tsales.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_1/tsales1.vsp b/binsrc/tutorial/web/vs_x_1/tsales1.vsp index e1608593d5..59db2236fb 100644 --- a/binsrc/tutorial/web/vs_x_1/tsales1.vsp +++ b/binsrc/tutorial/web/vs_x_1/tsales1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_1/tsales2.xsl b/binsrc/tutorial/web/vs_x_1/tsales2.xsl index 2fea565e68..510eea0737 100644 --- a/binsrc/tutorial/web/vs_x_1/tsales2.xsl +++ b/binsrc/tutorial/web/vs_x_1/tsales2.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_1/vs_x_1.xml b/binsrc/tutorial/web/vs_x_1/vs_x_1.xml index 556bad7ad7..179d858261 100644 --- a/binsrc/tutorial/web/vs_x_1/vs_x_1.xml +++ b/binsrc/tutorial/web/vs_x_1/vs_x_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_2/options.xml b/binsrc/tutorial/web/vs_x_2/options.xml index 48de3576fb..172e32869d 100644 --- a/binsrc/tutorial/web/vs_x_2/options.xml +++ b/binsrc/tutorial/web/vs_x_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_2/shippers.vsp b/binsrc/tutorial/web/vs_x_2/shippers.vsp index 2ce609d3cc..2d87eaa3a7 100644 --- a/binsrc/tutorial/web/vs_x_2/shippers.vsp +++ b/binsrc/tutorial/web/vs_x_2/shippers.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_2/shippers.xsl b/binsrc/tutorial/web/vs_x_2/shippers.xsl index 40c445e39e..068cea08fd 100644 --- a/binsrc/tutorial/web/vs_x_2/shippers.xsl +++ b/binsrc/tutorial/web/vs_x_2/shippers.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_2/vs_x_2.xml b/binsrc/tutorial/web/vs_x_2/vs_x_2.xml index c92401fed7..67e6e146d0 100644 --- a/binsrc/tutorial/web/vs_x_2/vs_x_2.xml +++ b/binsrc/tutorial/web/vs_x_2/vs_x_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_3/options.xml b/binsrc/tutorial/web/vs_x_3/options.xml index 48de3576fb..172e32869d 100644 --- a/binsrc/tutorial/web/vs_x_3/options.xml +++ b/binsrc/tutorial/web/vs_x_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_3/shippers.vsp b/binsrc/tutorial/web/vs_x_3/shippers.vsp index 4e341100da..2cc73083fc 100644 --- a/binsrc/tutorial/web/vs_x_3/shippers.vsp +++ b/binsrc/tutorial/web/vs_x_3/shippers.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_3/shippers.xsl b/binsrc/tutorial/web/vs_x_3/shippers.xsl index 383b1976d7..a9bc74e4c2 100644 --- a/binsrc/tutorial/web/vs_x_3/shippers.xsl +++ b/binsrc/tutorial/web/vs_x_3/shippers.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_x_3/vs_x_3.xml b/binsrc/tutorial/web/vs_x_3/vs_x_3.xml index aa34d0db68..2aebf764e9 100644 --- a/binsrc/tutorial/web/vs_x_3/vs_x_3.xml +++ b/binsrc/tutorial/web/vs_x_3/vs_x_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_xr_1/options.xml b/binsrc/tutorial/web/vs_xr_1/options.xml index 48de3576fb..172e32869d 100644 --- a/binsrc/tutorial/web/vs_xr_1/options.xml +++ b/binsrc/tutorial/web/vs_xr_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xml b/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xml index ad06ab8498..9f04f9bab3 100644 --- a/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xml +++ b/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xsl b/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xsl index f1f4466a7f..f0dffe9599 100644 --- a/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xsl +++ b/binsrc/tutorial/web/vs_xr_1/vs_xr_1.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_xr_1/vs_xr_1_qry.vsp b/binsrc/tutorial/web/vs_xr_1/vs_xr_1_qry.vsp index 14f4723f5c..8c36d3ad82 100644 --- a/binsrc/tutorial/web/vs_xr_1/vs_xr_1_qry.vsp +++ b/binsrc/tutorial/web/vs_xr_1/vs_xr_1_qry.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_xr_2/options.xml b/binsrc/tutorial/web/vs_xr_2/options.xml index 48de3576fb..172e32869d 100644 --- a/binsrc/tutorial/web/vs_xr_2/options.xml +++ b/binsrc/tutorial/web/vs_xr_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xml b/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xml index b3278fb84b..c6236697a6 100644 --- a/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xml +++ b/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xsl b/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xsl index 8b84160751..bbfe256219 100644 --- a/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xsl +++ b/binsrc/tutorial/web/vs_xr_2/vs_xr_2.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vs_xr_2/vs_xr_2_qry.vsp b/binsrc/tutorial/web/vs_xr_2/vs_xr_2_qry.vsp index ccaebb664a..1373c5d382 100644 --- a/binsrc/tutorial/web/vs_xr_2/vs_xr_2_qry.vsp +++ b/binsrc/tutorial/web/vs_xr_2/vs_xr_2_qry.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_1/options.xml b/binsrc/tutorial/web/vx_s_1/options.xml index 968611383a..9961dcfd7d 100644 --- a/binsrc/tutorial/web/vx_s_1/options.xml +++ b/binsrc/tutorial/web/vx_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_1/simple.vspx b/binsrc/tutorial/web/vx_s_1/simple.vspx index 031c0af409..d7936ac2d5 100644 --- a/binsrc/tutorial/web/vx_s_1/simple.vspx +++ b/binsrc/tutorial/web/vx_s_1/simple.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_1/vx_s_1.xml b/binsrc/tutorial/web/vx_s_1/vx_s_1.xml index 1a295be9f2..85ba801156 100644 --- a/binsrc/tutorial/web/vx_s_1/vx_s_1.xml +++ b/binsrc/tutorial/web/vx_s_1/vx_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_10/order.vspx b/binsrc/tutorial/web/vx_s_10/order.vspx index b81cf52381..0e5d32dac8 100644 --- a/binsrc/tutorial/web/vx_s_10/order.vspx +++ b/binsrc/tutorial/web/vx_s_10/order.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_10/vx_s_10.sql b/binsrc/tutorial/web/vx_s_10/vx_s_10.sql index bd4feafb16..1eec2e21a6 100644 --- a/binsrc/tutorial/web/vx_s_10/vx_s_10.sql +++ b/binsrc/tutorial/web/vx_s_10/vx_s_10.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_10/vx_s_10.xml b/binsrc/tutorial/web/vx_s_10/vx_s_10.xml index 6fdd0ca37e..6819bdae90 100644 --- a/binsrc/tutorial/web/vx_s_10/vx_s_10.xml +++ b/binsrc/tutorial/web/vx_s_10/vx_s_10.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_11/options.xml b/binsrc/tutorial/web/vx_s_11/options.xml index 6fa57f2d3a..ec6ec1272d 100644 --- a/binsrc/tutorial/web/vx_s_11/options.xml +++ b/binsrc/tutorial/web/vx_s_11/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_11/vx_s_11.xml b/binsrc/tutorial/web/vx_s_11/vx_s_11.xml index 3b0b4a19e0..098cd038cf 100644 --- a/binsrc/tutorial/web/vx_s_11/vx_s_11.xml +++ b/binsrc/tutorial/web/vx_s_11/vx_s_11.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_11/vx_s_11_sample.vspx b/binsrc/tutorial/web/vx_s_11/vx_s_11_sample.vspx index a07d0ef920..6f9897fb87 100644 --- a/binsrc/tutorial/web/vx_s_11/vx_s_11_sample.vspx +++ b/binsrc/tutorial/web/vx_s_11/vx_s_11_sample.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_12/options.xml b/binsrc/tutorial/web/vx_s_12/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/web/vx_s_12/options.xml +++ b/binsrc/tutorial/web/vx_s_12/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_12/vx_s_12.sql b/binsrc/tutorial/web/vx_s_12/vx_s_12.sql index f7bb70c6ff..fab3ef410e 100644 --- a/binsrc/tutorial/web/vx_s_12/vx_s_12.sql +++ b/binsrc/tutorial/web/vx_s_12/vx_s_12.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_12/vx_s_12.xml b/binsrc/tutorial/web/vx_s_12/vx_s_12.xml index 46b971c5c3..9d099fcaf9 100644 --- a/binsrc/tutorial/web/vx_s_12/vx_s_12.xml +++ b/binsrc/tutorial/web/vx_s_12/vx_s_12.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_12/vx_s_12_sample.vspx b/binsrc/tutorial/web/vx_s_12/vx_s_12_sample.vspx index 451edaea3f..930e8ee9c0 100644 --- a/binsrc/tutorial/web/vx_s_12/vx_s_12_sample.vspx +++ b/binsrc/tutorial/web/vx_s_12/vx_s_12_sample.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_13/atom.xml b/binsrc/tutorial/web/vx_s_13/atom.xml index 28a6a0b9b1..dd479a9ae8 100644 --- a/binsrc/tutorial/web/vx_s_13/atom.xml +++ b/binsrc/tutorial/web/vx_s_13/atom.xml @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_13/c_data.vspx b/binsrc/tutorial/web/vx_s_13/c_data.vspx index 3a220cb537..dfb22adadc 100644 --- a/binsrc/tutorial/web/vx_s_13/c_data.vspx +++ b/binsrc/tutorial/web/vx_s_13/c_data.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_13/c_disp.vspx b/binsrc/tutorial/web/vx_s_13/c_disp.vspx index ec480f8892..070c16303e 100644 --- a/binsrc/tutorial/web/vx_s_13/c_disp.vspx +++ b/binsrc/tutorial/web/vx_s_13/c_disp.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_13/c_edit.vspx b/binsrc/tutorial/web/vx_s_13/c_edit.vspx index 945e034261..0cd456fa20 100644 --- a/binsrc/tutorial/web/vx_s_13/c_edit.vspx +++ b/binsrc/tutorial/web/vx_s_13/c_edit.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_13/countries.xml b/binsrc/tutorial/web/vx_s_13/countries.xml index 01a1c2822d..eeae5ce45c 100644 --- a/binsrc/tutorial/web/vx_s_13/countries.xml +++ b/binsrc/tutorial/web/vx_s_13/countries.xml @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_13/options.xml b/binsrc/tutorial/web/vx_s_13/options.xml index 1626a6965c..8cbe5ecbeb 100644 --- a/binsrc/tutorial/web/vx_s_13/options.xml +++ b/binsrc/tutorial/web/vx_s_13/options.xml @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_13/rdf.xml b/binsrc/tutorial/web/vx_s_13/rdf.xml index 829685bcd0..2c23f7b93d 100644 --- a/binsrc/tutorial/web/vx_s_13/rdf.xml +++ b/binsrc/tutorial/web/vx_s_13/rdf.xml @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_13/rss.xml b/binsrc/tutorial/web/vx_s_13/rss.xml index d29cba2039..5aafe97ecd 100644 --- a/binsrc/tutorial/web/vx_s_13/rss.xml +++ b/binsrc/tutorial/web/vx_s_13/rss.xml @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_13/vx_s_13.sql b/binsrc/tutorial/web/vx_s_13/vx_s_13.sql index c8de41c348..b3fe3d1212 100644 --- a/binsrc/tutorial/web/vx_s_13/vx_s_13.sql +++ b/binsrc/tutorial/web/vx_s_13/vx_s_13.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_2/check_box.vspx b/binsrc/tutorial/web/vx_s_2/check_box.vspx index cc580e9d33..6de930511d 100644 --- a/binsrc/tutorial/web/vx_s_2/check_box.vspx +++ b/binsrc/tutorial/web/vx_s_2/check_box.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_2/date.vspx b/binsrc/tutorial/web/vx_s_2/date.vspx index 6e0519ffd3..f88e4c7abb 100644 --- a/binsrc/tutorial/web/vx_s_2/date.vspx +++ b/binsrc/tutorial/web/vx_s_2/date.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_2/form.vspx b/binsrc/tutorial/web/vx_s_2/form.vspx index 71dd12a6e2..562604b72b 100644 --- a/binsrc/tutorial/web/vx_s_2/form.vspx +++ b/binsrc/tutorial/web/vx_s_2/form.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_2/options.xml b/binsrc/tutorial/web/vx_s_2/options.xml index 968611383a..9961dcfd7d 100644 --- a/binsrc/tutorial/web/vx_s_2/options.xml +++ b/binsrc/tutorial/web/vx_s_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_2/radio.vspx b/binsrc/tutorial/web/vx_s_2/radio.vspx index c224903e29..5197e9f7e8 100644 --- a/binsrc/tutorial/web/vx_s_2/radio.vspx +++ b/binsrc/tutorial/web/vx_s_2/radio.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_2/radio_group.vspx b/binsrc/tutorial/web/vx_s_2/radio_group.vspx index 5091e59d87..5ee87e38c4 100644 --- a/binsrc/tutorial/web/vx_s_2/radio_group.vspx +++ b/binsrc/tutorial/web/vx_s_2/radio_group.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_2/select.vspx b/binsrc/tutorial/web/vx_s_2/select.vspx index d87fdc6fde..8d1f48a4ce 100644 --- a/binsrc/tutorial/web/vx_s_2/select.vspx +++ b/binsrc/tutorial/web/vx_s_2/select.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_2/textarea.vspx b/binsrc/tutorial/web/vx_s_2/textarea.vspx index 5e04e1c3e7..8c3b4d65d4 100644 --- a/binsrc/tutorial/web/vx_s_2/textarea.vspx +++ b/binsrc/tutorial/web/vx_s_2/textarea.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_2/vx_s_2.xml b/binsrc/tutorial/web/vx_s_2/vx_s_2.xml index b786b3289a..1079f3e90c 100644 --- a/binsrc/tutorial/web/vx_s_2/vx_s_2.xml +++ b/binsrc/tutorial/web/vx_s_2/vx_s_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_3/data_set.vspx b/binsrc/tutorial/web/vx_s_3/data_set.vspx index 2df77a6118..397db487a9 100644 --- a/binsrc/tutorial/web/vx_s_3/data_set.vspx +++ b/binsrc/tutorial/web/vx_s_3/data_set.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_3/selectdb.vspx b/binsrc/tutorial/web/vx_s_3/selectdb.vspx index 9df47478b2..95926b13a3 100644 --- a/binsrc/tutorial/web/vx_s_3/selectdb.vspx +++ b/binsrc/tutorial/web/vx_s_3/selectdb.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_3/update_form.vspx b/binsrc/tutorial/web/vx_s_3/update_form.vspx index f4dacaab20..3c5039caf6 100644 --- a/binsrc/tutorial/web/vx_s_3/update_form.vspx +++ b/binsrc/tutorial/web/vx_s_3/update_form.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_3/update_radio.vspx b/binsrc/tutorial/web/vx_s_3/update_radio.vspx index f955adf458..a125f5cf79 100644 --- a/binsrc/tutorial/web/vx_s_3/update_radio.vspx +++ b/binsrc/tutorial/web/vx_s_3/update_radio.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_3/vx_s_3.sql b/binsrc/tutorial/web/vx_s_3/vx_s_3.sql index 6c14da286d..4e9b50011a 100644 --- a/binsrc/tutorial/web/vx_s_3/vx_s_3.sql +++ b/binsrc/tutorial/web/vx_s_3/vx_s_3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_3/vx_s_3.xml b/binsrc/tutorial/web/vx_s_3/vx_s_3.xml index 4b9b857534..7e097706d3 100644 --- a/binsrc/tutorial/web/vx_s_3/vx_s_3.xml +++ b/binsrc/tutorial/web/vx_s_3/vx_s_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_4/tree.vspx b/binsrc/tutorial/web/vx_s_4/tree.vspx index 0ef18ce5c8..57a3c4e73d 100644 --- a/binsrc/tutorial/web/vx_s_4/tree.vspx +++ b/binsrc/tutorial/web/vx_s_4/tree.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_4/vx_s_4.sql b/binsrc/tutorial/web/vx_s_4/vx_s_4.sql index caa8c28eb3..44219c7f6d 100644 --- a/binsrc/tutorial/web/vx_s_4/vx_s_4.sql +++ b/binsrc/tutorial/web/vx_s_4/vx_s_4.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_4/vx_s_4.xml b/binsrc/tutorial/web/vx_s_4/vx_s_4.xml index 40201896c4..a94006e967 100644 --- a/binsrc/tutorial/web/vx_s_4/vx_s_4.xml +++ b/binsrc/tutorial/web/vx_s_4/vx_s_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_5/emp.vspx b/binsrc/tutorial/web/vx_s_5/emp.vspx index 42f09a9b6d..b9a4586430 100644 --- a/binsrc/tutorial/web/vx_s_5/emp.vspx +++ b/binsrc/tutorial/web/vx_s_5/emp.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_5/options.xml b/binsrc/tutorial/web/vx_s_5/options.xml index 403b0b101a..efbaef986a 100644 --- a/binsrc/tutorial/web/vx_s_5/options.xml +++ b/binsrc/tutorial/web/vx_s_5/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_5/tab.vspx b/binsrc/tutorial/web/vx_s_5/tab.vspx index fe3bef9772..476b717a8b 100644 --- a/binsrc/tutorial/web/vx_s_5/tab.vspx +++ b/binsrc/tutorial/web/vx_s_5/tab.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_5/vx_s_5.sql b/binsrc/tutorial/web/vx_s_5/vx_s_5.sql index 168adc9db9..56466ce1b4 100644 --- a/binsrc/tutorial/web/vx_s_5/vx_s_5.sql +++ b/binsrc/tutorial/web/vx_s_5/vx_s_5.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_5/vx_s_5.xml b/binsrc/tutorial/web/vx_s_5/vx_s_5.xml index b15c45c256..02b3880f12 100644 --- a/binsrc/tutorial/web/vx_s_5/vx_s_5.xml +++ b/binsrc/tutorial/web/vx_s_5/vx_s_5.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_6/login.vspx b/binsrc/tutorial/web/vx_s_6/login.vspx index a31da3d21d..3c491d453f 100644 --- a/binsrc/tutorial/web/vx_s_6/login.vspx +++ b/binsrc/tutorial/web/vx_s_6/login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_6/vx_s_6.sql b/binsrc/tutorial/web/vx_s_6/vx_s_6.sql index 8454c0a50c..3e58b887a5 100644 --- a/binsrc/tutorial/web/vx_s_6/vx_s_6.sql +++ b/binsrc/tutorial/web/vx_s_6/vx_s_6.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_6/vx_s_6.xml b/binsrc/tutorial/web/vx_s_6/vx_s_6.xml index 963e55960e..4c95d9983d 100644 --- a/binsrc/tutorial/web/vx_s_6/vx_s_6.xml +++ b/binsrc/tutorial/web/vx_s_6/vx_s_6.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_7/options.xml b/binsrc/tutorial/web/vx_s_7/options.xml index 73f4f8b893..39c3884979 100644 --- a/binsrc/tutorial/web/vx_s_7/options.xml +++ b/binsrc/tutorial/web/vx_s_7/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_7/products.vspx b/binsrc/tutorial/web/vx_s_7/products.vspx index f28c9c9a4b..64bbf6d6cd 100644 --- a/binsrc/tutorial/web/vx_s_7/products.vspx +++ b/binsrc/tutorial/web/vx_s_7/products.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_7/sel_category.vspx b/binsrc/tutorial/web/vx_s_7/sel_category.vspx index 4edda8ec43..daf6d9d1fb 100644 --- a/binsrc/tutorial/web/vx_s_7/sel_category.vspx +++ b/binsrc/tutorial/web/vx_s_7/sel_category.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_7/vx_s_7.xml b/binsrc/tutorial/web/vx_s_7/vx_s_7.xml index 5238a8135a..536ab34a9c 100644 --- a/binsrc/tutorial/web/vx_s_7/vx_s_7.xml +++ b/binsrc/tutorial/web/vx_s_7/vx_s_7.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_8/formdecor.vspx b/binsrc/tutorial/web/vx_s_8/formdecor.vspx index e5fee88a69..14dac3fe5d 100644 --- a/binsrc/tutorial/web/vx_s_8/formdecor.vspx +++ b/binsrc/tutorial/web/vx_s_8/formdecor.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_8/formsty.vspx b/binsrc/tutorial/web/vx_s_8/formsty.vspx index 90b8eabde2..41d5f0cab0 100644 --- a/binsrc/tutorial/web/vx_s_8/formsty.vspx +++ b/binsrc/tutorial/web/vx_s_8/formsty.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_8/formsty.xsl b/binsrc/tutorial/web/vx_s_8/formsty.xsl index d0e992e885..543ad5f056 100644 --- a/binsrc/tutorial/web/vx_s_8/formsty.xsl +++ b/binsrc/tutorial/web/vx_s_8/formsty.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_8/options.xml b/binsrc/tutorial/web/vx_s_8/options.xml index 0e12b8ddda..70b50edd34 100644 --- a/binsrc/tutorial/web/vx_s_8/options.xml +++ b/binsrc/tutorial/web/vx_s_8/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_8/vx_s_8.xml b/binsrc/tutorial/web/vx_s_8/vx_s_8.xml index 7c04860e53..93254959f8 100644 --- a/binsrc/tutorial/web/vx_s_8/vx_s_8.xml +++ b/binsrc/tutorial/web/vx_s_8/vx_s_8.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/button_0.vspx b/binsrc/tutorial/web/vx_s_9/button_0.vspx index 648b2acdd8..0585d4a287 100644 --- a/binsrc/tutorial/web/vx_s_9/button_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/button_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/button_1.vspx b/binsrc/tutorial/web/vx_s_9/button_1.vspx index 88cf80dca3..5f462e9609 100644 --- a/binsrc/tutorial/web/vx_s_9/button_1.vspx +++ b/binsrc/tutorial/web/vx_s_9/button_1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/button_2.vspx b/binsrc/tutorial/web/vx_s_9/button_2.vspx index dde24f3ddb..cfca004e68 100644 --- a/binsrc/tutorial/web/vx_s_9/button_2.vspx +++ b/binsrc/tutorial/web/vx_s_9/button_2.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/button_3.vspx b/binsrc/tutorial/web/vx_s_9/button_3.vspx index 82d6fc0b25..f2d7887ab9 100644 --- a/binsrc/tutorial/web/vx_s_9/button_3.vspx +++ b/binsrc/tutorial/web/vx_s_9/button_3.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/calendar_0.vspx b/binsrc/tutorial/web/vx_s_9/calendar_0.vspx index dc6d8971da..9d6a345c80 100644 --- a/binsrc/tutorial/web/vx_s_9/calendar_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/calendar_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/check_box_0.vspx b/binsrc/tutorial/web/vx_s_9/check_box_0.vspx index dfcee591ec..19b5ff65b1 100644 --- a/binsrc/tutorial/web/vx_s_9/check_box_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/check_box_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/data_grid_0.vspx b/binsrc/tutorial/web/vx_s_9/data_grid_0.vspx index 5acb49023b..f3b5454659 100644 --- a/binsrc/tutorial/web/vx_s_9/data_grid_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/data_grid_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/data_list_0.vspx b/binsrc/tutorial/web/vx_s_9/data_list_0.vspx index 6facee471c..b5c3797386 100644 --- a/binsrc/tutorial/web/vx_s_9/data_list_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/data_list_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/data_list_1.vspx b/binsrc/tutorial/web/vx_s_9/data_list_1.vspx index 8ed1049d8e..3aea2b1d42 100644 --- a/binsrc/tutorial/web/vx_s_9/data_list_1.vspx +++ b/binsrc/tutorial/web/vx_s_9/data_list_1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/data_set_0.vspx b/binsrc/tutorial/web/vx_s_9/data_set_0.vspx index 9eb7510496..a3cacccf65 100644 --- a/binsrc/tutorial/web/vx_s_9/data_set_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/data_set_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/data_set_1.vspx b/binsrc/tutorial/web/vx_s_9/data_set_1.vspx index 59b9e8137a..ec6c2e8204 100644 --- a/binsrc/tutorial/web/vx_s_9/data_set_1.vspx +++ b/binsrc/tutorial/web/vx_s_9/data_set_1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/data_source_0.vspx b/binsrc/tutorial/web/vx_s_9/data_source_0.vspx index e0aecf439c..8686f78414 100644 --- a/binsrc/tutorial/web/vx_s_9/data_source_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/data_source_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/error_summary_0.vspx b/binsrc/tutorial/web/vx_s_9/error_summary_0.vspx index 665bb0799e..eb401d67d8 100644 --- a/binsrc/tutorial/web/vx_s_9/error_summary_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/error_summary_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/error_summary_1.vspx b/binsrc/tutorial/web/vx_s_9/error_summary_1.vspx index 02983b67b6..61c935b602 100644 --- a/binsrc/tutorial/web/vx_s_9/error_summary_1.vspx +++ b/binsrc/tutorial/web/vx_s_9/error_summary_1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/footer.xml b/binsrc/tutorial/web/vx_s_9/footer.xml index 6699ea56be..b275a8ebaa 100644 --- a/binsrc/tutorial/web/vx_s_9/footer.xml +++ b/binsrc/tutorial/web/vx_s_9/footer.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/form_0.vspx b/binsrc/tutorial/web/vx_s_9/form_0.vspx index 66d038f466..04f1578db7 100644 --- a/binsrc/tutorial/web/vx_s_9/form_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/form_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/form_1.vspx b/binsrc/tutorial/web/vx_s_9/form_1.vspx index dfaedd7228..eaa1053e51 100644 --- a/binsrc/tutorial/web/vx_s_9/form_1.vspx +++ b/binsrc/tutorial/web/vx_s_9/form_1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/include_0.vspx b/binsrc/tutorial/web/vx_s_9/include_0.vspx index 0594d73871..d62e914f56 100644 --- a/binsrc/tutorial/web/vx_s_9/include_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/include_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/label_0.vspx b/binsrc/tutorial/web/vx_s_9/label_0.vspx index f5a8403e71..49711c5d25 100644 --- a/binsrc/tutorial/web/vx_s_9/label_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/label_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/login_0.vspx b/binsrc/tutorial/web/vx_s_9/login_0.vspx index 17aa85ba7c..0bfd158bea 100644 --- a/binsrc/tutorial/web/vx_s_9/login_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/login_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/login_form_0.vspx b/binsrc/tutorial/web/vx_s_9/login_form_0.vspx index 92d490ec7a..e916882c50 100644 --- a/binsrc/tutorial/web/vx_s_9/login_form_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/login_form_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/page_0.vspx b/binsrc/tutorial/web/vx_s_9/page_0.vspx index 678229120c..bc4c6a17bd 100644 --- a/binsrc/tutorial/web/vx_s_9/page_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/page_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/radio_button_0.vspx b/binsrc/tutorial/web/vx_s_9/radio_button_0.vspx index 23efd365f2..3b0bd93ee9 100644 --- a/binsrc/tutorial/web/vx_s_9/radio_button_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/radio_button_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/radio_group_0.vspx b/binsrc/tutorial/web/vx_s_9/radio_group_0.vspx index cc2878ae49..b77ac65936 100644 --- a/binsrc/tutorial/web/vx_s_9/radio_group_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/radio_group_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/select_list_0.vspx b/binsrc/tutorial/web/vx_s_9/select_list_0.vspx index d7ce283a5d..dd1ead06dc 100644 --- a/binsrc/tutorial/web/vx_s_9/select_list_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/select_list_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/tab_0.vspx b/binsrc/tutorial/web/vx_s_9/tab_0.vspx index f5cabc9a74..649b465cc6 100644 --- a/binsrc/tutorial/web/vx_s_9/tab_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/tab_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/text_0.vspx b/binsrc/tutorial/web/vx_s_9/text_0.vspx index bd18b6845d..fb4057608c 100644 --- a/binsrc/tutorial/web/vx_s_9/text_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/text_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/text_area_0.vspx b/binsrc/tutorial/web/vx_s_9/text_area_0.vspx index 27d205e068..54c330b243 100644 --- a/binsrc/tutorial/web/vx_s_9/text_area_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/text_area_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/tree_0.vspx b/binsrc/tutorial/web/vx_s_9/tree_0.vspx index 0bd5165444..e1e7c6ceb3 100644 --- a/binsrc/tutorial/web/vx_s_9/tree_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/tree_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/url_0.vspx b/binsrc/tutorial/web/vx_s_9/url_0.vspx index 368a52590d..b567c28902 100644 --- a/binsrc/tutorial/web/vx_s_9/url_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/url_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/validator_0.vspx b/binsrc/tutorial/web/vx_s_9/validator_0.vspx index 810a28f0a4..88d0b9af4a 100644 --- a/binsrc/tutorial/web/vx_s_9/validator_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/validator_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/variable_0.vspx b/binsrc/tutorial/web/vx_s_9/variable_0.vspx index e9233dcafb..11400f1e85 100644 --- a/binsrc/tutorial/web/vx_s_9/variable_0.vspx +++ b/binsrc/tutorial/web/vx_s_9/variable_0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/vx_s_9.sql b/binsrc/tutorial/web/vx_s_9/vx_s_9.sql index 8dce5135b5..807c6e4e8c 100644 --- a/binsrc/tutorial/web/vx_s_9/vx_s_9.sql +++ b/binsrc/tutorial/web/vx_s_9/vx_s_9.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web/vx_s_9/vx_s_9.xml b/binsrc/tutorial/web/vx_s_9/vx_s_9.xml index a09933bd3b..1a56e5cc25 100644 --- a/binsrc/tutorial/web/vx_s_9/vx_s_9.xml +++ b/binsrc/tutorial/web/vx_s_9/vx_s_9.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/web2/index.xml b/binsrc/tutorial/web2/index.xml index cd9e5baa0e..c606ccb460 100644 --- a/binsrc/tutorial/web2/index.xml +++ b/binsrc/tutorial/web2/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xbel.vsp b/binsrc/tutorial/xbel.vsp index ff6f37ab43..49b51d13ba 100644 --- a/binsrc/tutorial/xbel.vsp +++ b/binsrc/tutorial/xbel.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/Makefile.am b/binsrc/tutorial/xml/Makefile.am index 36193e74d2..688aae91aa 100644 --- a/binsrc/tutorial/xml/Makefile.am +++ b/binsrc/tutorial/xml/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/demo.css b/binsrc/tutorial/xml/demo.css index 96e5c76b0d..45b267d45a 100644 --- a/binsrc/tutorial/xml/demo.css +++ b/binsrc/tutorial/xml/demo.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/index.xml b/binsrc/tutorial/xml/index.xml index 3a019d0609..4425d1e983 100644 --- a/binsrc/tutorial/xml/index.xml +++ b/binsrc/tutorial/xml/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/rq_s_1/options.xml b/binsrc/tutorial/xml/rq_s_1/options.xml index 3588994ff3..1b59a57b8a 100644 --- a/binsrc/tutorial/xml/rq_s_1/options.xml +++ b/binsrc/tutorial/xml/rq_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/rq_s_1/rq_s_1.xml b/binsrc/tutorial/xml/rq_s_1/rq_s_1.xml index 547d4cbb5b..fc5e6fe19d 100644 --- a/binsrc/tutorial/xml/rq_s_1/rq_s_1.xml +++ b/binsrc/tutorial/xml/rq_s_1/rq_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_0/options.xml b/binsrc/tutorial/xml/sx_e_0/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_e_0/options.xml +++ b/binsrc/tutorial/xml/sx_e_0/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_0/sx_e_0.xml b/binsrc/tutorial/xml/sx_e_0/sx_e_0.xml index 2205982476..9e42b42f6c 100644 --- a/binsrc/tutorial/xml/sx_e_0/sx_e_0.xml +++ b/binsrc/tutorial/xml/sx_e_0/sx_e_0.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_1/options.xml b/binsrc/tutorial/xml/sx_e_1/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_e_1/options.xml +++ b/binsrc/tutorial/xml/sx_e_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_1/sx_e_1.xml b/binsrc/tutorial/xml/sx_e_1/sx_e_1.xml index 2e90548f31..6fea189281 100644 --- a/binsrc/tutorial/xml/sx_e_1/sx_e_1.xml +++ b/binsrc/tutorial/xml/sx_e_1/sx_e_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_1/sx_e_1_sample.vsp b/binsrc/tutorial/xml/sx_e_1/sx_e_1_sample.vsp index 118afd7a15..75db537e40 100644 --- a/binsrc/tutorial/xml/sx_e_1/sx_e_1_sample.vsp +++ b/binsrc/tutorial/xml/sx_e_1/sx_e_1_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_2/options.xml b/binsrc/tutorial/xml/sx_e_2/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_e_2/options.xml +++ b/binsrc/tutorial/xml/sx_e_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_2/sx_e_2.xml b/binsrc/tutorial/xml/sx_e_2/sx_e_2.xml index 058b0bbc65..4176e72394 100644 --- a/binsrc/tutorial/xml/sx_e_2/sx_e_2.xml +++ b/binsrc/tutorial/xml/sx_e_2/sx_e_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_2/sx_e_2_sample.vsp b/binsrc/tutorial/xml/sx_e_2/sx_e_2_sample.vsp index 31a6fde5e3..c7268accf8 100644 --- a/binsrc/tutorial/xml/sx_e_2/sx_e_2_sample.vsp +++ b/binsrc/tutorial/xml/sx_e_2/sx_e_2_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_3/options.xml b/binsrc/tutorial/xml/sx_e_3/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_e_3/options.xml +++ b/binsrc/tutorial/xml/sx_e_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_3/sx_e_3.xml b/binsrc/tutorial/xml/sx_e_3/sx_e_3.xml index 89c78d59ec..46fb0ebec1 100644 --- a/binsrc/tutorial/xml/sx_e_3/sx_e_3.xml +++ b/binsrc/tutorial/xml/sx_e_3/sx_e_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_3/sx_e_3_sample.vsp b/binsrc/tutorial/xml/sx_e_3/sx_e_3_sample.vsp index 85cbbc32c9..631f249f2e 100644 --- a/binsrc/tutorial/xml/sx_e_3/sx_e_3_sample.vsp +++ b/binsrc/tutorial/xml/sx_e_3/sx_e_3_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_4/options.xml b/binsrc/tutorial/xml/sx_e_4/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_e_4/options.xml +++ b/binsrc/tutorial/xml/sx_e_4/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_4/sx_e_4.xml b/binsrc/tutorial/xml/sx_e_4/sx_e_4.xml index 269797ae68..f45d94f91c 100644 --- a/binsrc/tutorial/xml/sx_e_4/sx_e_4.xml +++ b/binsrc/tutorial/xml/sx_e_4/sx_e_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_4/sx_e_4_sample.vsp b/binsrc/tutorial/xml/sx_e_4/sx_e_4_sample.vsp index 393b20cab0..76d9ac5d76 100644 --- a/binsrc/tutorial/xml/sx_e_4/sx_e_4_sample.vsp +++ b/binsrc/tutorial/xml/sx_e_4/sx_e_4_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_5/options.xml b/binsrc/tutorial/xml/sx_e_5/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_e_5/options.xml +++ b/binsrc/tutorial/xml/sx_e_5/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_5/sx_e_5.xml b/binsrc/tutorial/xml/sx_e_5/sx_e_5.xml index fad03c69fe..e48a94cbb3 100644 --- a/binsrc/tutorial/xml/sx_e_5/sx_e_5.xml +++ b/binsrc/tutorial/xml/sx_e_5/sx_e_5.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_5/sx_e_5_sample.vsp b/binsrc/tutorial/xml/sx_e_5/sx_e_5_sample.vsp index f8e8919bb5..850051b893 100644 --- a/binsrc/tutorial/xml/sx_e_5/sx_e_5_sample.vsp +++ b/binsrc/tutorial/xml/sx_e_5/sx_e_5_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_6/options.xml b/binsrc/tutorial/xml/sx_e_6/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_e_6/options.xml +++ b/binsrc/tutorial/xml/sx_e_6/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_6/sx_e_6.xml b/binsrc/tutorial/xml/sx_e_6/sx_e_6.xml index c9fceb2ac1..38d12bbb98 100644 --- a/binsrc/tutorial/xml/sx_e_6/sx_e_6.xml +++ b/binsrc/tutorial/xml/sx_e_6/sx_e_6.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_6/sx_e_6_sample.vsp b/binsrc/tutorial/xml/sx_e_6/sx_e_6_sample.vsp index 0c1c71db6f..0dd4b24a91 100644 --- a/binsrc/tutorial/xml/sx_e_6/sx_e_6_sample.vsp +++ b/binsrc/tutorial/xml/sx_e_6/sx_e_6_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_7/options.xml b/binsrc/tutorial/xml/sx_e_7/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_e_7/options.xml +++ b/binsrc/tutorial/xml/sx_e_7/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_7/sx_e_7.xml b/binsrc/tutorial/xml/sx_e_7/sx_e_7.xml index 4365f6b2ce..8a7236b355 100644 --- a/binsrc/tutorial/xml/sx_e_7/sx_e_7.xml +++ b/binsrc/tutorial/xml/sx_e_7/sx_e_7.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_7/sx_e_7_sample.vsp b/binsrc/tutorial/xml/sx_e_7/sx_e_7_sample.vsp index ddbb925550..5cf60c573f 100644 --- a/binsrc/tutorial/xml/sx_e_7/sx_e_7_sample.vsp +++ b/binsrc/tutorial/xml/sx_e_7/sx_e_7_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_8/options.xml b/binsrc/tutorial/xml/sx_e_8/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_e_8/options.xml +++ b/binsrc/tutorial/xml/sx_e_8/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_8/sx_e_8.xml b/binsrc/tutorial/xml/sx_e_8/sx_e_8.xml index d1354a453f..95567195b2 100644 --- a/binsrc/tutorial/xml/sx_e_8/sx_e_8.xml +++ b/binsrc/tutorial/xml/sx_e_8/sx_e_8.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_8/sx_e_8_sample.vsp b/binsrc/tutorial/xml/sx_e_8/sx_e_8_sample.vsp index 42b5fcb5b4..68b726080d 100644 --- a/binsrc/tutorial/xml/sx_e_8/sx_e_8_sample.vsp +++ b/binsrc/tutorial/xml/sx_e_8/sx_e_8_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_9/options.xml b/binsrc/tutorial/xml/sx_e_9/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_e_9/options.xml +++ b/binsrc/tutorial/xml/sx_e_9/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_9/sx_e_9.xml b/binsrc/tutorial/xml/sx_e_9/sx_e_9.xml index 18c6d0cfcf..93406de935 100644 --- a/binsrc/tutorial/xml/sx_e_9/sx_e_9.xml +++ b/binsrc/tutorial/xml/sx_e_9/sx_e_9.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_e_9/sx_e_9_sample.vsp b/binsrc/tutorial/xml/sx_e_9/sx_e_9_sample.vsp index 9fa1ad4b51..e83b359ea6 100644 --- a/binsrc/tutorial/xml/sx_e_9/sx_e_9_sample.vsp +++ b/binsrc/tutorial/xml/sx_e_9/sx_e_9_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_f_1/options.xml b/binsrc/tutorial/xml/sx_f_1/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_f_1/options.xml +++ b/binsrc/tutorial/xml/sx_f_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_f_1/sx_f_1.xml b/binsrc/tutorial/xml/sx_f_1/sx_f_1.xml index 72a0dfec26..7d16e7b1da 100644 --- a/binsrc/tutorial/xml/sx_f_1/sx_f_1.xml +++ b/binsrc/tutorial/xml/sx_f_1/sx_f_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_f_1/sx_f_1_sample.vsp b/binsrc/tutorial/xml/sx_f_1/sx_f_1_sample.vsp index 9ee67c883c..519c0b3d7d 100644 --- a/binsrc/tutorial/xml/sx_f_1/sx_f_1_sample.vsp +++ b/binsrc/tutorial/xml/sx_f_1/sx_f_1_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_g_1/options.xml b/binsrc/tutorial/xml/sx_g_1/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_g_1/options.xml +++ b/binsrc/tutorial/xml/sx_g_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_g_1/sx_g_1.xml b/binsrc/tutorial/xml/sx_g_1/sx_g_1.xml index b59c9811fc..49b619ad58 100644 --- a/binsrc/tutorial/xml/sx_g_1/sx_g_1.xml +++ b/binsrc/tutorial/xml/sx_g_1/sx_g_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_g_1/sx_g_1_sample.vsp b/binsrc/tutorial/xml/sx_g_1/sx_g_1_sample.vsp index 5db11d50e2..82e59c5c8f 100644 --- a/binsrc/tutorial/xml/sx_g_1/sx_g_1_sample.vsp +++ b/binsrc/tutorial/xml/sx_g_1/sx_g_1_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_h_1/options.xml b/binsrc/tutorial/xml/sx_h_1/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xml/sx_h_1/options.xml +++ b/binsrc/tutorial/xml/sx_h_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_h_1/sx_h_1.xml b/binsrc/tutorial/xml/sx_h_1/sx_h_1.xml index d63ee3598d..0bd55c1248 100644 --- a/binsrc/tutorial/xml/sx_h_1/sx_h_1.xml +++ b/binsrc/tutorial/xml/sx_h_1/sx_h_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_h_1/sx_h_1_sample.vsp b/binsrc/tutorial/xml/sx_h_1/sx_h_1_sample.vsp index 0fd238ad04..68a757442a 100644 --- a/binsrc/tutorial/xml/sx_h_1/sx_h_1_sample.vsp +++ b/binsrc/tutorial/xml/sx_h_1/sx_h_1_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/sx_output.xsl b/binsrc/tutorial/xml/sx_output.xsl index e99a309b3e..1081ddfe1e 100644 --- a/binsrc/tutorial/xml/sx_output.xsl +++ b/binsrc/tutorial/xml/sx_output.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/map01.xsd b/binsrc/tutorial/xml/usecases/map01.xsd index dc3f47f866..e572136158 100644 --- a/binsrc/tutorial/xml/usecases/map01.xsd +++ b/binsrc/tutorial/xml/usecases/map01.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/map02.xml b/binsrc/tutorial/xml/usecases/map02.xml index 6a4852167d..6fcbe93f40 100644 --- a/binsrc/tutorial/xml/usecases/map02.xml +++ b/binsrc/tutorial/xml/usecases/map02.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/map02.xsd b/binsrc/tutorial/xml/usecases/map02.xsd index 7e2e5d4c7c..d8fa791de0 100644 --- a/binsrc/tutorial/xml/usecases/map02.xsd +++ b/binsrc/tutorial/xml/usecases/map02.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/map03.xml b/binsrc/tutorial/xml/usecases/map03.xml index 4bab639694..bbf2d60005 100644 --- a/binsrc/tutorial/xml/usecases/map03.xml +++ b/binsrc/tutorial/xml/usecases/map03.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/options.xml b/binsrc/tutorial/xml/usecases/options.xml index b6602e0fab..6bec21fb99 100644 --- a/binsrc/tutorial/xml/usecases/options.xml +++ b/binsrc/tutorial/xml/usecases/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/slash.xml b/binsrc/tutorial/xml/usecases/slash.xml index b6b0207501..1ef9e18df0 100644 --- a/binsrc/tutorial/xml/usecases/slash.xml +++ b/binsrc/tutorial/xml/usecases/slash.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/sq01.xml b/binsrc/tutorial/xml/usecases/sq01.xml index 38a67bda04..0eec3a2542 100644 --- a/binsrc/tutorial/xml/usecases/sq01.xml +++ b/binsrc/tutorial/xml/usecases/sq01.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/sq02.xml b/binsrc/tutorial/xml/usecases/sq02.xml index 024d81771b..e00c2b83a9 100644 --- a/binsrc/tutorial/xml/usecases/sq02.xml +++ b/binsrc/tutorial/xml/usecases/sq02.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/sq03.xml b/binsrc/tutorial/xml/usecases/sq03.xml index 11c1080a74..ae532b8c0a 100644 --- a/binsrc/tutorial/xml/usecases/sq03.xml +++ b/binsrc/tutorial/xml/usecases/sq03.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/sq04.xml b/binsrc/tutorial/xml/usecases/sq04.xml index 5fd27895b1..bc7d507f50 100644 --- a/binsrc/tutorial/xml/usecases/sq04.xml +++ b/binsrc/tutorial/xml/usecases/sq04.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/sq05.xml b/binsrc/tutorial/xml/usecases/sq05.xml index 53c4b5472b..49e3fdc83b 100644 --- a/binsrc/tutorial/xml/usecases/sq05.xml +++ b/binsrc/tutorial/xml/usecases/sq05.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/sq06.xml b/binsrc/tutorial/xml/usecases/sq06.xml index 1a4ff9b3c4..fa9a8942e6 100644 --- a/binsrc/tutorial/xml/usecases/sq06.xml +++ b/binsrc/tutorial/xml/usecases/sq06.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/sqlx01.xml b/binsrc/tutorial/xml/usecases/sqlx01.xml index 7f2ea63be6..ef2d0e4aaf 100644 --- a/binsrc/tutorial/xml/usecases/sqlx01.xml +++ b/binsrc/tutorial/xml/usecases/sqlx01.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/sqlx02.xml b/binsrc/tutorial/xml/usecases/sqlx02.xml index f3bd63fdee..6a52a50edf 100644 --- a/binsrc/tutorial/xml/usecases/sqlx02.xml +++ b/binsrc/tutorial/xml/usecases/sqlx02.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/sqlx03.xml b/binsrc/tutorial/xml/usecases/sqlx03.xml index 336afe3216..c2b104c7be 100644 --- a/binsrc/tutorial/xml/usecases/sqlx03.xml +++ b/binsrc/tutorial/xml/usecases/sqlx03.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/sqlx04.xml b/binsrc/tutorial/xml/usecases/sqlx04.xml index df18e4e75a..ebc8503cf8 100644 --- a/binsrc/tutorial/xml/usecases/sqlx04.xml +++ b/binsrc/tutorial/xml/usecases/sqlx04.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/usecases.sql b/binsrc/tutorial/xml/usecases/usecases.sql index a1be4691ca..9da6f2a42b 100644 --- a/binsrc/tutorial/xml/usecases/usecases.sql +++ b/binsrc/tutorial/xml/usecases/usecases.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/usecases.vsp b/binsrc/tutorial/xml/usecases/usecases.vsp index 6c23792362..d183cf6df5 100644 --- a/binsrc/tutorial/xml/usecases/usecases.vsp +++ b/binsrc/tutorial/xml/usecases/usecases.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/usecases_vad.sql b/binsrc/tutorial/xml/usecases/usecases_vad.sql index 8200611a12..84a08a40f4 100644 --- a/binsrc/tutorial/xml/usecases/usecases_vad.sql +++ b/binsrc/tutorial/xml/usecases/usecases_vad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/xq04.xml b/binsrc/tutorial/xml/usecases/xq04.xml index 837af3c19d..47e0cb0334 100644 --- a/binsrc/tutorial/xml/usecases/xq04.xml +++ b/binsrc/tutorial/xml/usecases/xq04.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/xq05.xml b/binsrc/tutorial/xml/usecases/xq05.xml index 865613767e..822cb7a9b7 100644 --- a/binsrc/tutorial/xml/usecases/xq05.xml +++ b/binsrc/tutorial/xml/usecases/xq05.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/xq06.xml b/binsrc/tutorial/xml/usecases/xq06.xml index 1f0a6ddde0..9698f0a100 100644 --- a/binsrc/tutorial/xml/usecases/xq06.xml +++ b/binsrc/tutorial/xml/usecases/xq06.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/xqr01.xml b/binsrc/tutorial/xml/usecases/xqr01.xml index 469a438383..b0bda1396e 100644 --- a/binsrc/tutorial/xml/usecases/xqr01.xml +++ b/binsrc/tutorial/xml/usecases/xqr01.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/xqr02.xml b/binsrc/tutorial/xml/usecases/xqr02.xml index a9f72d6fc1..191a453adf 100644 --- a/binsrc/tutorial/xml/usecases/xqr02.xml +++ b/binsrc/tutorial/xml/usecases/xqr02.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/usecases/xqr03.xml b/binsrc/tutorial/xml/usecases/xqr03.xml index 8b3d276182..8497c8b812 100644 --- a/binsrc/tutorial/xml/usecases/xqr03.xml +++ b/binsrc/tutorial/xml/usecases/xqr03.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_1/options.xml b/binsrc/tutorial/xml/xq_s_1/options.xml index eafe8f0e0f..77360e0a4b 100644 --- a/binsrc/tutorial/xml/xq_s_1/options.xml +++ b/binsrc/tutorial/xml/xq_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_1/xq_s_1.xml b/binsrc/tutorial/xml/xq_s_1/xq_s_1.xml index f7e25baedd..4b0480362f 100644 --- a/binsrc/tutorial/xml/xq_s_1/xq_s_1.xml +++ b/binsrc/tutorial/xml/xq_s_1/xq_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2/options.xml b/binsrc/tutorial/xml/xq_s_2/options.xml index 62553206dd..dc37f0a868 100644 --- a/binsrc/tutorial/xml/xq_s_2/options.xml +++ b/binsrc/tutorial/xml/xq_s_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2/search.sql b/binsrc/tutorial/xml/xq_s_2/search.sql index fa917d3d13..b61a9c51a0 100644 --- a/binsrc/tutorial/xml/xq_s_2/search.sql +++ b/binsrc/tutorial/xml/xq_s_2/search.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2/search.vsp b/binsrc/tutorial/xml/xq_s_2/search.vsp index 9b1362b912..9fc486b274 100644 --- a/binsrc/tutorial/xml/xq_s_2/search.vsp +++ b/binsrc/tutorial/xml/xq_s_2/search.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2/text.vsp b/binsrc/tutorial/xml/xq_s_2/text.vsp index 83912143fd..4a05beabbd 100644 --- a/binsrc/tutorial/xml/xq_s_2/text.vsp +++ b/binsrc/tutorial/xml/xq_s_2/text.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2/xq_s_2.xml b/binsrc/tutorial/xml/xq_s_2/xq_s_2.xml index bbd9c4482f..59276b3847 100644 --- a/binsrc/tutorial/xml/xq_s_2/xq_s_2.xml +++ b/binsrc/tutorial/xml/xq_s_2/xq_s_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/example.vsp b/binsrc/tutorial/xml/xq_s_2a/example.vsp index 8239946c69..477c57e06c 100644 --- a/binsrc/tutorial/xml/xq_s_2a/example.vsp +++ b/binsrc/tutorial/xml/xq_s_2a/example.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss1.xml b/binsrc/tutorial/xml/xq_s_2a/rss1.xml index 2d4795d222..0304f002ae 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss1.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss1.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss10.xml b/binsrc/tutorial/xml/xq_s_2a/rss10.xml index b27c3f00ed..3b488cbe26 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss10.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss10.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss11.xml b/binsrc/tutorial/xml/xq_s_2a/rss11.xml index a53fa013b8..10cb74aa30 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss11.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss11.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss12.xml b/binsrc/tutorial/xml/xq_s_2a/rss12.xml index b6f97846f2..28c0838447 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss12.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss12.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss13.xml b/binsrc/tutorial/xml/xq_s_2a/rss13.xml index 62937a8dbf..0f0ea6fc78 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss13.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss13.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss14.xml b/binsrc/tutorial/xml/xq_s_2a/rss14.xml index b25a599e5e..1ba4d1ee43 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss14.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss14.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss2.xml b/binsrc/tutorial/xml/xq_s_2a/rss2.xml index e51aa0ae33..9e64df1a83 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss2.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss2.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss3.xml b/binsrc/tutorial/xml/xq_s_2a/rss3.xml index 5920f9d411..39fb9256a0 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss3.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss3.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss4.xml b/binsrc/tutorial/xml/xq_s_2a/rss4.xml index 74c204f87d..a482b7c3a6 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss4.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss4.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss5.xml b/binsrc/tutorial/xml/xq_s_2a/rss5.xml index 6169b2ea01..2716b2a087 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss5.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss5.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss6.xml b/binsrc/tutorial/xml/xq_s_2a/rss6.xml index 935ee6aee9..5464620fcd 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss6.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss6.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss7.xml b/binsrc/tutorial/xml/xq_s_2a/rss7.xml index 9c9fdfd4af..6c5f41df5f 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss7.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss7.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss8.xml b/binsrc/tutorial/xml/xq_s_2a/rss8.xml index adf83327fe..8cda88373c 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss8.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss8.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/rss9.xml b/binsrc/tutorial/xml/xq_s_2a/rss9.xml index 5169bcab05..5cd43991ea 100644 --- a/binsrc/tutorial/xml/xq_s_2a/rss9.xml +++ b/binsrc/tutorial/xml/xq_s_2a/rss9.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.sql b/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.sql index cea280a838..8babaeaee2 100644 --- a/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.sql +++ b/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.xml b/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.xml index 0cc8180229..3a2b8985b9 100644 --- a/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.xml +++ b/binsrc/tutorial/xml/xq_s_2a/xq_s_2a.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_3/slash.vsp b/binsrc/tutorial/xml/xq_s_3/slash.vsp index c569b890b2..a6b4afb831 100644 --- a/binsrc/tutorial/xml/xq_s_3/slash.vsp +++ b/binsrc/tutorial/xml/xq_s_3/slash.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_3/slash.xml b/binsrc/tutorial/xml/xq_s_3/slash.xml index ea5621d8d0..08bc50fe65 100644 --- a/binsrc/tutorial/xml/xq_s_3/slash.xml +++ b/binsrc/tutorial/xml/xq_s_3/slash.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_3/xq_s_3.sql b/binsrc/tutorial/xml/xq_s_3/xq_s_3.sql index f82c4bf923..fc171bd8b4 100644 --- a/binsrc/tutorial/xml/xq_s_3/xq_s_3.sql +++ b/binsrc/tutorial/xml/xq_s_3/xq_s_3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_3/xq_s_3.xml b/binsrc/tutorial/xml/xq_s_3/xq_s_3.xml index 41bff8f4a6..882517c0ea 100644 --- a/binsrc/tutorial/xml/xq_s_3/xq_s_3.xml +++ b/binsrc/tutorial/xml/xq_s_3/xq_s_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/african_blogs.vsp b/binsrc/tutorial/xml/xq_s_4/african_blogs.vsp index c475851c54..bed4392652 100644 --- a/binsrc/tutorial/xml/xq_s_4/african_blogs.vsp +++ b/binsrc/tutorial/xml/xq_s_4/african_blogs.vsp @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/atom.vsp b/binsrc/tutorial/xml/xq_s_4/atom.vsp index 3a9c752d75..6c0ce3aa1c 100644 --- a/binsrc/tutorial/xml/xq_s_4/atom.vsp +++ b/binsrc/tutorial/xml/xq_s_4/atom.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/blog100.vsp b/binsrc/tutorial/xml/xq_s_4/blog100.vsp index c475851c54..bed4392652 100644 --- a/binsrc/tutorial/xml/xq_s_4/blog100.vsp +++ b/binsrc/tutorial/xml/xq_s_4/blog100.vsp @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/blogafrica.vsp b/binsrc/tutorial/xml/xq_s_4/blogafrica.vsp index c475851c54..bed4392652 100644 --- a/binsrc/tutorial/xml/xq_s_4/blogafrica.vsp +++ b/binsrc/tutorial/xml/xq_s_4/blogafrica.vsp @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/ceo.vsp b/binsrc/tutorial/xml/xq_s_4/ceo.vsp index c475851c54..bed4392652 100644 --- a/binsrc/tutorial/xml/xq_s_4/ceo.vsp +++ b/binsrc/tutorial/xml/xq_s_4/ceo.vsp @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/common.vsp b/binsrc/tutorial/xml/xq_s_4/common.vsp index aec02244d6..a94c1f10ae 100644 --- a/binsrc/tutorial/xml/xq_s_4/common.vsp +++ b/binsrc/tutorial/xml/xq_s_4/common.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/foaf.vsp b/binsrc/tutorial/xml/xq_s_4/foaf.vsp index 156ad11cb6..74c23e3761 100644 --- a/binsrc/tutorial/xml/xq_s_4/foaf.vsp +++ b/binsrc/tutorial/xml/xq_s_4/foaf.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/foafmap.vsp b/binsrc/tutorial/xml/xq_s_4/foafmap.vsp index c0bcd1ceae..7cc584802f 100644 --- a/binsrc/tutorial/xml/xq_s_4/foafmap.vsp +++ b/binsrc/tutorial/xml/xq_s_4/foafmap.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/gnomedexers.vsp b/binsrc/tutorial/xml/xq_s_4/gnomedexers.vsp index cc87b1010b..f54f437043 100644 --- a/binsrc/tutorial/xml/xq_s_4/gnomedexers.vsp +++ b/binsrc/tutorial/xml/xq_s_4/gnomedexers.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/mapufacture.vsp b/binsrc/tutorial/xml/xq_s_4/mapufacture.vsp index c0bcd1ceae..7cc584802f 100644 --- a/binsrc/tutorial/xml/xq_s_4/mapufacture.vsp +++ b/binsrc/tutorial/xml/xq_s_4/mapufacture.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/nigerian_bloggers.vsp b/binsrc/tutorial/xml/xq_s_4/nigerian_bloggers.vsp index c475851c54..bed4392652 100644 --- a/binsrc/tutorial/xml/xq_s_4/nigerian_bloggers.vsp +++ b/binsrc/tutorial/xml/xq_s_4/nigerian_bloggers.vsp @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/o100.sql b/binsrc/tutorial/xml/xq_s_4/o100.sql index e31727c333..c37d03a78a 100644 --- a/binsrc/tutorial/xml/xq_s_4/o100.sql +++ b/binsrc/tutorial/xml/xq_s_4/o100.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/o100.vsp b/binsrc/tutorial/xml/xq_s_4/o100.vsp index cc87b1010b..f54f437043 100644 --- a/binsrc/tutorial/xml/xq_s_4/o100.vsp +++ b/binsrc/tutorial/xml/xq_s_4/o100.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/options.xml b/binsrc/tutorial/xml/xq_s_4/options.xml index 2c8e9c80d2..7f7596f010 100644 --- a/binsrc/tutorial/xml/xq_s_4/options.xml +++ b/binsrc/tutorial/xml/xq_s_4/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/osc2003.vsp b/binsrc/tutorial/xml/xq_s_4/osc2003.vsp index cc87b1010b..f54f437043 100644 --- a/binsrc/tutorial/xml/xq_s_4/osc2003.vsp +++ b/binsrc/tutorial/xml/xq_s_4/osc2003.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/osc2005.vsp b/binsrc/tutorial/xml/xq_s_4/osc2005.vsp index cc87b1010b..f54f437043 100644 --- a/binsrc/tutorial/xml/xq_s_4/osc2005.vsp +++ b/binsrc/tutorial/xml/xq_s_4/osc2005.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/planetrdf.vsp b/binsrc/tutorial/xml/xq_s_4/planetrdf.vsp index c475851c54..bed4392652 100644 --- a/binsrc/tutorial/xml/xq_s_4/planetrdf.vsp +++ b/binsrc/tutorial/xml/xq_s_4/planetrdf.vsp @@ -7,7 +7,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/sem_blogs.vsp b/binsrc/tutorial/xml/xq_s_4/sem_blogs.vsp index c0bcd1ceae..7cc584802f 100644 --- a/binsrc/tutorial/xml/xq_s_4/sem_blogs.vsp +++ b/binsrc/tutorial/xml/xq_s_4/sem_blogs.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/sioc.vsp b/binsrc/tutorial/xml/xq_s_4/sioc.vsp index 7da04a2b4f..9af2371c05 100644 --- a/binsrc/tutorial/xml/xq_s_4/sioc.vsp +++ b/binsrc/tutorial/xml/xq_s_4/sioc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/status.vsp b/binsrc/tutorial/xml/xq_s_4/status.vsp index cea9c9c36f..c11a905d08 100644 --- a/binsrc/tutorial/xml/xq_s_4/status.vsp +++ b/binsrc/tutorial/xml/xq_s_4/status.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/techcrunch.vsp b/binsrc/tutorial/xml/xq_s_4/techcrunch.vsp index cc87b1010b..f54f437043 100644 --- a/binsrc/tutorial/xml/xq_s_4/techcrunch.vsp +++ b/binsrc/tutorial/xml/xq_s_4/techcrunch.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/technologyvoices.vsp b/binsrc/tutorial/xml/xq_s_4/technologyvoices.vsp index c0bcd1ceae..7cc584802f 100644 --- a/binsrc/tutorial/xml/xq_s_4/technologyvoices.vsp +++ b/binsrc/tutorial/xml/xq_s_4/technologyvoices.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/technorati_fav.vsp b/binsrc/tutorial/xml/xq_s_4/technorati_fav.vsp index c0bcd1ceae..7cc584802f 100644 --- a/binsrc/tutorial/xml/xq_s_4/technorati_fav.vsp +++ b/binsrc/tutorial/xml/xq_s_4/technorati_fav.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/technorati_pop.vsp b/binsrc/tutorial/xml/xq_s_4/technorati_pop.vsp index c0bcd1ceae..7cc584802f 100644 --- a/binsrc/tutorial/xml/xq_s_4/technorati_pop.vsp +++ b/binsrc/tutorial/xml/xq_s_4/technorati_pop.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/vloggercon.vsp b/binsrc/tutorial/xml/xq_s_4/vloggercon.vsp index cc87b1010b..f54f437043 100644 --- a/binsrc/tutorial/xml/xq_s_4/vloggercon.vsp +++ b/binsrc/tutorial/xml/xq_s_4/vloggercon.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/web2005.vsp b/binsrc/tutorial/xml/xq_s_4/web2005.vsp index 7af5bf644b..f869ea40f8 100644 --- a/binsrc/tutorial/xml/xq_s_4/web2005.vsp +++ b/binsrc/tutorial/xml/xq_s_4/web2005.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/xq_s_4.xml b/binsrc/tutorial/xml/xq_s_4/xq_s_4.xml index a6883a2663..4ecd8751cd 100644 --- a/binsrc/tutorial/xml/xq_s_4/xq_s_4.xml +++ b/binsrc/tutorial/xml/xq_s_4/xq_s_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/xq_s_4.xsl b/binsrc/tutorial/xml/xq_s_4/xq_s_4.xsl index 54c773474e..c17c6d105b 100644 --- a/binsrc/tutorial/xml/xq_s_4/xq_s_4.xsl +++ b/binsrc/tutorial/xml/xq_s_4/xq_s_4.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xml/xq_s_4/xq_s_4svc.xsl b/binsrc/tutorial/xml/xq_s_4/xq_s_4svc.xsl index b48a9d753c..a37928e8dc 100644 --- a/binsrc/tutorial/xml/xq_s_4/xq_s_4svc.xsl +++ b/binsrc/tutorial/xml/xq_s_4/xq_s_4svc.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlapps/index.xml b/binsrc/tutorial/xmlapps/index.xml index 3a019d0609..4425d1e983 100644 --- a/binsrc/tutorial/xmlapps/index.xml +++ b/binsrc/tutorial/xmlapps/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/demo.css b/binsrc/tutorial/xmlsql/demo.css index 96e5c76b0d..45b267d45a 100644 --- a/binsrc/tutorial/xmlsql/demo.css +++ b/binsrc/tutorial/xmlsql/demo.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/index.xml b/binsrc/tutorial/xmlsql/index.xml index db5e5ae41d..0cf7ca9b54 100644 --- a/binsrc/tutorial/xmlsql/index.xml +++ b/binsrc/tutorial/xmlsql/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_1/Cat_Product.xsd b/binsrc/tutorial/xmlsql/ms_a_1/Cat_Product.xsd index d114e276e8..37e8f2a6ff 100644 --- a/binsrc/tutorial/xmlsql/ms_a_1/Cat_Product.xsd +++ b/binsrc/tutorial/xmlsql/ms_a_1/Cat_Product.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_1/CustOr_constant.xsd b/binsrc/tutorial/xmlsql/ms_a_1/CustOr_constant.xsd index 8563d876a5..ec03ce46e1 100644 --- a/binsrc/tutorial/xmlsql/ms_a_1/CustOr_constant.xsd +++ b/binsrc/tutorial/xmlsql/ms_a_1/CustOr_constant.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_OD.xsd b/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_OD.xsd index c58bd0a439..dfbbd6d4b0 100644 --- a/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_OD.xsd +++ b/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_OD.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_attr.xsd b/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_attr.xsd index 43ee94d56c..842f5b0f74 100644 --- a/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_attr.xsd +++ b/binsrc/tutorial/xmlsql/ms_a_1/Cust_Order_attr.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_1/Customer_Order.xsd b/binsrc/tutorial/xmlsql/ms_a_1/Customer_Order.xsd index dba03ebb38..b853971ffb 100644 --- a/binsrc/tutorial/xmlsql/ms_a_1/Customer_Order.xsd +++ b/binsrc/tutorial/xmlsql/ms_a_1/Customer_Order.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_1/EmpSchema.xsd b/binsrc/tutorial/xmlsql/ms_a_1/EmpSchema.xsd index 9526a65f21..1319b0a502 100644 --- a/binsrc/tutorial/xmlsql/ms_a_1/EmpSchema.xsd +++ b/binsrc/tutorial/xmlsql/ms_a_1/EmpSchema.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.sql b/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.sql index 0d22632356..4565dd8444 100644 --- a/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.sql +++ b/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.xml b/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.xml index c81bd4ab38..0c264da6ee 100644 --- a/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.xml +++ b/binsrc/tutorial/xmlsql/ms_a_1/ms_a_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_1/options.xml b/binsrc/tutorial/xmlsql/ms_a_1/options.xml index 897931a658..b174d1bc47 100644 --- a/binsrc/tutorial/xmlsql/ms_a_1/options.xml +++ b/binsrc/tutorial/xmlsql/ms_a_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2.xml b/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2.xml index 1c9d735b25..cd1f9d8878 100644 --- a/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2.xml +++ b/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_1.vsp b/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_1.vsp index 61814e0bad..5570231772 100644 --- a/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_1.vsp +++ b/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_2.vsp b/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_2.vsp index ff37351435..3c282783ee 100644 --- a/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_2.vsp +++ b/binsrc/tutorial/xmlsql/ms_a_2/ms_a_2_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_2/options.xml b/binsrc/tutorial/xmlsql/ms_a_2/options.xml index a355527802..f86c6f8900 100644 --- a/binsrc/tutorial/xmlsql/ms_a_2/options.xml +++ b/binsrc/tutorial/xmlsql/ms_a_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3.xml b/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3.xml index 653a08fee6..c7b9d6fef3 100644 --- a/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3.xml +++ b/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample.vsp b/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample.vsp index 4d2a300075..9a5b4b4f2a 100644 --- a/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample.vsp +++ b/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample_2.vsp b/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample_2.vsp index 7e76afb9f8..815aab233a 100644 --- a/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample_2.vsp +++ b/binsrc/tutorial/xmlsql/ms_a_3/ms_a_3_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_3/options.xml b/binsrc/tutorial/xmlsql/ms_a_3/options.xml index a355527802..f86c6f8900 100644 --- a/binsrc/tutorial/xmlsql/ms_a_3/options.xml +++ b/binsrc/tutorial/xmlsql/ms_a_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a.xml b/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a.xml index 99560f2fb3..7d963345e9 100644 --- a/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a.xml +++ b/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample.vsp b/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample.vsp index 31817c2bff..2e0b9d5070 100644 --- a/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample.vsp +++ b/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample_2.vsp b/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample_2.vsp index bc00dc9d34..825704c427 100644 --- a/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample_2.vsp +++ b/binsrc/tutorial/xmlsql/ms_a_3a/ms_a_3a_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_3a/options.xml b/binsrc/tutorial/xmlsql/ms_a_3a/options.xml index a355527802..f86c6f8900 100644 --- a/binsrc/tutorial/xmlsql/ms_a_3a/options.xml +++ b/binsrc/tutorial/xmlsql/ms_a_3a/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b.xml b/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b.xml index d54a30cf41..6c07b954ee 100644 --- a/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b.xml +++ b/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample.vsp b/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample.vsp index fdfa5b4877..41573076f0 100644 --- a/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample.vsp +++ b/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample_2.vsp b/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample_2.vsp index c27d95ff43..a2be49f1ac 100644 --- a/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample_2.vsp +++ b/binsrc/tutorial/xmlsql/ms_a_3b/ms_a_3b_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_3b/options.xml b/binsrc/tutorial/xmlsql/ms_a_3b/options.xml index a355527802..f86c6f8900 100644 --- a/binsrc/tutorial/xmlsql/ms_a_3b/options.xml +++ b/binsrc/tutorial/xmlsql/ms_a_3b/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4.xml b/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4.xml index 78a801853b..3b74109fc2 100644 --- a/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4.xml +++ b/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample.vsp b/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample.vsp index 2d99161093..a869a5f535 100644 --- a/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample.vsp +++ b/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample_2.vsp b/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample_2.vsp index f0cd374751..0826e5ec5c 100644 --- a/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample_2.vsp +++ b/binsrc/tutorial/xmlsql/ms_a_4/ms_a_4_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_4/options.xml b/binsrc/tutorial/xmlsql/ms_a_4/options.xml index a355527802..f86c6f8900 100644 --- a/binsrc/tutorial/xmlsql/ms_a_4/options.xml +++ b/binsrc/tutorial/xmlsql/ms_a_4/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5.xml b/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5.xml index f80590d23d..4ae996925b 100644 --- a/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5.xml +++ b/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample.vsp b/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample.vsp index 2d1206f0be..552b683d03 100644 --- a/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample.vsp +++ b/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample_2.vsp b/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample_2.vsp index 45e7785f4c..7013515164 100644 --- a/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample_2.vsp +++ b/binsrc/tutorial/xmlsql/ms_a_5/ms_a_5_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/ms_a_5/options.xml b/binsrc/tutorial/xmlsql/ms_a_5/options.xml index a355527802..f86c6f8900 100644 --- a/binsrc/tutorial/xmlsql/ms_a_5/options.xml +++ b/binsrc/tutorial/xmlsql/ms_a_5/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/sx_output.xsl b/binsrc/tutorial/xmlsql/sx_output.xsl index e99a309b3e..1081ddfe1e 100644 --- a/binsrc/tutorial/xmlsql/sx_output.xsl +++ b/binsrc/tutorial/xmlsql/sx_output.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xp_v_1/options.xml b/binsrc/tutorial/xmlsql/xp_v_1/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xmlsql/xp_v_1/options.xml +++ b/binsrc/tutorial/xmlsql/xp_v_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.sql b/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.sql index eacf00e4a2..b125c5981c 100644 --- a/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.sql +++ b/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.xml b/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.xml index d6eb9ff0fd..43584ece9c 100644 --- a/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.xml +++ b/binsrc/tutorial/xmlsql/xp_v_1/xp_v_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xp_v_2/options.xml b/binsrc/tutorial/xmlsql/xp_v_2/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xmlsql/xp_v_2/options.xml +++ b/binsrc/tutorial/xmlsql/xp_v_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2.xml b/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2.xml index f1862592b0..31d57e0e2b 100644 --- a/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2.xml +++ b/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2_sample.vsp b/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2_sample.vsp index 3a90a255ad..c61ff7356c 100644 --- a/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2_sample.vsp +++ b/binsrc/tutorial/xmlsql/xp_v_2/xp_v_2_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xp_v_3/options.xml b/binsrc/tutorial/xmlsql/xp_v_3/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xmlsql/xp_v_3/options.xml +++ b/binsrc/tutorial/xmlsql/xp_v_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xp_v_3/xp_v_3.xml b/binsrc/tutorial/xmlsql/xp_v_3/xp_v_3.xml index 80f7582f50..a6f91445b8 100644 --- a/binsrc/tutorial/xmlsql/xp_v_3/xp_v_3.xml +++ b/binsrc/tutorial/xmlsql/xp_v_3/xp_v_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_1/options.xml b/binsrc/tutorial/xmlsql/xs_s_1/options.xml index 0b71d3f300..8c6c0e8434 100644 --- a/binsrc/tutorial/xmlsql/xs_s_1/options.xml +++ b/binsrc/tutorial/xmlsql/xs_s_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.sql b/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.sql index b52735dffd..9bd4974503 100644 --- a/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.sql +++ b/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.xml b/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.xml index 0dbed1ab4e..3857eac4e8 100644 --- a/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.xml +++ b/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1_sample_1.vsp index bc359a4064..cf7903d35e 100644 --- a/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1_sample_1.vsp +++ b/binsrc/tutorial/xmlsql/xs_s_1/xs_s_1_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_2/options.xml b/binsrc/tutorial/xmlsql/xs_s_2/options.xml index bd86dfdb91..caba036170 100644 --- a/binsrc/tutorial/xmlsql/xs_s_2/options.xml +++ b/binsrc/tutorial/xmlsql/xs_s_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.sql b/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.sql index 874403fdce..792d9b5bfb 100644 --- a/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.sql +++ b/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.xml b/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.xml index bfa56ef3df..03611e4c75 100644 --- a/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.xml +++ b/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2_sample_1.vsp index 17e0a15a06..50bcf0159f 100644 --- a/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2_sample_1.vsp +++ b/binsrc/tutorial/xmlsql/xs_s_2/xs_s_2_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_3/options.xml b/binsrc/tutorial/xmlsql/xs_s_3/options.xml index fd9d15bbe5..a07e18f3fb 100644 --- a/binsrc/tutorial/xmlsql/xs_s_3/options.xml +++ b/binsrc/tutorial/xmlsql/xs_s_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3.xml b/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3.xml index 269f981650..67c3f99c93 100644 --- a/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3.xml +++ b/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3_sample_1.vsp index 010716ab13..ebd60ffb17 100644 --- a/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3_sample_1.vsp +++ b/binsrc/tutorial/xmlsql/xs_s_3/xs_s_3_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_4/options.xml b/binsrc/tutorial/xmlsql/xs_s_4/options.xml index fd9d15bbe5..a07e18f3fb 100644 --- a/binsrc/tutorial/xmlsql/xs_s_4/options.xml +++ b/binsrc/tutorial/xmlsql/xs_s_4/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4.xml b/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4.xml index 49fd5fcfbf..73adaccc38 100644 --- a/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4.xml +++ b/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4_sample_1.vsp index ea390c75c0..060a746e27 100644 --- a/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4_sample_1.vsp +++ b/binsrc/tutorial/xmlsql/xs_s_4/xs_s_4_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.sql b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.sql index 648c661c04..05488c5856 100644 --- a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.sql +++ b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xml b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xml index ccf0a91621..7d1fa5d7ab 100644 --- a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xml +++ b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xsl b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xsl index b78cad1d83..4a7a3950e0 100644 --- a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xsl +++ b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5_show.vsp b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5_show.vsp index 445db67295..26f91e9831 100644 --- a/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5_show.vsp +++ b/binsrc/tutorial/xmlsql/xs_s_5/xs_s_5_show.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_6/options.xml b/binsrc/tutorial/xmlsql/xs_s_6/options.xml index fd9d15bbe5..a07e18f3fb 100644 --- a/binsrc/tutorial/xmlsql/xs_s_6/options.xml +++ b/binsrc/tutorial/xmlsql/xs_s_6/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6.xml b/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6.xml index 648796fb84..e10495646e 100644 --- a/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6.xml +++ b/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6_sample_1.vsp index 506240cda6..c405253b43 100644 --- a/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6_sample_1.vsp +++ b/binsrc/tutorial/xmlsql/xs_s_6/xs_s_6_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.html b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.html index 7ec7ecac95..63fc099c9f 100644 --- a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.html +++ b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xml b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xml index 019a1add1b..81c2aae0dc 100644 --- a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xml +++ b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xsl b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xsl index f72445e808..478e4d762e 100644 --- a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xsl +++ b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7_sample_1.vsp index 7ff360ee6b..8d4cb63ade 100644 --- a/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7_sample_1.vsp +++ b/binsrc/tutorial/xmlsql/xs_s_7/xs_s_7_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_8/options.xml b/binsrc/tutorial/xmlsql/xs_s_8/options.xml index fd9d15bbe5..a07e18f3fb 100644 --- a/binsrc/tutorial/xmlsql/xs_s_8/options.xml +++ b/binsrc/tutorial/xmlsql/xs_s_8/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.sql b/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.sql index 91773beaf6..13ee75fa24 100644 --- a/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.sql +++ b/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.xml b/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.xml index 164c139ac3..d823e53343 100644 --- a/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.xml +++ b/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8_sample.vsp b/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8_sample.vsp index 163942c399..dda6428b90 100644 --- a/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8_sample.vsp +++ b/binsrc/tutorial/xmlsql/xs_s_8/xs_s_8_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_9/options.xml b/binsrc/tutorial/xmlsql/xs_s_9/options.xml index fd9d15bbe5..a07e18f3fb 100644 --- a/binsrc/tutorial/xmlsql/xs_s_9/options.xml +++ b/binsrc/tutorial/xmlsql/xs_s_9/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9.xml b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9.xml index ab00e9820d..a107dd6368 100644 --- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9.xml +++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.sql b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.sql index 6eca985b7b..65ab9c9419 100644 --- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.sql +++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.vsp b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.vsp index 9312be6ce4..ed95347d81 100644 --- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.vsp +++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.sql b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.sql index eda38d0291..d68f61d5a0 100644 --- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.sql +++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.vsp b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.vsp index 55ff99572c..9ec56be15e 100644 --- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.vsp +++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_3.vsp b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_3.vsp index 87fc5f1a1b..0d6620d33d 100644 --- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_3.vsp +++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_4.sql b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_4.sql index b517a0631b..aaa7f9e5b6 100644 --- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_4.sql +++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_4.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_5.sql b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_5.sql index f6f45b776c..a215f219f9 100644 --- a/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_5.sql +++ b/binsrc/tutorial/xmlsql/xs_s_9/xs_s_9_sample_5.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_1/options.xml b/binsrc/tutorial/xmlsql/xs_u_1/options.xml index c6ea4cbc9d..2b591547cc 100644 --- a/binsrc/tutorial/xmlsql/xs_u_1/options.xml +++ b/binsrc/tutorial/xmlsql/xs_u_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xml b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xml index c99277c4de..47d142c8a9 100644 --- a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xml +++ b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xsl b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xsl index 168e388315..4ec11a89d6 100644 --- a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xsl +++ b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_sample_1.sql b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_sample_1.sql index f48bc35021..f10f72c949 100644 --- a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_sample_1.sql +++ b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_sample_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_view_src.vsp b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_view_src.vsp index 0cae00e8c6..b52c63d17f 100644 --- a/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_view_src.vsp +++ b/binsrc/tutorial/xmlsql/xs_u_1/xs_u_1_view_src.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_2/options.xml b/binsrc/tutorial/xmlsql/xs_u_2/options.xml index 9683cd3627..f3e9970a9d 100644 --- a/binsrc/tutorial/xmlsql/xs_u_2/options.xml +++ b/binsrc/tutorial/xmlsql/xs_u_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.sql b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.sql index 2084eab718..8f03c65a57 100644 --- a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.sql +++ b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.xml b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.xml index d09669171a..6fe418274f 100644 --- a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.xml +++ b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_photo.vsp b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_photo.vsp index 45a3d46c56..4e8dcbd723 100644 --- a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_photo.vsp +++ b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_photo.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_sample.vsp b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_sample.vsp index 0c3b70bf76..01ea16a801 100644 --- a/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_sample.vsp +++ b/binsrc/tutorial/xmlsql/xs_u_2/xs_u_2_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_3/options.xml b/binsrc/tutorial/xmlsql/xs_u_3/options.xml index 9fca19263c..b3e5a385b9 100644 --- a/binsrc/tutorial/xmlsql/xs_u_3/options.xml +++ b/binsrc/tutorial/xmlsql/xs_u_3/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_3/shippers.html b/binsrc/tutorial/xmlsql/xs_u_3/shippers.html index d18f46d35c..ae549a9068 100644 --- a/binsrc/tutorial/xmlsql/xs_u_3/shippers.html +++ b/binsrc/tutorial/xmlsql/xs_u_3/shippers.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_3/shippers.xml b/binsrc/tutorial/xmlsql/xs_u_3/shippers.xml index b5ba201f47..c701f1712b 100644 --- a/binsrc/tutorial/xmlsql/xs_u_3/shippers.xml +++ b/binsrc/tutorial/xmlsql/xs_u_3/shippers.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_3/shippers.xsl b/binsrc/tutorial/xmlsql/xs_u_3/shippers.xsl index f12ffa5bcb..8cca2ddb83 100644 --- a/binsrc/tutorial/xmlsql/xs_u_3/shippers.xsl +++ b/binsrc/tutorial/xmlsql/xs_u_3/shippers.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.sql b/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.sql index 45c5755c0b..d4be7c87cf 100644 --- a/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.sql +++ b/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.xml b/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.xml index fb1dc5cd2c..08e0e3ca02 100644 --- a/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.xml +++ b/binsrc/tutorial/xmlsql/xs_u_3/xs_u_3.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/index.xml b/binsrc/tutorial/xmlxslt/index.xml index 031bba79dd..0ff2a4bdd1 100644 --- a/binsrc/tutorial/xmlxslt/index.xml +++ b/binsrc/tutorial/xmlxslt/index.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_d_1/options.xml b/binsrc/tutorial/xmlxslt/xs_d_1/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xmlxslt/xs_d_1/options.xml +++ b/binsrc/tutorial/xmlxslt/xs_d_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1.xml b/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1.xml index 5aea52937b..8aa5161d63 100644 --- a/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1.xml +++ b/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1_sample_1.vsp b/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1_sample_1.vsp index b2f71dce7a..bceb0afb5e 100644 --- a/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1_sample_1.vsp +++ b/binsrc/tutorial/xmlxslt/xs_d_1/xs_d_1_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/options.xml b/binsrc/tutorial/xmlxslt/xs_e_1/options.xml index e93a324d92..7a28b7ee0e 100644 --- a/binsrc/tutorial/xmlxslt/xs_e_1/options.xml +++ b/binsrc/tutorial/xmlxslt/xs_e_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.sql b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.sql index 14767ac74c..92a9ade36a 100644 --- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.sql +++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xml b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xml index 101548d358..53da95876d 100644 --- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xml +++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xsl b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xsl index f8fdfb3457..05eff3b86f 100644 --- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xsl +++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_ft_intl.sql b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_ft_intl.sql index 34fc9ae173..189ad1b42a 100644 --- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_ft_intl.sql +++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_ft_intl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_1.vsp b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_1.vsp index c29be47173..a9e459e353 100644 --- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_1.vsp +++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_2.vsp b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_2.vsp index 08d29a9dce..4fcad2c58c 100644 --- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_2.vsp +++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_3.vsp b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_3.vsp index 3fc6a0c03b..472254e305 100644 --- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_3.vsp +++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_1_sample_3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_2.xsl b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_2.xsl index 9a64fde3da..beeb2695d2 100644 --- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_2.xsl +++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_2.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_3.xsl b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_3.xsl index 8b6009e336..4957756d75 100644 --- a/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_3.xsl +++ b/binsrc/tutorial/xmlxslt/xs_e_1/xs_e_3.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_f_1/options.xml b/binsrc/tutorial/xmlxslt/xs_f_1/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xmlxslt/xs_f_1/options.xml +++ b/binsrc/tutorial/xmlxslt/xs_f_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xml b/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xml index d32216a867..bd7eec3245 100644 --- a/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xml +++ b/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xsl b/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xsl index 1076a1518a..df0f84670d 100644 --- a/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xsl +++ b/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1_sample.vsp b/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1_sample.vsp index 57ff705ee7..f1ca30a601 100644 --- a/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1_sample.vsp +++ b/binsrc/tutorial/xmlxslt/xs_f_1/xs_f_1_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_f_2/options.xml b/binsrc/tutorial/xmlxslt/xs_f_2/options.xml index e2a1832c2b..94e3d2bd60 100644 --- a/binsrc/tutorial/xmlxslt/xs_f_2/options.xml +++ b/binsrc/tutorial/xmlxslt/xs_f_2/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2.xml b/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2.xml index 44eef0760f..b8878963e5 100644 --- a/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2.xml +++ b/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2_sample.vsp b/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2_sample.vsp index 8e29817aa8..04e6e077b1 100644 --- a/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2_sample.vsp +++ b/binsrc/tutorial/xmlxslt/xs_f_2/xs_f_2_sample.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1.xml b/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1.xml index bb361bd0c0..9a6212e1db 100644 --- a/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1.xml +++ b/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1_sample_1.vsp b/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1_sample_1.vsp index 35f479398d..0b7d40b9db 100644 --- a/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1_sample_1.vsp +++ b/binsrc/tutorial/xmlxslt/xs_l_1/xs_l_1_sample_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/options.xml b/binsrc/tutorial/xmlxslt/xs_t_1/options.xml index a03282f79c..24ea98b70e 100644 --- a/binsrc/tutorial/xmlxslt/xs_t_1/options.xml +++ b/binsrc/tutorial/xmlxslt/xs_t_1/options.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.sql b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.sql index c61ec418e7..3e4cbab188 100644 --- a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.sql +++ b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.xml b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.xml index af6e832f2a..c46d5d3e06 100644 --- a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.xml +++ b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits.vsp b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits.vsp index 112afaf5c4..8db6762f91 100644 --- a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits.vsp +++ b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits1.vsp b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits1.vsp index 13dfc79676..55483b73f6 100644 --- a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits1.vsp +++ b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_hits1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_list.vsp b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_list.vsp index 4b03b18f06..12c4110035 100644 --- a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_list.vsp +++ b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_trig.vsp b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_trig.vsp index 04803aad69..13df8b1b06 100644 --- a/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_trig.vsp +++ b/binsrc/tutorial/xmlxslt/xs_t_1/xs_t_1_trig.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/Makefile.am b/binsrc/vad/Makefile.am index 123dd367ca..48e20c8dc5 100644 --- a/binsrc/vad/Makefile.am +++ b/binsrc/vad/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/http/regedit.vsp b/binsrc/vad/http/regedit.vsp index db2d13257f..2a227a4069 100644 --- a/binsrc/vad/http/regedit.vsp +++ b/binsrc/vad/http/regedit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/http/regedit_data.vsp b/binsrc/vad/http/regedit_data.vsp index b1b7abf0e1..79ccdcda62 100644 --- a/binsrc/vad/http/regedit_data.vsp +++ b/binsrc/vad/http/regedit_data.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/http/regedit_e1.vsp b/binsrc/vad/http/regedit_e1.vsp index 9e7433e0cd..91fb9cca29 100644 --- a/binsrc/vad/http/regedit_e1.vsp +++ b/binsrc/vad/http/regedit_e1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/http/regedit_sql.vsp b/binsrc/vad/http/regedit_sql.vsp index 6e88ff1fe3..017d6d0ba8 100644 --- a/binsrc/vad/http/regedit_sql.vsp +++ b/binsrc/vad/http/regedit_sql.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/http/regedit_sticker.vsp b/binsrc/vad/http/regedit_sticker.vsp index fa12f494c3..7b9416c9dd 100644 --- a/binsrc/vad/http/regedit_sticker.vsp +++ b/binsrc/vad/http/regedit_sticker.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/http/regedit_tree.vsp b/binsrc/vad/http/regedit_tree.vsp index 027ecc8aad..690ecb302e 100644 --- a/binsrc/vad/http/regedit_tree.vsp +++ b/binsrc/vad/http/regedit_tree.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/oper_pars.sql b/binsrc/vad/oper_pars.sql index ad0bb959e9..06f8c72a10 100644 --- a/binsrc/vad/oper_pars.sql +++ b/binsrc/vad/oper_pars.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/operpars.awk b/binsrc/vad/operpars.awk index 43c5679132..885bc3da21 100644 --- a/binsrc/vad/operpars.awk +++ b/binsrc/vad/operpars.awk @@ -3,7 +3,7 @@ BEGIN { # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/pars_init.sql b/binsrc/vad/pars_init.sql index 5e86c30012..56d4f73582 100644 --- a/binsrc/vad/pars_init.sql +++ b/binsrc/vad/pars_init.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/parse_oper_pars.sh b/binsrc/vad/parse_oper_pars.sh index b44f4d311e..259ee9dafb 100755 --- a/binsrc/vad/parse_oper_pars.sh +++ b/binsrc/vad/parse_oper_pars.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/regedit.sql b/binsrc/vad/regedit.sql index c35fcde089..ba6c47589a 100644 --- a/binsrc/vad/regedit.sql +++ b/binsrc/vad/regedit.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/specs/sticker_rdf_lib.xml b/binsrc/vad/specs/sticker_rdf_lib.xml index 8f2a35e8b1..e83fe74682 100644 --- a/binsrc/vad/specs/sticker_rdf_lib.xml +++ b/binsrc/vad/specs/sticker_rdf_lib.xml @@ -6,7 +6,7 @@ - + diff --git a/binsrc/vad/vad.isql b/binsrc/vad/vad.isql index f1b4b9e4a2..dfc71a68f3 100644 --- a/binsrc/vad/vad.isql +++ b/binsrc/vad/vad.isql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/vad_boot.sql b/binsrc/vad/vad_boot.sql index dc98b5dff2..956ea9311d 100644 --- a/binsrc/vad/vad_boot.sql +++ b/binsrc/vad/vad_boot.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/vad_make.sql b/binsrc/vad/vad_make.sql index 22715465be..47560db61c 100644 --- a/binsrc/vad/vad_make.sql +++ b/binsrc/vad/vad_make.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vad/vad_misc.sql b/binsrc/vad/vad_misc.sql index 05bbee98e6..68df185028 100644 --- a/binsrc/vad/vad_misc.sql +++ b/binsrc/vad/vad_misc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -86,7 +86,7 @@ create procedure "VAD"."DBA"."HTML_FOOTER_OUT" ( in arr any ) http (''); http ('

    Virtuoso Server '); http (sys_stat('st_dbms_ver')); - http (sprintf (' VAD Interface (%s) - Copyright© 1998-2018 OpenLink Software.

    ',"VAD"."DBA"."VAD_VERSION" ())); + http (sprintf (' VAD Interface (%s) - Copyright© 1998-2019 OpenLink Software.

    ',"VAD"."DBA"."VAD_VERSION" ())); http ('\n'); } ; diff --git a/binsrc/vad/vad_root.sql b/binsrc/vad/vad_root.sql index c8c7c1feed..3eff4335a1 100644 --- a/binsrc/vad/vad_root.sql +++ b/binsrc/vad/vad_root.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/CLIsql3_w32.cpp b/binsrc/virtodbc/CLIsql3_w32.cpp index 141169502e..939b71d5c2 100644 --- a/binsrc/virtodbc/CLIsql3_w32.cpp +++ b/binsrc/virtodbc/CLIsql3_w32.cpp @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -48,6 +48,7 @@ extern BOOL virtodbc_LoginDlg (TKVList &props, HWND hWnd); extern TZCBrowser _zcbrowser; extern "C" int isdts_mode; +extern "C" int virt_wide_as_utf16 = 0; static LPWSTR StrCopyInW (SQLCHAR *inStr, int size) @@ -322,6 +323,17 @@ virtodbc_connect ( } #endif + if ((szStr = props.Value (_T("Charset"))) != NULL) + { + char *cs = virt_wide_to_ansi (szStr); + if (!strcmp (cs, "UTF-8")) + { + props.Undefine(_T("Charset")); + con->con_string_is_utf8 = 1; + } + dk_free_box (cs); + } + mutex_enter (con->con_environment->env_mtx); /* Daylight */ diff --git a/binsrc/virtodbc/Makefile.am b/binsrc/virtodbc/Makefile.am index ccddb9ba0b..c47e8e6d62 100644 --- a/binsrc/virtodbc/Makefile.am +++ b/binsrc/virtodbc/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/dialog.cpp b/binsrc/virtodbc/dialog.cpp index ff05c952cf..bc4303cbc1 100644 --- a/binsrc/virtodbc/dialog.cpp +++ b/binsrc/virtodbc/dialog.cpp @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/dialog.h b/binsrc/virtodbc/dialog.h index 3c7d4813e8..e31d61765c 100644 --- a/binsrc/virtodbc/dialog.h +++ b/binsrc/virtodbc/dialog.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/kvlist.cpp b/binsrc/virtodbc/kvlist.cpp index a48fa96d64..9767f184fe 100644 --- a/binsrc/virtodbc/kvlist.cpp +++ b/binsrc/virtodbc/kvlist.cpp @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/kvlist.h b/binsrc/virtodbc/kvlist.h index 62e2ee88c0..bcbc12fad0 100644 --- a/binsrc/virtodbc/kvlist.h +++ b/binsrc/virtodbc/kvlist.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/resource.h b/binsrc/virtodbc/resource.h index c6ac5d22d8..8b64095bec 100644 --- a/binsrc/virtodbc/resource.h +++ b/binsrc/virtodbc/resource.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/virtodbc.cpp b/binsrc/virtodbc/virtodbc.cpp index 9ab0f05e2b..4cbe1c04d9 100644 --- a/binsrc/virtodbc/virtodbc.cpp +++ b/binsrc/virtodbc/virtodbc.cpp @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/virtodbc.def b/binsrc/virtodbc/virtodbc.def index 3313bf305e..c7bdeb58f1 100644 --- a/binsrc/virtodbc/virtodbc.def +++ b/binsrc/virtodbc/virtodbc.def @@ -8,7 +8,7 @@ ; This file is part of the OpenLink Software Virtuoso Open-Source (VOS) ; project. ; -; Copyright (C) 1998-2018 OpenLink Software +; Copyright (C) 1998-2019 OpenLink Software ; ; This project is free software; you can redistribute it and/or modify it ; under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/virtodbc.rc b/binsrc/virtodbc/virtodbc.rc index 8479a7f6c1..44e695194e 100644 --- a/binsrc/virtodbc/virtodbc.rc +++ b/binsrc/virtodbc/virtodbc.rc @@ -251,8 +251,8 @@ IDB_BITMAPVIRT BITMAP "virtodbc.bmp" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 7,2,5,3229 - PRODUCTVERSION 7,2,5,3229 + FILEVERSION 7,2,6,3230 + PRODUCTVERSION 7,2,6,3230 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -269,11 +269,11 @@ BEGIN BEGIN VALUE "CompanyName", "OpenLink Software" VALUE "FileDescription", "Virtuoso OpenSource" - VALUE "FileVersion", "7, 2, 5, 3229" + VALUE "FileVersion", "7, 2, 6, 3230" VALUE "InternalName", "Virtuoso" - VALUE "LegalCopyright", "Copyright (C) 1998-2018 OpenLink Software" + VALUE "LegalCopyright", "Copyright (C) 1998-2019 OpenLink Software" VALUE "ProductName", "Virtuoso OpenSource" - VALUE "ProductVersion", "7, 2, 5, 3229" + VALUE "ProductVersion", "7, 2, 6, 3230" END END BLOCK "VarFileInfo" diff --git a/binsrc/virtodbc/w32util.h b/binsrc/virtodbc/w32util.h index 96e1859998..5817009e8f 100644 --- a/binsrc/virtodbc/w32util.h +++ b/binsrc/virtodbc/w32util.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/waitcursor.h b/binsrc/virtodbc/waitcursor.h index 153075d81a..56fa2445a0 100644 --- a/binsrc/virtodbc/waitcursor.h +++ b/binsrc/virtodbc/waitcursor.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/winctl.cpp b/binsrc/virtodbc/winctl.cpp index 1a548264b3..affce5fc69 100644 --- a/binsrc/virtodbc/winctl.cpp +++ b/binsrc/virtodbc/winctl.cpp @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/winctl.h b/binsrc/virtodbc/winctl.h index 6c977aa4c1..e295f84661 100644 --- a/binsrc/virtodbc/winctl.h +++ b/binsrc/virtodbc/winctl.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/wizard.cpp b/binsrc/virtodbc/wizard.cpp index 2e9a939da5..3eb94e3c22 100644 --- a/binsrc/virtodbc/wizard.cpp +++ b/binsrc/virtodbc/wizard.cpp @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/wizard.h b/binsrc/virtodbc/wizard.h index 54282ce428..b240743326 100644 --- a/binsrc/virtodbc/wizard.h +++ b/binsrc/virtodbc/wizard.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/zcbrowser.cpp b/binsrc/virtodbc/zcbrowser.cpp index 7066fec3bd..210f268ae2 100644 --- a/binsrc/virtodbc/zcbrowser.cpp +++ b/binsrc/virtodbc/zcbrowser.cpp @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/zcbrowser.h b/binsrc/virtodbc/zcbrowser.h index d9777e41e4..c6b9d9b3aa 100644 --- a/binsrc/virtodbc/zcbrowser.h +++ b/binsrc/virtodbc/zcbrowser.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/zcbrowsercombo.cpp b/binsrc/virtodbc/zcbrowsercombo.cpp index 39259ae471..0c98ffaefc 100644 --- a/binsrc/virtodbc/zcbrowsercombo.cpp +++ b/binsrc/virtodbc/zcbrowsercombo.cpp @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtodbc/zcbrowsercombo.h b/binsrc/virtodbc/zcbrowsercombo.h index 10dcabc4ce..0f740d4b02 100644 --- a/binsrc/virtodbc/zcbrowsercombo.h +++ b/binsrc/virtodbc/zcbrowsercombo.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/Makefile.am b/binsrc/virtoledb/Makefile.am index 8c5d94621a..9e34258358 100644 --- a/binsrc/virtoledb/Makefile.am +++ b/binsrc/virtoledb/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/asserts.cpp b/binsrc/virtoledb/asserts.cpp index 4ceb5ad14d..6be6af2fce 100644 --- a/binsrc/virtoledb/asserts.cpp +++ b/binsrc/virtoledb/asserts.cpp @@ -10,7 +10,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/asserts.h b/binsrc/virtoledb/asserts.h index dbcba5d84b..04f793ff4a 100644 --- a/binsrc/virtoledb/asserts.h +++ b/binsrc/virtoledb/asserts.h @@ -10,7 +10,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/baseobj.cpp b/binsrc/virtoledb/baseobj.cpp index d470b4da2e..bb3ec1dc50 100644 --- a/binsrc/virtoledb/baseobj.cpp +++ b/binsrc/virtoledb/baseobj.cpp @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/baseobj.h b/binsrc/virtoledb/baseobj.h index 26ac35dc2a..c1a3f53952 100644 --- a/binsrc/virtoledb/baseobj.h +++ b/binsrc/virtoledb/baseobj.h @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/command.cpp b/binsrc/virtoledb/command.cpp index 6667c1fa3c..7596d2322e 100644 --- a/binsrc/virtoledb/command.cpp +++ b/binsrc/virtoledb/command.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/command.h b/binsrc/virtoledb/command.h index 66f8adca40..8733d3b0df 100644 --- a/binsrc/virtoledb/command.h +++ b/binsrc/virtoledb/command.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/connobj.cpp b/binsrc/virtoledb/connobj.cpp index 0e08dd4da9..f49e7c2f7b 100644 --- a/binsrc/virtoledb/connobj.cpp +++ b/binsrc/virtoledb/connobj.cpp @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/connobj.h b/binsrc/virtoledb/connobj.h index ecc80c88ec..918bc43a39 100644 --- a/binsrc/virtoledb/connobj.h +++ b/binsrc/virtoledb/connobj.h @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/data.cpp b/binsrc/virtoledb/data.cpp index d35aa130ea..5427f4a6f1 100644 --- a/binsrc/virtoledb/data.cpp +++ b/binsrc/virtoledb/data.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/data.h b/binsrc/virtoledb/data.h index 649dc6d41b..aca480437b 100644 --- a/binsrc/virtoledb/data.h +++ b/binsrc/virtoledb/data.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/datalink.cpp b/binsrc/virtoledb/datalink.cpp index 66ebeb4012..2ede2abfe5 100644 --- a/binsrc/virtoledb/datalink.cpp +++ b/binsrc/virtoledb/datalink.cpp @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/datalink.h b/binsrc/virtoledb/datalink.h index 0ed954f3f1..e37130952b 100644 --- a/binsrc/virtoledb/datalink.h +++ b/binsrc/virtoledb/datalink.h @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/dataobj.cpp b/binsrc/virtoledb/dataobj.cpp index d2fbb15aaa..20d05125bf 100644 --- a/binsrc/virtoledb/dataobj.cpp +++ b/binsrc/virtoledb/dataobj.cpp @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/dataobj.h b/binsrc/virtoledb/dataobj.h index 6d416f991d..0fbbc8e26a 100644 --- a/binsrc/virtoledb/dataobj.h +++ b/binsrc/virtoledb/dataobj.h @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/datasource.cpp b/binsrc/virtoledb/datasource.cpp index fb23c4c78f..eb03130263 100644 --- a/binsrc/virtoledb/datasource.cpp +++ b/binsrc/virtoledb/datasource.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/datasource.h b/binsrc/virtoledb/datasource.h index 28f9f2f09d..6e6b884f77 100644 --- a/binsrc/virtoledb/datasource.h +++ b/binsrc/virtoledb/datasource.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/db.cpp b/binsrc/virtoledb/db.cpp index 4b099c4503..784ec9a08b 100644 --- a/binsrc/virtoledb/db.cpp +++ b/binsrc/virtoledb/db.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/db.h b/binsrc/virtoledb/db.h index d8f43b1c95..e8ae443552 100644 --- a/binsrc/virtoledb/db.h +++ b/binsrc/virtoledb/db.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/dllmodule.cpp b/binsrc/virtoledb/dllmodule.cpp index 68ebc6df97..d3f28a36d8 100644 --- a/binsrc/virtoledb/dllmodule.cpp +++ b/binsrc/virtoledb/dllmodule.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/dllmodule.h b/binsrc/virtoledb/dllmodule.h index f927343943..b971a4283d 100644 --- a/binsrc/virtoledb/dllmodule.h +++ b/binsrc/virtoledb/dllmodule.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/error.cpp b/binsrc/virtoledb/error.cpp index 0dfe8d0930..8bc27c6d28 100644 --- a/binsrc/virtoledb/error.cpp +++ b/binsrc/virtoledb/error.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/error.h b/binsrc/virtoledb/error.h index b7ce72c8d9..357504f0d0 100644 --- a/binsrc/virtoledb/error.h +++ b/binsrc/virtoledb/error.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/filedsn.cpp b/binsrc/virtoledb/filedsn.cpp index 31346df88d..15ace311dc 100644 --- a/binsrc/virtoledb/filedsn.cpp +++ b/binsrc/virtoledb/filedsn.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/filedsn.h b/binsrc/virtoledb/filedsn.h index cf99ac9fa5..65e7f4d068 100644 --- a/binsrc/virtoledb/filedsn.h +++ b/binsrc/virtoledb/filedsn.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/globals.cpp b/binsrc/virtoledb/globals.cpp index 3318fb7c8b..793d75e349 100644 --- a/binsrc/virtoledb/globals.cpp +++ b/binsrc/virtoledb/globals.cpp @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/headers.cpp b/binsrc/virtoledb/headers.cpp index d1ecf00a22..de84c77c80 100644 --- a/binsrc/virtoledb/headers.cpp +++ b/binsrc/virtoledb/headers.cpp @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/headers.h b/binsrc/virtoledb/headers.h index c00c3fe2ee..fb156f677c 100644 --- a/binsrc/virtoledb/headers.h +++ b/binsrc/virtoledb/headers.h @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/lobdata.cpp b/binsrc/virtoledb/lobdata.cpp index cf2e004cf4..9965a6e8af 100644 --- a/binsrc/virtoledb/lobdata.cpp +++ b/binsrc/virtoledb/lobdata.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/lobdata.h b/binsrc/virtoledb/lobdata.h index f16f509b1b..0df20d6ded 100644 --- a/binsrc/virtoledb/lobdata.h +++ b/binsrc/virtoledb/lobdata.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/mresults.cpp b/binsrc/virtoledb/mresults.cpp index 728920b3f2..a73df75da3 100644 --- a/binsrc/virtoledb/mresults.cpp +++ b/binsrc/virtoledb/mresults.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/mresults.h b/binsrc/virtoledb/mresults.h index 772295c284..534cd454ea 100644 --- a/binsrc/virtoledb/mresults.h +++ b/binsrc/virtoledb/mresults.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/os.h b/binsrc/virtoledb/os.h index 0afc083b73..30440099ec 100644 --- a/binsrc/virtoledb/os.h +++ b/binsrc/virtoledb/os.h @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/paramdata.cpp b/binsrc/virtoledb/paramdata.cpp index d631397d43..7d3bd37216 100644 --- a/binsrc/virtoledb/paramdata.cpp +++ b/binsrc/virtoledb/paramdata.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/paramdata.h b/binsrc/virtoledb/paramdata.h index c30d041c45..f197d13011 100644 --- a/binsrc/virtoledb/paramdata.h +++ b/binsrc/virtoledb/paramdata.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/properties.cpp b/binsrc/virtoledb/properties.cpp index fdd27709ed..2e032a4fca 100644 --- a/binsrc/virtoledb/properties.cpp +++ b/binsrc/virtoledb/properties.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/properties.h b/binsrc/virtoledb/properties.h index 7e837303e6..d6522eb067 100644 --- a/binsrc/virtoledb/properties.h +++ b/binsrc/virtoledb/properties.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/refcounted.cpp b/binsrc/virtoledb/refcounted.cpp index e89695de23..4796388073 100644 --- a/binsrc/virtoledb/refcounted.cpp +++ b/binsrc/virtoledb/refcounted.cpp @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/refcounted.h b/binsrc/virtoledb/refcounted.h index 5b59969966..56ded43f91 100644 --- a/binsrc/virtoledb/refcounted.h +++ b/binsrc/virtoledb/refcounted.h @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/resource.h b/binsrc/virtoledb/resource.h index 323bce6c87..aac6052117 100644 --- a/binsrc/virtoledb/resource.h +++ b/binsrc/virtoledb/resource.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/rowset.cpp b/binsrc/virtoledb/rowset.cpp index c7e5e66b2a..6b9cbeb5cf 100644 --- a/binsrc/virtoledb/rowset.cpp +++ b/binsrc/virtoledb/rowset.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/rowset.h b/binsrc/virtoledb/rowset.h index 3f8ad956aa..c8cecbcda5 100644 --- a/binsrc/virtoledb/rowset.h +++ b/binsrc/virtoledb/rowset.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/rowsetdata.cpp b/binsrc/virtoledb/rowsetdata.cpp index 64089c91c8..f79067bed4 100644 --- a/binsrc/virtoledb/rowsetdata.cpp +++ b/binsrc/virtoledb/rowsetdata.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/rowsetdata.h b/binsrc/virtoledb/rowsetdata.h index 04ca552b7a..ec3668f2fb 100644 --- a/binsrc/virtoledb/rowsetdata.h +++ b/binsrc/virtoledb/rowsetdata.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/rowsetprops.cpp b/binsrc/virtoledb/rowsetprops.cpp index e11afa36fa..dfc1e6b2f4 100644 --- a/binsrc/virtoledb/rowsetprops.cpp +++ b/binsrc/virtoledb/rowsetprops.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/rowsetprops.h b/binsrc/virtoledb/rowsetprops.h index 44452333dd..fd4777017e 100644 --- a/binsrc/virtoledb/rowsetprops.h +++ b/binsrc/virtoledb/rowsetprops.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/session.cpp b/binsrc/virtoledb/session.cpp index 61d14d6e2d..9569985841 100644 --- a/binsrc/virtoledb/session.cpp +++ b/binsrc/virtoledb/session.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/session.h b/binsrc/virtoledb/session.h index 6da5352602..3dcb03b9f7 100644 --- a/binsrc/virtoledb/session.h +++ b/binsrc/virtoledb/session.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/syncobj.cpp b/binsrc/virtoledb/syncobj.cpp index b037db7824..cf280e5883 100644 --- a/binsrc/virtoledb/syncobj.cpp +++ b/binsrc/virtoledb/syncobj.cpp @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/syncobj.h b/binsrc/virtoledb/syncobj.h index 9d7e9f23a5..66d6ac8ff3 100644 --- a/binsrc/virtoledb/syncobj.h +++ b/binsrc/virtoledb/syncobj.h @@ -7,7 +7,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/util.cpp b/binsrc/virtoledb/util.cpp index 16b7b2c5de..e5db27a5b4 100644 --- a/binsrc/virtoledb/util.cpp +++ b/binsrc/virtoledb/util.cpp @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/util.h b/binsrc/virtoledb/util.h index 0e1b39a81d..b769a96e29 100644 --- a/binsrc/virtoledb/util.h +++ b/binsrc/virtoledb/util.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtoledb/virtoledb.h b/binsrc/virtoledb/virtoledb.h index 6eb70c169d..982efcdc49 100644 --- a/binsrc/virtoledb/virtoledb.h +++ b/binsrc/virtoledb/virtoledb.h @@ -5,7 +5,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso/Makefile.am b/binsrc/virtuoso/Makefile.am index a9e66e296e..e5b9c5440b 100644 --- a/binsrc/virtuoso/Makefile.am +++ b/binsrc/virtuoso/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso/libviwin32.def b/binsrc/virtuoso/libviwin32.def index ec16e6487a..12c957edbf 100644 --- a/binsrc/virtuoso/libviwin32.def +++ b/binsrc/virtuoso/libviwin32.def @@ -8,7 +8,7 @@ ; This file is part of the OpenLink Software Virtuoso Open-Source (VOS) ; project. ; -; Copyright (C) 1998-2018 OpenLink Software +; Copyright (C) 1998-2019 OpenLink Software ; ; This project is free software; you can redistribute it and/or modify it ; under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso/viconfig.c b/binsrc/virtuoso/viconfig.c index f9cf465d64..2a3332bbf4 100644 --- a/binsrc/virtuoso/viconfig.c +++ b/binsrc/virtuoso/viconfig.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -120,6 +120,9 @@ extern char *https_port; extern char *https_cert; extern char *https_key; extern char *https_extra; +extern char *https_dhparam; +extern char *https_ecdh_curve; +extern int32 https_hsts_max_age; extern int32 https_client_verify; extern int32 https_client_verify_depth; extern char * https_client_verify_file; @@ -136,6 +139,8 @@ extern int32 ssl_server_verify_depth; extern char *ssl_server_verify_file; extern char *ssl_server_cipher_list; extern char *ssl_server_protocols; +extern char *ssl_server_dhparam; +extern char *ssl_server_ecdh_curve; #endif extern int spotlight_integration; #ifdef BIF_XML @@ -194,7 +199,7 @@ extern int c_compress_mode; char * http_log_file_check (struct tm *now); /* http log name checking */ -int32 c_txn_after_image_limit; +size_t c_txn_after_image_limit; int32 c_n_fds_per_file; int32 c_syslog = 0; char *c_syslog_facility = NULL; @@ -389,6 +394,8 @@ extern int32 txs_max_terms; int32 c_callstack_on_exception = 0; extern long callstack_on_exception; /* from sqlintrp.c */ +int32 c_public_debug = 0; +extern long public_debug; /* from sqlintrp.c */ int32 c_pl_debug_all = 0; extern long pl_debug_all; @@ -477,7 +484,7 @@ extern int32 mon_enable; extern int timezoneless_datetimes; -long c_timezoneless_datetimes; +int32 c_timezoneless_datetimes; /* for use in bif_servers */ int @@ -686,6 +693,7 @@ cfg_setup (void) char *section; char *tmp_str; int32 long_helper; + size_t size_t_helper; if (f_config_file == NULL) f_config_file = "virtuoso.ini"; @@ -819,6 +827,12 @@ cfg_setup (void) if (cfg_getstring (pconfig, section, "SSL_PROTOCOLS", &ssl_server_protocols) == -1) ssl_server_protocols = "default"; + + if (cfg_getstring (pconfig, section, "SSL_DHPARAM", &ssl_server_dhparam) == -1) + ssl_server_dhparam = NULL; + + if (cfg_getstring (pconfig, section, "SSL_ECDH_CURVE", &ssl_server_ecdh_curve) == -1) + ssl_server_ecdh_curve = NULL; #endif if (cfg_getlong (pconfig, section, "ServerThreads", &c_server_threads) == -1) @@ -985,6 +999,9 @@ cfg_setup (void) if (cfg_getlong (pconfig, section, "CallstackOnException", &c_callstack_on_exception) == -1) c_callstack_on_exception = 0; + if (cfg_getlong (pconfig, section, "PublicDebug", &c_public_debug) == -1) + c_public_debug = 0; + if (cfg_getlong (pconfig, section, "PLDebug", &c_pl_debug_all) == -1) c_pl_debug_all = 0; @@ -1011,10 +1028,10 @@ cfg_setup (void) if (cfg_getstring (pconfig, section, "DecryptionAccess", &c_pwd_magic_users_list) == -1) c_pwd_magic_users_list = NULL; - if (cfg_getlong (pconfig, section, "TransactionAfterImageLimit", &c_txn_after_image_limit) == -1) - c_txn_after_image_limit = 50000000; - if (c_txn_after_image_limit != 0 && c_txn_after_image_limit < 10000) - c_txn_after_image_limit = 10000; + if (cfg_getsize (pconfig, section, "TransactionAfterImageLimit", &c_txn_after_image_limit) == -1) + c_txn_after_image_limit = 50000000L; + if (c_txn_after_image_limit != 0 && (int64) c_txn_after_image_limit < 10000L) + c_txn_after_image_limit = 10000L; if (cfg_getlong (pconfig, section, "FDsPerFile", &c_n_fds_per_file) == -1) c_n_fds_per_file = 1; @@ -1027,10 +1044,10 @@ cfg_setup (void) if (cfg_getlong (pconfig, section, "StopCompilerWhenXOverRunTime", &sqlo_compiler_exceeds_run_factor) == -1) sqlo_compiler_exceeds_run_factor = 0; - if (cfg_getlong (pconfig, section, "MaxMemPoolSize", &long_helper) == -1) + if (cfg_getsize (pconfig, section, "MaxMemPoolSize", &size_t_helper) == -1) sqlo_max_mp_size = 200000000; else - sqlo_max_mp_size = (uint32)long_helper; + sqlo_max_mp_size = size_t_helper; #ifdef POINTER_64 if (sqlo_max_mp_size >= 0x40000000) sqlo_max_mp_size = INT32_MAX; @@ -1067,30 +1084,20 @@ cfg_setup (void) if (cfg_getlong (pconfig, section, "ColumnStoreAll", &c_col_by_default) == -1) c_col_by_default = 0; - if (c_col_by_default > 0) log_warning ("Setting ColumnStoreAll = 1 is not recommended in a production environment"); if (0 != cfg_getsize (pconfig, section, "MaxQueryMem", &c_max_large_vec)) c_max_large_vec = 0; - if (0 != cfg_getsize (pconfig, section, "HashJoinSpace", &chash_space_avail)) + if (0 != cfg_getsize (pconfig, section, "HashJoinSpace", &size_t_helper)) chash_space_avail = MAX (1000000000, main_bufs * 1000); + else + chash_space_avail = ((MIN (size_t_helper, 10000000) >> 1) << 1); if (cfg_getlong (pconfig, section, "UseAIO", &c_c_use_aio) == -1) c_c_use_aio = 0; -#if 0 - /* Disable AIO for now */ - if (c_c_use_aio) { - log_warning ("Setting UseAIO = 1 is not supported in this build"); - c_c_use_aio = 0; - } -#endif - - if (cfg_getlong (pconfig, section, "AsyncQueueMaxThreads", &c_aq_max_threads) == -1) - c_aq_max_threads = 48; - if (cfg_getlong (pconfig, section, "BuffersAllocation", &malloc_bufs) == -1) malloc_bufs = 0; @@ -1109,8 +1116,7 @@ cfg_setup (void) if (cfg_getlong (pconfig, section, "LogProcOverwrite", &log_proc_overwrite) == -1) log_proc_overwrite = 1; - - if (cfg_getlong (pconfig, section, "PageCompress", (int32 *) &c_compress_mode) == -1) + if (cfg_getlong (pconfig, section, "PageCompress", &c_compress_mode) == -1) c_compress_mode = 0; @@ -1283,6 +1289,9 @@ cfg_setup (void) enable_qp = 16; } + if (cfg_getlong (pconfig, section, "AsyncQueueMaxThreads", &c_aq_max_threads) == -1) + c_aq_max_threads = enable_qp * 2; + if (cfg_getlong (pconfig, section, "MaxVectorSize", &dc_max_q_batch_sz) == -1) dc_max_q_batch_sz = 1000000; /* @@ -1300,6 +1309,7 @@ cfg_setup (void) if (cfg_getlong (pconfig, section, "EnableMonitor", &mon_enable) == -1) mon_enable = 1; + if (cfg_getlong (pconfig, section, "TimezonelessDatetimes", &c_timezoneless_datetimes) == -1) c_timezoneless_datetimes = -1; /* temporary value to be reset on reading database config page or before writing it */ else if ((c_timezoneless_datetimes < 0) || (c_timezoneless_datetimes > 4)) @@ -1437,6 +1447,15 @@ cfg_setup (void) if (cfg_getstring (pconfig, section, "SSLExtraChainCertificate", &https_extra) == -1) https_extra = NULL; + if (cfg_getstring (pconfig, section, "SSL_DHPARAM", &https_dhparam) == -1) + https_dhparam = NULL; + + if (cfg_getstring (pconfig, section, "SSL_ECDH_CURVE", &https_ecdh_curve) == -1) + https_ecdh_curve = NULL; + + if (cfg_getlong (pconfig, section, "HSTS_MaxAge", &https_hsts_max_age) == -1) + https_hsts_max_age = -1; + if (cfg_getstring (pconfig, section, "SSLPrivateKey", &c_https_key) == -1) c_https_key = NULL; @@ -2041,6 +2060,7 @@ new_db_read_cfg (dbe_storage_t * ignore, char *mode) callstack_on_exception = c_callstack_on_exception; + public_debug = c_public_debug; log_file_line = c_log_file_line; pl_debug_all = c_pl_debug_all; pl_debug_cov_file = c_pl_debug_cov_file; diff --git a/binsrc/virtuoso/virtuoso_t.rc b/binsrc/virtuoso/virtuoso_t.rc index 6e2e648db7..59b76a6762 100644 --- a/binsrc/virtuoso/virtuoso_t.rc +++ b/binsrc/virtuoso/virtuoso_t.rc @@ -80,7 +80,7 @@ BEGIN VALUE "FileDescription", "Virtuoso OpenSource" VALUE "FileVersion", "7.0.1.3207" VALUE "InternalName", "Virtuoso" - VALUE "LegalCopyright", "Copyright (C) 1998-2018 OpenLink Software" + VALUE "LegalCopyright", "Copyright (C) 1998-2019 OpenLink Software" VALUE "ProductName", "Virtuoso OpenSource" VALUE "ProductVersion", "7.0.1.3207" END diff --git a/binsrc/virtuoso/viunix.c b/binsrc/virtuoso/viunix.c index 9baef9991f..8f6e2cc0aa 100644 --- a/binsrc/virtuoso/viunix.c +++ b/binsrc/virtuoso/viunix.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -588,7 +588,7 @@ main (int argc, char **argv) initialize_program (&argc, &argv); /* all of the below means foreground ! */ - if (f_backup_dump || recover_file_prefix || f_crash_dump) + if (f_backup_dump || recover_file_prefix || f_crash_dump || f_read_from_rebuilt_database) f_foreground = 1; #ifdef V5UPGRADE if (!f_backup_dump && !f_read_from_rebuilt_database) @@ -636,6 +636,7 @@ main (int argc, char **argv) sigh_action (SIGH_BLOCK); srv_global_init (f_mode); sigh_action (SIGH_EXIT); + txn_after_image_limit = 0; db_to_log (); viunix_terminate (0); } diff --git a/binsrc/virtuoso/viwin32.c b/binsrc/virtuoso/viwin32.c index d3fd8c9390..62ff3bea2f 100644 --- a/binsrc/virtuoso/viwin32.c +++ b/binsrc/virtuoso/viwin32.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -198,6 +198,7 @@ int cfg_setup (void); int db_check_in_use (void); static void sigh_do_action (int is_asynchronous); static int set_virtuoso_dir (void); +void viwin32_terminate (int n); /* Program options */ struct pgm_option options[] = @@ -730,6 +731,7 @@ ServiceCtrlMain (int cmd) DWORD CreateApplicationConsole (void) { +#if 0 if (debugFlag && AllocConsole ()) { SetConsoleTitle (DISPLAY_NAME); @@ -753,7 +755,7 @@ CreateApplicationConsole (void) *stdin = *CInputHandle; setvbuf(stdin, NULL, _IONBF, 0); } - +#endif return NO_ERROR; } @@ -1013,7 +1015,7 @@ main (int argc, char **argv) dbg_malloc_enable(); #endif - process_exit_hook = terminate; + process_exit_hook = viwin32_terminate; srv_set_cfg (new_cfg_replace_log, new_cfg_set_checkpoint_interval, new_db_read_cfg, new_dbs_read_cfg, new_cfg_read_storages); @@ -1039,7 +1041,7 @@ main (int argc, char **argv) /* * Don't execute maintenance commands running as a service */ - if (f_backup_dump || f_crash_dump) + if (f_backup_dump || f_crash_dump || f_read_from_rebuilt_database) { f_cmd = CMD_NONE; f_foreground = 1; @@ -1113,7 +1115,7 @@ sigh_do_action (int is_asynchronous) switch (sigh_mode) { case SIGH_EXIT: - terminate (1); + viwin32_terminate (1); case SIGH_BLOCK: log_info ("Server shutdown pending", sigh_pending_signal); @@ -1179,7 +1181,7 @@ CtrlEventHandler (DWORD sig) * Take the necessary action to shutdown this application */ void -terminate (int n) +viwin32_terminate (int n) { if (is_in_use) { @@ -1208,7 +1210,7 @@ terminate (int n) static void server_is_down (void) { - terminate (0); + viwin32_terminate (0); } @@ -1253,7 +1255,6 @@ usage (void) char version[400]; char line[200]; char *p; - extern char *git_head; #if LICENSE int lic; #endif @@ -1266,15 +1267,6 @@ usage (void) PACKAGE_VERSION, DBMS_SRV_GEN_MAJOR, DBMS_SRV_GEN_MINOR, build_thread_model, build_date); p = stpcpy (p, line); - /* - * Add git SHA1 of HEAD for easier identification of code base - */ - if (git_head[0]) - { - sprintf (line, " (%s)", git_head); - p = stpcpy (p, line); - } - sprintf (line, "\nCompiled for %s (%s)\n", build_opsys_id, build_host_id); p = stpcpy (p, line); @@ -1305,7 +1297,7 @@ usage (void) " %s +service start +instance MyService\n", program_info.program_name, program_info.program_name); - terminate (1); + viwin32_terminate (1); } @@ -1453,20 +1445,20 @@ ApplicationMain (int argc, char **argv) /* change to virtuoso directory */ if (set_virtuoso_dir () == -1) - terminate (1); + viwin32_terminate (1); if (kernel_init () == -1) - terminate (1); + viwin32_terminate (1); dk_box_initialize (); /* This should happen before cfg_setup() because loading plugins may result in calls of bif_define() and thus calls of box_dv_uname_string() and the like */ /* parse configuration file */ if (cfg_setup () == -1) - terminate (1); + viwin32_terminate (1); /* make sure database is not in use */ if (db_check_in_use () == -1) - terminate (1); + viwin32_terminate (1); /* mark .lck file for removal */ is_in_use = 1; @@ -1489,8 +1481,9 @@ ApplicationMain (int argc, char **argv) os_sigh_action (SIGH_BLOCK); srv_global_init (f_mode); os_sigh_action (SIGH_EXIT); + txn_after_image_limit = 0; db_to_log (); - terminate (0); + viwin32_terminate (0); } if (recover_file_prefix) @@ -1498,7 +1491,7 @@ ApplicationMain (int argc, char **argv) os_sigh_action (SIGH_BLOCK); srv_global_init (f_mode); os_sigh_action (SIGH_EXIT); - terminate (0); + viwin32_terminate (0); } if (f_crash_dump) @@ -1515,7 +1508,7 @@ ApplicationMain (int argc, char **argv) db_recover_keys (f_dump_keys); log_info ("Using mode \'%s\'", f_mode); db_crash_to_log (f_mode); - terminate (0); + viwin32_terminate (0); } /* begin normal server operation */ @@ -1560,7 +1553,7 @@ ApplicationMain (int argc, char **argv) if (!DKSESSTAT_ISSET (listening, SST_LISTENING)) { log_error ("Failed to start listening at SQL port '%s'", c_serverport); - terminate (1); + viwin32_terminate (1); } ssl_server_listen (); diff --git a/binsrc/virtuoso_sink/DBConnection.cpp b/binsrc/virtuoso_sink/DBConnection.cpp index caab927afa..1aee17da63 100644 --- a/binsrc/virtuoso_sink/DBConnection.cpp +++ b/binsrc/virtuoso_sink/DBConnection.cpp @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/DBConnection.h b/binsrc/virtuoso_sink/DBConnection.h index e03a4e3bc0..ecf6fe7861 100644 --- a/binsrc/virtuoso_sink/DBConnection.h +++ b/binsrc/virtuoso_sink/DBConnection.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/DBConnectionPool.cpp b/binsrc/virtuoso_sink/DBConnectionPool.cpp index 7d2ad05213..83925250ef 100644 --- a/binsrc/virtuoso_sink/DBConnectionPool.cpp +++ b/binsrc/virtuoso_sink/DBConnectionPool.cpp @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/DBConnectionPool.h b/binsrc/virtuoso_sink/DBConnectionPool.h index ac4ef191b8..6abf1b45a4 100644 --- a/binsrc/virtuoso_sink/DBConnectionPool.h +++ b/binsrc/virtuoso_sink/DBConnectionPool.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/MailMsg_i.c b/binsrc/virtuoso_sink/MailMsg_i.c index e178524007..ff79b56eec 100644 --- a/binsrc/virtuoso_sink/MailMsg_i.c +++ b/binsrc/virtuoso_sink/MailMsg_i.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/MailMsg_p.c b/binsrc/virtuoso_sink/MailMsg_p.c index 67f910fa7e..dbb1bd3608 100644 --- a/binsrc/virtuoso_sink/MailMsg_p.c +++ b/binsrc/virtuoso_sink/MailMsg_p.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/Makefile.am b/binsrc/virtuoso_sink/Makefile.am index 3de9eb9533..5a211c72b1 100644 --- a/binsrc/virtuoso_sink/Makefile.am +++ b/binsrc/virtuoso_sink/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/NNTP.cpp b/binsrc/virtuoso_sink/NNTP.cpp index 1081e12bad..04699a4ce9 100644 --- a/binsrc/virtuoso_sink/NNTP.cpp +++ b/binsrc/virtuoso_sink/NNTP.cpp @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/NNTP.h b/binsrc/virtuoso_sink/NNTP.h index d55e326ecf..f70e6cfb16 100644 --- a/binsrc/virtuoso_sink/NNTP.h +++ b/binsrc/virtuoso_sink/NNTP.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/SMTP.cpp b/binsrc/virtuoso_sink/SMTP.cpp index 836012b3dd..8776316edc 100644 --- a/binsrc/virtuoso_sink/SMTP.cpp +++ b/binsrc/virtuoso_sink/SMTP.cpp @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/SMTP.h b/binsrc/virtuoso_sink/SMTP.h index bfc4896c6a..4787922178 100644 --- a/binsrc/virtuoso_sink/SMTP.h +++ b/binsrc/virtuoso_sink/SMTP.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/Seo_i.c b/binsrc/virtuoso_sink/Seo_i.c index 540e1773a1..69b40afbc4 100644 --- a/binsrc/virtuoso_sink/Seo_i.c +++ b/binsrc/virtuoso_sink/Seo_i.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/Seo_p.c b/binsrc/virtuoso_sink/Seo_p.c index 40ec29cefd..459b457cad 100644 --- a/binsrc/virtuoso_sink/Seo_p.c +++ b/binsrc/virtuoso_sink/Seo_p.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/SmtpEvent.h b/binsrc/virtuoso_sink/SmtpEvent.h index 45cb1d7f44..33da5f682b 100644 --- a/binsrc/virtuoso_sink/SmtpEvent.h +++ b/binsrc/virtuoso_sink/SmtpEvent.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/SmtpEvent_i.c b/binsrc/virtuoso_sink/SmtpEvent_i.c index 96087a2248..826324ca91 100644 --- a/binsrc/virtuoso_sink/SmtpEvent_i.c +++ b/binsrc/virtuoso_sink/SmtpEvent_i.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/SmtpEvent_p.c b/binsrc/virtuoso_sink/SmtpEvent_p.c index 956c134615..cef3ab4da0 100644 --- a/binsrc/virtuoso_sink/SmtpEvent_p.c +++ b/binsrc/virtuoso_sink/SmtpEvent_p.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/StdAfx.cpp b/binsrc/virtuoso_sink/StdAfx.cpp index b10a8907b4..bd239b264f 100644 --- a/binsrc/virtuoso_sink/StdAfx.cpp +++ b/binsrc/virtuoso_sink/StdAfx.cpp @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/StdAfx.h b/binsrc/virtuoso_sink/StdAfx.h index 07ccdcf413..1dbac7db7d 100644 --- a/binsrc/virtuoso_sink/StdAfx.h +++ b/binsrc/virtuoso_sink/StdAfx.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/VirtuosoSink.cpp b/binsrc/virtuoso_sink/VirtuosoSink.cpp index 1d4793631c..6968ead4c4 100644 --- a/binsrc/virtuoso_sink/VirtuosoSink.cpp +++ b/binsrc/virtuoso_sink/VirtuosoSink.cpp @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/VirtuosoSink.h b/binsrc/virtuoso_sink/VirtuosoSink.h index c8a729b952..87b2f6eef9 100644 --- a/binsrc/virtuoso_sink/VirtuosoSink.h +++ b/binsrc/virtuoso_sink/VirtuosoSink.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/VirtuosoSink.idl b/binsrc/virtuoso_sink/VirtuosoSink.idl index 6980ca964d..1615e53348 100644 --- a/binsrc/virtuoso_sink/VirtuosoSink.idl +++ b/binsrc/virtuoso_sink/VirtuosoSink.idl @@ -2,7 +2,7 @@ // This file is part of the OpenLink Software Virtuoso Open-Source (VOS) // project. // -// Copyright (C) 1998-2018 OpenLink Software +// Copyright (C) 1998-2019 OpenLink Software // // This project is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/VirtuosoSink_i.c b/binsrc/virtuoso_sink/VirtuosoSink_i.c index 54fe0415a2..e4cae2ced7 100644 --- a/binsrc/virtuoso_sink/VirtuosoSink_i.c +++ b/binsrc/virtuoso_sink/VirtuosoSink_i.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/VirtuosoSink_p.c b/binsrc/virtuoso_sink/VirtuosoSink_p.c index 95527529b6..7d4caf5b78 100644 --- a/binsrc/virtuoso_sink/VirtuosoSink_p.c +++ b/binsrc/virtuoso_sink/VirtuosoSink_p.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/dlldata.c b/binsrc/virtuoso_sink/dlldata.c index c4df5f94a6..f35749b961 100644 --- a/binsrc/virtuoso_sink/dlldata.c +++ b/binsrc/virtuoso_sink/dlldata.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/virtuoso_sink/resource.h b/binsrc/virtuoso_sink/resource.h index da42a26e55..484c9b94a3 100644 --- a/binsrc/virtuoso_sink/resource.h +++ b/binsrc/virtuoso_sink/resource.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/Makefile.am b/binsrc/vsp/Makefile.am index 29487537cc..00b4876539 100644 --- a/binsrc/vsp/Makefile.am +++ b/binsrc/vsp/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/Hosted_Modules.vspx b/binsrc/vsp/admin/Hosted_Modules.vspx index f8717b7b4f..e953d8e84c 100644 --- a/binsrc/vsp/admin/Hosted_Modules.vspx +++ b/binsrc/vsp/admin/Hosted_Modules.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/Hosted_Modules_load.vspx b/binsrc/vsp/admin/Hosted_Modules_load.vspx index a216149605..c84e3ea978 100644 --- a/binsrc/vsp/admin/Hosted_Modules_load.vspx +++ b/binsrc/vsp/admin/Hosted_Modules_load.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/Hosted_Modules_load_results.vspx b/binsrc/vsp/admin/Hosted_Modules_load_results.vspx index 91525820da..66792b81f1 100644 --- a/binsrc/vsp/admin/Hosted_Modules_load_results.vspx +++ b/binsrc/vsp/admin/Hosted_Modules_load_results.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/Hosted_Modules_select.vspx b/binsrc/vsp/admin/Hosted_Modules_select.vspx index b4a445c3a1..ee6b353905 100644 --- a/binsrc/vsp/admin/Hosted_Modules_select.vspx +++ b/binsrc/vsp/admin/Hosted_Modules_select.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/Hosted_Modules_select2.vspx b/binsrc/vsp/admin/Hosted_Modules_select2.vspx index 5e18e393f3..00da3c082e 100644 --- a/binsrc/vsp/admin/Hosted_Modules_select2.vspx +++ b/binsrc/vsp/admin/Hosted_Modules_select2.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/adm_js_check.vsp b/binsrc/vsp/admin/adm_js_check.vsp index b94ab37149..bd5b4e77f9 100644 --- a/binsrc/vsp/admin/adm_js_check.vsp +++ b/binsrc/vsp/admin/adm_js_check.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin.sql b/binsrc/vsp/admin/admin.sql index e728ef252d..9e3dc7417f 100644 --- a/binsrc/vsp/admin/admin.sql +++ b/binsrc/vsp/admin/admin.sql @@ -9,7 +9,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -4282,7 +4282,7 @@ adm_page_footer() http(''); http('

    Virtuoso Universal Server '); http(sys_stat('st_dbms_ver')); - http(' - Copyright© 1998-2018 OpenLink Software.

    '); + http(' - Copyright© 1998-2019 OpenLink Software.

    '); http('\n'); } ; diff --git a/binsrc/vsp/admin/admin_conn_ds.vsp b/binsrc/vsp/admin/admin_conn_ds.vsp index 89efe035f9..739bc2ed65 100644 --- a/binsrc/vsp/admin/admin_conn_ds.vsp +++ b/binsrc/vsp/admin/admin_conn_ds.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_conn_ds_add.vsp b/binsrc/vsp/admin/admin_conn_ds_add.vsp index d95cd13ec7..386622d7cb 100644 --- a/binsrc/vsp/admin/admin_conn_ds_add.vsp +++ b/binsrc/vsp/admin/admin_conn_ds_add.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/adm_acl_main.vsp b/binsrc/vsp/admin/admin_dav/adm_acl_main.vsp index e179d73c7e..7e90fbb7a5 100644 --- a/binsrc/vsp/admin/admin_dav/adm_acl_main.vsp +++ b/binsrc/vsp/admin/admin_dav/adm_acl_main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/adm_http_acl.vsp b/binsrc/vsp/admin/admin_dav/adm_http_acl.vsp index 28590526a3..a7253bd532 100644 --- a/binsrc/vsp/admin/admin_dav/adm_http_acl.vsp +++ b/binsrc/vsp/admin/admin_dav/adm_http_acl.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/adm_proxy_acl.vsp b/binsrc/vsp/admin/admin_dav/adm_proxy_acl.vsp index 7b291001a5..5f3d955efb 100644 --- a/binsrc/vsp/admin/admin_dav/adm_proxy_acl.vsp +++ b/binsrc/vsp/admin/admin_dav/adm_proxy_acl.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/adm_soap_opts.vsp b/binsrc/vsp/admin/admin_dav/adm_soap_opts.vsp index 69821d1a1d..1749eb657b 100644 --- a/binsrc/vsp/admin/admin_dav/adm_soap_opts.vsp +++ b/binsrc/vsp/admin/admin_dav/adm_soap_opts.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/adm_wsdl_gen.vsp b/binsrc/vsp/admin/admin_dav/adm_wsdl_gen.vsp index 21df3aa7a9..8ee417d3e2 100644 --- a/binsrc/vsp/admin/admin_dav/adm_wsdl_gen.vsp +++ b/binsrc/vsp/admin/admin_dav/adm_wsdl_gen.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog.vsp b/binsrc/vsp/admin/admin_dav/admin_blog.vsp index b1c7b4fd16..eac44fbb22 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_1.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_1.vsp index 614c0aa34d..436aa23b11 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_1.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_2.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_2.vsp index bdb5b13875..0898124615 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_2.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_3.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_3.vsp index 9efe4eb328..4e5464eb0e 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_3.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_category.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_category.vsp index 43e7a402b3..215b47e611 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_category.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_category.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_channel.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_channel.vsp index ee333afcc4..f0816bace2 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_channel.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_channel.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_channel_items.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_channel_items.vsp index 0fb1eb6076..517b6a2c86 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_channel_items.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_channel_items.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_comments.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_comments.vsp index d8f1058240..50a656d38c 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_comments.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_comments.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_cont.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_cont.vsp index de3f452493..82d6635b9f 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_cont.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_cont.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_domain_setup.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_domain_setup.vsp index c49007ec98..485e0069c6 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_domain_setup.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_domain_setup.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_error_log.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_error_log.vsp index 58f8d846aa..a43ba835ce 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_error_log.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_error_log.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_mail.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_mail.vsp index b8449a21cb..8516e28026 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_mail.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_mail.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_mail_gw.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_mail_gw.vsp index 19d9fc3a4f..6c599a9dc1 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_mail_gw.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_mail_gw.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_mail_pic.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_mail_pic.vsp index 067fa5230f..5bc46eafa0 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_mail_pic.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_mail_pic.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_mail_show.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_mail_show.vsp index 6006fc8f32..2d9dfb7538 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_mail_show.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_mail_show.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_notify.vspx b/binsrc/vsp/admin/admin_dav/admin_blog_notify.vspx index e53fd14e1e..4fe6d9b4a6 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_notify.vspx +++ b/binsrc/vsp/admin/admin_dav/admin_blog_notify.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_ping_hosts.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_ping_hosts.vsp index 91511090be..e3f25fd338 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_ping_hosts.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_ping_hosts.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_blog_search_eng.vsp b/binsrc/vsp/admin/admin_dav/admin_blog_search_eng.vsp index 42eb4d098b..4bcafa532f 100644 --- a/binsrc/vsp/admin/admin_dav/admin_blog_search_eng.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_blog_search_eng.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_browse.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_browse.vsp index 0c9abb89cb..2e1c4c7c9f 100644 --- a/binsrc/vsp/admin/admin_dav/admin_dav_browse.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_dav_browse.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_cols.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_cols.vsp index 6bd63c2295..4eaedaab4e 100644 --- a/binsrc/vsp/admin/admin_dav/admin_dav_cols.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_dav_cols.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_document_search.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_document_search.vsp index ed7ec59e78..0340dbd51e 100644 --- a/binsrc/vsp/admin/admin_dav/admin_dav_document_search.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_dav_document_search.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_documents.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_documents.vsp index 96f0698024..d5919aa374 100644 --- a/binsrc/vsp/admin/admin_dav/admin_dav_documents.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_dav_documents.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_edit.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_edit.vsp index 82f19542eb..e6c1e7bf22 100644 --- a/binsrc/vsp/admin/admin_dav/admin_dav_edit.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_dav_edit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_editor.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_editor.vsp index f0aa09bc9b..56ffdb4065 100644 --- a/binsrc/vsp/admin/admin_dav/admin_dav_editor.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_dav_editor.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_ftext_upd.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_ftext_upd.vsp index c7cebd2e54..6a2851da9b 100644 --- a/binsrc/vsp/admin/admin_dav/admin_dav_ftext_upd.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_dav_ftext_upd.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_new.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_new.vsp index 9454980614..f3da03f2c2 100644 --- a/binsrc/vsp/admin/admin_dav/admin_dav_new.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_dav_new.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_res_types.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_res_types.vsp index 640778fa9c..5b7dd7c7c0 100644 --- a/binsrc/vsp/admin/admin_dav/admin_dav_res_types.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_dav_res_types.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_user_opts.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_user_opts.vsp index d70a78db6b..86e81f2d50 100644 --- a/binsrc/vsp/admin/admin_dav/admin_dav_user_opts.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_dav_user_opts.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_users.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_users.vsp index fa8404b4e5..00f805700b 100644 --- a/binsrc/vsp/admin/admin_dav/admin_dav_users.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_dav_users.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_dav_xslt.vsp b/binsrc/vsp/admin/admin_dav/admin_dav_xslt.vsp index 61f636777b..7913679504 100644 --- a/binsrc/vsp/admin/admin_dav/admin_dav_xslt.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_dav_xslt.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_footer.vsp b/binsrc/vsp/admin/admin_dav/admin_footer.vsp index ef5b6de827..cdc9793521 100644 --- a/binsrc/vsp/admin/admin_dav/admin_footer.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_footer.vsp @@ -1 +1 @@ -
    Virtuoso management interface. Copyright © 1998-2018 OpenLink Software
    +
    Virtuoso management interface. Copyright © 1998-2019 OpenLink Software
    diff --git a/binsrc/vsp/admin/admin_dav/admin_import_users.vsp b/binsrc/vsp/admin/admin_dav/admin_import_users.vsp index 7c6e0d9c19..0fd55674df 100644 --- a/binsrc/vsp/admin/admin_dav/admin_import_users.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_import_users.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_import_users_1.vsp b/binsrc/vsp/admin/admin_dav/admin_import_users_1.vsp index 2082216a39..be4bd932d6 100644 --- a/binsrc/vsp/admin/admin_dav/admin_import_users_1.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_import_users_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_import_users_2.vsp b/binsrc/vsp/admin/admin_dav/admin_import_users_2.vsp index 464649150a..6ded8e199a 100644 --- a/binsrc/vsp/admin/admin_dav/admin_import_users_2.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_import_users_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_import_users_3.vsp b/binsrc/vsp/admin/admin_dav/admin_import_users_3.vsp index 830afb98b2..f1f0784569 100644 --- a/binsrc/vsp/admin/admin_dav/admin_import_users_3.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_import_users_3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_proc_list.vsp b/binsrc/vsp/admin/admin_dav/admin_proc_list.vsp index b59d84f533..f318b8922c 100644 --- a/binsrc/vsp/admin/admin_dav/admin_proc_list.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_proc_list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_select_proc.vsp b/binsrc/vsp/admin/admin_dav/admin_select_proc.vsp index a0cc13b2f0..79ad292aea 100644 --- a/binsrc/vsp/admin/admin_dav/admin_select_proc.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_select_proc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_soap_list.vsp b/binsrc/vsp/admin/admin_dav/admin_soap_list.vsp index bbc76ec62a..cce4dc83ae 100644 --- a/binsrc/vsp/admin/admin_dav/admin_soap_list.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_soap_list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_vfs_export_main.vsp b/binsrc/vsp/admin/admin_dav/admin_vfs_export_main.vsp index e901939bee..204e88518e 100644 --- a/binsrc/vsp/admin/admin_dav/admin_vfs_export_main.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_vfs_export_main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_vfs_queue.vsp b/binsrc/vsp/admin/admin_dav/admin_vfs_queue.vsp index 5a23971a4a..5a84e07061 100644 --- a/binsrc/vsp/admin/admin_dav/admin_vfs_queue.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_vfs_queue.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_vfs_site.vsp b/binsrc/vsp/admin/admin_dav/admin_vfs_site.vsp index 0c7cd164f6..7027921be0 100644 --- a/binsrc/vsp/admin/admin_dav/admin_vfs_site.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_vfs_site.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_vfs_urls.vsp b/binsrc/vsp/admin/admin_dav/admin_vfs_urls.vsp index 5173cc1eb4..2b98c174c7 100644 --- a/binsrc/vsp/admin/admin_dav/admin_vfs_urls.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_vfs_urls.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_virt_dir.vsp b/binsrc/vsp/admin/admin_dav/admin_virt_dir.vsp index 60ccf33964..6795a82fe4 100644 --- a/binsrc/vsp/admin/admin_dav/admin_virt_dir.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_virt_dir.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/admin_xml_template.vsp b/binsrc/vsp/admin/admin_dav/admin_xml_template.vsp index c4eea1baea..aac24dd10a 100644 --- a/binsrc/vsp/admin/admin_dav/admin_xml_template.vsp +++ b/binsrc/vsp/admin/admin_dav/admin_xml_template.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/blog_post_preview.vsp b/binsrc/vsp/admin/admin_dav/blog_post_preview.vsp index 5f023fa403..c516c81c99 100644 --- a/binsrc/vsp/admin/admin_dav/blog_post_preview.vsp +++ b/binsrc/vsp/admin/admin_dav/blog_post_preview.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/bridge.vspx b/binsrc/vsp/admin/admin_dav/bridge.vspx index 71454cf886..3913825952 100644 --- a/binsrc/vsp/admin/admin_dav/bridge.vspx +++ b/binsrc/vsp/admin/admin_dav/bridge.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_browser.css b/binsrc/vsp/admin/admin_dav/dav_browser.css index 080fc87391..22ef56e103 100644 --- a/binsrc/vsp/admin/admin_dav/dav_browser.css +++ b/binsrc/vsp/admin/admin_dav/dav_browser.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_browser.js b/binsrc/vsp/admin/admin_dav/dav_browser.js index edb9eb7ae4..3794efdef4 100644 --- a/binsrc/vsp/admin/admin_dav/dav_browser.js +++ b/binsrc/vsp/admin/admin_dav/dav_browser.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_browser.sql b/binsrc/vsp/admin/admin_dav/dav_browser.sql index f82a3aac33..6115233698 100644 --- a/binsrc/vsp/admin/admin_dav/dav_browser.sql +++ b/binsrc/vsp/admin/admin_dav/dav_browser.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_browser.vsp b/binsrc/vsp/admin/admin_dav/dav_browser.vsp index c71301b988..134d405663 100644 --- a/binsrc/vsp/admin/admin_dav/dav_browser.vsp +++ b/binsrc/vsp/admin/admin_dav/dav_browser.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_bot.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_bot.vsp index 098f0f1c21..679b492fef 100644 --- a/binsrc/vsp/admin/admin_dav/dav_browser_bot.vsp +++ b/binsrc/vsp/admin/admin_dav/dav_browser_bot.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_host.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_host.vsp index 1fb837f76a..57a11971c7 100644 --- a/binsrc/vsp/admin/admin_dav/dav_browser_host.vsp +++ b/binsrc/vsp/admin/admin_dav/dav_browser_host.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_js.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_js.vsp index 302c5fb121..bb1c76b363 100644 --- a/binsrc/vsp/admin/admin_dav/dav_browser_js.vsp +++ b/binsrc/vsp/admin/admin_dav/dav_browser_js.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_list.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_list.vsp index a76e6f12f9..ff3dad6cca 100644 --- a/binsrc/vsp/admin/admin_dav/dav_browser_list.vsp +++ b/binsrc/vsp/admin/admin_dav/dav_browser_list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_mozilla.js b/binsrc/vsp/admin/admin_dav/dav_browser_mozilla.js index 3e60ccaff1..f2668f4976 100644 --- a/binsrc/vsp/admin/admin_dav/dav_browser_mozilla.js +++ b/binsrc/vsp/admin/admin_dav/dav_browser_mozilla.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_msie.js b/binsrc/vsp/admin/admin_dav/dav_browser_msie.js index 864e440950..38dfc4b39b 100644 --- a/binsrc/vsp/admin/admin_dav/dav_browser_msie.js +++ b/binsrc/vsp/admin/admin_dav/dav_browser_msie.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_browser_top.vsp b/binsrc/vsp/admin/admin_dav/dav_browser_top.vsp index 61f8e3848a..083b8d74c5 100644 --- a/binsrc/vsp/admin/admin_dav/dav_browser_top.vsp +++ b/binsrc/vsp/admin/admin_dav/dav_browser_top.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_dir_list.vsp b/binsrc/vsp/admin/admin_dav/dav_dir_list.vsp index ddc578684f..6116b88f81 100644 --- a/binsrc/vsp/admin/admin_dav/dav_dir_list.vsp +++ b/binsrc/vsp/admin/admin_dav/dav_dir_list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_js.vsp b/binsrc/vsp/admin/admin_dav/dav_js.vsp index 302c5fb121..bb1c76b363 100644 --- a/binsrc/vsp/admin/admin_dav/dav_js.vsp +++ b/binsrc/vsp/admin/admin_dav/dav_js.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dav_prop_edit.vsp b/binsrc/vsp/admin/admin_dav/dav_prop_edit.vsp index 7820506faf..0b91f35ff1 100644 --- a/binsrc/vsp/admin/admin_dav/dav_prop_edit.vsp +++ b/binsrc/vsp/admin/admin_dav/dav_prop_edit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/dir_list.vsp b/binsrc/vsp/admin/admin_dav/dir_list.vsp index 7f5f9f210f..0909fe82ed 100644 --- a/binsrc/vsp/admin/admin_dav/dir_list.vsp +++ b/binsrc/vsp/admin/admin_dav/dir_list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/error.vsp b/binsrc/vsp/admin/admin_dav/error.vsp index 3eada7700c..5cace5fcf1 100644 --- a/binsrc/vsp/admin/admin_dav/error.vsp +++ b/binsrc/vsp/admin/admin_dav/error.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/error_pages.vspx b/binsrc/vsp/admin/admin_dav/error_pages.vspx index 18c1ec23e2..83fb821569 100644 --- a/binsrc/vsp/admin/admin_dav/error_pages.vspx +++ b/binsrc/vsp/admin/admin_dav/error_pages.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/ftt_hits.vsp b/binsrc/vsp/admin/admin_dav/ftt_hits.vsp index c340cee48b..be5f8af146 100644 --- a/binsrc/vsp/admin/admin_dav/ftt_hits.vsp +++ b/binsrc/vsp/admin/admin_dav/ftt_hits.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/ftt_query.vsp b/binsrc/vsp/admin/admin_dav/ftt_query.vsp index ddf07aaac1..848da67fbc 100644 --- a/binsrc/vsp/admin/admin_dav/ftt_query.vsp +++ b/binsrc/vsp/admin/admin_dav/ftt_query.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/get_blogs.vspx b/binsrc/vsp/admin/admin_dav/get_blogs.vspx index 9ca903e0aa..231a302fa7 100644 --- a/binsrc/vsp/admin/admin_dav/get_blogs.vspx +++ b/binsrc/vsp/admin/admin_dav/get_blogs.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/portfolio.xml b/binsrc/vsp/admin/admin_dav/portfolio.xml index b732dd1179..a15e2d7308 100644 --- a/binsrc/vsp/admin/admin_dav/portfolio.xml +++ b/binsrc/vsp/admin/admin_dav/portfolio.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/portfolio.xsl b/binsrc/vsp/admin/admin_dav/portfolio.xsl index 60b1d26031..fb332cb641 100644 --- a/binsrc/vsp/admin/admin_dav/portfolio.xsl +++ b/binsrc/vsp/admin/admin_dav/portfolio.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/search_help.html b/binsrc/vsp/admin/admin_dav/search_help.html index 42a8c15ee3..66b10baf33 100644 --- a/binsrc/vsp/admin/admin_dav/search_help.html +++ b/binsrc/vsp/admin/admin_dav/search_help.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/util.js b/binsrc/vsp/admin/admin_dav/util.js index 09703d8b02..f042e6ec31 100644 --- a/binsrc/vsp/admin/admin_dav/util.js +++ b/binsrc/vsp/admin/admin_dav/util.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/vfs.sql b/binsrc/vsp/admin/admin_dav/vfs.sql index fe78fa8e03..bc1c46925f 100644 --- a/binsrc/vsp/admin/admin_dav/vfs.sql +++ b/binsrc/vsp/admin/admin_dav/vfs.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -188,7 +188,7 @@ nf_opt: commit work; - if (_dav_method = 'checked' and _upd = 0 and _opage <> 'checked') + if (_dav_method = 'checked' and _opage <> 'checked') { declare dav_urls, _dav_opts, _url any; declare lev integer; @@ -2000,21 +2000,33 @@ create procedure WS.WS.DAV_PUT ( } ; + +-- /* get urls from dav response */ create procedure WS.WS.DAV_PROP ( inout _url varchar, in _d_imgs varchar, in _auth varchar) { - declare _res any; + declare _res, _tree any; declare _resp, _body varchar; - _body := http_get (_url, _res, 'PROPFIND', 'Content-Type: text/xml\r\nDepth: 1\r\n' || case when (isstring (_auth) and _auth <> '') then _auth else '' end, ''); --- _tree := xpath_eval ('//*/@href', xml_tree_doc (xml_tree (_body), 0), 0); --- DELME after fix in xpath_eval + _body := http_get (_url, _res, 'PROPFIND', + 'Content-Type: text/xml\r\nDepth: 1\r\n' || + case when (isstring (_auth) and _auth <> '') then _auth else '' end, + ''); + _tree := xpath_eval ('//href/text()', xtree_doc (_body), 0); _resp := WS.WS.VFS_HTTP_RESP_CODE (_res); - if (_resp = '200') - return WS.WS.GET_HREF_FROM_XML (_body, _d_imgs); - + if (_resp = '207') + { + declare len, inx, ret any; + len := length (_tree); + ret := make_array (len, 'any'); + for (inx := 0; inx < len; inx := inx + 1) + { + ret [inx] := cast (_tree[inx] as varchar); + } + return ret; + } return null; } ; diff --git a/binsrc/vsp/admin/admin_dav/vfs_export.vsp b/binsrc/vsp/admin/admin_dav/vfs_export.vsp index 9c3cb976fa..82dc191666 100644 --- a/binsrc/vsp/admin/admin_dav/vfs_export.vsp +++ b/binsrc/vsp/admin/admin_dav/vfs_export.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/vfs_queue_sched.vsp b/binsrc/vsp/admin/admin_dav/vfs_queue_sched.vsp index 2409ce0587..1a1fa97a9e 100644 --- a/binsrc/vsp/admin/admin_dav/vfs_queue_sched.vsp +++ b/binsrc/vsp/admin/admin_dav/vfs_queue_sched.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/vfs_status.vsp b/binsrc/vsp/admin/admin_dav/vfs_status.vsp index bd9efd7831..1535d4da77 100644 --- a/binsrc/vsp/admin/admin_dav/vfs_status.vsp +++ b/binsrc/vsp/admin/admin_dav/vfs_status.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/vfs_urls_list.vsp b/binsrc/vsp/admin/admin_dav/vfs_urls_list.vsp index 055a8588e2..122a0a60b7 100644 --- a/binsrc/vsp/admin/admin_dav/vfs_urls_list.vsp +++ b/binsrc/vsp/admin/admin_dav/vfs_urls_list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dav/vfsddk.sql b/binsrc/vsp/admin/admin_dav/vfsddk.sql index 3cc927a600..89ab4e98d3 100644 --- a/binsrc/vsp/admin/admin_dav/vfsddk.sql +++ b/binsrc/vsp/admin/admin_dav/vfsddk.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -115,59 +115,6 @@ create table WS.WS.VFS_SITE_RDF_MAP ( primary key (VM_HOST, VM_ROOT, VM_RDF_MAP, VM_SEQ)) ; ---#IF VER=5 -create procedure WS.WS.VFS_TBL_UPGRADE () -{ - declare _err, _state varchar; - _state := null; - exec ('select VS_OPAGE from WS.WS.VFS_SITE', _state, _err); - if (_state is not null) - DB.DBA.execstr ('alter table WS.WS.VFS_SITE add VS_OPAGE varchar'); - _state := null; - exec ('select VS_OTHER from WS.WS.VFS_SITE', _state, _err); - if (_state is not null) - DB.DBA.execstr ('alter table WS.WS.VFS_SITE add VS_OTHER char (10)'); - _state := null; - exec ('select VQ_OTHER from WS.WS.VFS_QUEUE', _state, _err); - if (_state is not null) - DB.DBA.execstr ('alter table WS.WS.VFS_QUEUE add VQ_OTHER varchar'); - _state := null; - exec ('select VQ_ERROR from WS.WS.VFS_QUEUE', _state, _err); - if (_state is not null) - DB.DBA.execstr ('alter table WS.WS.VFS_QUEUE add VQ_ERROR long varchar'); - _state := null; - exec ('select VU_OTHER from WS.WS.VFS_URL', _state, _err); - if (_state is not null) - DB.DBA.execstr ('alter table WS.WS.VFS_URL add VU_OTHER varchar'); - _state := null; - exec ('select VS_REDIRECT from WS.WS.VFS_SITE', _state, _err); - if (_state is not null) - { - DB.DBA.execstr ('alter table WS.WS.VFS_SITE add VS_REDIRECT int default 1'); - DB.DBA.execstr ('alter table WS.WS.VFS_SITE add VS_STORE int default 1'); - DB.DBA.execstr ('alter table WS.WS.VFS_SITE add VS_UDATA long varbinary'); - } - _state := null; - exec ('select VS_EXTRACT_FN from WS.WS.VFS_SITE', _state, _err); - if (_state is not null) - { - DB.DBA.execstr ('alter table WS.WS.VFS_SITE add VS_EXTRACT_FN varchar'); - DB.DBA.execstr ('alter table WS.WS.VFS_SITE add VS_STORE_FN varchar'); - } -} -; - ---!AFTER -WS.WS.VFS_TBL_UPGRADE () -; - ---!AFTER -alter table WS.WS.VFS_SITE add VS_DLOAD_META int default 0 -; - -alter table WS.WS.VFS_SITE add VS_INST_ID int -; ---#ENDIF alter table WS.WS.VFS_SITE add VS_DEPTH int default null ; diff --git a/binsrc/vsp/admin/admin_dav/vsp_debug.vsp b/binsrc/vsp/admin/admin_dav/vsp_debug.vsp index de7768690f..f9d2c5b107 100644 --- a/binsrc/vsp/admin/admin_dav/vsp_debug.vsp +++ b/binsrc/vsp/admin/admin_dav/vsp_debug.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_ddl.sql b/binsrc/vsp/admin/admin_ddl.sql index fa190a3549..a9c8bcb1c9 100644 --- a/binsrc/vsp/admin/admin_ddl.sql +++ b/binsrc/vsp/admin/admin_ddl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dsn.vsp b/binsrc/vsp/admin/admin_dsn.vsp index 821023e165..e648d2edbc 100644 --- a/binsrc/vsp/admin/admin_dsn.vsp +++ b/binsrc/vsp/admin/admin_dsn.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dsn_add.vsp b/binsrc/vsp/admin/admin_dsn_add.vsp index 149c3ad677..619266174d 100644 --- a/binsrc/vsp/admin/admin_dsn_add.vsp +++ b/binsrc/vsp/admin/admin_dsn_add.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dsn_add2.vsp b/binsrc/vsp/admin/admin_dsn_add2.vsp index 3b72a9be31..b9d4c8ea36 100644 --- a/binsrc/vsp/admin/admin_dsn_add2.vsp +++ b/binsrc/vsp/admin/admin_dsn_add2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dsn_add3.vsp b/binsrc/vsp/admin/admin_dsn_add3.vsp index 5061c1994e..83f7977978 100644 --- a/binsrc/vsp/admin/admin_dsn_add3.vsp +++ b/binsrc/vsp/admin/admin_dsn_add3.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dsn_add_generic32.vsp b/binsrc/vsp/admin/admin_dsn_add_generic32.vsp index 438e1fb3f9..74d4c1ccd6 100644 --- a/binsrc/vsp/admin/admin_dsn_add_generic32.vsp +++ b/binsrc/vsp/admin/admin_dsn_add_generic32.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -140,7 +140,7 @@ ?> - + '); http (''); + http (' DBPUMP Interface - Copyright© 1998-2019 OpenLink Software.

    '); http ('


    Copyright 1998-2018 OpenLink Software
    All rights reserved


    Copyright 1998-2019 OpenLink Software
    All rights reserved

    diff --git a/binsrc/vsp/admin/admin_dsn_add_generic32_2.vsp b/binsrc/vsp/admin/admin_dsn_add_generic32_2.vsp index f2363cdb72..eb1d5ff309 100644 --- a/binsrc/vsp/admin/admin_dsn_add_generic32_2.vsp +++ b/binsrc/vsp/admin/admin_dsn_add_generic32_2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dsn_add_virt.vsp b/binsrc/vsp/admin/admin_dsn_add_virt.vsp index dbf808e0b1..edd54fb3b9 100644 --- a/binsrc/vsp/admin/admin_dsn_add_virt.vsp +++ b/binsrc/vsp/admin/admin_dsn_add_virt.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dsn_edit.vsp b/binsrc/vsp/admin/admin_dsn_edit.vsp index 358e9d8d9d..6bd045eb1a 100644 --- a/binsrc/vsp/admin/admin_dsn_edit.vsp +++ b/binsrc/vsp/admin/admin_dsn_edit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_dsn_edit_virt.vsp b/binsrc/vsp/admin/admin_dsn_edit_virt.vsp index 9df10ee427..f6e62237ec 100644 --- a/binsrc/vsp/admin/admin_dsn_edit_virt.vsp +++ b/binsrc/vsp/admin/admin_dsn_edit_virt.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_evt_main.vsp b/binsrc/vsp/admin/admin_evt_main.vsp index 784d17452f..e42db4d4c9 100644 --- a/binsrc/vsp/admin/admin_evt_main.vsp +++ b/binsrc/vsp/admin/admin_evt_main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_footer.vsp b/binsrc/vsp/admin/admin_footer.vsp index 4675eced29..446567f9c9 100644 --- a/binsrc/vsp/admin/admin_footer.vsp +++ b/binsrc/vsp/admin/admin_footer.vsp @@ -1,4 +1,4 @@ - +

    Virtuoso Universal Server () - Copyright© 1998-2018 OpenLink Software.

    Virtuoso Universal Server () - Copyright© 1998-2019 OpenLink Software.

    diff --git a/binsrc/vsp/admin/admin_isql_main.vsp b/binsrc/vsp/admin/admin_isql_main.vsp index 44704cda67..7e03d44b63 100644 --- a/binsrc/vsp/admin/admin_isql_main.vsp +++ b/binsrc/vsp/admin/admin_isql_main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_left.vsp b/binsrc/vsp/admin/admin_left.vsp index 414401ff9f..099599f1d8 100644 --- a/binsrc/vsp/admin/admin_left.vsp +++ b/binsrc/vsp/admin/admin_left.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_link_proc.vsp b/binsrc/vsp/admin/admin_link_proc.vsp index 29d758b8db..78e44aebdf 100644 --- a/binsrc/vsp/admin/admin_link_proc.vsp +++ b/binsrc/vsp/admin/admin_link_proc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_link_proc_1.vsp b/binsrc/vsp/admin/admin_link_proc_1.vsp index 5df86b48fc..487d14f83b 100644 --- a/binsrc/vsp/admin/admin_link_proc_1.vsp +++ b/binsrc/vsp/admin/admin_link_proc_1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_link_tables.js b/binsrc/vsp/admin/admin_link_tables.js index f151aa9af9..82b5750ed4 100644 --- a/binsrc/vsp/admin/admin_link_tables.js +++ b/binsrc/vsp/admin/admin_link_tables.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_link_tables.vsp b/binsrc/vsp/admin/admin_link_tables.vsp index 1492cdee1d..2297b7a616 100644 --- a/binsrc/vsp/admin/admin_link_tables.vsp +++ b/binsrc/vsp/admin/admin_link_tables.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_lt_wiz.vsp b/binsrc/vsp/admin/admin_lt_wiz.vsp index 2436f52d1b..5dfe678191 100644 --- a/binsrc/vsp/admin/admin_lt_wiz.vsp +++ b/binsrc/vsp/admin/admin_lt_wiz.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_lt_wiz_start.vsp b/binsrc/vsp/admin/admin_lt_wiz_start.vsp index abb65641bd..671f99721b 100644 --- a/binsrc/vsp/admin/admin_lt_wiz_start.vsp +++ b/binsrc/vsp/admin/admin_lt_wiz_start.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_main.vsp b/binsrc/vsp/admin/admin_main.vsp index 7d1c51b4f5..dbfde3a9af 100644 --- a/binsrc/vsp/admin/admin_main.vsp +++ b/binsrc/vsp/admin/admin_main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/admin_news.sql b/binsrc/vsp/admin/admin_news/admin_news.sql index 3a46a15225..03689f6a3f 100644 --- a/binsrc/vsp/admin/admin_news/admin_news.sql +++ b/binsrc/vsp/admin/admin_news/admin_news.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/mime_display.vsp b/binsrc/vsp/admin/admin_news/mime_display.vsp index eaddaea632..b1035b59c6 100644 --- a/binsrc/vsp/admin/admin_news/mime_display.vsp +++ b/binsrc/vsp/admin/admin_news/mime_display.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/news_acl.vsp b/binsrc/vsp/admin/admin_news/news_acl.vsp index be01a5d493..3e579c17eb 100644 --- a/binsrc/vsp/admin/admin_news/news_acl.vsp +++ b/binsrc/vsp/admin/admin_news/news_acl.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/news_available_processing.vsp b/binsrc/vsp/admin/admin_news/news_available_processing.vsp index 2580b77564..0ee541a7d2 100644 --- a/binsrc/vsp/admin/admin_news/news_available_processing.vsp +++ b/binsrc/vsp/admin/admin_news/news_available_processing.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/news_available_update.vsp b/binsrc/vsp/admin/admin_news/news_available_update.vsp index 11fa777035..08c44d2915 100644 --- a/binsrc/vsp/admin/admin_news/news_available_update.vsp +++ b/binsrc/vsp/admin/admin_news/news_available_update.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/news_available_update_frame.vsp b/binsrc/vsp/admin/admin_news/news_available_update_frame.vsp index 095656d2e4..5dd3a25f99 100644 --- a/binsrc/vsp/admin/admin_news/news_available_update_frame.vsp +++ b/binsrc/vsp/admin/admin_news/news_available_update_frame.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/news_frames.vsp b/binsrc/vsp/admin/admin_news/news_frames.vsp index d543eb8dde..b71538c09b 100644 --- a/binsrc/vsp/admin/admin_news/news_frames.vsp +++ b/binsrc/vsp/admin/admin_news/news_frames.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/news_group_detail.vsp b/binsrc/vsp/admin/admin_news/news_group_detail.vsp index 793ee3c21c..ce4985ff3a 100644 --- a/binsrc/vsp/admin/admin_news/news_group_detail.vsp +++ b/binsrc/vsp/admin/admin_news/news_group_detail.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/news_read.vsp b/binsrc/vsp/admin/admin_news/news_read.vsp index ba0febb7de..95fa14af38 100644 --- a/binsrc/vsp/admin/admin_news/news_read.vsp +++ b/binsrc/vsp/admin/admin_news/news_read.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/news_read_banner.vsp b/binsrc/vsp/admin/admin_news/news_read_banner.vsp index c250482cbd..4292b9e6ea 100644 --- a/binsrc/vsp/admin/admin_news/news_read_banner.vsp +++ b/binsrc/vsp/admin/admin_news/news_read_banner.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/news_search.vsp b/binsrc/vsp/admin/admin_news/news_search.vsp index 4b4d347c81..ce26fbc7e6 100644 --- a/binsrc/vsp/admin/admin_news/news_search.vsp +++ b/binsrc/vsp/admin/admin_news/news_search.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/news_search_result.vsp b/binsrc/vsp/admin/admin_news/news_search_result.vsp index b830475444..3bb27e3598 100644 --- a/binsrc/vsp/admin/admin_news/news_search_result.vsp +++ b/binsrc/vsp/admin/admin_news/news_search_result.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/news_server_config.vsp b/binsrc/vsp/admin/admin_news/news_server_config.vsp index f992a44ae7..6e828d8c3d 100644 --- a/binsrc/vsp/admin/admin_news/news_server_config.vsp +++ b/binsrc/vsp/admin/admin_news/news_server_config.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/news_server_list.vsp b/binsrc/vsp/admin/admin_news/news_server_list.vsp index 05089a0270..09e19e7a47 100644 --- a/binsrc/vsp/admin/admin_news/news_server_list.vsp +++ b/binsrc/vsp/admin/admin_news/news_server_list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_news/newsgroups_add.vsp b/binsrc/vsp/admin/admin_news/newsgroups_add.vsp index 9fd66b7ba0..4100b2fff1 100644 --- a/binsrc/vsp/admin/admin_news/newsgroups_add.vsp +++ b/binsrc/vsp/admin/admin_news/newsgroups_add.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_proc_edit.vsp b/binsrc/vsp/admin/admin_proc_edit.vsp index a7ca3fae7a..98d11d5882 100644 --- a/binsrc/vsp/admin/admin_proc_edit.vsp +++ b/binsrc/vsp/admin/admin_proc_edit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_proc_view.vsp b/binsrc/vsp/admin/admin_proc_view.vsp index cdd921a4ad..59be995bd6 100644 --- a/binsrc/vsp/admin/admin_proc_view.vsp +++ b/binsrc/vsp/admin/admin_proc_view.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_procs.vsp b/binsrc/vsp/admin/admin_procs.vsp index 28d33b8e75..81574a9000 100644 --- a/binsrc/vsp/admin/admin_procs.vsp +++ b/binsrc/vsp/admin/admin_procs.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_procs_verify.vsp b/binsrc/vsp/admin/admin_procs_verify.vsp index 31fa9bbb59..ef620e584b 100644 --- a/binsrc/vsp/admin/admin_procs_verify.vsp +++ b/binsrc/vsp/admin/admin_procs_verify.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_repl/admin_repl_main.vsp b/binsrc/vsp/admin/admin_repl/admin_repl_main.vsp index 99abfd44fa..f21dbdb840 100644 --- a/binsrc/vsp/admin/admin_repl/admin_repl_main.vsp +++ b/binsrc/vsp/admin/admin_repl/admin_repl_main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_repl/link_tables.js b/binsrc/vsp/admin/admin_repl/link_tables.js index b75fec808c..1122acb6ec 100644 --- a/binsrc/vsp/admin/admin_repl/link_tables.js +++ b/binsrc/vsp/admin/admin_repl/link_tables.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_repl/snp_all_shed.vsp b/binsrc/vsp/admin/admin_repl/snp_all_shed.vsp index 17878b4c69..bec377fb7f 100644 --- a/binsrc/vsp/admin/admin_repl/snp_all_shed.vsp +++ b/binsrc/vsp/admin/admin_repl/snp_all_shed.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_repl/snp_bidir.vsp b/binsrc/vsp/admin/admin_repl/snp_bidir.vsp index 0e2129c458..78f478ed07 100644 --- a/binsrc/vsp/admin/admin_repl/snp_bidir.vsp +++ b/binsrc/vsp/admin/admin_repl/snp_bidir.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_repl/snp_bidir_edit.vsp b/binsrc/vsp/admin/admin_repl/snp_bidir_edit.vsp index df917a0409..198ecff51a 100644 --- a/binsrc/vsp/admin/admin_repl/snp_bidir_edit.vsp +++ b/binsrc/vsp/admin/admin_repl/snp_bidir_edit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_repl/snp_bidir_new_subscriber.vsp b/binsrc/vsp/admin/admin_repl/snp_bidir_new_subscriber.vsp index ad63e6d313..69df5eb1cf 100644 --- a/binsrc/vsp/admin/admin_repl/snp_bidir_new_subscriber.vsp +++ b/binsrc/vsp/admin/admin_repl/snp_bidir_new_subscriber.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_repl/snp_create.vsp b/binsrc/vsp/admin/admin_repl/snp_create.vsp index 7063499704..afce7443a3 100644 --- a/binsrc/vsp/admin/admin_repl/snp_create.vsp +++ b/binsrc/vsp/admin/admin_repl/snp_create.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_repl/snp_main.vsp b/binsrc/vsp/admin/admin_repl/snp_main.vsp index ae97c796ae..3f2f7b8b9c 100644 --- a/binsrc/vsp/admin/admin_repl/snp_main.vsp +++ b/binsrc/vsp/admin/admin_repl/snp_main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_repl/snp_sched.vsp b/binsrc/vsp/admin/admin_repl/snp_sched.vsp index bbebb4da83..86cc132c8f 100644 --- a/binsrc/vsp/admin/admin_repl/snp_sched.vsp +++ b/binsrc/vsp/admin/admin_repl/snp_sched.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_repl/snp_tbl_list.vsp b/binsrc/vsp/admin/admin_repl/snp_tbl_list.vsp index d337091502..a7be0add84 100644 --- a/binsrc/vsp/admin/admin_repl/snp_tbl_list.vsp +++ b/binsrc/vsp/admin/admin_repl/snp_tbl_list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_start.vsp b/binsrc/vsp/admin/admin_start.vsp index f53c1b65be..94ae87bf0f 100644 --- a/binsrc/vsp/admin/admin_start.vsp +++ b/binsrc/vsp/admin/admin_start.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_stat.vsp b/binsrc/vsp/admin/admin_stat.vsp index 725545709e..6dfebb27c0 100644 --- a/binsrc/vsp/admin/admin_stat.vsp +++ b/binsrc/vsp/admin/admin_stat.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_stat_audit.vsp b/binsrc/vsp/admin/admin_stat_audit.vsp index 9ad8c177a9..9485015683 100644 --- a/binsrc/vsp/admin/admin_stat_audit.vsp +++ b/binsrc/vsp/admin/admin_stat_audit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_stat_disk.vsp b/binsrc/vsp/admin/admin_stat_disk.vsp index 03cd3b67d9..5c81ae84a4 100644 --- a/binsrc/vsp/admin/admin_stat_disk.vsp +++ b/binsrc/vsp/admin/admin_stat_disk.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_stat_idx.vsp b/binsrc/vsp/admin/admin_stat_idx.vsp index 722a002e08..c2e1f4a580 100644 --- a/binsrc/vsp/admin/admin_stat_idx.vsp +++ b/binsrc/vsp/admin/admin_stat_idx.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_stat_lock.vsp b/binsrc/vsp/admin/admin_stat_lock.vsp index c652b67538..9439f8fee7 100644 --- a/binsrc/vsp/admin/admin_stat_lock.vsp +++ b/binsrc/vsp/admin/admin_stat_lock.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_stat_prof.vsp b/binsrc/vsp/admin/admin_stat_prof.vsp index 5a3e5520b8..a90f898bd1 100644 --- a/binsrc/vsp/admin/admin_stat_prof.vsp +++ b/binsrc/vsp/admin/admin_stat_prof.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_stat_space.vsp b/binsrc/vsp/admin/admin_stat_space.vsp index b6f854f5f4..38951db46a 100644 --- a/binsrc/vsp/admin/admin_stat_space.vsp +++ b/binsrc/vsp/admin/admin_stat_space.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_stat_www.vsp b/binsrc/vsp/admin/admin_stat_www.vsp index 8c334c180a..f163e4e437 100644 --- a/binsrc/vsp/admin/admin_stat_www.vsp +++ b/binsrc/vsp/admin/admin_stat_www.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_style.css b/binsrc/vsp/admin/admin_style.css index c68c5cd7ae..2c35273d59 100644 --- a/binsrc/vsp/admin/admin_style.css +++ b/binsrc/vsp/admin/admin_style.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_tables.vsp b/binsrc/vsp/admin/admin_tables.vsp index 5aa3a08910..20b3c4e248 100644 --- a/binsrc/vsp/admin/admin_tables.vsp +++ b/binsrc/vsp/admin/admin_tables.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_tables_verify.vsp b/binsrc/vsp/admin/admin_tables_verify.vsp index 9ac8471295..96f27d43d8 100644 --- a/binsrc/vsp/admin/admin_tables_verify.vsp +++ b/binsrc/vsp/admin/admin_tables_verify.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_topleft.html b/binsrc/vsp/admin/admin_topleft.html index bed73a8819..9e9740eefc 100644 --- a/binsrc/vsp/admin/admin_topleft.html +++ b/binsrc/vsp/admin/admin_topleft.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_triggers.vsp b/binsrc/vsp/admin/admin_triggers.vsp index 503a4c8cf7..0538b2de1d 100644 --- a/binsrc/vsp/admin/admin_triggers.vsp +++ b/binsrc/vsp/admin/admin_triggers.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_triggers_edit.vsp b/binsrc/vsp/admin/admin_triggers_edit.vsp index f8c634ce7a..995279faf1 100644 --- a/binsrc/vsp/admin/admin_triggers_edit.vsp +++ b/binsrc/vsp/admin/admin_triggers_edit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_triggers_verify.vsp b/binsrc/vsp/admin/admin_triggers_verify.vsp index 321b5123ab..b1efaf368c 100644 --- a/binsrc/vsp/admin/admin_triggers_verify.vsp +++ b/binsrc/vsp/admin/admin_triggers_verify.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/sub_error.vsp b/binsrc/vsp/admin/admin_trx_repl/sub_error.vsp index f6e2ffd636..9ace1b3524 100644 --- a/binsrc/vsp/admin/admin_trx_repl/sub_error.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/sub_error.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_dav.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_dav.vsp index 8a7b0c9589..490788d4d1 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_dav.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_dav.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_file.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_file.vsp index 38c82ae272..91af9c40e2 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_file.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_file.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_new_dav_col.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_new_dav_col.vsp index fe2d91ae42..4f567cdefd 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_new_dav_col.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_new_dav_col.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr.vsp index 8651ffa84a..4c3fd94942 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_edit.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_edit.vsp index 67350490d9..b880c456e0 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_edit.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_edit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_new.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_new.vsp index 3ac4b7f365..33117db30c 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_new.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_cr_new.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_add.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_add.vsp index a6a58d416a..e9355a4ea9 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_add.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_add.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_adv.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_adv.vsp index f30379db80..8105db060c 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_adv.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_item_adv.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub.vsp index 4e58b839ed..6109d098d4 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_items.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_items.vsp index 8f34d0e399..05aa6051d9 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_items.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_items.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_new.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_new.vsp index a05dd6d01e..b650bee390 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_new.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_pub_new.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_repl_subscriber_add.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_repl_subscriber_add.vsp index 42ba384159..f5379e8c51 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_repl_subscriber_add.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_repl_subscriber_add.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_sub.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_sub.vsp index 388573841c..d06c98d7ba 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_sub.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_sub.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_sub_copy_stat.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_sub_copy_stat.vsp index 4fb3b74e4a..a0be8af0be 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_sub_copy_stat.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_sub_copy_stat.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_sub_edit.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_sub_edit.vsp index db14f952fd..c7b9cb3a7a 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_sub_edit.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_sub_edit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_sub_new.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_sub_new.vsp index 6fbe988dad..d6566fcc92 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_sub_new.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_sub_new.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_trx_repl/trx_sub_replay.vsp b/binsrc/vsp/admin/admin_trx_repl/trx_sub_replay.vsp index 29d78107cd..0bf4fc2de1 100644 --- a/binsrc/vsp/admin/admin_trx_repl/trx_sub_replay.vsp +++ b/binsrc/vsp/admin/admin_trx_repl/trx_sub_replay.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_unlink_proc.vsp b/binsrc/vsp/admin/admin_unlink_proc.vsp index 3a9dde064b..6878fea10f 100644 --- a/binsrc/vsp/admin/admin_unlink_proc.vsp +++ b/binsrc/vsp/admin/admin_unlink_proc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_user_types.vsp b/binsrc/vsp/admin/admin_user_types.vsp index 67865f1a3b..761344c557 100644 --- a/binsrc/vsp/admin/admin_user_types.vsp +++ b/binsrc/vsp/admin/admin_user_types.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_user_types_verify.vsp b/binsrc/vsp/admin/admin_user_types_verify.vsp index 51153cbddf..4b90c93590 100644 --- a/binsrc/vsp/admin/admin_user_types_verify.vsp +++ b/binsrc/vsp/admin/admin_user_types_verify.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_users.vsp b/binsrc/vsp/admin/admin_users.vsp index 8e94f29968..3d4d50bb5d 100644 --- a/binsrc/vsp/admin/admin_users.vsp +++ b/binsrc/vsp/admin/admin_users.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_utils.js b/binsrc/vsp/admin/admin_utils.js index 458af98c5e..55c52ebad0 100644 --- a/binsrc/vsp/admin/admin_utils.js +++ b/binsrc/vsp/admin/admin_utils.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_views.vsp b/binsrc/vsp/admin/admin_views.vsp index fbf286b534..1d6b53bad9 100644 --- a/binsrc/vsp/admin/admin_views.vsp +++ b/binsrc/vsp/admin/admin_views.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_views_edit.vsp b/binsrc/vsp/admin/admin_views_edit.vsp index 586921eca6..10dfb1d120 100644 --- a/binsrc/vsp/admin/admin_views_edit.vsp +++ b/binsrc/vsp/admin/admin_views_edit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_views_verify.vsp b/binsrc/vsp/admin/admin_views_verify.vsp index 8c128f934e..9ff0c064eb 100644 --- a/binsrc/vsp/admin/admin_views_verify.vsp +++ b/binsrc/vsp/admin/admin_views_verify.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_virtini.vsp b/binsrc/vsp/admin/admin_virtini.vsp index 78c4519926..8f69eb546b 100644 --- a/binsrc/vsp/admin/admin_virtini.vsp +++ b/binsrc/vsp/admin/admin_virtini.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_xml_documents_main.vsp b/binsrc/vsp/admin/admin_xml_documents_main.vsp index 3247b911eb..898b6ca5e1 100644 --- a/binsrc/vsp/admin/admin_xml_documents_main.vsp +++ b/binsrc/vsp/admin/admin_xml_documents_main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_xml_documents_view.vsp b/binsrc/vsp/admin/admin_xml_documents_view.vsp index 550288881d..bd77091cc7 100644 --- a/binsrc/vsp/admin/admin_xml_documents_view.vsp +++ b/binsrc/vsp/admin/admin_xml_documents_view.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_xml_views_main.vsp b/binsrc/vsp/admin/admin_xml_views_main.vsp index 35321ad6fd..00c172b8a1 100644 --- a/binsrc/vsp/admin/admin_xml_views_main.vsp +++ b/binsrc/vsp/admin/admin_xml_views_main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_xquery_main.vsp b/binsrc/vsp/admin/admin_xquery_main.vsp index f534002c12..1ea8d1ec76 100644 --- a/binsrc/vsp/admin/admin_xquery_main.vsp +++ b/binsrc/vsp/admin/admin_xquery_main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/admin_xquery_test.vsp b/binsrc/vsp/admin/admin_xquery_test.vsp index 7451b8adf2..c9afc05005 100644 --- a/binsrc/vsp/admin/admin_xquery_test.vsp +++ b/binsrc/vsp/admin/admin_xquery_test.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/browse_page.vsp b/binsrc/vsp/admin/dbpump/browse_page.vsp index 1f8cee057f..5f8056e873 100644 --- a/binsrc/vsp/admin/dbpump/browse_page.vsp +++ b/binsrc/vsp/admin/dbpump/browse_page.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/comp_html.sql b/binsrc/vsp/admin/dbpump/comp_html.sql index 06a39c7a20..4537e108e4 100644 --- a/binsrc/vsp/admin/dbpump/comp_html.sql +++ b/binsrc/vsp/admin/dbpump/comp_html.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -223,7 +223,7 @@ create procedure "PUMP"."DBA"."HTML_FOOTER_OUT" ( inout arr any ) http ('

    Virtuoso Server '); http (sys_stat('st_dbms_ver')); - http (' DBPUMP Interface - Copyright© 1998-2018 OpenLink Software.

    \n'); } ; diff --git a/binsrc/vsp/admin/dbpump/comp_misc.sql b/binsrc/vsp/admin/dbpump/comp_misc.sql index 98e5b5d8cd..1e659ea3dd 100644 --- a/binsrc/vsp/admin/dbpump/comp_misc.sql +++ b/binsrc/vsp/admin/dbpump/comp_misc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/comp_rpath.sql b/binsrc/vsp/admin/dbpump/comp_rpath.sql index 94ff1588aa..fee60e816b 100644 --- a/binsrc/vsp/admin/dbpump/comp_rpath.sql +++ b/binsrc/vsp/admin/dbpump/comp_rpath.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/comp_tables.sql b/binsrc/vsp/admin/dbpump/comp_tables.sql index 1c1991f690..a6337a7352 100644 --- a/binsrc/vsp/admin/dbpump/comp_tables.sql +++ b/binsrc/vsp/admin/dbpump/comp_tables.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/components.sql b/binsrc/vsp/admin/dbpump/components.sql index 9fca7472d8..2dbbef0aea 100644 --- a/binsrc/vsp/admin/dbpump/components.sql +++ b/binsrc/vsp/admin/dbpump/components.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/dbdoc.vsp b/binsrc/vsp/admin/dbpump/dbdoc.vsp index f9688df448..0529a11239 100644 --- a/binsrc/vsp/admin/dbpump/dbdoc.vsp +++ b/binsrc/vsp/admin/dbpump/dbdoc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/dbhelp.vsp b/binsrc/vsp/admin/dbpump/dbhelp.vsp index a03fb3b6a7..f0a03f2449 100644 --- a/binsrc/vsp/admin/dbpump/dbhelp.vsp +++ b/binsrc/vsp/admin/dbpump/dbhelp.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/dbpump.vsp b/binsrc/vsp/admin/dbpump/dbpump.vsp index f67329a9fc..9dcd244c8f 100644 --- a/binsrc/vsp/admin/dbpump/dbpump.vsp +++ b/binsrc/vsp/admin/dbpump/dbpump.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/dbpump_root.sql b/binsrc/vsp/admin/dbpump/dbpump_root.sql index 9584448e98..efd6315bfc 100644 --- a/binsrc/vsp/admin/dbpump/dbpump_root.sql +++ b/binsrc/vsp/admin/dbpump/dbpump_root.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/dbpump_scripts.html b/binsrc/vsp/admin/dbpump/dbpump_scripts.html index c101785ca9..e50ba8788b 100644 --- a/binsrc/vsp/admin/dbpump/dbpump_scripts.html +++ b/binsrc/vsp/admin/dbpump/dbpump_scripts.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/debug.vsp b/binsrc/vsp/admin/dbpump/debug.vsp index b6547b0af3..8c8d0ac306 100644 --- a/binsrc/vsp/admin/dbpump/debug.vsp +++ b/binsrc/vsp/admin/dbpump/debug.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/dump_itself.vsp b/binsrc/vsp/admin/dbpump/dump_itself.vsp index db86d5643e..948eaaef7e 100644 --- a/binsrc/vsp/admin/dbpump/dump_itself.vsp +++ b/binsrc/vsp/admin/dbpump/dump_itself.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/dump_options.vsp b/binsrc/vsp/admin/dbpump/dump_options.vsp index b62286ff04..d859cf54e2 100644 --- a/binsrc/vsp/admin/dbpump/dump_options.vsp +++ b/binsrc/vsp/admin/dbpump/dump_options.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/dump_page.vsp b/binsrc/vsp/admin/dbpump/dump_page.vsp index c32f1f2c04..bee08f6b56 100644 --- a/binsrc/vsp/admin/dbpump/dump_page.vsp +++ b/binsrc/vsp/admin/dbpump/dump_page.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/dump_schema.vsp b/binsrc/vsp/admin/dbpump/dump_schema.vsp index d4d2b4a11a..f01e8976f4 100644 --- a/binsrc/vsp/admin/dbpump/dump_schema.vsp +++ b/binsrc/vsp/admin/dbpump/dump_schema.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/dump_schema_itself.vsp b/binsrc/vsp/admin/dbpump/dump_schema_itself.vsp index 597a5fd30f..8be0977ae4 100644 --- a/binsrc/vsp/admin/dbpump/dump_schema_itself.vsp +++ b/binsrc/vsp/admin/dbpump/dump_schema_itself.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/dump_tables.vsp b/binsrc/vsp/admin/dbpump/dump_tables.vsp index 6649ae21b7..b829bd27f1 100644 --- a/binsrc/vsp/admin/dbpump/dump_tables.vsp +++ b/binsrc/vsp/admin/dbpump/dump_tables.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/dump_tables_itself.vsp b/binsrc/vsp/admin/dbpump/dump_tables_itself.vsp index 047cd08940..924b4a1671 100644 --- a/binsrc/vsp/admin/dbpump/dump_tables_itself.vsp +++ b/binsrc/vsp/admin/dbpump/dump_tables_itself.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/filter_options.vsp b/binsrc/vsp/admin/dbpump/filter_options.vsp index c54f1aed9a..e2194ba07a 100644 --- a/binsrc/vsp/admin/dbpump/filter_options.vsp +++ b/binsrc/vsp/admin/dbpump/filter_options.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/manifest.vsp b/binsrc/vsp/admin/dbpump/manifest.vsp index 753f29f511..7ca626f3af 100644 --- a/binsrc/vsp/admin/dbpump/manifest.vsp +++ b/binsrc/vsp/admin/dbpump/manifest.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/manifest.xsl b/binsrc/vsp/admin/dbpump/manifest.xsl index 46d9fff69a..0949693890 100644 --- a/binsrc/vsp/admin/dbpump/manifest.xsl +++ b/binsrc/vsp/admin/dbpump/manifest.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/oper_pars.sql b/binsrc/vsp/admin/dbpump/oper_pars.sql index 2567caa3da..807b072d86 100644 --- a/binsrc/vsp/admin/dbpump/oper_pars.sql +++ b/binsrc/vsp/admin/dbpump/oper_pars.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/operpars.awk b/binsrc/vsp/admin/dbpump/operpars.awk index c787d0ad48..de1b36efb8 100644 --- a/binsrc/vsp/admin/dbpump/operpars.awk +++ b/binsrc/vsp/admin/dbpump/operpars.awk @@ -3,7 +3,7 @@ BEGIN { # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/pars_init.sql b/binsrc/vsp/admin/dbpump/pars_init.sql index 7a48841230..e97e0f4771 100644 --- a/binsrc/vsp/admin/dbpump/pars_init.sql +++ b/binsrc/vsp/admin/dbpump/pars_init.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/parse_oper_pars.sh b/binsrc/vsp/admin/dbpump/parse_oper_pars.sh index a165f35c46..712128e19f 100755 --- a/binsrc/vsp/admin/dbpump/parse_oper_pars.sh +++ b/binsrc/vsp/admin/dbpump/parse_oper_pars.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/passwd_page.vsp b/binsrc/vsp/admin/dbpump/passwd_page.vsp index a7c5be3691..6cb0503b66 100644 --- a/binsrc/vsp/admin/dbpump/passwd_page.vsp +++ b/binsrc/vsp/admin/dbpump/passwd_page.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/restore_itself.vsp b/binsrc/vsp/admin/dbpump/restore_itself.vsp index 3690475002..40c20c3831 100644 --- a/binsrc/vsp/admin/dbpump/restore_itself.vsp +++ b/binsrc/vsp/admin/dbpump/restore_itself.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/restore_options.vsp b/binsrc/vsp/admin/dbpump/restore_options.vsp index 181277a0fc..cf3289f3de 100644 --- a/binsrc/vsp/admin/dbpump/restore_options.vsp +++ b/binsrc/vsp/admin/dbpump/restore_options.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/restore_page.vsp b/binsrc/vsp/admin/dbpump/restore_page.vsp index 34a78bd527..52431382d4 100644 --- a/binsrc/vsp/admin/dbpump/restore_page.vsp +++ b/binsrc/vsp/admin/dbpump/restore_page.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/restore_schema.vsp b/binsrc/vsp/admin/dbpump/restore_schema.vsp index faa7757377..a0783dd751 100644 --- a/binsrc/vsp/admin/dbpump/restore_schema.vsp +++ b/binsrc/vsp/admin/dbpump/restore_schema.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/restore_schema_itself.vsp b/binsrc/vsp/admin/dbpump/restore_schema_itself.vsp index ad1740b10f..157a861d6f 100644 --- a/binsrc/vsp/admin/dbpump/restore_schema_itself.vsp +++ b/binsrc/vsp/admin/dbpump/restore_schema_itself.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/restore_tables.vsp b/binsrc/vsp/admin/dbpump/restore_tables.vsp index df9d8a699e..9d377a1f99 100644 --- a/binsrc/vsp/admin/dbpump/restore_tables.vsp +++ b/binsrc/vsp/admin/dbpump/restore_tables.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/restore_tables_itself.vsp b/binsrc/vsp/admin/dbpump/restore_tables_itself.vsp index dd947da959..9dd714c14d 100644 --- a/binsrc/vsp/admin/dbpump/restore_tables_itself.vsp +++ b/binsrc/vsp/admin/dbpump/restore_tables_itself.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/root.isql b/binsrc/vsp/admin/dbpump/root.isql index 711d72493f..29785bc12d 100644 --- a/binsrc/vsp/admin/dbpump/root.isql +++ b/binsrc/vsp/admin/dbpump/root.isql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_index-info_error.xsl b/binsrc/vsp/admin/dbpump/schema_index-info_error.xsl index cb703b5cd5..b82cf37c8f 100644 --- a/binsrc/vsp/admin/dbpump/schema_index-info_error.xsl +++ b/binsrc/vsp/admin/dbpump/schema_index-info_error.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_index_info.vsp b/binsrc/vsp/admin/dbpump/schema_index_info.vsp index c791bc45f4..e65bf6f377 100644 --- a/binsrc/vsp/admin/dbpump/schema_index_info.vsp +++ b/binsrc/vsp/admin/dbpump/schema_index_info.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_index_info.xsl b/binsrc/vsp/admin/dbpump/schema_index_info.xsl index 7f76ecf51c..41dfa3e702 100644 --- a/binsrc/vsp/admin/dbpump/schema_index_info.xsl +++ b/binsrc/vsp/admin/dbpump/schema_index_info.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_indices.vsp b/binsrc/vsp/admin/dbpump/schema_indices.vsp index 550f3cb8aa..04f7d0ebf1 100644 --- a/binsrc/vsp/admin/dbpump/schema_indices.vsp +++ b/binsrc/vsp/admin/dbpump/schema_indices.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_indices.xsl b/binsrc/vsp/admin/dbpump/schema_indices.xsl index fe3d690348..68f35be679 100644 --- a/binsrc/vsp/admin/dbpump/schema_indices.xsl +++ b/binsrc/vsp/admin/dbpump/schema_indices.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_info.vsp b/binsrc/vsp/admin/dbpump/schema_info.vsp index 04770a649d..fb23435b1a 100644 --- a/binsrc/vsp/admin/dbpump/schema_info.vsp +++ b/binsrc/vsp/admin/dbpump/schema_info.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_proc_info.vsp b/binsrc/vsp/admin/dbpump/schema_proc_info.vsp index ce0b3698f9..8791bfb28d 100644 --- a/binsrc/vsp/admin/dbpump/schema_proc_info.vsp +++ b/binsrc/vsp/admin/dbpump/schema_proc_info.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_proc_info.xsl b/binsrc/vsp/admin/dbpump/schema_proc_info.xsl index 8cb3361612..4b5f0b7d96 100644 --- a/binsrc/vsp/admin/dbpump/schema_proc_info.xsl +++ b/binsrc/vsp/admin/dbpump/schema_proc_info.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_procs.vsp b/binsrc/vsp/admin/dbpump/schema_procs.vsp index 2481708334..a86b461e05 100644 --- a/binsrc/vsp/admin/dbpump/schema_procs.vsp +++ b/binsrc/vsp/admin/dbpump/schema_procs.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_procs.xsl b/binsrc/vsp/admin/dbpump/schema_procs.xsl index 244c99c4c2..5ade2bce8b 100644 --- a/binsrc/vsp/admin/dbpump/schema_procs.xsl +++ b/binsrc/vsp/admin/dbpump/schema_procs.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_table_info.vsp b/binsrc/vsp/admin/dbpump/schema_table_info.vsp index 338a89c257..b896672933 100644 --- a/binsrc/vsp/admin/dbpump/schema_table_info.vsp +++ b/binsrc/vsp/admin/dbpump/schema_table_info.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_table_info.xsl b/binsrc/vsp/admin/dbpump/schema_table_info.xsl index e10d0d8de8..bb349a0d8f 100644 --- a/binsrc/vsp/admin/dbpump/schema_table_info.xsl +++ b/binsrc/vsp/admin/dbpump/schema_table_info.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_tables.vsp b/binsrc/vsp/admin/dbpump/schema_tables.vsp index 1af4047db2..65f51a7312 100644 --- a/binsrc/vsp/admin/dbpump/schema_tables.vsp +++ b/binsrc/vsp/admin/dbpump/schema_tables.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_tables.xsl b/binsrc/vsp/admin/dbpump/schema_tables.xsl index eb2160ad20..d9d530ebc9 100644 --- a/binsrc/vsp/admin/dbpump/schema_tables.xsl +++ b/binsrc/vsp/admin/dbpump/schema_tables.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/schema_tables_select.xsl b/binsrc/vsp/admin/dbpump/schema_tables_select.xsl index 846bb61c92..54683aaa3a 100644 --- a/binsrc/vsp/admin/dbpump/schema_tables_select.xsl +++ b/binsrc/vsp/admin/dbpump/schema_tables_select.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/select_datasource.vsp b/binsrc/vsp/admin/dbpump/select_datasource.vsp index 16f2dccad0..decb98ee9e 100644 --- a/binsrc/vsp/admin/dbpump/select_datasource.vsp +++ b/binsrc/vsp/admin/dbpump/select_datasource.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/select_options.vsp b/binsrc/vsp/admin/dbpump/select_options.vsp index 949e4d5bb5..c21e27c594 100644 --- a/binsrc/vsp/admin/dbpump/select_options.vsp +++ b/binsrc/vsp/admin/dbpump/select_options.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/dbpump/try_connect.vsp b/binsrc/vsp/admin/dbpump/try_connect.vsp index a3df101548..733e12c451 100644 --- a/binsrc/vsp/admin/dbpump/try_connect.vsp +++ b/binsrc/vsp/admin/dbpump/try_connect.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/debug/filter.awk b/binsrc/vsp/admin/debug/filter.awk index 1a80b2c986..0c10829bd2 100644 --- a/binsrc/vsp/admin/debug/filter.awk +++ b/binsrc/vsp/admin/debug/filter.awk @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/debug/init.sql b/binsrc/vsp/admin/debug/init.sql index 88fbaba71b..8f2046b6b2 100644 --- a/binsrc/vsp/admin/debug/init.sql +++ b/binsrc/vsp/admin/debug/init.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/debug/make_vad.sh b/binsrc/vsp/admin/debug/make_vad.sh index 6f0cd86f61..9825da6403 100755 --- a/binsrc/vsp/admin/debug/make_vad.sh +++ b/binsrc/vsp/admin/debug/make_vad.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -188,7 +188,7 @@ sticker_init() { echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER - echo " " >> $STICKER + echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER echo " " >> $STICKER diff --git a/binsrc/vsp/admin/debug/record.vspx b/binsrc/vsp/admin/debug/record.vspx index 49c22c3081..7beb017d69 100644 --- a/binsrc/vsp/admin/debug/record.vspx +++ b/binsrc/vsp/admin/debug/record.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/debug/record_login.vspx b/binsrc/vsp/admin/debug/record_login.vspx index d079782c4d..b9c8ae15ba 100644 --- a/binsrc/vsp/admin/debug/record_login.vspx +++ b/binsrc/vsp/admin/debug/record_login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/debug/run_tests.sh b/binsrc/vsp/admin/debug/run_tests.sh index b5a1179395..f8ba634257 100755 --- a/binsrc/vsp/admin/debug/run_tests.sh +++ b/binsrc/vsp/admin/debug/run_tests.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/hosted_modules_grants.vsp b/binsrc/vsp/admin/hosted_modules_grants.vsp index 6693194fe0..727ef4bb8a 100644 --- a/binsrc/vsp/admin/hosted_modules_grants.vsp +++ b/binsrc/vsp/admin/hosted_modules_grants.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/hosted_modules_show_sql.vsp b/binsrc/vsp/admin/hosted_modules_show_sql.vsp index abd9c9b6c6..c10ac3dd94 100644 --- a/binsrc/vsp/admin/hosted_modules_show_sql.vsp +++ b/binsrc/vsp/admin/hosted_modules_show_sql.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/index_left.vsp b/binsrc/vsp/admin/index_left.vsp index 04c8f6522c..773ece9ac3 100644 --- a/binsrc/vsp/admin/index_left.vsp +++ b/binsrc/vsp/admin/index_left.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/leftfr.vsp b/binsrc/vsp/admin/leftfr.vsp index 21291a21b4..914c718ab7 100644 --- a/binsrc/vsp/admin/leftfr.vsp +++ b/binsrc/vsp/admin/leftfr.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/dbdoc.vsp b/binsrc/vsp/admin/vad/dbdoc.vsp index 34b49734f8..5336da6fe8 100644 --- a/binsrc/vsp/admin/vad/dbdoc.vsp +++ b/binsrc/vsp/admin/vad/dbdoc.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/dbhelp.vsp b/binsrc/vsp/admin/vad/dbhelp.vsp index 9ab548401f..7094eeed80 100644 --- a/binsrc/vsp/admin/vad/dbhelp.vsp +++ b/binsrc/vsp/admin/vad/dbhelp.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/regedit.vsp b/binsrc/vsp/admin/vad/regedit.vsp index f71b246091..a76194a7e8 100644 --- a/binsrc/vsp/admin/vad/regedit.vsp +++ b/binsrc/vsp/admin/vad/regedit.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/regedit_data.vsp b/binsrc/vsp/admin/vad/regedit_data.vsp index 1854d427b7..ddfc0bf5ec 100644 --- a/binsrc/vsp/admin/vad/regedit_data.vsp +++ b/binsrc/vsp/admin/vad/regedit_data.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/regedit_e1.vsp b/binsrc/vsp/admin/vad/regedit_e1.vsp index 008e93635e..63f9294c4b 100644 --- a/binsrc/vsp/admin/vad/regedit_e1.vsp +++ b/binsrc/vsp/admin/vad/regedit_e1.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/regedit_sql.vsp b/binsrc/vsp/admin/vad/regedit_sql.vsp index 1fbc522a0d..246f2fe291 100644 --- a/binsrc/vsp/admin/vad/regedit_sql.vsp +++ b/binsrc/vsp/admin/vad/regedit_sql.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/regedit_sticker.vsp b/binsrc/vsp/admin/vad/regedit_sticker.vsp index ade0f85208..b6e9ba6a85 100644 --- a/binsrc/vsp/admin/vad/regedit_sticker.vsp +++ b/binsrc/vsp/admin/vad/regedit_sticker.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/regedit_tree.vsp b/binsrc/vsp/admin/vad/regedit_tree.vsp index 079f92477a..675bf3e1e9 100644 --- a/binsrc/vsp/admin/vad/regedit_tree.vsp +++ b/binsrc/vsp/admin/vad/regedit_tree.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/vad.vsp b/binsrc/vsp/admin/vad/vad.vsp index 027e941ecd..7282b760e8 100644 --- a/binsrc/vsp/admin/vad/vad.vsp +++ b/binsrc/vsp/admin/vad/vad.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/vad_configs.vsp b/binsrc/vsp/admin/vad/vad_configs.vsp index 4d64c1015e..3eff02b5ae 100644 --- a/binsrc/vsp/admin/vad/vad_configs.vsp +++ b/binsrc/vsp/admin/vad/vad_configs.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/vad_davs.vsp b/binsrc/vsp/admin/vad/vad_davs.vsp index db819c8d64..384be140f4 100644 --- a/binsrc/vsp/admin/vad/vad_davs.vsp +++ b/binsrc/vsp/admin/vad/vad_davs.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/vad_docs.vsp b/binsrc/vsp/admin/vad/vad_docs.vsp index 39ab545bcb..a6e321dce0 100644 --- a/binsrc/vsp/admin/vad/vad_docs.vsp +++ b/binsrc/vsp/admin/vad/vad_docs.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/vad_packages.vsp b/binsrc/vsp/admin/vad/vad_packages.vsp index dc3f63d311..6e71ea6788 100644 --- a/binsrc/vsp/admin/vad/vad_packages.vsp +++ b/binsrc/vsp/admin/vad/vad_packages.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin/vad/vad_vsps.vsp b/binsrc/vsp/admin/vad/vad_vsps.vsp index c1f1d8a951..cb61c69a8d 100644 --- a/binsrc/vsp/admin/vad/vad_vsps.vsp +++ b/binsrc/vsp/admin/vad/vad_vsps.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/admin_style.html b/binsrc/vsp/admin_style.html index 6f6fa99d1d..3cbdc5b51b 100644 --- a/binsrc/vsp/admin_style.html +++ b/binsrc/vsp/admin_style.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/bugsfixed.html b/binsrc/vsp/bugsfixed.html index b9f9e61669..96d2313357 100644 --- a/binsrc/vsp/bugsfixed.html +++ b/binsrc/vsp/bugsfixed.html @@ -4,7 +4,7 @@ Bugs Fixed - + @@ -98,6 +98,6 @@
    -
    - Copyright 1998-2018 OpenLink Software -
    +
    - Copyright 1998-2019 OpenLink Software -
    diff --git a/binsrc/vsp/default.css b/binsrc/vsp/default.css index f31e57da15..9088ba6918 100644 --- a/binsrc/vsp/default.css +++ b/binsrc/vsp/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/demo-index.html b/binsrc/vsp/demo-index.html index 3fef152ed1..d6b0760ac0 100644 --- a/binsrc/vsp/demo-index.html +++ b/binsrc/vsp/demo-index.html @@ -185,7 +185,7 @@

    Data Access

    Virtuoso Universal Server - Administration Interface - Copyright© 1998-2018 OpenLink Software. + Administration Interface - Copyright© 1998-2019 OpenLink Software.

    diff --git a/binsrc/vsp/demo-index.vsp b/binsrc/vsp/demo-index.vsp index 8a9dee7ca7..7d83311f0f 100644 --- a/binsrc/vsp/demo-index.vsp +++ b/binsrc/vsp/demo-index.vsp @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -206,7 +206,7 @@ direct access to Virtuoso Servers. - +

    Virtuoso Server Administration Interface - Copyright© 1998-2018 OpenLink Software.

    Virtuoso Server Administration Interface - Copyright© 1998-2019 OpenLink Software.

    diff --git a/binsrc/vsp/doc/adv_search.vspx b/binsrc/vsp/doc/adv_search.vspx index 74cc662c7a..f25afa5fac 100644 --- a/binsrc/vsp/doc/adv_search.vspx +++ b/binsrc/vsp/doc/adv_search.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -692,7 +692,7 @@ while (i < t/n)
    Powered by Virtuoso
    - + <?vsp -
    Copyright© 1998-2018 OpenLink Software
    +
    Copyright© 1998-2019 OpenLink Software
    diff --git a/binsrc/vsp/doc/rss2xbel.xsl b/binsrc/vsp/doc/rss2xbel.xsl index 542ba941c5..3b6bd7d7f2 100644 --- a/binsrc/vsp/doc/rss2xbel.xsl +++ b/binsrc/vsp/doc/rss2xbel.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/doc/search.css b/binsrc/vsp/doc/search.css index 9fe794c21a..2e13b42d11 100644 --- a/binsrc/vsp/doc/search.css +++ b/binsrc/vsp/doc/search.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/doc/search.vsp b/binsrc/vsp/doc/search.vsp index 58dfc184e1..cf8084b657 100644 --- a/binsrc/vsp/doc/search.vsp +++ b/binsrc/vsp/doc/search.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -49,7 +49,7 @@ _keywords := get_keyword('keywords', params, ''); - + @@ -300,6 +300,6 @@ endf:; - + diff --git a/binsrc/vsp/doc/translate.vsp b/binsrc/vsp/doc/translate.vsp index 9a5596e16f..f74c4467de 100644 --- a/binsrc/vsp/doc/translate.vsp +++ b/binsrc/vsp/doc/translate.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/doc/translation.css b/binsrc/vsp/doc/translation.css index 9941335966..c71a29ac47 100644 --- a/binsrc/vsp/doc/translation.css +++ b/binsrc/vsp/doc/translation.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/downfr.html b/binsrc/vsp/downfr.html index f72c3cb705..de89fff8f0 100644 --- a/binsrc/vsp/downfr.html +++ b/binsrc/vsp/downfr.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/index.html b/binsrc/vsp/index.html index 6325a54d02..45330e9d20 100644 --- a/binsrc/vsp/index.html +++ b/binsrc/vsp/index.html @@ -114,7 +114,7 @@

    Welcome

    - Copyright © 1998-2018 OpenLink Software + Copyright © 1998-2019 OpenLink Software diff --git a/binsrc/vsp/index1.html b/binsrc/vsp/index1.html index 62724a9470..511027e6c3 100644 --- a/binsrc/vsp/index1.html +++ b/binsrc/vsp/index1.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/index_left.vsp b/binsrc/vsp/index_left.vsp index 85d433883e..5e207e1761 100644 --- a/binsrc/vsp/index_left.vsp +++ b/binsrc/vsp/index_left.vsp @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/install.sh b/binsrc/vsp/install.sh index da175d4d41..517fd621f3 100755 --- a/binsrc/vsp/install.sh +++ b/binsrc/vsp/install.sh @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/knownissues.html b/binsrc/vsp/knownissues.html index b553d47c78..acea8f4d5b 100644 --- a/binsrc/vsp/knownissues.html +++ b/binsrc/vsp/knownissues.html @@ -4,7 +4,7 @@ Release Notes - + @@ -25,6 +25,6 @@
  • Issue 2190: Entity references fail on certain XPath search expressions.
    • -
    - Copyright 1998-2018 OpenLink Software -
    +
    - Copyright 1998-2019 OpenLink Software -
    diff --git a/binsrc/vsp/leftfr.html b/binsrc/vsp/leftfr.html index d66449c389..054d16ffb7 100644 --- a/binsrc/vsp/leftfr.html +++ b/binsrc/vsp/leftfr.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mainfr.html b/binsrc/vsp/mainfr.html index 7bce8bd2df..50ab8eac0c 100644 --- a/binsrc/vsp/mainfr.html +++ b/binsrc/vsp/mainfr.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/dav_res.vsp b/binsrc/vsp/mime/dav_res.vsp index 7a08c293ba..61606a4a31 100644 --- a/binsrc/vsp/mime/dav_res.vsp +++ b/binsrc/vsp/mime/dav_res.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/ftt_mail_hits.vsp b/binsrc/vsp/mime/ftt_mail_hits.vsp index 96d7a81ceb..3a5a41ea52 100644 --- a/binsrc/vsp/mime/ftt_mail_hits.vsp +++ b/binsrc/vsp/mime/ftt_mail_hits.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/ftt_mail_query.vsp b/binsrc/vsp/mime/ftt_mail_query.vsp index 2bca65cfc5..d8fd3f841f 100644 --- a/binsrc/vsp/mime/ftt_mail_query.vsp +++ b/binsrc/vsp/mime/ftt_mail_query.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/ftt_news_hits.vsp b/binsrc/vsp/mime/ftt_news_hits.vsp index 08082c6f23..6ff10fc53c 100644 --- a/binsrc/vsp/mime/ftt_news_hits.vsp +++ b/binsrc/vsp/mime/ftt_news_hits.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/ftt_news_query.vsp b/binsrc/vsp/mime/ftt_news_query.vsp index f25a724321..b08f9a7354 100644 --- a/binsrc/vsp/mime/ftt_news_query.vsp +++ b/binsrc/vsp/mime/ftt_news_query.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/mail_search.vsp b/binsrc/vsp/mime/mail_search.vsp index ec53ec9b3d..82f7392894 100644 --- a/binsrc/vsp/mime/mail_search.vsp +++ b/binsrc/vsp/mime/mail_search.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/mime_compose.vsp b/binsrc/vsp/mime/mime_compose.vsp index 3d9575c584..2ea4f45421 100644 --- a/binsrc/vsp/mime/mime_compose.vsp +++ b/binsrc/vsp/mime/mime_compose.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/mime_display.vsp b/binsrc/vsp/mime/mime_display.vsp index 8aa1a735e1..d19e6195bb 100644 --- a/binsrc/vsp/mime/mime_display.vsp +++ b/binsrc/vsp/mime/mime_display.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/mime_plain.vsp b/binsrc/vsp/mime/mime_plain.vsp index c075b6a606..3c0937f869 100644 --- a/binsrc/vsp/mime/mime_plain.vsp +++ b/binsrc/vsp/mime/mime_plain.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/mime_spam_filter.vsp b/binsrc/vsp/mime/mime_spam_filter.vsp index ab408e7260..8be85690fe 100644 --- a/binsrc/vsp/mime/mime_spam_filter.vsp +++ b/binsrc/vsp/mime/mime_spam_filter.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/mime_spam_filter_setup.vsp b/binsrc/vsp/mime/mime_spam_filter_setup.vsp index ec6c59d3e9..ba068d1180 100644 --- a/binsrc/vsp/mime/mime_spam_filter_setup.vsp +++ b/binsrc/vsp/mime/mime_spam_filter_setup.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/nntp_help.htm b/binsrc/vsp/mime/nntp_help.htm index 7c472d144e..c2483cb20a 100644 --- a/binsrc/vsp/mime/nntp_help.htm +++ b/binsrc/vsp/mime/nntp_help.htm @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/mime/pop3_get.vsp b/binsrc/vsp/mime/pop3_get.vsp index 7e01db77e5..638328b2b5 100644 --- a/binsrc/vsp/mime/pop3_get.vsp +++ b/binsrc/vsp/mime/pop3_get.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/newfeatures.html b/binsrc/vsp/newfeatures.html index 4334a41f4c..8a6afc8aee 100644 --- a/binsrc/vsp/newfeatures.html +++ b/binsrc/vsp/newfeatures.html @@ -671,7 +671,7 @@

    Industry Standards Support

    Home | Technical Support
    -

    Copyright 1998-2018 OpenLink Software. All Rights Reserved.

    +

    Copyright 1998-2019 OpenLink Software. All Rights Reserved.

     
    diff --git a/binsrc/vsp/releasenotes.css b/binsrc/vsp/releasenotes.css index f1430c95f8..eef6aed58e 100644 --- a/binsrc/vsp/releasenotes.css +++ b/binsrc/vsp/releasenotes.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/releasenotes.html b/binsrc/vsp/releasenotes.html index bb3b5a3954..d85ad81d26 100644 --- a/binsrc/vsp/releasenotes.html +++ b/binsrc/vsp/releasenotes.html @@ -7,7 +7,7 @@ - + diff --git a/binsrc/vsp/soapdemo/SOAP.html b/binsrc/vsp/soapdemo/SOAP.html index 80138ae8a9..cf85d4fcb8 100644 --- a/binsrc/vsp/soapdemo/SOAP.html +++ b/binsrc/vsp/soapdemo/SOAP.html @@ -48,7 +48,7 @@ - +

    Virtuoso SOAP Test Interface - Copyright© 1998-2018 OpenLink Software.

    Virtuoso SOAP Test Interface - Copyright© 1998-2019 OpenLink Software.

      Virtuoso SOAP Interoperability Page

    Virtuoso Universal Server - Administration Interface - Copyright© 1998-2018 OpenLink Software. + Administration Interface - Copyright© 1998-2019 OpenLink Software.

    diff --git a/binsrc/vsp/soapdemo/interop_client.sql b/binsrc/vsp/soapdemo/interop_client.sql index 496973c1b1..eec95c10c9 100644 --- a/binsrc/vsp/soapdemo/interop_client.sql +++ b/binsrc/vsp/soapdemo/interop_client.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/interop_failed_wsdl.vsp b/binsrc/vsp/soapdemo/interop_failed_wsdl.vsp index 1e028dd2d7..19e10d8a9f 100644 --- a/binsrc/vsp/soapdemo/interop_failed_wsdl.vsp +++ b/binsrc/vsp/soapdemo/interop_failed_wsdl.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/interop_main.vsp b/binsrc/vsp/soapdemo/interop_main.vsp index 1bf7285bbb..1de01b9458 100644 --- a/binsrc/vsp/soapdemo/interop_main.vsp +++ b/binsrc/vsp/soapdemo/interop_main.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/interop_req_res.vsp b/binsrc/vsp/soapdemo/interop_req_res.vsp index 7cfd88d57e..508b51ea98 100644 --- a/binsrc/vsp/soapdemo/interop_req_res.vsp +++ b/binsrc/vsp/soapdemo/interop_req_res.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/interop_results.vsp b/binsrc/vsp/soapdemo/interop_results.vsp index 657a0f6be7..12fdff8886 100644 --- a/binsrc/vsp/soapdemo/interop_results.vsp +++ b/binsrc/vsp/soapdemo/interop_results.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/interop_results2.vsp b/binsrc/vsp/soapdemo/interop_results2.vsp index c056b9462b..fac18fd3fa 100644 --- a/binsrc/vsp/soapdemo/interop_results2.vsp +++ b/binsrc/vsp/soapdemo/interop_results2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/interop_services.vsp b/binsrc/vsp/soapdemo/interop_services.vsp index b1e9097ab8..c9d7c15aad 100644 --- a/binsrc/vsp/soapdemo/interop_services.vsp +++ b/binsrc/vsp/soapdemo/interop_services.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/interop_test.vsp b/binsrc/vsp/soapdemo/interop_test.vsp index 3f69384a07..d593150f7a 100644 --- a/binsrc/vsp/soapdemo/interop_test.vsp +++ b/binsrc/vsp/soapdemo/interop_test.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/interop_test2.vsp b/binsrc/vsp/soapdemo/interop_test2.vsp index eaa16bb36e..abb27fad75 100644 --- a/binsrc/vsp/soapdemo/interop_test2.vsp +++ b/binsrc/vsp/soapdemo/interop_test2.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r3_index.vsp b/binsrc/vsp/soapdemo/r3_index.vsp index d645eb45f7..cb337f01ed 100644 --- a/binsrc/vsp/soapdemo/r3_index.vsp +++ b/binsrc/vsp/soapdemo/r3_index.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-1.xsd b/binsrc/vsp/soapdemo/r4/complex-doc-1.xsd index e454af057c..ba1ccc2382 100644 --- a/binsrc/vsp/soapdemo/r4/complex-doc-1.xsd +++ b/binsrc/vsp/soapdemo/r4/complex-doc-1.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-2.xsd b/binsrc/vsp/soapdemo/r4/complex-doc-2.xsd index fec2c31bd1..478c25e5a4 100644 --- a/binsrc/vsp/soapdemo/r4/complex-doc-2.xsd +++ b/binsrc/vsp/soapdemo/r4/complex-doc-2.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-3.xsd b/binsrc/vsp/soapdemo/r4/complex-doc-3.xsd index 3c6a93710d..05961ffb8b 100644 --- a/binsrc/vsp/soapdemo/r4/complex-doc-3.xsd +++ b/binsrc/vsp/soapdemo/r4/complex-doc-3.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-literal.sql b/binsrc/vsp/soapdemo/r4/complex-doc-literal.sql index 23ebcc9e1f..c640c74215 100644 --- a/binsrc/vsp/soapdemo/r4/complex-doc-literal.sql +++ b/binsrc/vsp/soapdemo/r4/complex-doc-literal.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/complex-doc-literal_vad.sql b/binsrc/vsp/soapdemo/r4/complex-doc-literal_vad.sql index 50b2fae17b..d5065bbc0c 100644 --- a/binsrc/vsp/soapdemo/r4/complex-doc-literal_vad.sql +++ b/binsrc/vsp/soapdemo/r4/complex-doc-literal_vad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.sql b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.sql index 8e8e64706d..6903ed9df0 100644 --- a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.sql +++ b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.xsd b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.xsd index 0942fbcbfb..75415c6eef 100644 --- a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.xsd +++ b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded_vad.sql b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded_vad.sql index 271bcbb70e..e10d3685a9 100644 --- a/binsrc/vsp/soapdemo/r4/complex-rpc-encoded_vad.sql +++ b/binsrc/vsp/soapdemo/r4/complex-rpc-encoded_vad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/dime-doc.sql b/binsrc/vsp/soapdemo/r4/dime-doc.sql index 31716c7c98..215dc98db6 100644 --- a/binsrc/vsp/soapdemo/r4/dime-doc.sql +++ b/binsrc/vsp/soapdemo/r4/dime-doc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/dime-doc.xsd b/binsrc/vsp/soapdemo/r4/dime-doc.xsd index 9249e79573..5ded2129e0 100644 --- a/binsrc/vsp/soapdemo/r4/dime-doc.xsd +++ b/binsrc/vsp/soapdemo/r4/dime-doc.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/dime-rpc.sql b/binsrc/vsp/soapdemo/r4/dime-rpc.sql index ef337165bf..489647b0cb 100644 --- a/binsrc/vsp/soapdemo/r4/dime-rpc.sql +++ b/binsrc/vsp/soapdemo/r4/dime-rpc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/dime-rpc.xsd b/binsrc/vsp/soapdemo/r4/dime-rpc.xsd index 83c7c847d9..6f5ffc649f 100644 --- a/binsrc/vsp/soapdemo/r4/dime-rpc.xsd +++ b/binsrc/vsp/soapdemo/r4/dime-rpc.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/load_xsd.sql b/binsrc/vsp/soapdemo/r4/load_xsd.sql index d7e9fe10a1..a370cbfe99 100644 --- a/binsrc/vsp/soapdemo/r4/load_xsd.sql +++ b/binsrc/vsp/soapdemo/r4/load_xsd.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/mime-doc.sql b/binsrc/vsp/soapdemo/r4/mime-doc.sql index 1d158156cf..e3455dfa3e 100644 --- a/binsrc/vsp/soapdemo/r4/mime-doc.sql +++ b/binsrc/vsp/soapdemo/r4/mime-doc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/mime-rpc.sql b/binsrc/vsp/soapdemo/r4/mime-rpc.sql index d486ce8018..bbf72f0a95 100644 --- a/binsrc/vsp/soapdemo/r4/mime-rpc.sql +++ b/binsrc/vsp/soapdemo/r4/mime-rpc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/round4xsd-1.xsd b/binsrc/vsp/soapdemo/r4/round4xsd-1.xsd index 08f5849e71..16dc48b4e4 100644 --- a/binsrc/vsp/soapdemo/r4/round4xsd-1.xsd +++ b/binsrc/vsp/soapdemo/r4/round4xsd-1.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/round4xsd-2.xsd b/binsrc/vsp/soapdemo/r4/round4xsd-2.xsd index 1f1dba5b77..93c1cc1512 100644 --- a/binsrc/vsp/soapdemo/r4/round4xsd-2.xsd +++ b/binsrc/vsp/soapdemo/r4/round4xsd-2.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/round4xsd-3.xsd b/binsrc/vsp/soapdemo/r4/round4xsd-3.xsd index af04c1bb50..6e9e5aa491 100644 --- a/binsrc/vsp/soapdemo/r4/round4xsd-3.xsd +++ b/binsrc/vsp/soapdemo/r4/round4xsd-3.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/round4xsd-4.xsd b/binsrc/vsp/soapdemo/r4/round4xsd-4.xsd index 7cbd37afbe..0d52c74b73 100644 --- a/binsrc/vsp/soapdemo/r4/round4xsd-4.xsd +++ b/binsrc/vsp/soapdemo/r4/round4xsd-4.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/simple-doc-literal-1.xsd b/binsrc/vsp/soapdemo/r4/simple-doc-literal-1.xsd index 47edd748f7..3f08ab9da3 100644 --- a/binsrc/vsp/soapdemo/r4/simple-doc-literal-1.xsd +++ b/binsrc/vsp/soapdemo/r4/simple-doc-literal-1.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/simple-doc-literal-2.xsd b/binsrc/vsp/soapdemo/r4/simple-doc-literal-2.xsd index 4d10b6d6f8..d14e67e193 100644 --- a/binsrc/vsp/soapdemo/r4/simple-doc-literal-2.xsd +++ b/binsrc/vsp/soapdemo/r4/simple-doc-literal-2.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/simple-doc-literal-3.xsd b/binsrc/vsp/soapdemo/r4/simple-doc-literal-3.xsd index 953e128ff4..a609d80903 100644 --- a/binsrc/vsp/soapdemo/r4/simple-doc-literal-3.xsd +++ b/binsrc/vsp/soapdemo/r4/simple-doc-literal-3.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/simple-doc-literal.sql b/binsrc/vsp/soapdemo/r4/simple-doc-literal.sql index f70b71bf52..75b4f0e9d9 100644 --- a/binsrc/vsp/soapdemo/r4/simple-doc-literal.sql +++ b/binsrc/vsp/soapdemo/r4/simple-doc-literal.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.sql b/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.sql index 068fce591a..3cc3604b67 100644 --- a/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.sql +++ b/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.xsd b/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.xsd index ec198e1cc9..f543c45e5d 100644 --- a/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.xsd +++ b/binsrc/vsp/soapdemo/r4/simple-rpc-encoded.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/r4/xsd.sql b/binsrc/vsp/soapdemo/r4/xsd.sql index 3fcda632db..47395dd314 100644 --- a/binsrc/vsp/soapdemo/r4/xsd.sql +++ b/binsrc/vsp/soapdemo/r4/xsd.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/round2-B.sql b/binsrc/vsp/soapdemo/round2-B.sql index 11c8be499b..9535675094 100644 --- a/binsrc/vsp/soapdemo/round2-B.sql +++ b/binsrc/vsp/soapdemo/round2-B.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/round2-base.sql b/binsrc/vsp/soapdemo/round2-base.sql index 8dc2bccf14..38e66583ce 100644 --- a/binsrc/vsp/soapdemo/round2-base.sql +++ b/binsrc/vsp/soapdemo/round2-base.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/round2.sql b/binsrc/vsp/soapdemo/round2.sql index 6d324e93bc..da9b403a2c 100644 --- a/binsrc/vsp/soapdemo/round2.sql +++ b/binsrc/vsp/soapdemo/round2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/round3-D.sql b/binsrc/vsp/soapdemo/round3-D.sql index 5e469f9cbc..bf9a61ae67 100644 --- a/binsrc/vsp/soapdemo/round3-D.sql +++ b/binsrc/vsp/soapdemo/round3-D.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/round3-E.sql b/binsrc/vsp/soapdemo/round3-E.sql index 6b3c6b4857..b11e949650 100644 --- a/binsrc/vsp/soapdemo/round3-E.sql +++ b/binsrc/vsp/soapdemo/round3-E.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/round3-F.sql b/binsrc/vsp/soapdemo/round3-F.sql index e60f1d2637..4df7c5f202 100644 --- a/binsrc/vsp/soapdemo/round3-F.sql +++ b/binsrc/vsp/soapdemo/round3-F.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/round3-F_vad.sql b/binsrc/vsp/soapdemo/round3-F_vad.sql index d9e42821c7..b7378d076b 100644 --- a/binsrc/vsp/soapdemo/round3-F_vad.sql +++ b/binsrc/vsp/soapdemo/round3-F_vad.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/round3.html b/binsrc/vsp/soapdemo/round3.html index 6cc0a6243a..11465dc1f5 100644 --- a/binsrc/vsp/soapdemo/round3.html +++ b/binsrc/vsp/soapdemo/round3.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/round4.html b/binsrc/vsp/soapdemo/round4.html index b834f2c083..0d16d365f4 100644 --- a/binsrc/vsp/soapdemo/round4.html +++ b/binsrc/vsp/soapdemo/round4.html @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/soap.css b/binsrc/vsp/soapdemo/soap.css index 186cc9151c..955e86bdd4 100644 --- a/binsrc/vsp/soapdemo/soap.css +++ b/binsrc/vsp/soapdemo/soap.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/soap12-addon.sql b/binsrc/vsp/soapdemo/soap12-addon.sql index 308515feb5..b9e200213f 100644 --- a/binsrc/vsp/soapdemo/soap12-addon.sql +++ b/binsrc/vsp/soapdemo/soap12-addon.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/soapdemo/soap_validator.sql b/binsrc/vsp/soapdemo/soap_validator.sql index 721178e557..18c691608e 100644 --- a/binsrc/vsp/soapdemo/soap_validator.sql +++ b/binsrc/vsp/soapdemo/soap_validator.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/vsmx/default.css b/binsrc/vsp/vsmx/default.css index 04707bb67d..294db342f4 100644 --- a/binsrc/vsp/vsmx/default.css +++ b/binsrc/vsp/vsmx/default.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/vsmx/msg.vspx b/binsrc/vsp/vsmx/msg.vspx index 44832bfdf6..b72ec9d7a9 100644 --- a/binsrc/vsp/vsmx/msg.vspx +++ b/binsrc/vsp/vsmx/msg.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -406,7 +406,7 @@ -
    Virtuoso Universal Server - Copyright&copy; 1998-2018 OpenLink Software.
    +
    Virtuoso Universal Server - Copyright&copy; 1998-2019 OpenLink Software.
    diff --git a/binsrc/vsp/vsmx/oper.vspx b/binsrc/vsp/vsmx/oper.vspx index 3f03c20988..a9c92f79da 100644 --- a/binsrc/vsp/vsmx/oper.vspx +++ b/binsrc/vsp/vsmx/oper.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -118,7 +118,7 @@
    - Virtuoso Universal Server - Copyright© 1998-2018 OpenLink Software. + Virtuoso Universal Server - Copyright© 1998-2019 OpenLink Software.
    diff --git a/binsrc/vsp/vsmx/vsmx.vspx b/binsrc/vsp/vsmx/vsmx.vspx index 0c4b95aaeb..90473ce88f 100644 --- a/binsrc/vsp/vsmx/vsmx.vspx +++ b/binsrc/vsp/vsmx/vsmx.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -73,7 +73,7 @@
    - Virtuoso Universal Server - Copyright© 1998-2018 OpenLink Software. + Virtuoso Universal Server - Copyright© 1998-2019 OpenLink Software.
    diff --git a/binsrc/vsp/vsmx/vsmx_msg.xsl b/binsrc/vsp/vsmx/vsmx_msg.xsl index eb1d8f596f..f3910b7788 100644 --- a/binsrc/vsp/vsmx/vsmx_msg.xsl +++ b/binsrc/vsp/vsmx/vsmx_msg.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/vsmx/vsmx_oper.xsl b/binsrc/vsp/vsmx/vsmx_oper.xsl index 8c01d15e53..c0f1eb15b8 100644 --- a/binsrc/vsp/vsmx/vsmx_oper.xsl +++ b/binsrc/vsp/vsmx/vsmx_oper.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/vsmx/vsmx_res.xsl b/binsrc/vsp/vsmx/vsmx_res.xsl index 5fe3a754ce..2b175c55ec 100644 --- a/binsrc/vsp/vsmx/vsmx_res.xsl +++ b/binsrc/vsp/vsmx/vsmx_res.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vsp/vsp_auth.sql b/binsrc/vsp/vsp_auth.sql index 1286a2955c..4371346cc9 100644 --- a/binsrc/vsp/vsp_auth.sql +++ b/binsrc/vsp/vsp_auth.sql @@ -9,7 +9,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/Makefile.am b/binsrc/vspx/Makefile.am index 5385ce84b5..3e911ffcbd 100644 --- a/binsrc/vspx/Makefile.am +++ b/binsrc/vspx/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/active_ctrls.vspx b/binsrc/vspx/active_ctrls.vspx index ad2919161d..1cc5e803ee 100644 --- a/binsrc/vspx/active_ctrls.vspx +++ b/binsrc/vspx/active_ctrls.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/box.vspx b/binsrc/vspx/box.vspx index 69776eee33..cdff64d784 100644 --- a/binsrc/vspx/box.vspx +++ b/binsrc/vspx/box.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/admin_dav_browser.sql b/binsrc/vspx/browser/admin_dav_browser.sql index 1ff5c536c6..1fa525b054 100644 --- a/binsrc/vspx/browser/admin_dav_browser.sql +++ b/binsrc/vspx/browser/admin_dav_browser.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/dav_browser.css b/binsrc/vspx/browser/dav_browser.css index 080fc87391..22ef56e103 100644 --- a/binsrc/vspx/browser/dav_browser.css +++ b/binsrc/vspx/browser/dav_browser.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/dav_browser.js b/binsrc/vspx/browser/dav_browser.js index 0b937a5e1f..c2cde0f5e1 100644 --- a/binsrc/vspx/browser/dav_browser.js +++ b/binsrc/vspx/browser/dav_browser.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/dav_browser.vsp b/binsrc/vspx/browser/dav_browser.vsp index e49c53850d..aeef5c2fa2 100644 --- a/binsrc/vspx/browser/dav_browser.vsp +++ b/binsrc/vspx/browser/dav_browser.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/dav_browser_bot.vsp b/binsrc/vspx/browser/dav_browser_bot.vsp index 8c74f98959..c2bb46313d 100644 --- a/binsrc/vspx/browser/dav_browser_bot.vsp +++ b/binsrc/vspx/browser/dav_browser_bot.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/dav_browser_host.vsp b/binsrc/vspx/browser/dav_browser_host.vsp index 1fb837f76a..57a11971c7 100644 --- a/binsrc/vspx/browser/dav_browser_host.vsp +++ b/binsrc/vspx/browser/dav_browser_host.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/dav_browser_list.vsp b/binsrc/vspx/browser/dav_browser_list.vsp index 46b2e0baee..52c8eaa97d 100644 --- a/binsrc/vspx/browser/dav_browser_list.vsp +++ b/binsrc/vspx/browser/dav_browser_list.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/dav_browser_mozilla.js b/binsrc/vspx/browser/dav_browser_mozilla.js index 3e60ccaff1..f2668f4976 100644 --- a/binsrc/vspx/browser/dav_browser_mozilla.js +++ b/binsrc/vspx/browser/dav_browser_mozilla.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/dav_browser_msie.js b/binsrc/vspx/browser/dav_browser_msie.js index 864e440950..38dfc4b39b 100644 --- a/binsrc/vspx/browser/dav_browser_msie.js +++ b/binsrc/vspx/browser/dav_browser_msie.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/dav_browser_top.vsp b/binsrc/vspx/browser/dav_browser_top.vsp index 61f8e3848a..083b8d74c5 100644 --- a/binsrc/vspx/browser/dav_browser_top.vsp +++ b/binsrc/vspx/browser/dav_browser_top.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/dav_js.vsp b/binsrc/vspx/browser/dav_js.vsp index 302c5fb121..bb1c76b363 100644 --- a/binsrc/vspx/browser/dav_js.vsp +++ b/binsrc/vspx/browser/dav_js.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/util.js b/binsrc/vspx/browser/util.js index 09703d8b02..f042e6ec31 100644 --- a/binsrc/vspx/browser/util.js +++ b/binsrc/vspx/browser/util.js @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/browser/vsp_debug.vsp b/binsrc/vspx/browser/vsp_debug.vsp index de7768690f..f9d2c5b107 100644 --- a/binsrc/vspx/browser/vsp_debug.vsp +++ b/binsrc/vspx/browser/vsp_debug.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/cal.vspx b/binsrc/vspx/cal.vspx index 037e42af9d..7fedf24b91 100644 --- a/binsrc/vspx/cal.vspx +++ b/binsrc/vspx/cal.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/check_box.vspx b/binsrc/vspx/check_box.vspx index 5334507797..78c230dfd5 100644 --- a/binsrc/vspx/check_box.vspx +++ b/binsrc/vspx/check_box.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/code1.sql b/binsrc/vspx/code1.sql index e4993e45e3..04cd59db85 100644 --- a/binsrc/vspx/code1.sql +++ b/binsrc/vspx/code1.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/code_behind.vspx b/binsrc/vspx/code_behind.vspx index 300dbe587a..472f68fec5 100644 --- a/binsrc/vspx/code_behind.vspx +++ b/binsrc/vspx/code_behind.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/combo.vspx b/binsrc/vspx/combo.vspx index ac2e8fdf20..dc700f57fc 100644 --- a/binsrc/vspx/combo.vspx +++ b/binsrc/vspx/combo.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/combo1.vspx b/binsrc/vspx/combo1.vspx index 16ec7757e7..0582717310 100644 --- a/binsrc/vspx/combo1.vspx +++ b/binsrc/vspx/combo1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/custinst.vspx b/binsrc/vspx/custinst.vspx index 38d18d0514..9cc17d1fa3 100644 --- a/binsrc/vspx/custinst.vspx +++ b/binsrc/vspx/custinst.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/custom_condition.vspx b/binsrc/vspx/custom_condition.vspx index 7955f01a2f..6c9efec65a 100644 --- a/binsrc/vspx/custom_condition.vspx +++ b/binsrc/vspx/custom_condition.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/custom_format.vspx b/binsrc/vspx/custom_format.vspx index d67d0540aa..0d9ae75cd3 100644 --- a/binsrc/vspx/custom_format.vspx +++ b/binsrc/vspx/custom_format.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/data_list.vspx b/binsrc/vspx/data_list.vspx index ee1d22e6fe..c7212bb0ac 100644 --- a/binsrc/vspx/data_list.vspx +++ b/binsrc/vspx/data_list.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/data_list_sql.vspx b/binsrc/vspx/data_list_sql.vspx index 63405e7f1c..ad417a7c45 100644 --- a/binsrc/vspx/data_list_sql.vspx +++ b/binsrc/vspx/data_list_sql.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/data_set.vspx b/binsrc/vspx/data_set.vspx index ab2af65ca5..e988e07764 100644 --- a/binsrc/vspx/data_set.vspx +++ b/binsrc/vspx/data_set.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/data_set_arr.vspx b/binsrc/vspx/data_set_arr.vspx index 78ffe16419..1b7d2a1715 100644 --- a/binsrc/vspx/data_set_arr.vspx +++ b/binsrc/vspx/data_set_arr.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/data_set_arr_paging.vspx b/binsrc/vspx/data_set_arr_paging.vspx index cfa7d045dd..9a56640e16 100644 --- a/binsrc/vspx/data_set_arr_paging.vspx +++ b/binsrc/vspx/data_set_arr_paging.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/datagrid.vspx b/binsrc/vspx/datagrid.vspx index 1faf16496e..fc609609ab 100644 --- a/binsrc/vspx/datagrid.vspx +++ b/binsrc/vspx/datagrid.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/dataset_new.vspx b/binsrc/vspx/dataset_new.vspx index aec1be855a..8a9f99848b 100644 --- a/binsrc/vspx/dataset_new.vspx +++ b/binsrc/vspx/dataset_new.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/dataset_new_2.vspx b/binsrc/vspx/dataset_new_2.vspx index 126ebb56de..f76bb62144 100644 --- a/binsrc/vspx/dataset_new_2.vspx +++ b/binsrc/vspx/dataset_new_2.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/dataset_pager.vspx b/binsrc/vspx/dataset_pager.vspx index 00042c6b63..24e08cafd9 100644 --- a/binsrc/vspx/dataset_pager.vspx +++ b/binsrc/vspx/dataset_pager.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/dataset_update_1.vspx b/binsrc/vspx/dataset_update_1.vspx index b091939ba3..a3177b827e 100644 --- a/binsrc/vspx/dataset_update_1.vspx +++ b/binsrc/vspx/dataset_update_1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/datasource.vspx b/binsrc/vspx/datasource.vspx index 319473baa1..cd3a96d756 100644 --- a/binsrc/vspx/datasource.vspx +++ b/binsrc/vspx/datasource.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/date.vspx b/binsrc/vspx/date.vspx index 72732a7c9d..5736f1a6d0 100644 --- a/binsrc/vspx/date.vspx +++ b/binsrc/vspx/date.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/dav_browser.vspx b/binsrc/vspx/dav_browser.vspx index e90ee1d45f..93798adcff 100644 --- a/binsrc/vspx/dav_browser.vspx +++ b/binsrc/vspx/dav_browser.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/dgarr.vspx b/binsrc/vspx/dgarr.vspx index a2af9b1b42..a973cd101f 100644 --- a/binsrc/vspx/dgarr.vspx +++ b/binsrc/vspx/dgarr.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/error.vsp b/binsrc/vspx/error.vsp index bdcfa466c7..5c4f511b40 100644 --- a/binsrc/vspx/error.vsp +++ b/binsrc/vspx/error.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/errors.vspx b/binsrc/vspx/errors.vspx index fbaaaaa7a8..0aa7ba6d09 100644 --- a/binsrc/vspx/errors.vspx +++ b/binsrc/vspx/errors.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/button__0.vspx b/binsrc/vspx/examples/button__0.vspx index 6b414c3dc8..1769f51fd5 100644 --- a/binsrc/vspx/examples/button__0.vspx +++ b/binsrc/vspx/examples/button__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/button__1.vspx b/binsrc/vspx/examples/button__1.vspx index 071d3270c3..0fa73364e2 100644 --- a/binsrc/vspx/examples/button__1.vspx +++ b/binsrc/vspx/examples/button__1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/button__2.vspx b/binsrc/vspx/examples/button__2.vspx index fe939e43c7..9dec58800b 100644 --- a/binsrc/vspx/examples/button__2.vspx +++ b/binsrc/vspx/examples/button__2.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/button__3.vspx b/binsrc/vspx/examples/button__3.vspx index d292619c71..3d33aec27b 100644 --- a/binsrc/vspx/examples/button__3.vspx +++ b/binsrc/vspx/examples/button__3.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/button__4.vspx b/binsrc/vspx/examples/button__4.vspx index 72fd1e12c3..812cc1d7f8 100644 --- a/binsrc/vspx/examples/button__4.vspx +++ b/binsrc/vspx/examples/button__4.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/calendar__0.vspx b/binsrc/vspx/examples/calendar__0.vspx index 75b4a76341..9cb53c73bc 100644 --- a/binsrc/vspx/examples/calendar__0.vspx +++ b/binsrc/vspx/examples/calendar__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/check_box__0.vspx b/binsrc/vspx/examples/check_box__0.vspx index 945061811d..4bfa9ca879 100644 --- a/binsrc/vspx/examples/check_box__0.vspx +++ b/binsrc/vspx/examples/check_box__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/code_file__0.sql b/binsrc/vspx/examples/code_file__0.sql index 2c5a85f6ca..28a7369c30 100644 --- a/binsrc/vspx/examples/code_file__0.sql +++ b/binsrc/vspx/examples/code_file__0.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/code_file__0.vspx b/binsrc/vspx/examples/code_file__0.vspx index be039e1898..a76f1b50e6 100644 --- a/binsrc/vspx/examples/code_file__0.vspx +++ b/binsrc/vspx/examples/code_file__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/data_grid__0.vspx b/binsrc/vspx/examples/data_grid__0.vspx index 70fc581789..fa7c659d16 100644 --- a/binsrc/vspx/examples/data_grid__0.vspx +++ b/binsrc/vspx/examples/data_grid__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/data_list__0.vspx b/binsrc/vspx/examples/data_list__0.vspx index 483600805e..8f9287fa0f 100644 --- a/binsrc/vspx/examples/data_list__0.vspx +++ b/binsrc/vspx/examples/data_list__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/data_list__1.vspx b/binsrc/vspx/examples/data_list__1.vspx index 0de6ba1846..e77d33e07f 100644 --- a/binsrc/vspx/examples/data_list__1.vspx +++ b/binsrc/vspx/examples/data_list__1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/data_set__0.vspx b/binsrc/vspx/examples/data_set__0.vspx index a61df136ed..5b177b8bdc 100644 --- a/binsrc/vspx/examples/data_set__0.vspx +++ b/binsrc/vspx/examples/data_set__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/data_set__1.vspx b/binsrc/vspx/examples/data_set__1.vspx index 000ede260d..f6c355fdeb 100644 --- a/binsrc/vspx/examples/data_set__1.vspx +++ b/binsrc/vspx/examples/data_set__1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/data_source__0.vspx b/binsrc/vspx/examples/data_source__0.vspx index ae23cdcac4..c15f4c6971 100644 --- a/binsrc/vspx/examples/data_source__0.vspx +++ b/binsrc/vspx/examples/data_source__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/error_summary__0.vspx b/binsrc/vspx/examples/error_summary__0.vspx index 8a06191933..63b4941fed 100644 --- a/binsrc/vspx/examples/error_summary__0.vspx +++ b/binsrc/vspx/examples/error_summary__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/error_summary__1.vspx b/binsrc/vspx/examples/error_summary__1.vspx index e8addfc6c7..7b8382112a 100644 --- a/binsrc/vspx/examples/error_summary__1.vspx +++ b/binsrc/vspx/examples/error_summary__1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/footer.xml b/binsrc/vspx/examples/footer.xml index 249cd58ed0..c3ae3c5792 100644 --- a/binsrc/vspx/examples/footer.xml +++ b/binsrc/vspx/examples/footer.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/form__0.vspx b/binsrc/vspx/examples/form__0.vspx index d584396d11..b0f129732f 100644 --- a/binsrc/vspx/examples/form__0.vspx +++ b/binsrc/vspx/examples/form__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/form__1.vspx b/binsrc/vspx/examples/form__1.vspx index 47dfc692e6..9ea7cecf11 100644 --- a/binsrc/vspx/examples/form__1.vspx +++ b/binsrc/vspx/examples/form__1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/include__0.vspx b/binsrc/vspx/examples/include__0.vspx index 123fb8e106..b28c5960bd 100644 --- a/binsrc/vspx/examples/include__0.vspx +++ b/binsrc/vspx/examples/include__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/label__0.vspx b/binsrc/vspx/examples/label__0.vspx index 772e9ed86b..cac605d8e4 100644 --- a/binsrc/vspx/examples/label__0.vspx +++ b/binsrc/vspx/examples/label__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/login__0.vspx b/binsrc/vspx/examples/login__0.vspx index 3c2707b358..3bf5c3c41d 100644 --- a/binsrc/vspx/examples/login__0.vspx +++ b/binsrc/vspx/examples/login__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/login_form__0.vspx b/binsrc/vspx/examples/login_form__0.vspx index 3e6c75ed0b..7aa3ffd52e 100644 --- a/binsrc/vspx/examples/login_form__0.vspx +++ b/binsrc/vspx/examples/login_form__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/page__0.vspx b/binsrc/vspx/examples/page__0.vspx index 4cf29d4cc1..be46bf594a 100644 --- a/binsrc/vspx/examples/page__0.vspx +++ b/binsrc/vspx/examples/page__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/radio_button__0.vspx b/binsrc/vspx/examples/radio_button__0.vspx index 2035e57aa0..e1b86717ec 100644 --- a/binsrc/vspx/examples/radio_button__0.vspx +++ b/binsrc/vspx/examples/radio_button__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/radio_group__0.vspx b/binsrc/vspx/examples/radio_group__0.vspx index 0cba8ad9c5..e5d7547305 100644 --- a/binsrc/vspx/examples/radio_group__0.vspx +++ b/binsrc/vspx/examples/radio_group__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/select_list__0.vspx b/binsrc/vspx/examples/select_list__0.vspx index 9714c6ea6f..5812c95769 100644 --- a/binsrc/vspx/examples/select_list__0.vspx +++ b/binsrc/vspx/examples/select_list__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/tab__0.vspx b/binsrc/vspx/examples/tab__0.vspx index 7b80a4eeff..07a685626e 100644 --- a/binsrc/vspx/examples/tab__0.vspx +++ b/binsrc/vspx/examples/tab__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/text__0.vspx b/binsrc/vspx/examples/text__0.vspx index a8fdf651bb..8fcbd864eb 100644 --- a/binsrc/vspx/examples/text__0.vspx +++ b/binsrc/vspx/examples/text__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/text_area__0.vspx b/binsrc/vspx/examples/text_area__0.vspx index 9409b049d3..7361e2cd95 100644 --- a/binsrc/vspx/examples/text_area__0.vspx +++ b/binsrc/vspx/examples/text_area__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/tree__0.vspx b/binsrc/vspx/examples/tree__0.vspx index 558279a70c..f4ab1bd3fc 100644 --- a/binsrc/vspx/examples/tree__0.vspx +++ b/binsrc/vspx/examples/tree__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/url__0.vspx b/binsrc/vspx/examples/url__0.vspx index 09f8c1cc02..f147772594 100644 --- a/binsrc/vspx/examples/url__0.vspx +++ b/binsrc/vspx/examples/url__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/validator__0.vspx b/binsrc/vspx/examples/validator__0.vspx index 6bb6f9de8b..6f18d021c2 100644 --- a/binsrc/vspx/examples/validator__0.vspx +++ b/binsrc/vspx/examples/validator__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/variable__0.vspx b/binsrc/vspx/examples/variable__0.vspx index 939394476d..7ca168324b 100644 --- a/binsrc/vspx/examples/variable__0.vspx +++ b/binsrc/vspx/examples/variable__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/vscx__0.vspx b/binsrc/vspx/examples/vscx__0.vspx index e17af2e04e..a5600c2c30 100644 --- a/binsrc/vspx/examples/vscx__0.vspx +++ b/binsrc/vspx/examples/vscx__0.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/examples/vscx__1.vspx b/binsrc/vspx/examples/vscx__1.vspx index d8567031fa..1f578f1516 100644 --- a/binsrc/vspx/examples/vscx__1.vspx +++ b/binsrc/vspx/examples/vscx__1.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/file.vspx b/binsrc/vspx/file.vspx index db0540743a..4a394f40b0 100644 --- a/binsrc/vspx/file.vspx +++ b/binsrc/vspx/file.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/file_browser.vspx b/binsrc/vspx/file_browser.vspx index 553f584c85..4e190ba3b3 100644 --- a/binsrc/vspx/file_browser.vspx +++ b/binsrc/vspx/file_browser.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/footer.xml b/binsrc/vspx/footer.xml index efdf0409a4..91bf2ce074 100644 --- a/binsrc/vspx/footer.xml +++ b/binsrc/vspx/footer.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/form.vspx b/binsrc/vspx/form.vspx index edacce05fb..5fe29a839d 100644 --- a/binsrc/vspx/form.vspx +++ b/binsrc/vspx/form.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/formdecor.vspx b/binsrc/vspx/formdecor.vspx index 3fb17be9c9..bb2db4b414 100644 --- a/binsrc/vspx/formdecor.vspx +++ b/binsrc/vspx/formdecor.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/formsty.vspx b/binsrc/vspx/formsty.vspx index d6a5d98e90..6f46af3b87 100644 --- a/binsrc/vspx/formsty.vspx +++ b/binsrc/vspx/formsty.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/formsty.xsl b/binsrc/vspx/formsty.xsl index d8361d3b3a..04728380d3 100644 --- a/binsrc/vspx/formsty.xsl +++ b/binsrc/vspx/formsty.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/golive_data_set_colored.vspx b/binsrc/vspx/golive_data_set_colored.vspx index b3f4c13392..8616b17230 100644 --- a/binsrc/vspx/golive_data_set_colored.vspx +++ b/binsrc/vspx/golive_data_set_colored.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/grid.vspx b/binsrc/vspx/grid.vspx index 68449699bb..7d6ac27357 100644 --- a/binsrc/vspx/grid.vspx +++ b/binsrc/vspx/grid.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/hiding_test.vspx b/binsrc/vspx/hiding_test.vspx index e4443cab16..534ecaf191 100644 --- a/binsrc/vspx/hiding_test.vspx +++ b/binsrc/vspx/hiding_test.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/htree.vspx b/binsrc/vspx/htree.vspx index aba7f61248..1537d0cef7 100644 --- a/binsrc/vspx/htree.vspx +++ b/binsrc/vspx/htree.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/index.vsp b/binsrc/vspx/index.vsp index b8c817a568..ba00b990a9 100644 --- a/binsrc/vspx/index.vsp +++ b/binsrc/vspx/index.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/isql_control.vspx b/binsrc/vspx/isql_control.vspx index 324360bc3b..4ce7dd457e 100644 --- a/binsrc/vspx/isql_control.vspx +++ b/binsrc/vspx/isql_control.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/label.vspx b/binsrc/vspx/label.vspx index a492ebaede..5e1caa9fe6 100644 --- a/binsrc/vspx/label.vspx +++ b/binsrc/vspx/label.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/login.vspx b/binsrc/vspx/login.vspx index 6e953e48c8..00e80f22cd 100644 --- a/binsrc/vspx/login.vspx +++ b/binsrc/vspx/login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/make_docs.sql b/binsrc/vspx/make_docs.sql index 6891cb26a0..a2d388befd 100644 --- a/binsrc/vspx/make_docs.sql +++ b/binsrc/vspx/make_docs.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/new_post_handler.vspx b/binsrc/vspx/new_post_handler.vspx index 8211f9712e..3f9fa77d51 100644 --- a/binsrc/vspx/new_post_handler.vspx +++ b/binsrc/vspx/new_post_handler.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/new_tree.vspx b/binsrc/vspx/new_tree.vspx index 105c39423d..0a81ab2bc0 100644 --- a/binsrc/vspx/new_tree.vspx +++ b/binsrc/vspx/new_tree.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/new_version_search.vspx b/binsrc/vspx/new_version_search.vspx index 29cb883076..0bab85ddde 100644 --- a/binsrc/vspx/new_version_search.vspx +++ b/binsrc/vspx/new_version_search.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/products.vspx b/binsrc/vspx/products.vspx index e862fb2fd7..33465d8e4c 100644 --- a/binsrc/vspx/products.vspx +++ b/binsrc/vspx/products.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/radio.vspx b/binsrc/vspx/radio.vspx index 2b50516fdd..c74a70e4ce 100644 --- a/binsrc/vspx/radio.vspx +++ b/binsrc/vspx/radio.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/radio_group.vspx b/binsrc/vspx/radio_group.vspx index 9955230f2a..66f828d1f6 100644 --- a/binsrc/vspx/radio_group.vspx +++ b/binsrc/vspx/radio_group.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/sample.vspx b/binsrc/vspx/sample.vspx index 3e0ea71b7d..32086b77d1 100644 --- a/binsrc/vspx/sample.vspx +++ b/binsrc/vspx/sample.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/search.vspx b/binsrc/vspx/search.vspx index 2b8fa78971..3e259dd5b6 100644 --- a/binsrc/vspx/search.vspx +++ b/binsrc/vspx/search.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/search_login.vspx b/binsrc/vspx/search_login.vspx index 69802ac6b9..7fe7372c48 100644 --- a/binsrc/vspx/search_login.vspx +++ b/binsrc/vspx/search_login.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/sel_category.vspx b/binsrc/vspx/sel_category.vspx index 8bfa5ef75f..be7758c0aa 100644 --- a/binsrc/vspx/sel_category.vspx +++ b/binsrc/vspx/sel_category.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/sel_datagrid.vspx b/binsrc/vspx/sel_datagrid.vspx index 62b43a2b68..56a9e13cad 100644 --- a/binsrc/vspx/sel_datagrid.vspx +++ b/binsrc/vspx/sel_datagrid.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/sel_select.vspx b/binsrc/vspx/sel_select.vspx index 67f3daba17..3e4688fb30 100644 --- a/binsrc/vspx/sel_select.vspx +++ b/binsrc/vspx/sel_select.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/select.vspx b/binsrc/vspx/select.vspx index e7ad4b6cb4..420414c63d 100644 --- a/binsrc/vspx/select.vspx +++ b/binsrc/vspx/select.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/show_params.vspx b/binsrc/vspx/show_params.vspx index c98ae208d8..417d602dfc 100644 --- a/binsrc/vspx/show_params.vspx +++ b/binsrc/vspx/show_params.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/suite/filter.awk b/binsrc/vspx/suite/filter.awk index 9d200eefc7..987f4a5a90 100644 --- a/binsrc/vspx/suite/filter.awk +++ b/binsrc/vspx/suite/filter.awk @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/suite/run_tests.sh b/binsrc/vspx/suite/run_tests.sh index 1cd622448b..f284868ae5 100755 --- a/binsrc/vspx/suite/run_tests.sh +++ b/binsrc/vspx/suite/run_tests.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/suite/vspx_suite.sh b/binsrc/vspx/suite/vspx_suite.sh index 7f4757cc00..22a138be60 100755 --- a/binsrc/vspx/suite/vspx_suite.sh +++ b/binsrc/vspx/suite/vspx_suite.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/tab.vspx b/binsrc/vspx/tab.vspx index 0f39d609f7..8424ede6fd 100644 --- a/binsrc/vspx/tab.vspx +++ b/binsrc/vspx/tab.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/tab_custom.vspx b/binsrc/vspx/tab_custom.vspx index 27f7291fb4..20e760f340 100644 --- a/binsrc/vspx/tab_custom.vspx +++ b/binsrc/vspx/tab_custom.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/text.vspx b/binsrc/vspx/text.vspx index 34ab8c4e5d..3613eeb36c 100644 --- a/binsrc/vspx/text.vspx +++ b/binsrc/vspx/text.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/textarea.vspx b/binsrc/vspx/textarea.vspx index 5857076689..6b4aa7ebe4 100644 --- a/binsrc/vspx/textarea.vspx +++ b/binsrc/vspx/textarea.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/tree.vspx b/binsrc/vspx/tree.vspx index e05d59f24f..cd7ac86d93 100644 --- a/binsrc/vspx/tree.vspx +++ b/binsrc/vspx/tree.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/two_browse_buttons.vspx b/binsrc/vspx/two_browse_buttons.vspx index 58550aa09a..25ce1f391a 100644 --- a/binsrc/vspx/two_browse_buttons.vspx +++ b/binsrc/vspx/two_browse_buttons.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/update_form.vspx b/binsrc/vspx/update_form.vspx index e0a7c0f4c2..e71a9e7c3d 100644 --- a/binsrc/vspx/update_form.vspx +++ b/binsrc/vspx/update_form.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/update_radio.vspx b/binsrc/vspx/update_radio.vspx index 213331312d..a1c6b15acf 100644 --- a/binsrc/vspx/update_radio.vspx +++ b/binsrc/vspx/update_radio.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/var.vspx b/binsrc/vspx/var.vspx index 911b790002..0d421cb332 100644 --- a/binsrc/vspx/var.vspx +++ b/binsrc/vspx/var.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vdir.vspx b/binsrc/vspx/vdir.vspx index d69b7f36ba..42c5714317 100644 --- a/binsrc/vspx/vdir.vspx +++ b/binsrc/vspx/vdir.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vdir_browser.vspx b/binsrc/vspx/vdir_browser.vspx index b997b43772..2b6ab76d28 100644 --- a/binsrc/vspx/vdir_browser.vspx +++ b/binsrc/vspx/vdir_browser.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vdir_helper.sql b/binsrc/vspx/vdir_helper.sql index be44639f58..9074886f6b 100644 --- a/binsrc/vspx/vdir_helper.sql +++ b/binsrc/vspx/vdir_helper.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx.sql b/binsrc/vspx/vspx.sql index 808be70507..ccf270d699 100644 --- a/binsrc/vspx/vspx.sql +++ b/binsrc/vspx/vspx.sql @@ -9,7 +9,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx.xsd b/binsrc/vspx/vspx.xsd index e4bf13ae78..c844b655f5 100644 --- a/binsrc/vspx/vspx.xsd +++ b/binsrc/vspx/vspx.xsd @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx.xsl b/binsrc/vspx/vspx.xsl index 3c27619137..60b777c4f5 100644 --- a/binsrc/vspx/vspx.xsl +++ b/binsrc/vspx/vspx.xsl @@ -9,7 +9,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx4xsd.sh b/binsrc/vspx/vspx4xsd.sh index ce1db4e3f6..ed200d86fd 100755 --- a/binsrc/vspx/vspx4xsd.sh +++ b/binsrc/vspx/vspx4xsd.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx_add_locations.xsl b/binsrc/vspx/vspx_add_locations.xsl index 5dc48c848b..c0136606fd 100644 --- a/binsrc/vspx/vspx_add_locations.xsl +++ b/binsrc/vspx/vspx_add_locations.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx_demo_init.sql b/binsrc/vspx/vspx_demo_init.sql index e09228c15b..115a973b5f 100644 --- a/binsrc/vspx/vspx_demo_init.sql +++ b/binsrc/vspx/vspx_demo_init.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx_expand.xsl b/binsrc/vspx/vspx_expand.xsl index f636014c28..c245384a0d 100644 --- a/binsrc/vspx/vspx_expand.xsl +++ b/binsrc/vspx/vspx_expand.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx_log_format.xsl b/binsrc/vspx/vspx_log_format.xsl index 096afaed5f..c5b85ce02f 100644 --- a/binsrc/vspx/vspx_log_format.xsl +++ b/binsrc/vspx/vspx_log_format.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx_pre_sql.xsl b/binsrc/vspx/vspx_pre_sql.xsl index 5de9ac5dc8..7b11cedbb5 100644 --- a/binsrc/vspx/vspx_pre_sql.xsl +++ b/binsrc/vspx/vspx_pre_sql.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx_pre_xsd.xsl b/binsrc/vspx/vspx_pre_xsd.xsl index 7196aef4f1..00cfce6405 100644 --- a/binsrc/vspx/vspx_pre_xsd.xsl +++ b/binsrc/vspx/vspx_pre_xsd.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx_reload.sql b/binsrc/vspx/vspx_reload.sql index 496dc6ce03..d815e4434e 100644 --- a/binsrc/vspx/vspx_reload.sql +++ b/binsrc/vspx/vspx_reload.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx_vhost.sql b/binsrc/vspx/vspx_vhost.sql index aafbdc36c6..8d0a152418 100644 --- a/binsrc/vspx/vspx_vhost.sql +++ b/binsrc/vspx/vspx_vhost.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspx_wizards.sql b/binsrc/vspx/vspx_wizards.sql index 5b8818607a..cc1e8dec16 100644 --- a/binsrc/vspx/vspx_wizards.sql +++ b/binsrc/vspx/vspx_wizards.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/vspxmeta2doc.xsl b/binsrc/vspx/vspxmeta2doc.xsl index d70a2677e5..632d617f13 100644 --- a/binsrc/vspx/vspxmeta2doc.xsl +++ b/binsrc/vspx/vspxmeta2doc.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/xb_checkbox.vspx b/binsrc/vspx/xb_checkbox.vspx index 1a8824cdf5..baabad6bbb 100644 --- a/binsrc/vspx/xb_checkbox.vspx +++ b/binsrc/vspx/xb_checkbox.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/xb_orderby.vspx b/binsrc/vspx/xb_orderby.vspx index ec9d3b8f26..da37be1be8 100644 --- a/binsrc/vspx/xb_orderby.vspx +++ b/binsrc/vspx/xb_orderby.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/xb_orderby_e.vspx b/binsrc/vspx/xb_orderby_e.vspx index 704fb394ae..8919568981 100644 --- a/binsrc/vspx/xb_orderby_e.vspx +++ b/binsrc/vspx/xb_orderby_e.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/xform.vspx b/binsrc/vspx/xform.vspx index 7ad9d376d4..216b6e39b6 100644 --- a/binsrc/vspx/xform.vspx +++ b/binsrc/vspx/xform.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/xmldataset.vspx b/binsrc/vspx/xmldataset.vspx index f868665380..c7b1591689 100644 --- a/binsrc/vspx/xmldataset.vspx +++ b/binsrc/vspx/xmldataset.vspx @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/xsd2doc.xsl b/binsrc/vspx/xsd2doc.xsl index a923db2a46..11b1e152c1 100644 --- a/binsrc/vspx/xsd2doc.xsl +++ b/binsrc/vspx/xsd2doc.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/xsd2vspx.vsp b/binsrc/vspx/xsd2vspx.vsp index ca1b9f1813..9b375e4b2d 100644 --- a/binsrc/vspx/xsd2vspx.vsp +++ b/binsrc/vspx/xsd2vspx.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/vspx/xsd2vspx.xsl b/binsrc/vspx/xsd2vspx.xsl index 70dc1db04e..11f97f0950 100644 --- a/binsrc/vspx/xsd2vspx.xsl +++ b/binsrc/vspx/xsd2vspx.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/Makefile.am b/binsrc/ws/Makefile.am index 73a9e4c383..5c7eeae128 100644 --- a/binsrc/ws/Makefile.am +++ b/binsrc/ws/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/Makefile.am b/binsrc/ws/wsrm/Makefile.am index 96d691f0ee..f93264ad78 100644 --- a/binsrc/ws/wsrm/Makefile.am +++ b/binsrc/ws/wsrm/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/orabpel.xsd b/binsrc/ws/wsrm/orabpel.xsd index 9d924783a4..20ddc6f82d 100644 --- a/binsrc/ws/wsrm/orabpel.xsd +++ b/binsrc/ws/wsrm/orabpel.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/utility.xsd b/binsrc/ws/wsrm/utility.xsd index ba97291553..aed0ca8d93 100644 --- a/binsrc/ws/wsrm/utility.xsd +++ b/binsrc/ws/wsrm/utility.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/utility200306.xsd b/binsrc/ws/wsrm/utility200306.xsd index 00ea34f699..7ac114f97d 100644 --- a/binsrc/ws/wsrm/utility200306.xsd +++ b/binsrc/ws/wsrm/utility200306.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/wsa.xsd b/binsrc/ws/wsrm/wsa.xsd index 128f8b6d32..d812f4d750 100644 --- a/binsrc/ws/wsrm/wsa.xsd +++ b/binsrc/ws/wsrm/wsa.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/wsa200403.xsd b/binsrc/ws/wsrm/wsa200403.xsd index 5ae255f7b7..4fb333d292 100644 --- a/binsrc/ws/wsrm/wsa200403.xsd +++ b/binsrc/ws/wsrm/wsa200403.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/wsp.xsd b/binsrc/ws/wsrm/wsp.xsd index fb3f21c3d9..85138bc99b 100644 --- a/binsrc/ws/wsrm/wsp.xsd +++ b/binsrc/ws/wsrm/wsp.xsd @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/wsrm.xsd b/binsrc/ws/wsrm/wsrm.xsd index 72357ff8b8..3a39790c87 100644 --- a/binsrc/ws/wsrm/wsrm.xsd +++ b/binsrc/ws/wsrm/wsrm.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/wsrm_ddl.sql b/binsrc/ws/wsrm/wsrm_ddl.sql index 740facf908..cdc4ebe6d3 100644 --- a/binsrc/ws/wsrm/wsrm_ddl.sql +++ b/binsrc/ws/wsrm/wsrm_ddl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -44,11 +44,6 @@ CREATE TYPE SOAP_CLIENT_REQ AS ) ; ---#IF VER=5 ---!AFTER -alter type SOAP_CLIENT_REQ add attribute security_schema any -; ---#ENDIF create type WSA_CLI as ( @@ -118,11 +113,6 @@ CREATE TABLE SYS_WSRM_OUT_MESSAGE_LOG ( ) ; ---#IF VER=5 ---!AFTER -alter table SYS_WSRM_OUT_MESSAGE_LOG add OML_RESPONSE long xml -; ---#ENDIF CREATE TABLE SYS_WSRM_OUT_SEQUENCES ( @@ -144,11 +134,6 @@ create trigger SYS_WSRM_OUT_SEQUENCES_D after delete on SYS_WSRM_OUT_SEQUENCES } ; ---#IF VER=5 ---!AFTER -alter table SYS_WSRM_OUT_SEQUENCES add WOS_LAST_SENT integer -; ---#ENDIF create type soap_parameter as ( diff --git a/binsrc/ws/wsrm/wsrmcall.xsl b/binsrc/ws/wsrm/wsrmcall.xsl index d65b87e420..b0b4d15909 100644 --- a/binsrc/ws/wsrm/wsrmcall.xsl +++ b/binsrc/ws/wsrm/wsrmcall.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/wsrmcli.sql b/binsrc/ws/wsrm/wsrmcli.sql index fdd9ffab41..6193b85211 100644 --- a/binsrc/ws/wsrm/wsrmcli.sql +++ b/binsrc/ws/wsrm/wsrmcli.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -76,9 +76,6 @@ create constructor method wsrm_cli (in addr WSA_CLI, in url varchar) for wsrm_cl } ; ---#IF VER=5 ---!AFTER_AND_BEFORE DB.DBA.SYS_WSRM_OUT_SEQUENCES WOS_LAST_SENT ! ---#ENDIF create constructor method wsrm_cli (in addr WSA_CLI, in url varchar, in seq varchar) for wsrm_cli { self.url := url; @@ -143,9 +140,6 @@ create method send_message (in req soap_client_req) } ; ---#IF VER=5 ---!AFTER_AND_BEFORE DB.DBA.SYS_WSRM_OUT_SEQUENCES WOS_LAST_SENT ! ---#ENDIF create method send_message (in req soap_client_req, in last int) for wsrm_cli { diff --git a/binsrc/ws/wsrm/wsrmsrv.sql b/binsrc/ws/wsrm/wsrmsrv.sql index f571084380..a68b6a98d2 100644 --- a/binsrc/ws/wsrm/wsrmsrv.sql +++ b/binsrc/ws/wsrm/wsrmsrv.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/wss.xsd b/binsrc/ws/wsrm/wss.xsd index c953812aee..85ab7b238f 100644 --- a/binsrc/ws/wsrm/wss.xsd +++ b/binsrc/ws/wsrm/wss.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/wss0212.xsd b/binsrc/ws/wsrm/wss0212.xsd index 07b7212001..f5aacfa284 100644 --- a/binsrc/ws/wsrm/wss0212.xsd +++ b/binsrc/ws/wsrm/wss0212.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wsrm/xsd2sql.awk b/binsrc/ws/wsrm/xsd2sql.awk index 374ffaaec7..3e74dbe4d6 100644 --- a/binsrc/ws/wsrm/xsd2sql.awk +++ b/binsrc/ws/wsrm/xsd2sql.awk @@ -3,7 +3,7 @@ BEGIN { # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wstr/wstr_ddl.sql b/binsrc/ws/wstr/wstr_ddl.sql index cb7133e5cd..8f68424d72 100644 --- a/binsrc/ws/wstr/wstr_ddl.sql +++ b/binsrc/ws/wstr/wstr_ddl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wstr/wstrcli.sql b/binsrc/ws/wstr/wstrcli.sql index bd7e146825..5a6d4364e3 100644 --- a/binsrc/ws/wstr/wstrcli.sql +++ b/binsrc/ws/wstr/wstrcli.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/ws/wstr/wstrsrv.sql b/binsrc/ws/wstr/wstrsrv.sql index ed952f7f77..66a3fc9372 100644 --- a/binsrc/ws/wstr/wstrsrv.sql +++ b/binsrc/ws/wstr/wstrsrv.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/Makefile.am b/binsrc/xddl/Makefile.am index 84f8b31e5c..ada11fdc4d 100644 --- a/binsrc/xddl/Makefile.am +++ b/binsrc/xddl/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/demo.xml b/binsrc/xddl/demo.xml index 53eb292fa6..a849dcf410 100644 --- a/binsrc/xddl/demo.xml +++ b/binsrc/xddl/demo.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/fragment.xml b/binsrc/xddl/fragment.xml index 2e77d2ed36..8d184b8bd8 100644 --- a/binsrc/xddl/fragment.xml +++ b/binsrc/xddl/fragment.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/test.vsp b/binsrc/xddl/test.vsp index a0963d3468..4f18978d22 100644 --- a/binsrc/xddl/test.vsp +++ b/binsrc/xddl/test.vsp @@ -5,7 +5,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/xddl.sql b/binsrc/xddl/xddl.sql index f6135d5e57..b8b40ad74b 100644 --- a/binsrc/xddl/xddl.sql +++ b/binsrc/xddl/xddl.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/xddl.xsd b/binsrc/xddl/xddl.xsd index 4ac988edc8..646854cc75 100644 --- a/binsrc/xddl/xddl.xsd +++ b/binsrc/xddl/xddl.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/xddl_dav.sql b/binsrc/xddl/xddl_dav.sql index 4d01f02f0c..e9d90cb181 100644 --- a/binsrc/xddl/xddl_dav.sql +++ b/binsrc/xddl/xddl_dav.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/xddl_diff.xsl b/binsrc/xddl/xddl_diff.xsl index 7b3cff8497..a4fed298a7 100644 --- a/binsrc/xddl/xddl_diff.xsl +++ b/binsrc/xddl/xddl_diff.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/xddl_exec.xsl b/binsrc/xddl/xddl_exec.xsl index a444b7236c..d76d20f1be 100644 --- a/binsrc/xddl/xddl_exec.xsl +++ b/binsrc/xddl/xddl_exec.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/xddl_filesystem.sql b/binsrc/xddl/xddl_filesystem.sql index bf780e5182..c0281e7519 100644 --- a/binsrc/xddl/xddl_filesystem.sql +++ b/binsrc/xddl/xddl_filesystem.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/xddl_procs.xsd b/binsrc/xddl/xddl_procs.xsd index e69c81825d..c7556c1379 100644 --- a/binsrc/xddl/xddl_procs.xsd +++ b/binsrc/xddl/xddl_procs.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/xddl_tables.xsd b/binsrc/xddl/xddl_tables.xsd index ce92251ade..6d11fe1db2 100644 --- a/binsrc/xddl/xddl_tables.xsd +++ b/binsrc/xddl/xddl_tables.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/xddl/xddl_views.xsd b/binsrc/xddl/xddl_views.xsd index 56fab45a31..b0badec832 100644 --- a/binsrc/xddl/xddl_views.xsd +++ b/binsrc/xddl/xddl_views.xsd @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/binsrc/yacutia/cont_page.vspx b/binsrc/yacutia/cont_page.vspx deleted file mode 100644 index 48211cd9b9..0000000000 --- a/binsrc/yacutia/cont_page.vspx +++ /dev/null @@ -1,92 +0,0 @@ - - - - doctype="-//W3C//DTD XHTML 1.0 Transitional//EN" - doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - - WebDAV Content Management - - - - - - - - - - - - - - -
    - - - - -
    - - - - - - - -
    - - - - - - - -
    - - - - -
    - - - - - - - - - - - - -
    -
    -
    -     -     -     diff --git a/binsrc/yacutia/cont_type_edit.vspx b/binsrc/yacutia/cont_type_edit.vspx deleted file mode 100644 index cd1061e512..0000000000 --- a/binsrc/yacutia/cont_type_edit.vspx +++ /dev/null @@ -1,272 +0,0 @@ - - - - - WebDAV Content Management - - - - - - - - - -

    - -

    -     - - - - %V\n', tag, cast (c[i] as varchar)), ss); } @@ -1350,7 +1384,7 @@ in check_plan int := 1, in plan_xpath varchar := null, in addp int := 0, in ref_ create procedure -qt_check (in file varchar, out message varchar, in record_new integer := 0) returns int +qt_check (in file varchar, out message varchar, in record_new integer := 0, in skip_comment int := 0) returns int { declare xt, qr, xp_test, expl, da any; declare stat, msg, meta, data, r, check_order, cnt any; @@ -1365,6 +1399,8 @@ qt_check (in file varchar, out message varchar, in record_new integer := 0) retu xt := qt_source (file); message := xpath_eval ('/test/comment/text()', xt); + if (skip_comment) + message := ''; qr := charset_recode (xpath_eval ('string (/test/query)', xt), '_WIDE_', 'UTF-8'); check_order := atoi (charset_recode (xpath_eval ('/test/plans/plan/verify/@result-order', xt), '_WIDE_', 'UTF-8')); xp_test := charset_recode (xpath_eval ('/test/plans/plan/verify/@plan-xpath', xt), '_WIDE_', 'UTF-8'); @@ -1389,7 +1425,7 @@ qt_check (in file varchar, out message varchar, in record_new integer := 0) retu if (check_order = 0) gvector_sort (data, 1, 0, 1); if (cnt <> length (data)) - message := message || ' : result count differs'; + message := message || sprintf (' : result count differs %d<>%d', cnt, length (data)); refs := xpath_eval ('/test/result/row', xt, 0); idx := 0; foreach (any rr in refs) do @@ -1409,7 +1445,7 @@ qt_check (in file varchar, out message varchar, in record_new integer := 0) retu { declare t any; t := cast (vals[i] as varchar); - if (__tag(c[i]) in (191, 190, 219)) + if (__tag(c[i]) in (191, 190, __tag of decimal)) { declare delta float; t := cast (t as double precision); @@ -1418,15 +1454,15 @@ qt_check (in file varchar, out message varchar, in record_new integer := 0) retu delta := -1 * delta; if (delta > 1e-6) { - message := message || sprintf (' : value at #%d %s <> %s', i, + message := message || sprintf (' : value at #%d [%s] <> [%s]', i, cast (t as varchar), cast (c[i] as varchar)); - return 0; + goto err_ret; } } else if (t <> cast (c[i] as varchar) or cast (dtps[i] as int) <> __tag(c[i])) { - message := message || sprintf (' : value at %d #%d %s <> %s', idx + 1, i, t, cast (c[i] as varchar)); - return 0; + message := message || sprintf (' : value at %d #%d [%s] <> [%s]', idx + 1, i, t, cast (c[i] as varchar)); + goto err_ret; } } idx := idx + 1; @@ -1436,20 +1472,24 @@ qt_check (in file varchar, out message varchar, in record_new integer := 0) retu qt_record (file || '.new', qr, comment => message, check_order => check_order); } return 1; +err_ret: + qt_record (regexp_replace (file, '\.xml\x24', '.err'), qr, comment => message, check_order => check_order); + return 0; } ; create procedure -qt_check_dir (in dir varchar, in file_mask varchar := '%', in record_new integer := 0) +qt_check_dir (in dir varchar, in file_mask varchar := '%', in record_new integer := 0, in skip_comment int := 0) { declare ls, inx, f, msg, stat, file, report any; ls := sys_dirlist (dir, 1); result_names (stat, file, report); + gvector_sort (ls, 1, 0, 1); for (inx := 0; inx < length (ls); inx := inx + 1) { if (ls[inx] like '%.xml' and ls[inx] like file_mask) { - f := qt_check (dir || '/' || ls[inx], msg, record_new); + f := qt_check (dir || '/' || ls[inx], msg, record_new, skip_comment); result (case f when 1 then 'PASSED: ' else '***FAILED: ' end,ls[inx], msg); } } @@ -1550,9 +1590,9 @@ qt_make_array (inout arr any) { declare dtp int; dtp := cast (dtps[i] as int); - if (dtp = 246) - dtp := 182; - if (dtp = 219) + if (dtp = __tag of rdf_box) + dtp := __tag of varchar; + if (dtp = __tag of decimal) vals[i] := _cvt (vector (dtp, 40, 15), cast (vals[i] as varchar)); else vals[i] := _cvt (vector (dtp, 0), cast (vals[i] as varchar)); @@ -1609,9 +1649,9 @@ qt_diff (in file varchar, in target varchar, out message varchar) returns int t2 := v2[i]; dtp1 := __tag (t1); dtp2 := __tag (t2); - if (dtp1 in (191, 190, 219) and dtp2 in (191, 190, 219)) + if (dtp1 in (191, 190, __tag of decimal) and dtp2 in (191, 190, __tag of decimal)) dtp1 := dtp2 := __max (dtp1, dtp1); - if (dtp1 = dtp2 and dtp1 in (191, 190, 219)) + if (dtp1 = dtp2 and dtp1 in (191, 190, __tag of decimal)) { declare delta float; t1 := cast (t1 as double precision); @@ -1771,7 +1811,7 @@ create procedure VALIDATE.DBA.validate_internal ( if (propertyType = 'boolean') { - if (propertyValue not in ('Yes', 'No')) + if (lcase (propertyValue) not in ('yes', 'no', '1', '0', 'true', 'false')) goto _error; } else if (propertyType = 'integer') @@ -1955,7 +1995,7 @@ create procedure VALIDATE.DBA.validate_tags ( return 0; for (N := 0; N < length(V); N := N + 1) - if (not WEBDAV.DBA.validate_tag (V[N])) + if (not VALIDATE.DBA.validate_tag (V[N])) return 0; return 1; diff --git a/libsrc/Wi/text.c b/libsrc/Wi/text.c index 3ff5a0b58c..e24fb0d616 100644 --- a/libsrc/Wi/text.c +++ b/libsrc/Wi/text.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/text.h b/libsrc/Wi/text.h index 76a7eef2ac..03ed66433d 100644 --- a/libsrc/Wi/text.h +++ b/libsrc/Wi/text.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/trans.c b/libsrc/Wi/trans.c index 2a92bbdc09..11933b5701 100644 --- a/libsrc/Wi/trans.c +++ b/libsrc/Wi/trans.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/ttlpv.sql b/libsrc/Wi/ttlpv.sql index 452c5056f9..0ab52616d8 100644 --- a/libsrc/Wi/ttlpv.sql +++ b/libsrc/Wi/ttlpv.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -531,7 +531,8 @@ create procedure DB.DBA.TTLP_V (in strg varchar, in base varchar, in graph varch DB.DBA.TTLP_CL (strg, 0, base, graph, flags); return; } - + if (is_atomic ()) + signal ('22023', 'DB.DBA.TTLP_V(), the vectorized Turtle loader, can not be used while server is in the atomic mode; consider using plain non-vectorised loader DB.DBA.TTLP()'); declare exit handler for sqlstate '37000' { if (app_env <> 0) { @@ -829,7 +830,7 @@ create procedure DB.DBA.RDF_MAKE_S_O_FROM_PARTS_AND_FLAGS_C (inout s any array, { o := rdf_box (o, 258, 257, 0, 1); rdf_box_set_type (o, 257); - if (is_text and 246 = __tag (o)) + if (is_text and __tag of rdf_box = __tag (o)) rdf_box_set_is_text (o, 1); return; } @@ -843,7 +844,7 @@ create procedure DB.DBA.RDF_MAKE_S_O_FROM_PARTS_AND_FLAGS_C (inout s any array, else lid := rdf_lang_id (lower (o_type)); } - if (is_text and 246 = __tag (o)) + if (is_text and __tag of rdf_box = __tag (o)) rdf_box_set_is_text (o, 1); o := rdf_box (o, 257, lid, 0, 1); return; @@ -889,7 +890,7 @@ create procedure DB.DBA.RDF_MAKE_S_O_FROM_PARTS_AND_FLAGS_C (inout s any array, tid := rdf_type_id (o_type); } o := rdf_box (o, tid, 257, 0, 1); - if (is_text and 246 = __tag (o)) + if (is_text and __tag of rdf_box = __tag (o)) rdf_box_set_is_text (o, 1); return; } @@ -898,7 +899,7 @@ create procedure DB.DBA.RDF_MAKE_S_O_FROM_PARTS_AND_FLAGS_C (inout s any array, { o := rdf_box (xml_tree_doc (o), 300, 257, 0, 1); rdf_box_set_type (o, 257); - if (is_text and 246 = __tag (o)) + if (is_text and __tag of rdf_box = __tag (o)) rdf_box_set_is_text (o, 1); return; } diff --git a/libsrc/Wi/turtle_l.l b/libsrc/Wi/turtle_l.l index 1b09322be2..aecd33878b 100644 --- a/libsrc/Wi/turtle_l.l +++ b/libsrc/Wi/turtle_l.l @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -599,7 +599,7 @@ int ttlyyerror_if_long_qname (ttlp_t *ttlp_arg, int lexcode, caddr_t box, const char *lex_type_descr, struct yyguts_t * yyg) { size_t boxlen = box_length (box); - char buf[100]; + char buf[150]; char *colon; if (boxlen > MAX_XML_QNAME_LENGTH) { @@ -984,7 +984,25 @@ resume_sniffing: } else { + caddr_t msg = ERR_MESSAGE(err); + caddr_t longer_msg; /* ttlyydebug = 0; */ + if ((strncmp (msg, "RDF29", 5) && strncmp (msg, "RDF30", 5)) && !THR_IS_STACK_OVERFLOW (THREAD_CURRENT_THREAD, &msg, 2000+2000)) + { /* non-syntax error is not aware of file name and line, they should be imprinted */ + char temp[2000]; + int lineno = ttlp->ttlp_lexlineno; + const char *raw_text = ttlp->ttlp_raw_text; + snprintf (temp, sizeof (temp), "%.400s, line %d%.6s%.1000s%.6s: ", + ttlp->ttlp_err_hdr, + lineno, + ((NULL == raw_text) ? "" : " (at "), + ((NULL == raw_text) ? "" : raw_text), + ((NULL == raw_text) ? "" : ")" ) ); + temp[sizeof(temp)-1] = '\0'; + longer_msg = box_dv_short_strconcat (temp, msg); + ERR_MESSAGE(err) = longer_msg; + dk_free_box (msg); + } ttlp->ttlp_catched_error = err; if (NULL != ttlp->ttlp_iter_abend) { @@ -1070,7 +1088,7 @@ bif_turtle_lex_test (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) continue; dk_set_push (&report, box_dv_short_string ("")); dk_set_push (&report, - box_sprintf (0x100, "#define % 25s %d /* '%s' (%c) */", + box_sprintf (0x100, "#define %25s %d /* '%s' (%c) */", ld->ld_yname, ld->ld_val, ld->ld_fmt, ld->ld_fmttype ) ); for (cmd_idx = 0; cmd_idx < BOX_ELEMENTS(ld->ld_tests); cmd_idx++) { diff --git a/libsrc/Wi/turtle_p.y b/libsrc/Wi/turtle_p.y index d63c7795fc..6300b3baf8 100644 --- a/libsrc/Wi/turtle_p.y +++ b/libsrc/Wi/turtle_p.y @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/uddi.sql b/libsrc/Wi/uddi.sql index 3201649936..e7991e0c2c 100644 --- a/libsrc/Wi/uddi.sql +++ b/libsrc/Wi/uddi.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -102,11 +102,6 @@ create table UDDI..DESCRIPTION ( create index DESC_PARENT on DESCRIPTION (UD_TYPE, UD_PARENT_ID) ; ---#IF VER=5 ---!AFTER -alter table UDDI..DESCRIPTION add UD_DESCRIPTION_KEY varchar -; ---#ENDIF --===================================================================================== -- Discovery URL table: contains structure - holds a URL addressable discovery documents @@ -121,11 +116,6 @@ create table UDDI..DISCOVERY_URL ( create index DISCOVERY_URLS_PARENT on DISCOVERY_URL (DU_PARENT_TYPE, DU_PARENT_ID) ; ---#IF VER=5 ---!AFTER -alter table UDDI..DISCOVERY_URL add DU_DISCOVERY_KEY varchar -; ---#ENDIF --=================== @@ -142,11 +132,6 @@ create table UDDI..ADDRESS_LINE ( create index ADDR_LINE_PARENT on ADDRESS_LINE (AL_PARENT_TYPE, AL_PARENT_ID) ; ---#IF VER=5 ---!AFTER -alter table UDDI..ADDRESS_LINE add AL_ADDRESS_KEY varchar -; ---#ENDIF ---================ @@ -176,11 +161,6 @@ create table UDDI..EMAIL ( create index IN_EMPARENT on EMAIL (EM_CONTACT_KEY) ; ---#IF VER=5 ---!AFTER -alter table UDDI..EMAIL add EM_EMAIL_KEY varchar -; ---#ENDIF --============ -- phone table @@ -194,11 +174,6 @@ create table UDDI..PHONE ( create index IN_PHPARENT on PHONE (PH_CONTACT_KEY) ; ---#IF VER=5 ---!AFTER -alter table UDDI..PHONE add PH_PHONE_KEY varchar -; ---#ENDIF ---===================== --- Identifier Bag Table @@ -214,11 +189,6 @@ create table UDDI..IDENTIFIER_BAG ( create index IB_PARENT on IDENTIFIER_BAG (IB_PARENT_ID,IB_PARENT_TYPE) ; ---#IF VER=5 ---!AFTER -alter table UDDI..IDENTIFIER_BAG add IB_IDENTIFIER_KEY varchar -; ---#ENDIF ---=================== --- Category Bag Table @@ -234,11 +204,6 @@ create table UDDI..CATEGORY_BAG ( create index CB_PARENT on CATEGORY_BAG (CB_PARENT_ID, CB_PARENT_TYPE) ; ---#IF VER=5 ---!AFTER -alter table UDDI..CATEGORY_BAG add CB_CATEGORY_KEY varchar -; ---#ENDIF ---=================== @@ -572,7 +537,7 @@ UDDI_SAVE_BUSINESS (in uddi_req any) declare ress any; declare token, owner varchar; - if (__tag (uddi_req) <> 230) + if (__tag (uddi_req) <> __tag of XML) req := xml_tree_doc (uddi_req); else req := uddi_req; @@ -3091,7 +3056,7 @@ UDDI_LOCAL (in req_l any) if (isstring (req_l)) req := xml_tree_doc (req_l); - else if (__tag (req_l) = 230) + else if (__tag (req_l) = __tag of XML) { declare temp any; req := req_l; diff --git a/libsrc/Wi/uname_const_decl.c b/libsrc/Wi/uname_const_decl.c index 6d11453451..bbb6d2e137 100644 --- a/libsrc/Wi/uname_const_decl.c +++ b/libsrc/Wi/uname_const_decl.c @@ -1,4 +1,6 @@ /* + * uname_const_decl.c + * * $Id$ * * Constant declarations of commonly used UNAMEs. @@ -6,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -64,6 +66,102 @@ caddr_t uname_bif_c_st_within; caddr_t uname_bif_c_xcontains; caddr_t uname_bif_c_xpath_contains; caddr_t uname_bif_c_xquery_contains; +caddr_t uname_bif_ns_uri; +caddr_t uname_opengis_def_function_gs_ns_uri; +caddr_t uname_opengis_def_function_gs_ns_uri_boundary; +caddr_t uname_opengis_def_function_gs_ns_uri_buffer; +caddr_t uname_opengis_def_function_gs_ns_uri_convexHull; +caddr_t uname_opengis_def_function_gs_ns_uri_difference; +caddr_t uname_opengis_def_function_gs_ns_uri_distance; +caddr_t uname_opengis_def_function_gs_ns_uri_ehContains; +caddr_t uname_opengis_def_function_gs_ns_uri_ehCoveredBy; +caddr_t uname_opengis_def_function_gs_ns_uri_ehCovers; +caddr_t uname_opengis_def_function_gs_ns_uri_ehDisjoint; +caddr_t uname_opengis_def_function_gs_ns_uri_ehEquals; +caddr_t uname_opengis_def_function_gs_ns_uri_ehInside; +caddr_t uname_opengis_def_function_gs_ns_uri_ehMeet; +caddr_t uname_opengis_def_function_gs_ns_uri_ehOverlap; +caddr_t uname_opengis_def_function_gs_ns_uri_envelope; +caddr_t uname_opengis_def_function_gs_ns_uri_getSRID; +caddr_t uname_opengis_def_function_gs_ns_uri_intersection; +caddr_t uname_opengis_def_function_gs_ns_uri_rcc8dc; +caddr_t uname_opengis_def_function_gs_ns_uri_rcc8ec; +caddr_t uname_opengis_def_function_gs_ns_uri_rcc8eq; +caddr_t uname_opengis_def_function_gs_ns_uri_rcc8ntpp; +caddr_t uname_opengis_def_function_gs_ns_uri_rcc8ntppi; +caddr_t uname_opengis_def_function_gs_ns_uri_rcc8po; +caddr_t uname_opengis_def_function_gs_ns_uri_rcc8tpp; +caddr_t uname_opengis_def_function_gs_ns_uri_rcc8tppi; +caddr_t uname_opengis_def_function_gs_ns_uri_relate; +caddr_t uname_opengis_def_function_gs_ns_uri_sfContains; +caddr_t uname_opengis_def_function_gs_ns_uri_sfCrosses; +caddr_t uname_opengis_def_function_gs_ns_uri_sfDisjoint; +caddr_t uname_opengis_def_function_gs_ns_uri_sfEquals; +caddr_t uname_opengis_def_function_gs_ns_uri_sfIntersects; +caddr_t uname_opengis_def_function_gs_ns_uri_sfOverlaps; +caddr_t uname_opengis_def_function_gs_ns_uri_sfTouches; +caddr_t uname_opengis_def_function_gs_ns_uri_sfWithin; +caddr_t uname_opengis_def_function_gs_ns_uri_symDifference; +caddr_t uname_opengis_def_function_gs_ns_uri_union; +caddr_t uname_opengis_def_rule_gs_ns_uri; +caddr_t uname_opengis_def_rule_gs_ns_uri_ehContains; +caddr_t uname_opengis_def_rule_gs_ns_uri_ehCoveredBy; +caddr_t uname_opengis_def_rule_gs_ns_uri_ehCovers; +caddr_t uname_opengis_def_rule_gs_ns_uri_ehDisjoint; +caddr_t uname_opengis_def_rule_gs_ns_uri_ehEquals; +caddr_t uname_opengis_def_rule_gs_ns_uri_ehInside; +caddr_t uname_opengis_def_rule_gs_ns_uri_ehMeet; +caddr_t uname_opengis_def_rule_gs_ns_uri_ehOverlap; +caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8dc; +caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8ec; +caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8eq; +caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8ntpp; +caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8ntppi; +caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8po; +caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8tpp; +caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8tppi; +caddr_t uname_opengis_ns_uri; +caddr_t uname_opengis_ont_gml_ns_uri; +caddr_t uname_opengis_ont_gs_ns_uri; +caddr_t uname_opengis_ont_gs_ns_uri_Feature; +caddr_t uname_opengis_ont_gs_ns_uri_SpatialObject; +caddr_t uname_opengis_ont_gs_ns_uri_asGML; +caddr_t uname_opengis_ont_gs_ns_uri_asWKT; +caddr_t uname_opengis_ont_gs_ns_uri_coordinateDimension; +caddr_t uname_opengis_ont_gs_ns_uri_dimension; +caddr_t uname_opengis_ont_gs_ns_uri_ehContains; +caddr_t uname_opengis_ont_gs_ns_uri_ehCoveredBy; +caddr_t uname_opengis_ont_gs_ns_uri_ehCovers; +caddr_t uname_opengis_ont_gs_ns_uri_ehDisjoint; +caddr_t uname_opengis_ont_gs_ns_uri_ehEquals; +caddr_t uname_opengis_ont_gs_ns_uri_ehInside; +caddr_t uname_opengis_ont_gs_ns_uri_ehMeet; +caddr_t uname_opengis_ont_gs_ns_uri_ehOverlap; +caddr_t uname_opengis_ont_gs_ns_uri_gmlLiteral; +caddr_t uname_opengis_ont_gs_ns_uri_hasDefaultGeometry; +caddr_t uname_opengis_ont_gs_ns_uri_hasGeometry; +caddr_t uname_opengis_ont_gs_ns_uri_hasSerialization; +caddr_t uname_opengis_ont_gs_ns_uri_isEmpty; +caddr_t uname_opengis_ont_gs_ns_uri_isSimple; +caddr_t uname_opengis_ont_gs_ns_uri_rcc8dc; +caddr_t uname_opengis_ont_gs_ns_uri_rcc8ec; +caddr_t uname_opengis_ont_gs_ns_uri_rcc8eq; +caddr_t uname_opengis_ont_gs_ns_uri_rcc8ntpp; +caddr_t uname_opengis_ont_gs_ns_uri_rcc8ntppi; +caddr_t uname_opengis_ont_gs_ns_uri_rcc8po; +caddr_t uname_opengis_ont_gs_ns_uri_rcc8tpp; +caddr_t uname_opengis_ont_gs_ns_uri_rcc8tppi; +caddr_t uname_opengis_ont_gs_ns_uri_sfContains; +caddr_t uname_opengis_ont_gs_ns_uri_sfCrosses; +caddr_t uname_opengis_ont_gs_ns_uri_sfDisjoint; +caddr_t uname_opengis_ont_gs_ns_uri_sfEquals; +caddr_t uname_opengis_ont_gs_ns_uri_sfIntersects; +caddr_t uname_opengis_ont_gs_ns_uri_sfOverlaps; +caddr_t uname_opengis_ont_gs_ns_uri_sfTouches; +caddr_t uname_opengis_ont_gs_ns_uri_sfWithin; +caddr_t uname_opengis_ont_gs_ns_uri_spatialDimension; +caddr_t uname_opengis_ont_gs_ns_uri_wktLiteral; +caddr_t uname_opengis_ont_sf_ns_uri; caddr_t uname_false; caddr_t uname_lang; caddr_t uname_nil; @@ -97,12 +195,14 @@ caddr_t uname_rdfdf_ns_uri_default_nullable; caddr_t uname_rdfdf_ns_uri_default_iid; caddr_t uname_rdfdf_ns_uri_default_iid_nullable; caddr_t uname_space; +caddr_t uname_sql_ns_uri; caddr_t uname_swap_reify_ns_uri; caddr_t uname_swap_reify_ns_uri_statement; caddr_t uname_true; caddr_t uname_virtrdf_ns_uri; caddr_t uname_virtrdf_ns_uri_DefaultQuadMap; caddr_t uname_virtrdf_ns_uri_DefaultQuadStorage; +caddr_t uname_virtrdf_ns_uri_DefaultServiceMap; caddr_t uname_virtrdf_ns_uri_DefaultServiceStorage; caddr_t uname_virtrdf_ns_uri_DefaultSparul11Target; caddr_t uname_virtrdf_ns_uri_Geometry; @@ -110,6 +210,7 @@ caddr_t uname_virtrdf_ns_uri_PrivateGraphs; caddr_t uname_virtrdf_ns_uri_QuadMap; caddr_t uname_virtrdf_ns_uri_QuadMapFormat; caddr_t uname_virtrdf_ns_uri_QuadStorage; +caddr_t uname_virtrdf_ns_uri_RdfDebuggerSingletone; caddr_t uname_virtrdf_ns_uri_SparqlMacroLibrary; caddr_t uname_virtrdf_ns_uri_SyncToQuads; caddr_t uname_virtrdf_ns_uri_array_of_any; @@ -270,6 +371,102 @@ static uname_const_decl_t uname_const_decls[] = { { &uname_bif_c_xcontains , "bif:xcontains" }, { &uname_bif_c_xpath_contains , "bif:xpath_contains" }, { &uname_bif_c_xquery_contains , "bif:xquery_contains" }, + { &uname_bif_ns_uri , OPENLINKSW_BIF_NS_URI }, + { &uname_opengis_def_function_gs_ns_uri , OPENGIS_DEF_FUNCTION_GS_NS_URI }, + { &uname_opengis_def_function_gs_ns_uri_boundary , OPENGIS_DEF_FUNCTION_GS_NS_URI "boundary" }, + { &uname_opengis_def_function_gs_ns_uri_buffer , OPENGIS_DEF_FUNCTION_GS_NS_URI "buffer" }, + { &uname_opengis_def_function_gs_ns_uri_convexHull , OPENGIS_DEF_FUNCTION_GS_NS_URI "convexHull" }, + { &uname_opengis_def_function_gs_ns_uri_difference , OPENGIS_DEF_FUNCTION_GS_NS_URI "difference" }, + { &uname_opengis_def_function_gs_ns_uri_distance , OPENGIS_DEF_FUNCTION_GS_NS_URI "distance" }, + { &uname_opengis_def_function_gs_ns_uri_ehContains , OPENGIS_DEF_FUNCTION_GS_NS_URI "ehContains" }, + { &uname_opengis_def_function_gs_ns_uri_ehCoveredBy , OPENGIS_DEF_FUNCTION_GS_NS_URI "ehCoveredBy" }, + { &uname_opengis_def_function_gs_ns_uri_ehCovers , OPENGIS_DEF_FUNCTION_GS_NS_URI "ehCovers" }, + { &uname_opengis_def_function_gs_ns_uri_ehDisjoint , OPENGIS_DEF_FUNCTION_GS_NS_URI "ehDisjoint" }, + { &uname_opengis_def_function_gs_ns_uri_ehEquals , OPENGIS_DEF_FUNCTION_GS_NS_URI "ehEquals" }, + { &uname_opengis_def_function_gs_ns_uri_ehInside , OPENGIS_DEF_FUNCTION_GS_NS_URI "ehInside" }, + { &uname_opengis_def_function_gs_ns_uri_ehMeet , OPENGIS_DEF_FUNCTION_GS_NS_URI "ehMeet" }, + { &uname_opengis_def_function_gs_ns_uri_ehOverlap , OPENGIS_DEF_FUNCTION_GS_NS_URI "ehOverlap" }, + { &uname_opengis_def_function_gs_ns_uri_envelope , OPENGIS_DEF_FUNCTION_GS_NS_URI "envelope" }, + { &uname_opengis_def_function_gs_ns_uri_getSRID , OPENGIS_DEF_FUNCTION_GS_NS_URI "getSRID" }, + { &uname_opengis_def_function_gs_ns_uri_intersection , OPENGIS_DEF_FUNCTION_GS_NS_URI "intersection" }, + { &uname_opengis_def_function_gs_ns_uri_rcc8dc , OPENGIS_DEF_FUNCTION_GS_NS_URI "rcc8dc" }, + { &uname_opengis_def_function_gs_ns_uri_rcc8ec , OPENGIS_DEF_FUNCTION_GS_NS_URI "rcc8ec" }, + { &uname_opengis_def_function_gs_ns_uri_rcc8eq , OPENGIS_DEF_FUNCTION_GS_NS_URI "rcc8eq" }, + { &uname_opengis_def_function_gs_ns_uri_rcc8ntpp , OPENGIS_DEF_FUNCTION_GS_NS_URI "rcc8ntpp" }, + { &uname_opengis_def_function_gs_ns_uri_rcc8ntppi , OPENGIS_DEF_FUNCTION_GS_NS_URI "rcc8ntppi" }, + { &uname_opengis_def_function_gs_ns_uri_rcc8po , OPENGIS_DEF_FUNCTION_GS_NS_URI "rcc8po" }, + { &uname_opengis_def_function_gs_ns_uri_rcc8tpp , OPENGIS_DEF_FUNCTION_GS_NS_URI "rcc8tpp" }, + { &uname_opengis_def_function_gs_ns_uri_rcc8tppi , OPENGIS_DEF_FUNCTION_GS_NS_URI "rcc8tppi" }, + { &uname_opengis_def_function_gs_ns_uri_relate , OPENGIS_DEF_FUNCTION_GS_NS_URI "relate" }, + { &uname_opengis_def_function_gs_ns_uri_sfContains , OPENGIS_DEF_FUNCTION_GS_NS_URI "sfContains" }, + { &uname_opengis_def_function_gs_ns_uri_sfCrosses , OPENGIS_DEF_FUNCTION_GS_NS_URI "sfCrosses" }, + { &uname_opengis_def_function_gs_ns_uri_sfDisjoint , OPENGIS_DEF_FUNCTION_GS_NS_URI "sfDisjoint" }, + { &uname_opengis_def_function_gs_ns_uri_sfEquals , OPENGIS_DEF_FUNCTION_GS_NS_URI "sfEquals" }, + { &uname_opengis_def_function_gs_ns_uri_sfIntersects , OPENGIS_DEF_FUNCTION_GS_NS_URI "sfIntersects" }, + { &uname_opengis_def_function_gs_ns_uri_sfOverlaps , OPENGIS_DEF_FUNCTION_GS_NS_URI "sfOverlaps" }, + { &uname_opengis_def_function_gs_ns_uri_sfTouches , OPENGIS_DEF_FUNCTION_GS_NS_URI "sfTouches" }, + { &uname_opengis_def_function_gs_ns_uri_sfWithin , OPENGIS_DEF_FUNCTION_GS_NS_URI "sfWithin" }, + { &uname_opengis_def_function_gs_ns_uri_symDifference , OPENGIS_DEF_FUNCTION_GS_NS_URI "symDifference"}, + { &uname_opengis_def_function_gs_ns_uri_union , OPENGIS_DEF_FUNCTION_GS_NS_URI "union" }, + { &uname_opengis_def_rule_gs_ns_uri , OPENGIS_DEF_RULE_GS_NS_URI }, + { &uname_opengis_def_rule_gs_ns_uri_ehContains , OPENGIS_DEF_RULE_GS_NS_URI "ehContains" }, + { &uname_opengis_def_rule_gs_ns_uri_ehCoveredBy , OPENGIS_DEF_RULE_GS_NS_URI "ehCoveredBy" }, + { &uname_opengis_def_rule_gs_ns_uri_ehCovers , OPENGIS_DEF_RULE_GS_NS_URI "ehCovers" }, + { &uname_opengis_def_rule_gs_ns_uri_ehDisjoint , OPENGIS_DEF_RULE_GS_NS_URI "ehDisjoint" }, + { &uname_opengis_def_rule_gs_ns_uri_ehEquals , OPENGIS_DEF_RULE_GS_NS_URI "ehEquals" }, + { &uname_opengis_def_rule_gs_ns_uri_ehInside , OPENGIS_DEF_RULE_GS_NS_URI "ehInside" }, + { &uname_opengis_def_rule_gs_ns_uri_ehMeet , OPENGIS_DEF_RULE_GS_NS_URI "ehMeet" }, + { &uname_opengis_def_rule_gs_ns_uri_ehOverlap , OPENGIS_DEF_RULE_GS_NS_URI "ehOverlap" }, + { &uname_opengis_def_rule_gs_ns_uri_rcc8dc , OPENGIS_DEF_RULE_GS_NS_URI "rcc8dc" }, + { &uname_opengis_def_rule_gs_ns_uri_rcc8ec , OPENGIS_DEF_RULE_GS_NS_URI "rcc8ec" }, + { &uname_opengis_def_rule_gs_ns_uri_rcc8eq , OPENGIS_DEF_RULE_GS_NS_URI "rcc8eq" }, + { &uname_opengis_def_rule_gs_ns_uri_rcc8ntpp , OPENGIS_DEF_RULE_GS_NS_URI "rcc8ntpp" }, + { &uname_opengis_def_rule_gs_ns_uri_rcc8ntppi , OPENGIS_DEF_RULE_GS_NS_URI "rcc8ntppi" }, + { &uname_opengis_def_rule_gs_ns_uri_rcc8po , OPENGIS_DEF_RULE_GS_NS_URI "rcc8po" }, + { &uname_opengis_def_rule_gs_ns_uri_rcc8tpp , OPENGIS_DEF_RULE_GS_NS_URI "rcc8tpp" }, + { &uname_opengis_def_rule_gs_ns_uri_rcc8tppi , OPENGIS_DEF_RULE_GS_NS_URI "rcc8tppi" }, + { &uname_opengis_ns_uri , OPENGIS_NS_URI }, + { &uname_opengis_ont_gml_ns_uri , OPENGIS_ONT_GML_NS_URI }, + { &uname_opengis_ont_gs_ns_uri , OPENGIS_ONT_GS_NS_URI }, + { &uname_opengis_ont_gs_ns_uri_Feature , OPENGIS_ONT_GS_NS_URI "Feature" }, + { &uname_opengis_ont_gs_ns_uri_SpatialObject , OPENGIS_ONT_GS_NS_URI "SpatialObject" }, + { &uname_opengis_ont_gs_ns_uri_asGML , OPENGIS_ONT_GS_NS_URI "asGML" }, + { &uname_opengis_ont_gs_ns_uri_asWKT , OPENGIS_ONT_GS_NS_URI "asWKT" }, + { &uname_opengis_ont_gs_ns_uri_coordinateDimension , OPENGIS_ONT_GS_NS_URI "coordinateDimension" }, + { &uname_opengis_ont_gs_ns_uri_dimension , OPENGIS_ONT_GS_NS_URI "dimension" }, + { &uname_opengis_ont_gs_ns_uri_ehContains , OPENGIS_ONT_GS_NS_URI "ehContains" }, + { &uname_opengis_ont_gs_ns_uri_ehCoveredBy , OPENGIS_ONT_GS_NS_URI "ehCoveredBy" }, + { &uname_opengis_ont_gs_ns_uri_ehCovers , OPENGIS_ONT_GS_NS_URI "ehCovers" }, + { &uname_opengis_ont_gs_ns_uri_ehDisjoint , OPENGIS_ONT_GS_NS_URI "ehDisjoint" }, + { &uname_opengis_ont_gs_ns_uri_ehEquals , OPENGIS_ONT_GS_NS_URI "ehEquals" }, + { &uname_opengis_ont_gs_ns_uri_ehInside , OPENGIS_ONT_GS_NS_URI "ehInside" }, + { &uname_opengis_ont_gs_ns_uri_ehMeet , OPENGIS_ONT_GS_NS_URI "ehMeet" }, + { &uname_opengis_ont_gs_ns_uri_ehOverlap , OPENGIS_ONT_GS_NS_URI "ehOverlap" }, + { &uname_opengis_ont_gs_ns_uri_gmlLiteral , OPENGIS_ONT_GS_NS_URI "gmlLiteral" }, + { &uname_opengis_ont_gs_ns_uri_hasDefaultGeometry , OPENGIS_ONT_GS_NS_URI "hasDefaultGeometry" }, + { &uname_opengis_ont_gs_ns_uri_hasGeometry , OPENGIS_ONT_GS_NS_URI "hasGeometry" }, + { &uname_opengis_ont_gs_ns_uri_hasSerialization , OPENGIS_ONT_GS_NS_URI "hasSerialization" }, + { &uname_opengis_ont_gs_ns_uri_isEmpty , OPENGIS_ONT_GS_NS_URI "isEmpty" }, + { &uname_opengis_ont_gs_ns_uri_isSimple , OPENGIS_ONT_GS_NS_URI "isSimple" }, + { &uname_opengis_ont_gs_ns_uri_rcc8dc , OPENGIS_ONT_GS_NS_URI "rcc8dc" }, + { &uname_opengis_ont_gs_ns_uri_rcc8ec , OPENGIS_ONT_GS_NS_URI "rcc8ec" }, + { &uname_opengis_ont_gs_ns_uri_rcc8eq , OPENGIS_ONT_GS_NS_URI "rcc8eq" }, + { &uname_opengis_ont_gs_ns_uri_rcc8ntpp , OPENGIS_ONT_GS_NS_URI "rcc8ntpp" }, + { &uname_opengis_ont_gs_ns_uri_rcc8ntppi , OPENGIS_ONT_GS_NS_URI "rcc8ntppi" }, + { &uname_opengis_ont_gs_ns_uri_rcc8po , OPENGIS_ONT_GS_NS_URI "rcc8po" }, + { &uname_opengis_ont_gs_ns_uri_rcc8tpp , OPENGIS_ONT_GS_NS_URI "rcc8tpp" }, + { &uname_opengis_ont_gs_ns_uri_rcc8tppi , OPENGIS_ONT_GS_NS_URI "rcc8tppi" }, + { &uname_opengis_ont_gs_ns_uri_sfContains , OPENGIS_ONT_GS_NS_URI "sfContains" }, + { &uname_opengis_ont_gs_ns_uri_sfCrosses , OPENGIS_ONT_GS_NS_URI "sfCrosses" }, + { &uname_opengis_ont_gs_ns_uri_sfDisjoint , OPENGIS_ONT_GS_NS_URI "sfDisjoint" }, + { &uname_opengis_ont_gs_ns_uri_sfEquals , OPENGIS_ONT_GS_NS_URI "sfEquals" }, + { &uname_opengis_ont_gs_ns_uri_sfIntersects , OPENGIS_ONT_GS_NS_URI "sfIntersects" }, + { &uname_opengis_ont_gs_ns_uri_sfOverlaps , OPENGIS_ONT_GS_NS_URI "sfOverlaps" }, + { &uname_opengis_ont_gs_ns_uri_sfTouches , OPENGIS_ONT_GS_NS_URI "sfTouches" }, + { &uname_opengis_ont_gs_ns_uri_sfWithin , OPENGIS_ONT_GS_NS_URI "sfWithin" }, + { &uname_opengis_ont_gs_ns_uri_spatialDimension , OPENGIS_ONT_GS_NS_URI "spatialDimension" }, + { &uname_opengis_ont_gs_ns_uri_wktLiteral , OPENGIS_ONT_GS_NS_URI "wktLiteral" }, + { &uname_opengis_ont_sf_ns_uri , OPENGIS_ONT_SF_NS_URI }, { &uname_false , "false" }, { &uname_lang , "lang" }, { &uname_nil , "nil" }, @@ -303,12 +500,14 @@ static uname_const_decl_t uname_const_decls[] = { { &uname_rdfdf_ns_uri_default_iid , RDFDF_NS_URI "default-iid" }, { &uname_rdfdf_ns_uri_default_iid_nullable , RDFDF_NS_URI "default-iid-nullable" }, { &uname_space , "space" }, + { &uname_sql_ns_uri , OPENLINKSW_SQL_NS_URI }, { &uname_swap_reify_ns_uri , SWAP_REIFY_NS_URI }, { &uname_swap_reify_ns_uri_statement , SWAP_REIFY_NS_URI "statement" }, { &uname_true , "true" }, { &uname_virtrdf_ns_uri , VIRTRDF_NS_URI }, { &uname_virtrdf_ns_uri_DefaultQuadMap , VIRTRDF_NS_URI "DefaultQuadMap" }, { &uname_virtrdf_ns_uri_DefaultQuadStorage , VIRTRDF_NS_URI "DefaultQuadStorage" }, + { &uname_virtrdf_ns_uri_DefaultServiceMap , VIRTRDF_NS_URI "DefaultServiceMap" }, { &uname_virtrdf_ns_uri_DefaultServiceStorage , VIRTRDF_NS_URI "DefaultServiceStorage" }, { &uname_virtrdf_ns_uri_DefaultSparul11Target , VIRTRDF_NS_URI "DefaultSparul11Target" }, { &uname_virtrdf_ns_uri_Geometry , VIRTRDF_NS_URI "Geometry" }, @@ -316,6 +515,7 @@ static uname_const_decl_t uname_const_decls[] = { { &uname_virtrdf_ns_uri_QuadMap , VIRTRDF_NS_URI "QuadMap" }, { &uname_virtrdf_ns_uri_QuadMapFormat , VIRTRDF_NS_URI "QuadMapFormat" }, { &uname_virtrdf_ns_uri_QuadStorage , VIRTRDF_NS_URI "QuadStorage" }, + {&uname_virtrdf_ns_uri_RdfDebuggerSingletone, VIRTRDF_NS_URI "RdfDebuggerSingletone"}, { &uname_virtrdf_ns_uri_SparqlMacroLibrary , VIRTRDF_NS_URI "SparqlMacroLibrary" }, { &uname_virtrdf_ns_uri_SyncToQuads , VIRTRDF_NS_URI "SyncToQuads" }, { &uname_virtrdf_ns_uri_array_of_any , VIRTRDF_NS_URI "array-of-any" }, @@ -423,7 +623,8 @@ static uname_const_decl_t uname_const_decls[] = { { &uname_xmlschema_ns_uri_hash_unsignedLong , XMLSCHEMA_NS_URI "#unsignedLong" }, { &uname_xmlschema_ns_uri_hash_unsignedShort , XMLSCHEMA_NS_URI "#unsignedShort" }, { &uname_xmlschema_ns_uri_hash_yearMonthDuration , XMLSCHEMA_NS_URI "#yearMonthDuration" }, - { NULL, NULL } }; + {NULL, NULL} + }; uname_const_decl_t *tail = uname_const_decls; while (NULL != tail->var_ptr) diff --git a/libsrc/Wi/uname_const_decl.h b/libsrc/Wi/uname_const_decl.h index de7b290657..ad9bfe05ea 100644 --- a/libsrc/Wi/uname_const_decl.h +++ b/libsrc/Wi/uname_const_decl.h @@ -1,12 +1,10 @@ /* * $Id$ * - * Constant declarations of commonly used UNAMEs. - * * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -27,6 +25,20 @@ #define UNAME_CONST_DECL_H #include "Dk.h" +/* 0 1 2 3 */ +/* 012345678901234567890123456789012345678 */ +#define OPENLINKSW_BIF_NS_URI "http://www.openlinksw.com/schemas/bif#" +#define OPENLINKSW_SQL_NS_URI "http://www.openlinksw.com/schemas/sql#" +#define OPENLINKSW_BIF_NS_URI_LEN 38 +#define OPENLINKSW_SQL_NS_URI_LEN 38 + +/* 0 1 2 3 */ +/* 012345678901234567890123456789012345678 */ +#define OPENLINKSW_BIF_NS_URI "http://www.openlinksw.com/schemas/bif#" +#define OPENLINKSW_SQL_NS_URI "http://www.openlinksw.com/schemas/sql#" +#define OPENLINKSW_BIF_NS_URI_LEN 38 +#define OPENLINKSW_SQL_NS_URI_LEN 38 + /* 0 1 2 3 */ /* 01234567890123456789012345678901234567 */ #define SWAP_REIFY_NS_URI "http://www.w3.org/2000/10/swap/reify#" @@ -47,6 +59,35 @@ #define XHV_NS_URI "http://www.w3.org/1999/xhtml/vocab#" #define XHV_NS_URI_LEN 35 +/* 0 1 2 */ +/* 012345678901234567890123 */ +#define OPENGIS_NS_URI "http://www.opengis.net/" +#define OPENGIS_NS_URI_LEN 23 + +/* 0 1 2 3 4 */ +/* 01234567890123456789012345678901234567890123456 */ +#define OPENGIS_DEF_FUNCTION_GS_NS_URI "http://www.opengis.net/def/function/geosparql/" +#define OPENGIS_DEF_FUNCTION_GS_NS_URI_LEN 46 + +/* 0 1 2 3 4 */ +/* 0123456789012345678901234567890123456789012 */ +#define OPENGIS_DEF_RULE_GS_NS_URI "http://www.opengis.net/def/rule/geosparql/" +#define OPENGIS_DEF_RULE_GS_NS_URI_LEN 42 + +/* 0 1 2 3 */ +/* 0123456789012345678901234567890123456789 */ +#define OPENGIS_DEF_UOM_GS_NS_URI "http://www.opengis.net/def/uom/OGC/1.0/" +#define OPENGIS_DEF_UOM_GS_NS_URI_LEN 39 + +/* 0 1 2 3 */ +/* 01234567890123456789012345678901234567 */ +#define OPENGIS_ONT_GS_NS_URI "http://www.opengis.net/ont/geosparql#" +#define OPENGIS_ONT_GS_NS_URI_LEN 37 + +#define OPENGIS_ONT_GML_NS_URI "http://www.opengis.net/ont/gml#" +#define OPENGIS_ONT_SF_NS_URI "http://www.opengis.net/ont/sf#" + + extern void uname_const_decl_init (void); extern caddr_t uname___empty; @@ -87,6 +128,102 @@ extern caddr_t uname_bif_c_st_within; extern caddr_t uname_bif_c_xcontains; extern caddr_t uname_bif_c_xpath_contains; extern caddr_t uname_bif_c_xquery_contains; +extern caddr_t uname_bif_ns_uri; +extern caddr_t uname_opengis_def_function_gs_ns_uri; +extern caddr_t uname_opengis_def_function_gs_ns_uri_boundary; +extern caddr_t uname_opengis_def_function_gs_ns_uri_buffer; +extern caddr_t uname_opengis_def_function_gs_ns_uri_convexHull; +extern caddr_t uname_opengis_def_function_gs_ns_uri_difference; +extern caddr_t uname_opengis_def_function_gs_ns_uri_distance; +extern caddr_t uname_opengis_def_function_gs_ns_uri_ehContains; +extern caddr_t uname_opengis_def_function_gs_ns_uri_ehCoveredBy; +extern caddr_t uname_opengis_def_function_gs_ns_uri_ehCovers; +extern caddr_t uname_opengis_def_function_gs_ns_uri_ehDisjoint; +extern caddr_t uname_opengis_def_function_gs_ns_uri_ehEquals; +extern caddr_t uname_opengis_def_function_gs_ns_uri_ehInside; +extern caddr_t uname_opengis_def_function_gs_ns_uri_ehMeet; +extern caddr_t uname_opengis_def_function_gs_ns_uri_ehOverlap; +extern caddr_t uname_opengis_def_function_gs_ns_uri_envelope; +extern caddr_t uname_opengis_def_function_gs_ns_uri_getSRID; +extern caddr_t uname_opengis_def_function_gs_ns_uri_intersection; +extern caddr_t uname_opengis_def_function_gs_ns_uri_rcc8dc; +extern caddr_t uname_opengis_def_function_gs_ns_uri_rcc8ec; +extern caddr_t uname_opengis_def_function_gs_ns_uri_rcc8eq; +extern caddr_t uname_opengis_def_function_gs_ns_uri_rcc8ntpp; +extern caddr_t uname_opengis_def_function_gs_ns_uri_rcc8ntppi; +extern caddr_t uname_opengis_def_function_gs_ns_uri_rcc8po; +extern caddr_t uname_opengis_def_function_gs_ns_uri_rcc8tpp; +extern caddr_t uname_opengis_def_function_gs_ns_uri_rcc8tppi; +extern caddr_t uname_opengis_def_function_gs_ns_uri_relate; +extern caddr_t uname_opengis_def_function_gs_ns_uri_sfContains; +extern caddr_t uname_opengis_def_function_gs_ns_uri_sfCrosses; +extern caddr_t uname_opengis_def_function_gs_ns_uri_sfDisjoint; +extern caddr_t uname_opengis_def_function_gs_ns_uri_sfEquals; +extern caddr_t uname_opengis_def_function_gs_ns_uri_sfIntersects; +extern caddr_t uname_opengis_def_function_gs_ns_uri_sfOverlaps; +extern caddr_t uname_opengis_def_function_gs_ns_uri_sfTouches; +extern caddr_t uname_opengis_def_function_gs_ns_uri_sfWithin; +extern caddr_t uname_opengis_def_function_gs_ns_uri_symDifference; +extern caddr_t uname_opengis_def_function_gs_ns_uri_union; +extern caddr_t uname_opengis_def_rule_gs_ns_uri; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_ehContains; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_ehCoveredBy; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_ehCovers; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_ehDisjoint; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_ehEquals; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_ehInside; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_ehMeet; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_ehOverlap; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8dc; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8ec; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8eq; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8ntpp; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8ntppi; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8po; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8tpp; +extern caddr_t uname_opengis_def_rule_gs_ns_uri_rcc8tppi; +extern caddr_t uname_opengis_ns_uri; +extern caddr_t uname_opengis_ont_gml_ns_uri; +extern caddr_t uname_opengis_ont_gs_ns_uri; +extern caddr_t uname_opengis_ont_gs_ns_uri_Feature; +extern caddr_t uname_opengis_ont_gs_ns_uri_SpatialObject; +extern caddr_t uname_opengis_ont_gs_ns_uri_asGML; +extern caddr_t uname_opengis_ont_gs_ns_uri_asWKT; +extern caddr_t uname_opengis_ont_gs_ns_uri_coordinateDimension; +extern caddr_t uname_opengis_ont_gs_ns_uri_dimension; +extern caddr_t uname_opengis_ont_gs_ns_uri_ehContains; +extern caddr_t uname_opengis_ont_gs_ns_uri_ehCoveredBy; +extern caddr_t uname_opengis_ont_gs_ns_uri_ehCovers; +extern caddr_t uname_opengis_ont_gs_ns_uri_ehDisjoint; +extern caddr_t uname_opengis_ont_gs_ns_uri_ehEquals; +extern caddr_t uname_opengis_ont_gs_ns_uri_ehInside; +extern caddr_t uname_opengis_ont_gs_ns_uri_ehMeet; +extern caddr_t uname_opengis_ont_gs_ns_uri_ehOverlap; +extern caddr_t uname_opengis_ont_gs_ns_uri_gmlLiteral; +extern caddr_t uname_opengis_ont_gs_ns_uri_hasDefaultGeometry; +extern caddr_t uname_opengis_ont_gs_ns_uri_hasGeometry; +extern caddr_t uname_opengis_ont_gs_ns_uri_hasSerialization; +extern caddr_t uname_opengis_ont_gs_ns_uri_isEmpty; +extern caddr_t uname_opengis_ont_gs_ns_uri_isSimple; +extern caddr_t uname_opengis_ont_gs_ns_uri_rcc8dc; +extern caddr_t uname_opengis_ont_gs_ns_uri_rcc8ec; +extern caddr_t uname_opengis_ont_gs_ns_uri_rcc8eq; +extern caddr_t uname_opengis_ont_gs_ns_uri_rcc8ntpp; +extern caddr_t uname_opengis_ont_gs_ns_uri_rcc8ntppi; +extern caddr_t uname_opengis_ont_gs_ns_uri_rcc8po; +extern caddr_t uname_opengis_ont_gs_ns_uri_rcc8tpp; +extern caddr_t uname_opengis_ont_gs_ns_uri_rcc8tppi; +extern caddr_t uname_opengis_ont_gs_ns_uri_sfContains; +extern caddr_t uname_opengis_ont_gs_ns_uri_sfCrosses; +extern caddr_t uname_opengis_ont_gs_ns_uri_sfDisjoint; +extern caddr_t uname_opengis_ont_gs_ns_uri_sfEquals; +extern caddr_t uname_opengis_ont_gs_ns_uri_sfIntersects; +extern caddr_t uname_opengis_ont_gs_ns_uri_sfOverlaps; +extern caddr_t uname_opengis_ont_gs_ns_uri_sfTouches; +extern caddr_t uname_opengis_ont_gs_ns_uri_sfWithin; +extern caddr_t uname_opengis_ont_gs_ns_uri_spatialDimension; +extern caddr_t uname_opengis_ont_gs_ns_uri_wktLiteral; +extern caddr_t uname_opengis_ont_sf_ns_uri; extern caddr_t uname_false; extern caddr_t uname_lang; extern caddr_t uname_nil; @@ -120,12 +257,14 @@ extern caddr_t uname_rdfdf_ns_uri_default_nullable; extern caddr_t uname_rdfdf_ns_uri_default_iid; extern caddr_t uname_rdfdf_ns_uri_default_iid_nullable; extern caddr_t uname_space; +extern caddr_t uname_sql_ns_uri; extern caddr_t uname_swap_reify_ns_uri; extern caddr_t uname_swap_reify_ns_uri_statement; extern caddr_t uname_true; extern caddr_t uname_virtrdf_ns_uri; extern caddr_t uname_virtrdf_ns_uri_DefaultQuadMap; extern caddr_t uname_virtrdf_ns_uri_DefaultQuadStorage; +extern caddr_t uname_virtrdf_ns_uri_DefaultServiceMap; extern caddr_t uname_virtrdf_ns_uri_DefaultServiceStorage; extern caddr_t uname_virtrdf_ns_uri_DefaultSparul11Target; extern caddr_t uname_virtrdf_ns_uri_Geometry; @@ -133,6 +272,7 @@ extern caddr_t uname_virtrdf_ns_uri_PrivateGraphs; extern caddr_t uname_virtrdf_ns_uri_QuadMap; extern caddr_t uname_virtrdf_ns_uri_QuadMapFormat; extern caddr_t uname_virtrdf_ns_uri_QuadStorage; +extern caddr_t uname_virtrdf_ns_uri_RdfDebuggerSingletone; extern caddr_t uname_virtrdf_ns_uri_SparqlMacroLibrary; extern caddr_t uname_virtrdf_ns_uri_SyncToQuads; extern caddr_t uname_virtrdf_ns_uri_array_of_any; diff --git a/libsrc/Wi/update.c b/libsrc/Wi/update.c index dda2dfed3a..a00dd32f59 100644 --- a/libsrc/Wi/update.c +++ b/libsrc/Wi/update.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/url_rewrite.sql b/libsrc/Wi/url_rewrite.sql index 531dc52245..f06831cd1b 100644 --- a/libsrc/Wi/url_rewrite.sql +++ b/libsrc/Wi/url_rewrite.sql @@ -1,10 +1,8 @@ -- --- $Id$ --- -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -19,7 +17,6 @@ -- with this program; if not, write to the Free Software Foundation, Inc., -- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -- --- create table DB.DBA.URL_REWRITE_RULE_LIST ( URRL_LIST varchar not null, @@ -44,23 +41,6 @@ create table DB.DBA.URL_REWRITE_RULE ( primary key (URR_RULE) ) ; ---#IF VER=5 ---!AFTER -alter table DB.DBA.URL_REWRITE_RULE add URR_ACCEPT_PATTERN varchar -; - ---!AFTER -alter table DB.DBA.URL_REWRITE_RULE add URR_NO_CONTINUATION int -; - ---!AFTER -alter table DB.DBA.URL_REWRITE_RULE add URR_HTTP_REDIRECT int -; - ---!AFTER -alter table DB.DBA.URL_REWRITE_RULE add URR_HTTP_HEADERS varchar -; ---#ENDIF create table DB.DBA.HTTP_VARIANT_MAP ( VM_ID integer identity, @@ -78,11 +58,6 @@ create table DB.DBA.HTTP_VARIANT_MAP ( create unique index HTTP_VARIANT_MAP_ID on DB.DBA.HTTP_VARIANT_MAP (VM_ID) ; ---#IF VER=5 ---!AFTER -alter table DB.DBA.HTTP_VARIANT_MAP add VM_CONTENT_LOCATION_HOOK varchar -; ---#ENDIF create procedure DB.DBA.URLREWRITE_CREATE_RULE ( in rule_type int, @@ -1436,16 +1411,10 @@ create procedure DB.DBA.URLREWRITE_DUMP_RULELIST_SQL (in rulelist_iri varchar) } ; ---#IF VER=5 ---!AFTER ---#ENDIF -virt_proxy_init () +DB.DBA.virt_proxy_init () ; ---#IF VER=5 ---!AFTER ---#ENDIF -grant execute on ext_http_proxy to PROXY +grant execute on DB.DBA.ext_http_proxy to PROXY ; -- /* Example for 'denote' and 'entity' IRI patterns */ @@ -1454,8 +1423,7 @@ grant execute on ext_http_proxy to PROXY -- supported mime types -create procedure -url_rewrite_mime_types () +create procedure DB.DBA.url_rewrite_mime_types () { return vector ( vector ('html', 'text/html', 1.0), @@ -1475,11 +1443,10 @@ url_rewrite_mime_types () } ; -create procedure -url_rewrite_mime_pattern () +create procedure DB.DBA.url_rewrite_mime_pattern () { declare x, res any; - x := url_rewrite_mime_types (); + x := DB.DBA.url_rewrite_mime_types (); res := ''; foreach (varchar p in x) do { @@ -1489,8 +1456,9 @@ url_rewrite_mime_pattern () } ; -create procedure -url_rewrite_gen_describe (in graph varchar, in iri_spf varchar) +create procedure DB.DBA.url_rewrite_gen_describe ( + in graph varchar, + in iri_spf varchar) { declare ret, qr any; qr := sprintf ('DESCRIBE <%s>', iri_spf); @@ -1501,17 +1469,22 @@ url_rewrite_gen_describe (in graph varchar, in iri_spf varchar) } ; -create procedure -url_rewrite_gen_vsp (in graph varchar, in iri_spf varchar) +create procedure DB.DBA.url_rewrite_gen_vsp ( + in graph varchar, + in iri_spf varchar) { - declare ret, qr any; + declare ret any; ret := sprintf ('/describe/?url=%s', iri_spf); return ret; } ; -create procedure -url_rewrite_from_template (in prefix varchar, in graph varchar, in iri_pattern varchar, in url_pattern varchar, in flags int := 0) +create procedure DB.DBA.url_rewrite_from_template ( + in prefix varchar, + in graph varchar, + in iri_pattern varchar, + in url_pattern varchar, + in flags int := 0) { declare arr, h, iri_path, iri_regex, iri_spf, iri_tcn, url_spf, url_regex, url_tcn, iri_param, url_param, iri_vd, url_vd any; declare pos, nth, fct int; @@ -1609,19 +1582,19 @@ url_rewrite_from_template (in prefix varchar, in graph varchar, in iri_pattern v sys_sql_val_print (iri_param), rtrim (replace (replace (url_spf, '{Extension}', ''), '//', '/'), '.'), sys_sql_val_print (url_param), - url_rewrite_mime_pattern () + DB.DBA.url_rewrite_mime_pattern () ), ses); http ('\n', ses); http (sprintf ('delete from DB.DBA.HTTP_VARIANT_MAP where VM_RULELIST = \'%s_iri_rule_list\';\n', prefix), ses); if (flags and exists (select 1 from VAD.DBA.VAD_REGISTRY where R_KEY like '/VAD/fct/%/resources/dav/%')) fct := 1; - mime_types := url_rewrite_mime_types (); + mime_types := DB.DBA.url_rewrite_mime_types (); foreach (any x in mime_types) do { declare redir varchar; if (fct and x[0] = 'html') - redir := url_rewrite_gen_vsp (graph, iri_tcn); + redir := DB.DBA.url_rewrite_gen_vsp (graph, iri_tcn); else redir := replace (url_tcn, '{Extension}', x[0]); http (sprintf ('DB.DBA.HTTP_VARIANT_ADD (\'%s_iri_rule_list\', \'%s\', \'%s\', \'%s\', %.2f);\n', @@ -1648,7 +1621,7 @@ url_rewrite_from_template (in prefix varchar, in graph varchar, in iri_pattern v foreach (any x in mime_types) do { declare redir any; - redir := url_rewrite_gen_describe (graph, iri_spf) || replace (sprintf ('&format=%U', x[1]), '%', '%%'); + redir := DB.DBA.url_rewrite_gen_describe (graph, iri_spf) || replace (sprintf ('&format=%U', x[1]), '%', '%%'); http (sprintf ('DB.DBA.URLREWRITE_CREATE_REGEX_RULE ( \'%s_url_rule_%d\', 1, \'%s\', %s, 1, \'%s\', %s, null, null, 2, null, \'Content-Type: %s\'); \n', prefix, nth, replace (url_regex, '{Extension}', x[0]), diff --git a/libsrc/Wi/useraggr.sql b/libsrc/Wi/useraggr.sql index f429a2eadc..5c4c5829ca 100644 --- a/libsrc/Wi/useraggr.sql +++ b/libsrc/Wi/useraggr.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -790,7 +790,7 @@ create procedure DB.DBA.GROUP_CONCAT_ACC (inout _env any, in token varchar, in d --!AWK PUBLIC create procedure DB.DBA.GROUP_CONCAT_FIN (inout _env any) { --- if (185 <> __tag (_env)) +-- if (__tag of stream <> __tag (_env)) -- return ''; -- return string_output_string (_env); if (__tag of varchar <> __tag (_env)) diff --git a/libsrc/Wi/users.sql b/libsrc/Wi/users.sql index 532019093f..062c0db6b8 100644 --- a/libsrc/Wi/users.sql +++ b/libsrc/Wi/users.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/uuencode.c b/libsrc/Wi/uuencode.c index dc39df70d2..c940f5db77 100644 --- a/libsrc/Wi/uuencode.c +++ b/libsrc/Wi/uuencode.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/uuencode_impl.h b/libsrc/Wi/uuencode_impl.h index b2be63ef6b..5d8f9c0616 100644 --- a/libsrc/Wi/uuencode_impl.h +++ b/libsrc/Wi/uuencode_impl.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/vdb.sql b/libsrc/Wi/vdb.sql index 3bb48b4bcb..93bc65ea92 100644 --- a/libsrc/Wi/vdb.sql +++ b/libsrc/Wi/vdb.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/vec.c b/libsrc/Wi/vec.c index 03a2d5a03b..cfe23f3281 100644 --- a/libsrc/Wi/vec.c +++ b/libsrc/Wi/vec.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -1361,11 +1361,11 @@ sslr_qst_get (caddr_t * inst, state_slot_ref_t * sslr, int row_no) case DV_SINGLE_FLOAT: SSL_FIXED_STR_BOX (DV_SINGLE_FLOAT, sizeof (float)); default: - if (DCT_BOXES & val_dc->dc_type) + if (!(DCT_BOXES & val_dc->dc_type)) + GPF_T1 ("dc of unsupported dtp for single value qst_get"); if (val_dc->dc_n_values <= (uint32) row_no) return NULL; return ((caddr_t *) val_dc->dc_values)[row_no]; - GPF_T1 ("dc of unsupported dtp for single value qst_get"); } return 0; } diff --git a/libsrc/Wi/vec.h b/libsrc/Wi/vec.h index 5419e6f3c4..684d5fb10d 100644 --- a/libsrc/Wi/vec.h +++ b/libsrc/Wi/vec.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/vechash.c b/libsrc/Wi/vechash.c index 001be2d539..0b7a093655 100644 --- a/libsrc/Wi/vechash.c +++ b/libsrc/Wi/vechash.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/vecins.c b/libsrc/Wi/vecins.c index 27acef1de9..1f57a72673 100644 --- a/libsrc/Wi/vecins.c +++ b/libsrc/Wi/vecins.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/vecrdf.c b/libsrc/Wi/vecrdf.c index 92fee100ec..736175d902 100644 --- a/libsrc/Wi/vecrdf.c +++ b/libsrc/Wi/vecrdf.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/vecsearch.c b/libsrc/Wi/vecsearch.c index a06cdad27c..fc33e2e6f4 100644 --- a/libsrc/Wi/vecsearch.c +++ b/libsrc/Wi/vecsearch.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/virtext.h b/libsrc/Wi/virtext.h index 97598e6b07..78c3b365c3 100644 --- a/libsrc/Wi/virtext.h +++ b/libsrc/Wi/virtext.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/virtpwd.h b/libsrc/Wi/virtpwd.h index 04a37970f9..abb864e25c 100644 --- a/libsrc/Wi/virtpwd.h +++ b/libsrc/Wi/virtpwd.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/virtual_dir.sql b/libsrc/Wi/virtual_dir.sql index eb26a5d139..3b200319fe 100644 --- a/libsrc/Wi/virtual_dir.sql +++ b/libsrc/Wi/virtual_dir.sql @@ -1,14 +1,10 @@ -- --- virtual_dir.sql --- --- $Id$ --- -- Virtual Web directories support. -- -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -23,7 +19,6 @@ -- with this program; if not, write to the Free Software Foundation, Inc., -- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -- --- -- XXX: no longer needed, obsoleted --create table SYS_HTTP_MAP @@ -92,28 +87,10 @@ HA_LIMIT integer default 0, PRIMARY KEY (HA_LIST, HA_ORDER, HA_CLIENT_IP, HA_FLAG)) ; ---#IF VER=5 --- HTTP_ACL table upgrade ---!AFTER -alter table HTTP_ACL add HA_LIST varchar not null -; - ---!AFTER -alter table HTTP_ACL add HA_ORDER integer not null -; - ---!AFTER -alter table HTTP_ACL add HA_RATE double precision -- Rate (hits/second). -; - ---#ENDIF alter table HTTP_ACL add HA_LIMIT integer default 0 ; -- triggers to keep in sync in-memory representation ---#IF VER=5 ---!AFTER_AND_BEFORE DB.DBA.HTTP_ACL HA_RATE ! ---#ENDIF create trigger HTTP_ACL_I after insert on DB.DBA.HTTP_ACL { declare def_rate int; @@ -126,9 +103,6 @@ create trigger HTTP_ACL_I after insert on DB.DBA.HTTP_ACL ; -- triggers to keep in sync in-memory representation ---#IF VER=5 ---!AFTER_AND_BEFORE DB.DBA.HTTP_ACL HA_RATE ! ---#ENDIF create trigger HTTP_ACL_U after update on DB.DBA.HTTP_ACL referencing old as O, new as N { http_acl_remove (O.HA_LIST, O.HA_ORDER, O.HA_CLIENT_IP, O.HA_FLAG); @@ -294,33 +268,9 @@ values ( '*sslini*', '*sslini*', '/vsmx', '/vsmx/', 0, 0, 'vsmx.vspx', NULL, NUL ) ; ---#IF VER=5 -create procedure HTTP_PATH_UPGRADE () -{ -declare arr, new_vhost any; -if (registry_get ('__http_vd_upgrade') = 'done') -return; -for select HP_HOST vhost, HP_LISTEN_HOST lhost, HP_LPATH lpath from DB.DBA.HTTP_PATH where HP_HOST not in ('*ini*', '*sslini*') do -{ - arr := split_and_decode (vhost, 0, ':=:'); - if (length (arr) > 1) - { - new_vhost := arr[0]; - if (exists (select 1 from DB.DBA.HTTP_PATH where HP_HOST = new_vhost and HP_LISTEN_HOST = lhost and HP_LPATH = lpath)) - log_message (sprintf ('The virtual directory at host=[%s] path=[%s] conflict with an existing, and cannot be upgraded.', vhost, lpath)); - else - update DB.DBA.HTTP_PATH set HP_HOST = new_vhost where HP_HOST = vhost and HP_LISTEN_HOST = lhost and HP_LPATH = lpath; - } -} -registry_set ('__http_vd_upgrade', 'done'); -} -; - -HTTP_PATH_UPGRADE () -; ---#ENDIF -create procedure HTTP_SET_DBA_ADMIN (in realm varchar) +create procedure DB.DBA.HTTP_SET_DBA_ADMIN ( + in realm varchar) { declare auth, _user varchar; auth := vsp_auth_vec (http_request_header()); @@ -338,9 +288,8 @@ return 1; } ; - -create procedure -DB.DBA.IS_EMPTY_OR_NULL (in x any) +create procedure DB.DBA.IS_EMPTY_OR_NULL ( + in x any) { if (x is null or '' = x or 0 = x) return 1; @@ -348,9 +297,10 @@ return 0; } ; - -- Inserts new entry in map table -create procedure INS_VIRTUAL_DIR (in lpath varchar, in ppath varchar) +create procedure DB.DBA.INS_VIRTUAL_DIR ( + in lpath varchar, + in ppath varchar) { declare is_dav integer; if (DB.DBA.IS_EMPTY_OR_NULL (lpath) or DB.DBA.IS_EMPTY_OR_NULL (ppath)) @@ -370,7 +320,8 @@ return http_map_table (lpath, ppath, '*ini*', '*ini*', is_dav); ; -- Remove entry from map table -create procedure DEL_VIRTUAL_DIR (in lpath varchar) +create procedure DB.DBA.DEL_VIRTUAL_DIR ( + in lpath varchar) { if (DB.DBA.IS_EMPTY_OR_NULL (lpath)) return NULL; @@ -380,27 +331,25 @@ return http_map_del (lpath, '*ini*', '*ini*'); ; -- Add new virtual host / directory ---#IF VER=5 ---!AFTER_AND_BEFORE DB.DBA.HTTP_PATH HP_IS_DEFAULT_HOST ! ---#ENDIF -create procedure VHOST_DEFINE (in vhost varchar := '*ini*', - in lhost varchar := '*ini*', - in lpath varchar, - in ppath varchar, - in is_dav integer := 0, - in is_brws integer := 0, - in def_page varchar := null, - in auth_fn varchar := null, - in realm varchar := null, - in ppr_fn varchar := null, - in vsp_user varchar := null, - in soap_user varchar := null, - in sec varchar := null, - in ses_vars integer := 0, - in soap_opts any := null, - in auth_opts any := null, - in opts any := null, - in is_default_host integer := 0) +create procedure DB.DBA.VHOST_DEFINE ( + in vhost varchar := '*ini*', + in lhost varchar := '*ini*', + in lpath varchar, + in ppath varchar, + in is_dav integer := 0, + in is_brws integer := 0, + in def_page varchar := null, + in auth_fn varchar := null, + in realm varchar := null, + in ppr_fn varchar := null, + in vsp_user varchar := null, + in soap_user varchar := null, + in sec varchar := null, + in ses_vars integer := 0, + in soap_opts any := null, + in auth_opts any := null, + in opts any := null, + in is_default_host integer := 0) { declare ssl_port varchar; declare ssl_opts any; @@ -438,10 +387,10 @@ if (isstring (server_http_port ())) end , 0, ':=:'); - if (__tag (varr) = 193 and length (varr) > 1) + if (__tag (varr) = __tag of vector and length (varr) > 1) vhost := varr[0]; - if (__tag (lport) = 193 and length (lport) > 1) + if (__tag (lport) = __tag of vector and length (lport) > 1) lport := aref (lport, 1); else if (lhost = '*ini*') lport := server_http_port (); @@ -517,7 +466,10 @@ sec, realm, auth_fn, ppr_fn, vsp_user, soap_user, ses_vars, soap_opts, auth_opts } ; -create procedure VHOST_MAP_RELOAD (in vhost varchar := '*ini*', in lhost varchar := '*ini*', in lpath varchar) +create procedure DB.DBA.VHOST_MAP_RELOAD ( + in vhost varchar := '*ini*', + in lhost varchar := '*ini*', + in lpath varchar) { declare ssl_port, varr varchar; declare ret int; @@ -575,10 +527,11 @@ return ret; ; -- Remove entry from virtual hosts / directories -create procedure VHOST_REMOVE (in vhost varchar := '*ini*', - in lhost varchar := '*ini*', - in lpath varchar, - in del_vsps integer := 0) +create procedure DB.DBA.VHOST_REMOVE ( + in vhost varchar := '*ini*', + in lhost varchar := '*ini*', + in lpath varchar, + in del_vsps integer := 0) { declare ssl_port, varr, lport varchar; declare ppath, vsp_user, stat, msg varchar; @@ -609,9 +562,9 @@ if (isstring (server_http_port ())) else lhost end , 0, ':=:'); - if (__tag (varr) = 193 and length (varr) > 1) + if (__tag (varr) = __tag of vector and length (varr) > 1) vhost := varr[0]; - if (__tag (lport) = 193 and length (lport) > 1) + if (__tag (lport) = __tag of vector and length (lport) > 1) lport := aref (lport, 1); else if (lhost = '*ini*') lport := server_http_port (); @@ -662,9 +615,8 @@ WS.WS.SPARQL_VHOST_RESET() ; -- This is called internally via WS..DEFAULT, to check ACL on proxy service -create procedure -HTTP_PROXY_ACCESS (in dst varchar) -returns integer +create procedure DB.DBA.HTTP_PROXY_ACCESS ( + in dst varchar) returns integer { declare client varchar; declare host, ppath any; @@ -843,7 +795,7 @@ if (row_count ()) ; -- /* extended http proxy service */ -create procedure virt_proxy_init () +create procedure DB.DBA.virt_proxy_init () { if (not exists (select 1 from "DB"."DBA"."SYS_USERS" where U_NAME = 'PROXY')) DB.DBA.USER_CREATE ('PROXY', uuid(), vector ('DISABLED', 1)); @@ -854,14 +806,16 @@ create procedure virt_proxy_init () '/proxy?url=%U&force=%U&login=%U', vector ('url', 'force', 'login'), null, null, 2); DB.DBA.URLREWRITE_CREATE_RULELIST ('ext_http_proxy_rule_list1', 1, vector ('ext_http_proxy_rule_1')); DB.DBA.VHOST_REMOVE (lpath=>'/proxy'); - DB.DBA.VHOST_DEFINE (lpath=>'/proxy', ppath=>'/SOAP/Http/ext_http_proxy', soap_user=>'PROXY', + DB.DBA.VHOST_DEFINE (lpath=>'/proxy', ppath=>'/SOAP/Http/EXT_HTTP_PROXY', soap_user=>'PROXY', opts=>vector('url_rewrite', 'ext_http_proxy_rule_list1')); registry_set ('DB.DBA.virt_proxy_init_state', '1.1'); } ; -create procedure -proxy_sp_html_error_page (in title varchar, in hd varchar, in message varchar) +create procedure DB.DBA.proxy_sp_html_error_page ( + in title varchar, + in hd varchar, + in message varchar) { http (''); http (''); @@ -884,8 +838,9 @@ proxy_sp_html_error_page (in title varchar, in hd varchar, in message varchar) -- It''s handier for templating, etc. -- -create procedure -str_fmt (in fmt_str varchar, in parm_arr any) +create procedure DB.DBA.str_fmt ( + in fmt_str varchar, + in parm_arr any) { declare f_l,l,p,st,cnt integer; declare s varchar; @@ -938,8 +893,9 @@ create table DB.DBA.PROXY_SP_QRY ( ) ; -create procedure -ext_http_proxy_exec_qry (in exec varchar, in params any) +create procedure DB.DBA.ext_http_proxy_exec_qry ( + in exec varchar, + in params any) { declare qt, stat, msg, accept varchar; declare metas, rset, triples, ses any; @@ -1011,13 +967,14 @@ ext_http_proxy_exec_qry (in exec varchar, in params any) -- XXX now REALLY check for that SQL injection! create procedure -ext_http_proxy (in url varchar := null, - in exec varchar := null, - in header varchar := null, - in force varchar := null, - in "output-format" varchar := null, - in get varchar := 'add', - in login varchar := '') __SOAP_HTTP 'text/html' +DB.DBA.EXT_HTTP_PROXY ( + in url varchar := null, + in exec varchar := null, + in header varchar := null, + in force varchar := null, + in "output-format" varchar := null, + in get varchar := 'add', + in login varchar := '') __SOAP_HTTP 'text/html' { declare hdr, content, req_hdr any; declare ct, in_hdr, new_hdr varchar; @@ -1246,8 +1203,10 @@ end_loop:; } ; -create procedure -DB.DBA.VHOST_DUMP_SQL (in lpath varchar, in vhost varchar := '*ini*', in lhost varchar := '*ini*') +create procedure DB.DBA.VHOST_DUMP_SQL ( + in lpath varchar, + in vhost varchar := '*ini*', + in lhost varchar := '*ini*') { declare ses any; ses := string_output (); @@ -1365,7 +1324,11 @@ create procedure DB.DBA.HTTP_RDF_GET_ACCEPT_BY_Q ( } ; -create procedure DB.DBA.HTTP_RDF_ACCEPT (in path varchar, in virtual_dir varchar, in lines any, in graph_mode int) +create procedure DB.DBA.HTTP_RDF_ACCEPT ( + in path varchar, + in virtual_dir varchar, + in lines any, + in graph_mode int) { declare host, stat, msg, qry, data, meta, accept, format, graph, url, ssl varchar; declare ses any; @@ -1413,7 +1376,10 @@ create procedure DB.DBA.HTTP_RDF_ACCEPT (in path varchar, in virtual_dir varchar } ; -create procedure WS.WS.DIR_INDEX_MAKE_XML (inout _sheet varchar, in curdir varchar := null, in start_from varchar := null) +create procedure WS.WS.DIR_INDEX_MAKE_XML ( + inout _sheet varchar, + in curdir varchar := null, + in start_from varchar := null) { declare dirarr, filearr, fsize, xte_path, xte_list, xte_entry any; declare dirname, root, modt varchar; @@ -1538,7 +1504,10 @@ xslt_sheet ('http://local.virt/dir_output', xml_tree_doc (' ; -create procedure WS.WS.DIR_INDEX_XML (in path any, in params any, in lines any) +create procedure WS.WS.DIR_INDEX_XML ( + in path any, + in params any, + in lines any) { declare _html, _xml, _sheet varchar; declare _b_opt any; @@ -1577,7 +1546,10 @@ create procedure WS.WS.DIR_INDEX_XML (in path any, in params any, in lines any) } ; -create procedure DB.DBA.SERVICES_WSIL (in path any, in params any, in lines any) +create procedure DB.DBA.SERVICES_WSIL ( + in path any, + in params any, + in lines any) { declare host, intf, requrl, proto, rhost varchar; declare arr any; @@ -1620,7 +1592,9 @@ create table WS.WS.HTTP_HOST_META ( ) ; -create procedure WS.WS.host_meta_add (in app varchar, in meta varchar) +create procedure WS.WS.host_meta_add ( + in app varchar, + in meta varchar) { -- check if it is valid xml xtree_doc (meta); @@ -1629,14 +1603,16 @@ create procedure WS.WS.host_meta_add (in app varchar, in meta varchar) } ; -create procedure WS.WS.host_meta_del (in app varchar) +create procedure WS.WS.host_meta_del ( + in app varchar) { delete from WS.WS.HTTP_HOST_META where HM_APP = app; } ; -create procedure WS.WS."host-meta" (in format varchar := 'xml') __SOAP_HTTP 'application/xrd+xml' +create procedure WS.WS."host-meta" ( + in format varchar := 'xml') __SOAP_HTTP 'application/xrd+xml' { declare ses, lines any; declare ret, accept varchar; @@ -1720,7 +1696,9 @@ create procedure WS.WS.host_meta_dss () --! -- (Re-)Creates all default virtual dirs on the given listener. --/ -create procedure DB.DBA.CREATE_DEFAULT_VHOSTS (in vhost varchar := '*ini*', in lhost varchar := '*ini*') +create procedure DB.DBA.CREATE_DEFAULT_VHOSTS ( + in vhost varchar := '*ini*', + in lhost varchar := '*ini*') { declare auth any; declare sec, cert, sslKey varchar; diff --git a/libsrc/Wi/vt_text.sql b/libsrc/Wi/vt_text.sql index a12e1a1839..07f6633b4a 100644 --- a/libsrc/Wi/vt_text.sql +++ b/libsrc/Wi/vt_text.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -474,8 +474,5 @@ create procedure DB.DBA.vt_drop_ftt (in tb varchar, in dbcol varchar) } ; ---#IF VER=5 ---!AFTER ---#ENDIF grant execute on DB.DBA.vt_create_text_index to public ; diff --git a/libsrc/Wi/wi.h b/libsrc/Wi/wi.h index 8d9839be57..cfcf2fcade 100644 --- a/libsrc/Wi/wi.h +++ b/libsrc/Wi/wi.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wi_xid.c b/libsrc/Wi/wi_xid.c index 8be6c67ac9..05738a2a21 100644 --- a/libsrc/Wi/wi_xid.c +++ b/libsrc/Wi/wi_xid.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wi_xid.h b/libsrc/Wi/wi_xid.h index b19c3064a9..bcf3d4cf7d 100644 --- a/libsrc/Wi/wi_xid.h +++ b/libsrc/Wi/wi_xid.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/widd.h b/libsrc/Wi/widd.h index f96333df32..bdc3353aff 100644 --- a/libsrc/Wi/widd.h +++ b/libsrc/Wi/widd.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/widisk.h b/libsrc/Wi/widisk.h index 7badaa8589..fc2be1dc6e 100644 --- a/libsrc/Wi/widisk.h +++ b/libsrc/Wi/widisk.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/widv.h b/libsrc/Wi/widv.h index bc142ca641..296a147c67 100644 --- a/libsrc/Wi/widv.h +++ b/libsrc/Wi/widv.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -291,6 +291,8 @@ User-level object is of type DV_XML_ENTITY. */ #define DV_WIDESTRINGP(q) \ (IS_BOX_POINTER (q) && (DV_WIDE == box_tag (q) || DV_LONG_WIDE == box_tag (q))) +#define DV_STRING_TYPE(q) \ + (IS_BOX_POINTER (q) && ((DV_STRING == box_tag (q)) || (DV_UNAME == box_tag (q)) || (DV_SYMBOL == box_tag (q)))) #define DV_LONG_INT_PREC 10 diff --git a/libsrc/Wi/wifn.h b/libsrc/Wi/wifn.h index 91d6e475fb..f0928e4a00 100644 --- a/libsrc/Wi/wifn.h +++ b/libsrc/Wi/wifn.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -377,7 +377,7 @@ extern int rn_n_col_leaves; /* disk.c */ dbe_storage_t * dbs_open_slice (dbe_storage_t * top_dbs, disk_segment_t * seg, int slice_no, int create); -void dbs_slice_close (cluster_map_t * clm, dbe_storage_t * top_dbs, dbe_storage_t * dbs, int delete); +void dbs_slice_close (cluster_map_t * clm, dbe_storage_t * top_dbs, dbe_storage_t * dbs, int unlink_files); void cl_dbs_read_cfg (dbe_storage_t * dbs); void dbs_slice_init (dbe_storage_t * top_dbs, dbe_storage_t * dbs, int exists); int word_free_bit (dp_addr_t w); @@ -767,7 +767,7 @@ void sch_split_name (const char *q_default, const char *name, char *q, char *o, dbe_key_t * sch_table_key (dbe_schema_t * sc, const char *table, const char *key, int non_primary); -struct query_s * sch_proc_def (dbe_schema_t * sch, const char * name); +EXE_EXPORT (struct query_s * ,sch_proc_def, (dbe_schema_t * sch, const char * name)); struct query_s * sch_partial_proc_def (dbe_schema_t * sc, caddr_t name, char *q_def, char *o_def); struct query_s * sch_proc_exact_def (dbe_schema_t * sch, const char * name); struct query_s * sch_module_def (dbe_schema_t * sch, const char * name); @@ -828,6 +828,7 @@ extern char * http_server_id_string; extern long http_ses_trap; extern unsigned long cfg_scheduler_period ; extern long callstack_on_exception; +extern long public_debug; extern long pl_debug_all; extern char * pl_debug_cov_file; extern long vt_batch_size_limit; @@ -1371,6 +1372,7 @@ void dv_geo_length (db_buf_t dv, long * hl, long * l); int cmpf_geo (buffer_desc_t * buf, int irow, it_cursor_t * itc); void itc_geo_insert (it_cursor_t * itc, buffer_desc_t * buf, row_delta_t * rd); caddr_t geo_wkt (caddr_t g); +caddr_t geo_wkb (caddr_t g); extern dk_mutex_t * geo_reg_mtx; void itc_geo_unregister (it_cursor_t * itc); caddr_t geo_parse_wkt (char * str, caddr_t * err_ret); diff --git a/libsrc/Wi/wirpc.c b/libsrc/Wi/wirpc.c index 1e6d34de27..2aa7bcfa94 100644 --- a/libsrc/Wi/wirpc.c +++ b/libsrc/Wi/wirpc.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wirpce.h b/libsrc/Wi/wirpce.h index 2525177de9..fa1475bdfa 100644 --- a/libsrc/Wi/wirpce.h +++ b/libsrc/Wi/wirpce.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wiservic.c b/libsrc/Wi/wiservic.c index c109e54427..cee5b0eed2 100644 --- a/libsrc/Wi/wiservic.c +++ b/libsrc/Wi/wiservic.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wiservic.h b/libsrc/Wi/wiservic.h index 8a9f73caf4..9cb6aa0ac7 100644 --- a/libsrc/Wi/wiservic.h +++ b/libsrc/Wi/wiservic.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wsdl2rdf.xsl b/libsrc/Wi/wsdl2rdf.xsl index 7ffe11e451..c46cc0ee38 100644 --- a/libsrc/Wi/wsdl2rdf.xsl +++ b/libsrc/Wi/wsdl2rdf.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wsdl_expand.xsl b/libsrc/Wi/wsdl_expand.xsl index ec6ea741bc..429ed5b1e9 100644 --- a/libsrc/Wi/wsdl_expand.xsl +++ b/libsrc/Wi/wsdl_expand.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wsdl_import.xsl b/libsrc/Wi/wsdl_import.xsl index 73dc51e120..5be8d8b464 100644 --- a/libsrc/Wi/wsdl_import.xsl +++ b/libsrc/Wi/wsdl_import.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wsdl_parts.xsl b/libsrc/Wi/wsdl_parts.xsl index 44778b064f..1c2547bc04 100644 --- a/libsrc/Wi/wsdl_parts.xsl +++ b/libsrc/Wi/wsdl_parts.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wsrp_error.xsl b/libsrc/Wi/wsrp_error.xsl index 5f89d7a965..27ff388989 100644 --- a/libsrc/Wi/wsrp_error.xsl +++ b/libsrc/Wi/wsrp_error.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wsrp_interm.xsl b/libsrc/Wi/wsrp_interm.xsl index 76dc504b84..7ddd34c62f 100644 --- a/libsrc/Wi/wsrp_interm.xsl +++ b/libsrc/Wi/wsrp_interm.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wsrp_resp.xsl b/libsrc/Wi/wsrp_resp.xsl index 7a4a0f7129..e0a4c9ad47 100644 --- a/libsrc/Wi/wsrp_resp.xsl +++ b/libsrc/Wi/wsrp_resp.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/wsrp_ultim.xsl b/libsrc/Wi/wsrp_ultim.xsl index 81092d10b5..91e5adeb8a 100644 --- a/libsrc/Wi/wsrp_ultim.xsl +++ b/libsrc/Wi/wsrp_ultim.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xml.h b/libsrc/Wi/xml.h index cd9d1d26ff..34c8a9df7c 100644 --- a/libsrc/Wi/xml.h +++ b/libsrc/Wi/xml.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xml2json.xsl b/libsrc/Wi/xml2json.xsl index 23157b162c..86e48f7dc1 100644 --- a/libsrc/Wi/xml2json.xsl +++ b/libsrc/Wi/xml2json.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xml_a.sql b/libsrc/Wi/xml_a.sql index 8240f9d347..47ff1e8e94 100644 --- a/libsrc/Wi/xml_a.sql +++ b/libsrc/Wi/xml_a.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xml_view.sql b/libsrc/Wi/xml_view.sql index 70ab5d4c1e..e03dbd4ae5 100644 --- a/libsrc/Wi/xml_view.sql +++ b/libsrc/Wi/xml_view.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmla.sql b/libsrc/Wi/xmla.sql index 9a5e8fd710..2cb379173c 100644 --- a/libsrc/Wi/xmla.sql +++ b/libsrc/Wi/xmla.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -50,13 +50,6 @@ method xmla_get_property (pname varchar, deflt any) returns any, method xmla_command () returns any ; ---#IF VER=5 -call exec_quiet ('alter type xmla_discover add method xmla_dbschema_foreign_keys () returns any') -; - -call exec_quiet ('alter type xmla_discover add method xmla_dbschema_primary_keys () returns any') -; ---#ENDIF create constructor method xmla_discover (in request_type varchar, in restrictions any, in properties any) for xmla_discover @@ -379,7 +372,7 @@ create procedure res := exec (stmt, state, msg, vector (), 0, mdta, dta); if (isinteger (dta)) dta := vector (vector (dta)); - if ((1 = length (dta)) and (1 = length (dta[0])) and (214 = __tag (dta[0][0]))) + if ((1 = length (dta)) and (1 = length (dta[0])) and (__tag of dictionary reference = __tag (dta[0][0]))) { declare triples, inx any; triples := dict_list_keys (dta[0][0], 1); @@ -456,7 +449,7 @@ xmla_make_meta (in dta any) declare dtp any; dtp := __tag (dta[i+1]); aset (res, i1, vector (dta[i], - case when dtp = 193 and length(dta[i+1]) = 2 then 'boolean' else dtp end + case when dtp = __tag of vector and length(dta[i+1]) = 2 then 'boolean' else dtp end )); i1 := i1 + 1; i := i + 2; @@ -776,17 +769,17 @@ xmla_make_xsd (inout mdta any) mdta[i][1] := 211; } -- IRI_ID - else if (isinteger(_type) and _type = 243) + else if (isinteger(_type) and _type = __tag of IRI_ID) { - _type := 182; - mdta[i][1] := 182; + _type := __tag of varchar; + mdta[i][1] := __tag of varchar; } if (length (mdta[i]) > 4) nill := mdta[i][4]; else nill := 0; - if (_type <> 193) + if (_type <> __tag of vector) { if (isstring (_type)) _type_name := _type; @@ -845,13 +838,13 @@ xmla_make_element (in mdta any, in dta any) while (i < l) { aset (res, i1, mdta[i][0]); - if (mdta[i][1] = 243) + if (mdta[i][1] = __tag of IRI_ID) aset (res, i2, cast (dta[i] as varchar)); else if (mdta[i][1] = 125 and isentity(dta[i])) aset (res, i2, serialize_to_UTF8_xml(dta[i])); else if (mdta[i][1] = 131 and not isblob(dta[i])) aset (res, i2, cast (dta[i] as varbinary)); - else if (mdta[i][1] = 219 and 219 <> __tag (dta[i])) + else if (mdta[i][1] = __tag of decimal and __tag of decimal <> __tag (dta[i])) aset (res, i2, cast (dta[i] as decimal)); else aset (res, i2, dta[i]); diff --git a/libsrc/Wi/xmlenc-dec.c b/libsrc/Wi/xmlenc-dec.c index 89fbdb1a58..7ddc4d344e 100644 --- a/libsrc/Wi/xmlenc-dec.c +++ b/libsrc/Wi/xmlenc-dec.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmlenc.c b/libsrc/Wi/xmlenc.c index c3a62b30f1..3f4ac27ba4 100644 --- a/libsrc/Wi/xmlenc.c +++ b/libsrc/Wi/xmlenc.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmlenc.h b/libsrc/Wi/xmlenc.h index 066cc5077c..75cd9e4836 100644 --- a/libsrc/Wi/xmlenc.h +++ b/libsrc/Wi/xmlenc.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmlenc_algos.c b/libsrc/Wi/xmlenc_algos.c index eacac5940e..eb5bcf8707 100644 --- a/libsrc/Wi/xmlenc_algos.c +++ b/libsrc/Wi/xmlenc_algos.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmlenc_algos.h b/libsrc/Wi/xmlenc_algos.h index 09daccf8e1..dc6230dfd1 100644 --- a/libsrc/Wi/xmlenc_algos.h +++ b/libsrc/Wi/xmlenc_algos.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmlenc_test.h b/libsrc/Wi/xmlenc_test.h index bd76443071..9552a57f55 100644 --- a/libsrc/Wi/xmlenc_test.h +++ b/libsrc/Wi/xmlenc_test.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmlgen.h b/libsrc/Wi/xmlgen.h index 3c24a9c65a..0a763a481a 100644 --- a/libsrc/Wi/xmlgen.h +++ b/libsrc/Wi/xmlgen.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmllazy.c b/libsrc/Wi/xmllazy.c index 2e257d846b..3506a0f6da 100644 --- a/libsrc/Wi/xmllazy.c +++ b/libsrc/Wi/xmllazy.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmlnode.h b/libsrc/Wi/xmlnode.h index 57dfbf2060..639b61266c 100644 --- a/libsrc/Wi/xmlnode.h +++ b/libsrc/Wi/xmlnode.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmlres.h b/libsrc/Wi/xmlres.h index 18370b1800..282dd94185 100644 --- a/libsrc/Wi/xmlres.h +++ b/libsrc/Wi/xmlres.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmlrpc_soap.xsl b/libsrc/Wi/xmlrpc_soap.xsl index 73e0f5f0d5..f731d5f101 100644 --- a/libsrc/Wi/xmlrpc_soap.xsl +++ b/libsrc/Wi/xmlrpc_soap.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmlschema.c b/libsrc/Wi/xmlschema.c index f1623a1fc7..4b100ad9fe 100644 --- a/libsrc/Wi/xmlschema.c +++ b/libsrc/Wi/xmlschema.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmlsearch.c b/libsrc/Wi/xmlsearch.c index 7975ece440..56b206efde 100644 --- a/libsrc/Wi/xmlsearch.c +++ b/libsrc/Wi/xmlsearch.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmlsql.c b/libsrc/Wi/xmlsql.c index b1854e2b43..73de4e2d48 100644 --- a/libsrc/Wi/xmlsql.c +++ b/libsrc/Wi/xmlsql.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -4184,11 +4184,11 @@ xs_fill (caddr_t * current, xmlsql_ugram_t ** xs, int where, caddr_t * err_ret, /* Elements */ for (ix = 1; ix < len; ix++) { - if (193 == DV_TYPE_OF((caddr_t *)current[ix])) + if (DV_ARRAY_OF_POINTER == DV_TYPE_OF((caddr_t *)current[ix])) { lem = BOX_ELEMENTS ((caddr_t *)current[ix]); if (lem > 0 - && 193 == DV_TYPE_OF((((caddr_t *)current[ix])[0])) + && DV_ARRAY_OF_POINTER == DV_TYPE_OF((((caddr_t *)current[ix])[0])) /*&& ((caddr_t *)current[ix])[1]*/) { ename = ((caddr_t *)((caddr_t *)current[ix])[0])[0]; @@ -4384,7 +4384,7 @@ xs_parms (caddr_t * var, caddr_t * parms) id_hash_t *xs_var = NULL; int ix, ix1, found, vlen = 0, plen = 0; xs_var = id_str_hash_create (101); - if (var && parms && DV_TYPE_OF (var) == 193 && DV_TYPE_OF (parms) == 193) + if (var && parms && DV_TYPE_OF (var) == DV_ARRAY_OF_POINTER && DV_TYPE_OF (parms) == DV_ARRAY_OF_POINTER) { vlen = BOX_ELEMENTS (var); plen = BOX_ELEMENTS (parms); diff --git a/libsrc/Wi/xmltree.c b/libsrc/Wi/xmltree.c index 2ad626adc8..c81284108d 100644 --- a/libsrc/Wi/xmltree.c +++ b/libsrc/Wi/xmltree.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xmltree.h b/libsrc/Wi/xmltree.h index 244f39d3b9..603cadccff 100644 --- a/libsrc/Wi/xmltree.h +++ b/libsrc/Wi/xmltree.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xpath.c b/libsrc/Wi/xpath.c index 06fe5c0bba..7876799b4b 100644 --- a/libsrc/Wi/xpath.c +++ b/libsrc/Wi/xpath.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xpath.h b/libsrc/Wi/xpath.h index f5b691e7a0..3ddd850e10 100644 --- a/libsrc/Wi/xpath.h +++ b/libsrc/Wi/xpath.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xpathp.y b/libsrc/Wi/xpathp.y index b7746ffd48..ae9989691d 100644 --- a/libsrc/Wi/xpathp.y +++ b/libsrc/Wi/xpathp.y @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xpathp_impl.h b/libsrc/Wi/xpathp_impl.h index 88550c95dd..3d55f78973 100644 --- a/libsrc/Wi/xpathp_impl.h +++ b/libsrc/Wi/xpathp_impl.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xpf.c b/libsrc/Wi/xpf.c index 2665a76b81..f2a892f0b6 100644 --- a/libsrc/Wi/xpf.c +++ b/libsrc/Wi/xpf.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xpf.h b/libsrc/Wi/xpf.h index d5023ea7b4..fe2762d077 100644 --- a/libsrc/Wi/xpf.h +++ b/libsrc/Wi/xpf.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xpscn.l b/libsrc/Wi/xpscn.l index 3b25e58c4f..7f581ddd41 100644 --- a/libsrc/Wi/xpscn.l +++ b/libsrc/Wi/xpscn.l @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -148,7 +148,7 @@ static const char *xpyyerror_msg_tooshallow = "Too many closing parentheses"; static void xpyyerror_if_long_lname (xpp_t *xpp, caddr_t box, const char *lex_type_descr) { size_t boxlen = box_length (box); - char buf[100]; + char buf[150]; if (boxlen > MAX_XML_LNAME_LENGTH) { snprintf (buf, sizeof (buf), "%.90s is too long", lex_type_descr); @@ -198,7 +198,7 @@ static void xpyyerror_if_long_lname (xpp_t *xpp, caddr_t box, const char *lex_ty static void xpyyerror_if_long_qname (xpp_t *xpp, caddr_t box, const char *lex_type_descr) { size_t boxlen = box_length (box); - char buf[100]; + char buf[150]; char *colon; if (boxlen > MAX_XML_QNAME_LENGTH) { diff --git a/libsrc/Wi/xqf.c b/libsrc/Wi/xqf.c index a0d30eff08..4d947a097c 100644 --- a/libsrc/Wi/xqf.c +++ b/libsrc/Wi/xqf.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -3567,7 +3567,7 @@ bif_xqf_str_parse_to_rdf_box (caddr_t * qst, caddr_t * err_ret, state_slot_t ** { caddr_t err = NULL; caddr_t g = geo_parse_wkt (arg, &err); - if (err && (!suppress_error || !strcmp (type_iri, "http://www.openlinksw.com/schemas/virtrdf#Geometry"))) + if (err && (!(suppress_error & 1) || !strcmp (type_iri, "http://www.openlinksw.com/schemas/virtrdf#Geometry"))) sqlr_resignal (err); if (!err) { diff --git a/libsrc/Wi/xqf.h b/libsrc/Wi/xqf.h index 08e5d74c95..35df96524f 100644 --- a/libsrc/Wi/xqf.h +++ b/libsrc/Wi/xqf.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xrd2json.xsl b/libsrc/Wi/xrd2json.xsl index 10daa59057..ef1888e3c3 100644 --- a/libsrc/Wi/xrd2json.xsl +++ b/libsrc/Wi/xrd2json.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xslt.c b/libsrc/Wi/xslt.c index 6bd6079ab8..c8ad96ec5a 100644 --- a/libsrc/Wi/xslt.c +++ b/libsrc/Wi/xslt.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -3405,7 +3405,7 @@ box_find_mt_unsafe_subtree (caddr_t box) id_hash_iterator_t tmp_hit; if (NULL == hit->hit_hash) return NULL; - if (NULL != hit->hit_hash->ht_mutex) + if (NULL != hit->hit_hash->ht_rwlock) return NULL; id_hash_iterator (&tmp_hit, hit->hit_hash); while (hit_next (&tmp_hit, (char **)(&key_ptr), (char **)(&val_ptr))) @@ -3450,9 +3450,9 @@ box_make_tree_mt_safe (caddr_t box) id_hash_iterator_t tmp_hit; if (NULL != hit->hit_hash) { - if (NULL != hit->hit_hash->ht_mutex) + if (NULL != hit->hit_hash->ht_rwlock) return; - hit->hit_hash->ht_mutex = mutex_allocate (); + hit->hit_hash->ht_rwlock = rwlock_allocate (); } id_hash_iterator (&tmp_hit, hit->hit_hash); while (hit_next (&tmp_hit, (char **) &key_ptr, (char **) &val_ptr)) @@ -3569,7 +3569,8 @@ dict_put_impl (id_hash_iterator_t *hit, caddr_t key, caddr_t val, int signal_uns id_hash_t *ht = hit->hit_hash; caddr_t *old_val_ptr; long res; - if (NULL != ht->ht_mutex) + int wrlocked; + if (HT_WRLOCK_COND(ht,wrlocked)) { if (signal_unsafe_args) { @@ -3578,16 +3579,18 @@ dict_put_impl (id_hash_iterator_t *hit, caddr_t key, caddr_t val, int signal_uns if (NULL != unsafe_val_subtree) { dtp_t dtp = DV_TYPE_OF (unsafe_val_subtree); + HT_UNLOCK/*_COND*/(ht/*,wrlocked*/); sqlr_new_error ("42000", "SR565", "Argument #3 for dict_put() contain data of type %s (%d) that can not be used as a value in a dictionary that is shared between threads", dv_type_title (dtp), dtp); } } - mutex_enter (ht->ht_mutex); } - if ((0 < ht->ht_dict_max_entries) && ((ht->ht_inserts - ht->ht_deletes) > ht->ht_dict_max_entries)) + if ((0 < ht->ht_dict_max_entries) && + ((ht->ht_inserts - ht->ht_deletes) > ht->ht_dict_max_entries) ) goto skip_insertion; /* see below */ - if ((0 < ht->ht_dict_max_mem_in_use) && (ht->ht_dict_mem_in_use > ht->ht_dict_max_mem_in_use)) + if ((0 < ht->ht_dict_max_mem_in_use) && + (ht->ht_dict_mem_in_use > ht->ht_dict_max_mem_in_use) ) goto skip_insertion; /* see below */ old_val_ptr = (caddr_t *) id_hash_get (ht, (caddr_t) (&key)); if (NULL != old_val_ptr) @@ -3603,20 +3606,20 @@ dict_put_impl (id_hash_iterator_t *hit, caddr_t key, caddr_t val, int signal_uns dk_free_tree (old_val_ptr[0]); val = box_copy_tree (val); } - if (ht->ht_mutex) + if (wrlocked) box_make_tree_mt_safe (val); old_val_ptr[0] = val; } else { - if (signal_unsafe_args && (NULL != ht->ht_mutex)) + if (signal_unsafe_args && wrlocked) { caddr_t unsafe_key_subtree; unsafe_key_subtree = box_find_mt_unsafe_subtree (key); if (NULL != unsafe_key_subtree) { dtp_t dtp = DV_TYPE_OF (unsafe_key_subtree); - mutex_leave (ht->ht_mutex); + HT_UNLOCK/*_COND*/ (ht); sqlr_new_error ("42000", "SR566", "Argument #2 for dict_put() contain data of type %s (%d) that can not be used as a key in a dictionary that is shared between threads", dv_type_title (dtp), dtp); @@ -3632,7 +3635,7 @@ dict_put_impl (id_hash_iterator_t *hit, caddr_t key, caddr_t val, int signal_uns key = box_copy_tree (key); val = box_copy_tree (val); } - if (ht->ht_mutex) + if (wrlocked) { box_make_tree_mt_safe (key); box_make_tree_mt_safe (val); @@ -3643,12 +3646,9 @@ dict_put_impl (id_hash_iterator_t *hit, caddr_t key, caddr_t val, int signal_uns } id_hash_iterator (hit, ht); ht->ht_dict_version++; - hit->hit_dict_version++ - /* It's incorrect to write hit->hit_dict_version = ht->ht_dict_version because they may be out of sync before the id_hash_put */ - ; + hit->hit_dict_version++ /* It's incorrect to write hit->hit_dict_version = ht->ht_dict_version because they may be out of sync before the id_hash_put */; skip_insertion: - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,wrlocked); res = ht->ht_inserts - ht->ht_deletes; return box_num (res); } @@ -3670,8 +3670,8 @@ bif_dict_get (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) caddr_t key = bif_arg (qst, args, 1, "dict_get"); caddr_t *valptr; caddr_t res; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + int rdlocked; + HT_RDLOCK_COND(ht,rdlocked); valptr = (caddr_t *)id_hash_get (ht, (caddr_t)(&key)); if (NULL == valptr) { @@ -3682,8 +3682,7 @@ bif_dict_get (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) } else res = box_copy_tree (valptr[0]); - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,rdlocked); return res; } @@ -3695,11 +3694,10 @@ bif_dict_contains_key (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) id_hash_t *ht = hit->hit_hash; caddr_t key = bif_arg (qst, args, 1, "dict_contains_key"); caddr_t *valptr; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + int rdlocked; + HT_RDLOCK_COND(ht,rdlocked); valptr = (caddr_t *)id_hash_get (ht, (caddr_t)(&key)); - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,rdlocked); return (caddr_t)((ptrlong)((NULL != valptr) ? 1 : 0)); } @@ -3710,8 +3708,8 @@ dict_remove_impl (id_hash_iterator_t *hit, caddr_t key) caddr_t *old_key_ptr, *old_val_ptr; caddr_t old_key, old_val; int res; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + int wrlocked; + HT_WRLOCK_COND(ht,wrlocked); old_val_ptr = (caddr_t *)id_hash_get (ht, (caddr_t)(&key)); if (NULL == old_val_ptr) res = 0; @@ -3734,8 +3732,7 @@ dict_remove_impl (id_hash_iterator_t *hit, caddr_t key) hit->hit_dict_version++; res = 1; } - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,wrlocked); return box_num (res); } @@ -3753,8 +3750,8 @@ dict_inc_or_put_impl (id_hash_iterator_t *hit, caddr_t key, boxint inc_val, int id_hash_t *ht = hit->hit_hash; boxint res; caddr_t *old_val_ptr; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + int wrlocked; + HT_WRLOCK_COND(ht,wrlocked); if ((0 < ht->ht_dict_max_entries) && ((ht->ht_inserts - ht->ht_deletes) > ht->ht_dict_max_entries) ) goto skip_insertion; /* see below */ @@ -3766,12 +3763,18 @@ dict_inc_or_put_impl (id_hash_iterator_t *hit, caddr_t key, boxint inc_val, int { boxint old_int; if (signal_unsafe_args && (DV_LONG_INT != DV_TYPE_OF (old_val_ptr[0]))) + { + HT_UNLOCK_COND(ht,wrlocked); sqlr_new_error ("42000", "SR627", "dict_inc_or_put() can not increment a noninteger value" ); + } old_int = unbox (old_val_ptr[0]); if (signal_unsafe_args && (0 >= old_int)) + { + HT_UNLOCK_COND(ht,wrlocked); sqlr_new_error ("42000", "SR628", "dict_inc_or_put() can not increment a value if it is less than or equal to zero" ); + } res = old_int + inc_val; if (NULL != ht->ht_mp) { @@ -3797,7 +3800,7 @@ dict_inc_or_put_impl (id_hash_iterator_t *hit, caddr_t key, boxint inc_val, int val = box_num (inc_val); key = box_copy_tree (key); } - if (ht->ht_mutex) + if (wrlocked) box_make_tree_mt_safe (key); id_hash_set (ht, (caddr_t)(&key), (caddr_t)(&val)); if (0 < ht->ht_dict_max_mem_in_use) @@ -3807,8 +3810,7 @@ dict_inc_or_put_impl (id_hash_iterator_t *hit, caddr_t key, boxint inc_val, int ht->ht_dict_version++; hit->hit_dict_version++ /* It's incorrect to write hit->hit_dict_version = ht->ht_dict_version because they may be out of sync before the id_hash_put */; skip_insertion: - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,wrlocked); res = ht->ht_inserts - ht->ht_deletes; return box_num (res); } @@ -3818,7 +3820,7 @@ bif_dict_inc_or_put (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) { id_hash_iterator_t *hit = bif_dict_iterator_arg (qst, args, 0, "dict_inc_or_put", 0); caddr_t key = bif_arg (qst, args, 1, "dict_inc_or_put"); - boxint inc_val = bif_long_range_arg (qst, args, 2, "dict_inc_or_put", 0, 0xffff); + boxint inc_val = bif_boxint_range_arg (qst, args, 2, "dict_inc_or_put", 0, BOXINT_MAX); return dict_inc_or_put_impl (hit, key, inc_val, 1 /*signal_unsafe_args*/); } @@ -3828,21 +3830,27 @@ dict_dec_or_remove_impl (id_hash_iterator_t *hit, caddr_t key, boxint dec_val, i id_hash_t *ht = hit->hit_hash; caddr_t *old_key_ptr, *old_val_ptr; boxint res = 0; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + int wrlocked; + HT_WRLOCK_COND(ht,wrlocked); old_val_ptr = (caddr_t *)id_hash_get (ht, (caddr_t)(&key)); if (NULL == old_val_ptr) res = 0; else if (signal_unsafe_args && (DV_LONG_INT != DV_TYPE_OF (old_val_ptr[0]))) + { + HT_UNLOCK_COND(ht,wrlocked); sqlr_new_error ("42000", "SR629", "dict_dec_or_remove() can not decrement a noninteger value" ); + } else if (unbox (old_val_ptr[0]) > dec_val) { boxint old_int; old_int = unbox (old_val_ptr[0]); if (signal_unsafe_args && (0 >= old_int)) + { + HT_UNLOCK_COND(ht,wrlocked); sqlr_new_error ("42000", "SR631", "dict_dec_or_remove() can not decrement a value if it is less than or equal to zero" ); + } res = old_int - dec_val; if (NULL != ht->ht_mp) { @@ -3876,8 +3884,7 @@ dict_dec_or_remove_impl (id_hash_iterator_t *hit, caddr_t key, boxint dec_val, i hit->hit_dict_version++; res = 0; } - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,wrlocked); return box_num (res); } @@ -3886,7 +3893,7 @@ bif_dict_dec_or_remove (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) { id_hash_iterator_t *hit = bif_dict_iterator_arg (qst, args, 0, "dict_dec_or_remove", 0); caddr_t key = bif_arg (qst, args, 1, "dict_dec_or_remove"); - boxint dec_val = bif_long_range_arg (qst, args, 2, "dict_dec_or_remove", 0, 0xffff); + boxint dec_val = bif_boxint_range_arg (qst, args, 2, "dict_dec_or_remove", 0, BOXINT_MAX); return dict_dec_or_remove_impl (hit, key, dec_val, 1 /*signal_unsafe_args*/); } @@ -3896,8 +3903,8 @@ dict_bitor_or_put_impl (id_hash_iterator_t *hit, caddr_t key, boxint bits_to_set id_hash_t *ht = hit->hit_hash; boxint res; caddr_t *old_val_ptr; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + int wrlocked; + HT_WRLOCK_COND(ht,wrlocked); if ((0 < ht->ht_dict_max_entries) && ((ht->ht_inserts - ht->ht_deletes) > ht->ht_dict_max_entries) ) goto skip_insertion; /* see below */ @@ -3910,8 +3917,11 @@ dict_bitor_or_put_impl (id_hash_iterator_t *hit, caddr_t key, boxint bits_to_set boxint old_int; if (DV_LONG_INT != DV_TYPE_OF (old_val_ptr[0])) if (signal_unsafe_args) + { + HT_UNLOCK_COND(ht,wrlocked); sqlr_new_error ("42000", "SR627", "dict_bitor_or_put() can not apply a bitwise OR to a noninteger value" ); + } else old_int = 0; else @@ -3939,7 +3949,7 @@ dict_bitor_or_put_impl (id_hash_iterator_t *hit, caddr_t key, boxint bits_to_set val = box_num (bits_to_set); } res = bits_to_set; - if (ht->ht_mutex) + if (wrlocked) box_make_tree_mt_safe (key); id_hash_set (ht, (caddr_t) (&key), (caddr_t) (&val)); if (0 < ht->ht_dict_max_mem_in_use) @@ -3949,8 +3959,7 @@ dict_bitor_or_put_impl (id_hash_iterator_t *hit, caddr_t key, boxint bits_to_set ht->ht_dict_version++; hit->hit_dict_version++ /* It's incorrect to write hit->hit_dict_version = ht->ht_dict_version because they may be out of sync before the id_hash_put */; skip_insertion: - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,wrlocked); res = ht->ht_inserts - ht->ht_deletes; return box_num (res); } @@ -3973,8 +3982,8 @@ bif_dict_get_or_set_sequence_next (caddr_t * qst, caddr_t * err_ret, state_slot_ caddr_t sequence_name = bif_string_arg (qst, args, 2, "dict_get_or_set_sequence_next"); caddr_t res = 0; caddr_t *old_val_ptr; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + int wrlocked; + HT_WRLOCK_COND(ht,wrlocked); if ((0 < ht->ht_dict_max_entries) && ((ht->ht_inserts - ht->ht_deletes) > ht->ht_dict_max_entries) ) goto skip_insertion; /* see below */ @@ -3999,7 +4008,7 @@ bif_dict_get_or_set_sequence_next (caddr_t * qst, caddr_t * err_ret, state_slot_ boxed_val = box_num (val); } res = box_num (val); - if (ht->ht_mutex) + if (wrlocked) box_make_tree_mt_safe (key); id_hash_set (ht, (caddr_t)(&key), (caddr_t)(&boxed_val)); if (0 < ht->ht_dict_max_mem_in_use) @@ -4010,8 +4019,7 @@ bif_dict_get_or_set_sequence_next (caddr_t * qst, caddr_t * err_ret, state_slot_ res = box_num (val); } skip_insertion: - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,wrlocked); return res; } @@ -4022,17 +4030,16 @@ dict_zap_impl (id_hash_iterator_t *hit, ptrlong destructive, int signal_unsafe_a id_hash_t *ht; caddr_t *keyp, *valp; long len; + int wrlocked; if (NULL == hit) return box_num (0); ht = hit->hit_hash; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + HT_WRLOCK_COND(ht,wrlocked); len = ht->ht_inserts - ht->ht_deletes; id_hash_iterator (&tmp_hit, ht); if ((1 != ht->ht_dict_refctr) && !(destructive & ~1)) { - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,wrlocked); if (signal_unsafe_args) sqlr_new_error ("22023", "SR632", "dict_zap() can not zap a dictionary that is used in many places, if second parameter is 0 or 1"); else @@ -4051,8 +4058,7 @@ dict_zap_impl (id_hash_iterator_t *hit, ptrlong destructive, int signal_unsafe_a } ht->ht_dict_version++; ht->ht_dict_mem_in_use = 0; - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,wrlocked); return (caddr_t)box_num (len); } @@ -4083,17 +4089,16 @@ bif_dict_list_keys (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) boxint destructive = bif_long_arg (qst, args, 1, "dict_list_keys"); id_hash_t *ht; caddr_t *res, *tail, *keyp, *valp; + int rdlocked; long len; if (NULL == hit1) return list (0); ht = hit1->hit_hash; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + HT_RDLOCK_COND(ht,rdlocked); len = ht->ht_inserts - ht->ht_deletes; if ((len * sizeof (caddr_t)) & ~0xffffff) { - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,rdlocked); sqlr_new_error ("22023", "SR...", "The result vector is too large"); } res = (caddr_t *)dk_alloc_box (len * sizeof (caddr_t), DV_ARRAY_OF_POINTER); @@ -4124,8 +4129,7 @@ bif_dict_list_keys (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) ht->ht_dict_version++; ht->ht_dict_mem_in_use = 0; } - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,rdlocked); return (caddr_t)res; } @@ -4137,11 +4141,17 @@ bif_dict_destructive_list_rnd_keys (caddr_t * qst, caddr_t * err_ret, state_slot id_hash_t *ht; caddr_t *res, *tail; long len, bucket_rnd; + int wrlocked; if (NULL == hit1) return list (0); ht = hit1->hit_hash; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + if (ht->ht_rwlock) + { + rwlock_wrlock (ht->ht_rwlock); + wrlocked = 1; + } + else + wrlocked = 0; len = ht->ht_inserts - ht->ht_deletes; if (len > batch_size) len = batch_size; @@ -4174,8 +4184,7 @@ bif_dict_destructive_list_rnd_keys (caddr_t * qst, caddr_t * err_ret, state_slot return NULL; /* never reached */ res_done: ht->ht_dict_version++; - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,wrlocked); return (caddr_t)res; } @@ -4187,16 +4196,18 @@ bif_dict_to_vector (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) id_hash_t *ht; caddr_t *res, *tail, *keyp, *valp; size_t box_len; + int locked; if (NULL == hit1) return list (0); ht = hit1->hit_hash; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + if (destructive) + HT_WRLOCK_COND(ht,locked); + else + HT_RDLOCK_COND(ht,locked); box_len = (ht->ht_inserts - ht->ht_deletes) * 2 * sizeof (caddr_t); if (box_len >= MAX_BOX_LENGTH) { - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,locked); sqlr_new_error ("22023", ".....", "The result array too large"); } res = (caddr_t *)dk_alloc_box (box_len, DV_ARRAY_OF_POINTER); @@ -4228,8 +4239,7 @@ bif_dict_to_vector (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) ht->ht_dict_version++; ht->ht_dict_mem_in_use = 0; } - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,locked); return (caddr_t)res; } @@ -4238,16 +4248,15 @@ bif_dict_iter_rewind (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) { id_hash_iterator_t *hit = bif_dict_iterator_or_null_arg (qst, args, 0, "dict_iter_rewind", 0); id_hash_t *ht; + int rdlocked; if (NULL == hit) return box_num (0); ht = hit->hit_hash; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + HT_RDLOCK_COND(ht,rdlocked); hit->hit_bucket = 0; hit->hit_chilum = NULL; hit->hit_dict_version = ht->ht_dict_version; - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,rdlocked); return box_num (ht->ht_inserts - ht->ht_deletes); } @@ -4257,13 +4266,13 @@ bif_dict_iter_next (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) id_hash_iterator_t *hit = bif_dict_iterator_or_null_arg (qst, args, 0, "dict_iter_next", 0); id_hash_t *ht; int res = 0; + int rdlocked; if (3 > BOX_ELEMENTS(args)) sqlr_new_error ("22003", "SR345", "Too few arguments for dict_iter_next ()"); if (NULL == hit) return box_num (0); ht = hit->hit_hash; - if (ht->ht_mutex) - mutex_enter (ht->ht_mutex); + HT_RDLOCK_COND(ht,rdlocked); if (hit->hit_dict_version == ht->ht_dict_version) { caddr_t *key, *data; @@ -4278,10 +4287,10 @@ bif_dict_iter_next (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) } else { - if (ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,rdlocked); sqlr_new_error ("22023", "SR630", "Function dict_iter_next() tries to iterate a volatile dictionary changed after last dict_iter_rewind()"); } + HT_UNLOCK_COND(ht,rdlocked); return box_num (res); } diff --git a/libsrc/Wi/xslt_fmt.c b/libsrc/Wi/xslt_fmt.c index c9adaf7a85..c2455214d2 100644 --- a/libsrc/Wi/xslt_fmt.c +++ b/libsrc/Wi/xslt_fmt.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xslt_impl.h b/libsrc/Wi/xslt_impl.h index 7fca057378..027abd31b4 100644 --- a/libsrc/Wi/xslt_impl.h +++ b/libsrc/Wi/xslt_impl.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/xslt_opt.c b/libsrc/Wi/xslt_opt.c index 8b6f9b1aba..31d2d3b03d 100644 --- a/libsrc/Wi/xslt_opt.c +++ b/libsrc/Wi/xslt_opt.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/Makefile.am b/libsrc/Xml.new/Makefile.am index 045519b68d..d472bf9794 100644 --- a/libsrc/Xml.new/Makefile.am +++ b/libsrc/Xml.new/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/charclasses.c b/libsrc/Xml.new/charclasses.c index 89ea15c149..16085329f4 100644 --- a/libsrc/Xml.new/charclasses.c +++ b/libsrc/Xml.new/charclasses.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/charclasses.h b/libsrc/Xml.new/charclasses.h index fd616f9edb..5a61f8ba70 100644 --- a/libsrc/Xml.new/charclasses.h +++ b/libsrc/Xml.new/charclasses.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/datatypes.c b/libsrc/Xml.new/datatypes.c index 424f7e3631..64139efd06 100644 --- a/libsrc/Xml.new/datatypes.c +++ b/libsrc/Xml.new/datatypes.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/dtd.c b/libsrc/Xml.new/dtd.c index 5401ee17be..2c10e42189 100644 --- a/libsrc/Xml.new/dtd.c +++ b/libsrc/Xml.new/dtd.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/html_mode.c b/libsrc/Xml.new/html_mode.c index 33ebb29ce1..2abc3896e0 100644 --- a/libsrc/Xml.new/html_mode.c +++ b/libsrc/Xml.new/html_mode.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/html_mode.h b/libsrc/Xml.new/html_mode.h index cdcc9aa358..8f68d6b30e 100644 --- a/libsrc/Xml.new/html_mode.h +++ b/libsrc/Xml.new/html_mode.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/schema.c b/libsrc/Xml.new/schema.c index f89a099516..c7167e5345 100644 --- a/libsrc/Xml.new/schema.c +++ b/libsrc/Xml.new/schema.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/schema.h b/libsrc/Xml.new/schema.h index fdcf512345..7e8523b4e9 100644 --- a/libsrc/Xml.new/schema.h +++ b/libsrc/Xml.new/schema.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/schema_ecm.h b/libsrc/Xml.new/schema_ecm.h index 07c39a2bab..de40ac60bc 100644 --- a/libsrc/Xml.new/schema_ecm.h +++ b/libsrc/Xml.new/schema_ecm.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/schema_fsm.c b/libsrc/Xml.new/schema_fsm.c index c18bd0d127..52fb23904f 100644 --- a/libsrc/Xml.new/schema_fsm.c +++ b/libsrc/Xml.new/schema_fsm.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/test.c b/libsrc/Xml.new/test.c index 45644a0ab8..5efc235045 100644 --- a/libsrc/Xml.new/test.c +++ b/libsrc/Xml.new/test.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/tst.c b/libsrc/Xml.new/tst.c index 4778524f03..8973445cb9 100644 --- a/libsrc/Xml.new/tst.c +++ b/libsrc/Xml.new/tst.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/xml_ecm.c b/libsrc/Xml.new/xml_ecm.c index 88b9b998a8..37145d31a0 100644 --- a/libsrc/Xml.new/xml_ecm.c +++ b/libsrc/Xml.new/xml_ecm.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/xml_ecm.h b/libsrc/Xml.new/xml_ecm.h index e7857c77fc..f7091d6521 100644 --- a/libsrc/Xml.new/xml_ecm.h +++ b/libsrc/Xml.new/xml_ecm.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/xml_ecm_test.c b/libsrc/Xml.new/xml_ecm_test.c index 59288b5e12..b10f0014f8 100644 --- a/libsrc/Xml.new/xml_ecm_test.c +++ b/libsrc/Xml.new/xml_ecm_test.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/xmlgram.c b/libsrc/Xml.new/xmlgram.c index 212875ed23..e97b9b779a 100644 --- a/libsrc/Xml.new/xmlgram.c +++ b/libsrc/Xml.new/xmlgram.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/xmlparser.c b/libsrc/Xml.new/xmlparser.c index 92875e4dae..33b8b5999c 100644 --- a/libsrc/Xml.new/xmlparser.c +++ b/libsrc/Xml.new/xmlparser.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/xmlparser.h b/libsrc/Xml.new/xmlparser.h index c860a16654..c530df78d1 100644 --- a/libsrc/Xml.new/xmlparser.h +++ b/libsrc/Xml.new/xmlparser.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/xmlparser_impl.h b/libsrc/Xml.new/xmlparser_impl.h index 7a7da51168..318fec25d0 100644 --- a/libsrc/Xml.new/xmlparser_impl.h +++ b/libsrc/Xml.new/xmlparser_impl.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Xml.new/xmlread.c b/libsrc/Xml.new/xmlread.c index 969fb3e1e1..d41c212029 100644 --- a/libsrc/Xml.new/xmlread.c +++ b/libsrc/Xml.new/xmlread.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -2060,13 +2060,15 @@ static int dtd_compile (vxml_parser_t *parser) } xml_dbg_printf (("\n\nFSM for children of %s, grammar %s:", el->ee_name, el->ee_grammar)); if (NULL == el->ee_grammar) - { - if (!el->ee_is_any && !el->ee_is_empty) - xmlparser_logprintf (parser, parser->validator.dv_curr_config.dc_names_unresolved, 100+strlen (el->ee_name), - "Element name '%s' is undefined but DTD contains references to it", - el->ee_name ); - el->ee_is_any = 1; - } + { + if (!el->ee_is_any && !el->ee_is_empty) + { + xmlparser_logprintf (parser, parser->validator.dv_curr_config.dc_names_unresolved, 100+strlen (el->ee_name), + "Element name '%s' is undefined but DTD contains references to it", + el->ee_name ); + el->ee_is_any = 1; /* This assigment was unconditional but it's better to not set it for EMPTY even if EMPTY takes precedence over ANY atm. */ + } + } else { ecm_grammar_to_fsa (ctr, dtd); diff --git a/libsrc/langfunc/Makefile.am b/libsrc/langfunc/Makefile.am index 2cafcfb3c4..90321602aa 100644 --- a/libsrc/langfunc/Makefile.am +++ b/libsrc/langfunc/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/encoding_basic.c b/libsrc/langfunc/encoding_basic.c index 755b4e0118..350e34016d 100644 --- a/libsrc/langfunc/encoding_basic.c +++ b/libsrc/langfunc/encoding_basic.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/encoding_charsets.c b/libsrc/langfunc/encoding_charsets.c index aa26fabc2e..3f5b8fac98 100644 --- a/libsrc/langfunc/encoding_charsets.c +++ b/libsrc/langfunc/encoding_charsets.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/encoding_ucm.c b/libsrc/langfunc/encoding_ucm.c index ce5b717063..3c22c589b1 100644 --- a/libsrc/langfunc/encoding_ucm.c +++ b/libsrc/langfunc/encoding_ucm.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/encoding_wide.c b/libsrc/langfunc/encoding_wide.c index d174767857..30536c2083 100644 --- a/libsrc/langfunc/encoding_wide.c +++ b/libsrc/langfunc/encoding_wide.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/lang25.c b/libsrc/langfunc/lang25.c index 1f87ef7d31..242e124971 100644 --- a/libsrc/langfunc/lang25.c +++ b/libsrc/langfunc/lang25.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/langfunc.c b/libsrc/langfunc/langfunc.c index cffede7a93..d1eb9d6435 100644 --- a/libsrc/langfunc/langfunc.c +++ b/libsrc/langfunc/langfunc.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/langfunc.h b/libsrc/langfunc/langfunc.h index 4ee4aa4f0b..5d7b853178 100644 --- a/libsrc/langfunc/langfunc.h +++ b/libsrc/langfunc/langfunc.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/langfunc_templ.c b/libsrc/langfunc/langfunc_templ.c index bd0fe9afa6..1a0a92f3c1 100644 --- a/libsrc/langfunc/langfunc_templ.c +++ b/libsrc/langfunc/langfunc_templ.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -41,7 +41,7 @@ int LH_COUNT_WORDS_NAME (const unichar *buf, size_t bufsize, lh_word_check_t *ch continue; if (NULL!=check && 0 == check(buf+word_start, word_length)) continue; - res++; + res++; continue; } if (prop & UCP_IDEO) diff --git a/libsrc/langfunc/langman.c b/libsrc/langfunc/langman.c index c04fa5d2b9..3d1b363765 100644 --- a/libsrc/langfunc/langman.c +++ b/libsrc/langfunc/langman.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/language__en_UK.c b/libsrc/langfunc/language__en_UK.c index 53a5128483..fde1488286 100644 --- a/libsrc/langfunc/language__en_UK.c +++ b/libsrc/langfunc/language__en_UK.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/language__en_US.c b/libsrc/langfunc/language__en_US.c index 26cd411ae4..a5aab45c85 100644 --- a/libsrc/langfunc/language__en_US.c +++ b/libsrc/langfunc/language__en_US.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/language__ru_RU.c b/libsrc/langfunc/language__ru_RU.c index f5865e90f2..c088e597c6 100644 --- a/libsrc/langfunc/language__ru_RU.c +++ b/libsrc/langfunc/language__ru_RU.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/language__x_ViAny.c b/libsrc/langfunc/language__x_ViAny.c index 3103767a38..baad2cc560 100644 --- a/libsrc/langfunc/language__x_ViAny.c +++ b/libsrc/langfunc/language__x_ViAny.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/language__x_ViDoc.c b/libsrc/langfunc/language__x_ViDoc.c index a8b3178766..318a870a8a 100644 --- a/libsrc/langfunc/language__x_ViDoc.c +++ b/libsrc/langfunc/language__x_ViDoc.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/ucm.h b/libsrc/langfunc/ucm.h index 812ceac4fe..f341946896 100644 --- a/libsrc/langfunc/ucm.h +++ b/libsrc/langfunc/ucm.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/ucm2enc.c b/libsrc/langfunc/ucm2enc.c index 8970ed668d..6efbb20b53 100644 --- a/libsrc/langfunc/ucm2enc.c +++ b/libsrc/langfunc/ucm2enc.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/unicode3.c b/libsrc/langfunc/unicode3.c index a652686e54..42ca714f93 100644 --- a/libsrc/langfunc/unicode3.c +++ b/libsrc/langfunc/unicode3.c @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/unicode3_all_chars.h b/libsrc/langfunc/unicode3_all_chars.h index f9049db645..a314565036 100644 --- a/libsrc/langfunc/unicode3_all_chars.h +++ b/libsrc/langfunc/unicode3_all_chars.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/unicode3_basechars.h b/libsrc/langfunc/unicode3_basechars.h index 1f476af65c..cbb5e32295 100644 --- a/libsrc/langfunc/unicode3_basechars.h +++ b/libsrc/langfunc/unicode3_basechars.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/unicode3_lowers.h b/libsrc/langfunc/unicode3_lowers.h index ae893093b0..8a7b47a3b2 100644 --- a/libsrc/langfunc/unicode3_lowers.h +++ b/libsrc/langfunc/unicode3_lowers.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/unicode3_spaces.h b/libsrc/langfunc/unicode3_spaces.h index 6d528a0722..b1caa96a6d 100644 --- a/libsrc/langfunc/unicode3_spaces.h +++ b/libsrc/langfunc/unicode3_spaces.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/unicode3_uppers.h b/libsrc/langfunc/unicode3_uppers.h index 91b2181e3a..948655f0e4 100644 --- a/libsrc/langfunc/unicode3_uppers.h +++ b/libsrc/langfunc/unicode3_uppers.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/langfunc/unicodetab2h.sh b/libsrc/langfunc/unicodetab2h.sh index ed2ca02ee4..0657ac842c 100755 --- a/libsrc/langfunc/unicodetab2h.sh +++ b/libsrc/langfunc/unicodetab2h.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -71,7 +71,7 @@ cat > $2 <<-EOF * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/libutil.h b/libsrc/libutil.h index cf701510c2..a0a835ab69 100644 --- a/libsrc/libutil.h +++ b/libsrc/libutil.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/odbcsdk/Makefile.am b/libsrc/odbcsdk/Makefile.am index bb2f854ece..2501ae0ebe 100644 --- a/libsrc/odbcsdk/Makefile.am +++ b/libsrc/odbcsdk/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/odbcsdk/include/iodbcext.h b/libsrc/odbcsdk/include/iodbcext.h index c17c2e0122..71230fd0a3 100644 --- a/libsrc/odbcsdk/include/iodbcext.h +++ b/libsrc/odbcsdk/include/iodbcext.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -166,6 +166,15 @@ #define SQL_RE_DEFAULT SQL_RE_OFF +#define SQL_ATTR_APP_WCHAR_ID 1061 +#define SQL_ATTR_APP_UNICODE_ID 1064 +#define SQL_ATTR_DRIVER_UNICODE_ID 1065 + +#define SQL_DM_CP_UCS4 0 +#define SQL_DM_CP_UTF16 1 +#define SQL_DM_CP_UTF8 2 + + /* * IBM extensions for DB2 */ diff --git a/libsrc/odbcsdk/include/iodbcinst.h b/libsrc/odbcsdk/include/iodbcinst.h index dd4af40f86..7691a3a120 100644 --- a/libsrc/odbcsdk/include/iodbcinst.h +++ b/libsrc/odbcsdk/include/iodbcinst.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2018 OpenLink Software + * Copyright (C) 1996-2019 OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/libsrc/odbcsdk/include/iodbcunix.h b/libsrc/odbcsdk/include/iodbcunix.h index 01d0bb1993..e4176f0ed5 100644 --- a/libsrc/odbcsdk/include/iodbcunix.h +++ b/libsrc/odbcsdk/include/iodbcunix.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2018 OpenLink Software + * Copyright (C) 1996-2019 OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/libsrc/odbcsdk/include/isql.h b/libsrc/odbcsdk/include/isql.h index 9f3974ef04..ddb270c680 100644 --- a/libsrc/odbcsdk/include/isql.h +++ b/libsrc/odbcsdk/include/isql.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2018 OpenLink Software + * Copyright (C) 1996-2019 OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/libsrc/odbcsdk/include/isqlext.h b/libsrc/odbcsdk/include/isqlext.h index 54b75f11a1..d234a341dc 100644 --- a/libsrc/odbcsdk/include/isqlext.h +++ b/libsrc/odbcsdk/include/isqlext.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2018 OpenLink Software + * Copyright (C) 1996-2019 OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/libsrc/odbcsdk/include/isqltypes.h b/libsrc/odbcsdk/include/isqltypes.h index fb447576ea..2b50f24dd1 100644 --- a/libsrc/odbcsdk/include/isqltypes.h +++ b/libsrc/odbcsdk/include/isqltypes.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2018 OpenLink Software + * Copyright (C) 1996-2019 OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/libsrc/odbcsdk/include/odbcinst.h b/libsrc/odbcsdk/include/odbcinst.h index 94d4896ea9..65844927c4 100644 --- a/libsrc/odbcsdk/include/odbcinst.h +++ b/libsrc/odbcsdk/include/odbcinst.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1999-2018 OpenLink Software + * Copyright (C) 1999-2019 OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/libsrc/odbcsdk/include/sql.h b/libsrc/odbcsdk/include/sql.h index 447c788379..2ce2e7cea4 100644 --- a/libsrc/odbcsdk/include/sql.h +++ b/libsrc/odbcsdk/include/sql.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2018 OpenLink Software + * Copyright (C) 1996-2019 OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/libsrc/odbcsdk/include/sqlext.h b/libsrc/odbcsdk/include/sqlext.h index 328addb90d..8b3ae82828 100644 --- a/libsrc/odbcsdk/include/sqlext.h +++ b/libsrc/odbcsdk/include/sqlext.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2018 OpenLink Software + * Copyright (C) 1996-2019 OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/libsrc/odbcsdk/include/sqltypes.h b/libsrc/odbcsdk/include/sqltypes.h index c47925b630..7a3da32c3e 100644 --- a/libsrc/odbcsdk/include/sqltypes.h +++ b/libsrc/odbcsdk/include/sqltypes.h @@ -8,7 +8,7 @@ * The iODBC driver manager. * * Copyright (C) 1995 by Ke Jin - * Copyright (C) 1996-2018 OpenLink Software + * Copyright (C) 1996-2019 OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following @@ -397,6 +397,7 @@ typedef unsigned short SQLWCHAR; # include # if defined(__cplusplus) || \ + defined(linux) || \ defined(_WCHAR_T) || \ defined(_WCHAR_T_DEFINED) || \ defined(_WCHAR_T_DEFINED_) || \ diff --git a/libsrc/odbcsdk/include/sqlucode.h b/libsrc/odbcsdk/include/sqlucode.h index 6948d41afa..c32a252569 100644 --- a/libsrc/odbcsdk/include/sqlucode.h +++ b/libsrc/odbcsdk/include/sqlucode.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2018 OpenLink Software + * Copyright (C) 1996-2019 OpenLink Software * All Rights Reserved. * * This software is released under the terms of either of the following diff --git a/libsrc/plugin/Makefile.am b/libsrc/plugin/Makefile.am index 7bc3ffde50..e5be38332f 100644 --- a/libsrc/plugin/Makefile.am +++ b/libsrc/plugin/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/plugin/dlf.c b/libsrc/plugin/dlf.c index f34f53e7ab..3c5f5db32b 100644 --- a/libsrc/plugin/dlf.c +++ b/libsrc/plugin/dlf.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/plugin/dlf.h b/libsrc/plugin/dlf.h index 4ed3b7d87d..9464f22ad2 100644 --- a/libsrc/plugin/dlf.h +++ b/libsrc/plugin/dlf.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/plugin/exe_export.h b/libsrc/plugin/exe_export.h index ae16ada827..1dd914c4a6 100644 --- a/libsrc/plugin/exe_export.h +++ b/libsrc/plugin/exe_export.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -26,21 +26,34 @@ #ifndef _EXE_EXPORT_H #define _EXE_EXPORT_H +#ifdef __cplusplus +#define EXE_EXPORT_LINKAGE "C" +#else +#define EXE_EXPORT_LINKAGE +#endif + #define EXE_EXPORT_TYPED(rettype,name) \ -extern rettype name +extern EXE_EXPORT_LINKAGE rettype name #ifdef _USRDLL #define EXE_EXPORT(rettype,name,arglist) \ typedef rettype typeof__##name arglist; \ -extern rettype name arglist +extern EXE_EXPORT_LINKAGE rettype name arglist #else #define EXE_EXPORT(rettype,name,arglist) \ typedef rettype typeof__##name arglist; \ -extern rettype name arglist +extern EXE_EXPORT_LINKAGE rettype name arglist #endif +struct _gate_export_item_s { void *_ptr; const char *_name; }; +typedef struct _gate_export_item_s _gate_export_item_t; + +extern _gate_export_item_t _gate_export_data[]; + +extern EXE_EXPORT_LINKAGE int _gate_export (_gate_export_item_t *tgt); + #endif diff --git a/libsrc/plugin/gate_virtuoso.h b/libsrc/plugin/gate_virtuoso.h index 5f689ec9f7..fe652c04c6 100644 --- a/libsrc/plugin/gate_virtuoso.h +++ b/libsrc/plugin/gate_virtuoso.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/plugin/gate_virtuoso_stubs.c b/libsrc/plugin/gate_virtuoso_stubs.c index b7594aa9d6..4cbff470e1 100644 --- a/libsrc/plugin/gate_virtuoso_stubs.c +++ b/libsrc/plugin/gate_virtuoso_stubs.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -52,3 +52,12 @@ void dbg_free (const char *file, u_int line, void *data) { free (data); } char * dbg_strdup (const char *file, u_int line, const char *str) { return strdup (str); } #endif +#if 0 +#ifdef thread_create +#undef thread_create +thread_t *OPL_thread_create (thread_init_func init, unsigned long stack_size, void *init_arg) +{ + return thread_create (init, stack_size, init_arg); +} +#endif +#endif diff --git a/libsrc/plugin/gate_virtuoso_stubs.h b/libsrc/plugin/gate_virtuoso_stubs.h index f737145133..6477253f22 100644 --- a/libsrc/plugin/gate_virtuoso_stubs.h +++ b/libsrc/plugin/gate_virtuoso_stubs.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -33,6 +33,11 @@ EXE_EXPORT (void * , dbg_calloc, (const char *file, u_int line, size_t num, size EXE_EXPORT (void , dbg_free, (const char *file, u_int line, void *data)); EXE_EXPORT (char * , dbg_strdup, (const char *file, u_int line, const char *str)); EXE_EXPORT (void * , dbg_realloc, (const char *file, u_int line, void *old, size_t size)); +EXE_EXPORT (int , log_error, (const char *format, ...)); +EXE_EXPORT (int , log_warning, (const char *format, ...)); +EXE_EXPORT (int , log_info, (const char *format, ...)); +EXE_EXPORT (int , log_debug, (const char *format, ...)); + #define wi_inst (wi_instance_get()[0]) #define bootstrap_cli (get_bootstrap_cli()) #define log_proc_overwrite 1 diff --git a/libsrc/plugin/gen_all_gates.sh b/libsrc/plugin/gen_all_gates.sh index 13f7a22905..82235b7aee 100755 --- a/libsrc/plugin/gen_all_gates.sh +++ b/libsrc/plugin/gen_all_gates.sh @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/plugin/gen_gate.sh b/libsrc/plugin/gen_gate.sh index d3626994c7..dcc3128270 100755 --- a/libsrc/plugin/gen_gate.sh +++ b/libsrc/plugin/gen_gate.sh @@ -3,7 +3,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -216,9 +216,6 @@ cat <<- EOF >> $exportc.tmp /* Now we should declare dictionary array with one item per one exported function. */ /* At connection time, executable will fill _gate structures of plugins with data from this table. */ - struct _gate_export_item_s { void *_ptr; const char *_name; }; - typedef struct _gate_export_item_s _gate_export_item_t; - extern _gate_export_item_t _gate_export_data[]; int _gate_export (_gate_export_item_t *tgt) diff --git a/libsrc/plugin/hosting_sample.c b/libsrc/plugin/hosting_sample.c index 0f4a05e2c2..32470ba8fd 100644 --- a/libsrc/plugin/hosting_sample.c +++ b/libsrc/plugin/hosting_sample.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/plugin/msdtc_plugin.c b/libsrc/plugin/msdtc_plugin.c index 36cd3c8878..96e7405bf9 100644 --- a/libsrc/plugin/msdtc_plugin.c +++ b/libsrc/plugin/msdtc_plugin.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/plugin/plugin.c b/libsrc/plugin/plugin.c index 8c0f5b3e49..e636264ce9 100644 --- a/libsrc/plugin/plugin.c +++ b/libsrc/plugin/plugin.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/plugin/plugin.h b/libsrc/plugin/plugin.h index 0838f9f1c7..9e12c9e9c9 100644 --- a/libsrc/plugin/plugin.h +++ b/libsrc/plugin/plugin.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -26,6 +26,8 @@ #ifndef _PLUGIN_H #define _PLUGIN_H +#include "Dk.h" + /*! \file \brief System-independent interface between dock (executable) and plugin (DLL) @@ -60,11 +62,11 @@ typedef void unit_control_func_t (void *appdata); struct unit_version_s { - char *uv_title; /*!< Title of unit, filled by unit */ - char *uv_version; /*!< Version number, filled by unit */ - char *uv_companyname; /*!< Plugin's developer, filled by unit */ - char *uv_comments; /*!< Any additional info, filled by unit */ - char *uv_load_error; /*!< Error message, filled by unit loader */ + const char *uv_title; /*!< Title of unit, filled by unit */ + const char *uv_version; /*!< Version number, filled by unit */ + const char *uv_companyname; /*!< Plugin's developer, filled by unit */ + const char *uv_comments; /*!< Any additional info, filled by unit */ + const char *uv_load_error; /*!< Error message, filled by unit loader */ char *uv_filename; /*!< Name of file with unit's code, filled by unit loader */ unit_control_func_t *uv_connect; /*!< Pointer to connection function, cannot be NULL */ unit_control_func_t *uv_disconnect; /*!< Pointer to disconnection function, or NULL */ diff --git a/libsrc/plugin/plugin_lang25.h b/libsrc/plugin/plugin_lang25.h index fb80949393..38ce62f73b 100644 --- a/libsrc/plugin/plugin_lang25.h +++ b/libsrc/plugin/plugin_lang25.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/plugin/plugin_msdtc.h b/libsrc/plugin/plugin_msdtc.h index 1353eff4f3..ec6d609ec6 100644 --- a/libsrc/plugin/plugin_msdtc.h +++ b/libsrc/plugin/plugin_msdtc.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/plugin/plugin_sample.c b/libsrc/plugin/plugin_sample.c index 4fc3712c70..7eb6e6665d 100644 --- a/libsrc/plugin/plugin_sample.c +++ b/libsrc/plugin/plugin_sample.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/plugin/plugin_unix.c b/libsrc/plugin/plugin_unix.c index 4ae14d67c4..fdfccd6a0c 100644 --- a/libsrc/plugin/plugin_unix.c +++ b/libsrc/plugin/plugin_unix.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -30,8 +30,6 @@ #include "plugin.h" #include "dlf.h" -extern int _gate_export (void *tgt); - const char * so_extensions[] = { ".so", ".a" }; const int so_extensions_n = sizeof (so_extensions) / sizeof (const char*); @@ -63,7 +61,7 @@ unit_version_t *uv_load_and_check_plugin( } if (NULL == test) { - res = calloc (1, sizeof (unit_version_t)); + res = (unit_version_t *)calloc (1, sizeof (unit_version_t)); res->uv_filename = (char *) strdup (fname); res->uv_load_error = "Unable to locate file"; return res; @@ -73,14 +71,14 @@ unit_version_t *uv_load_and_check_plugin( dll = DLL_OPEN_GLOBAL (fname); if (NULL == dll) { - res = calloc (1, sizeof (unit_version_t)); + res = (unit_version_t *)calloc (1, sizeof (unit_version_t)); res->uv_filename = strdup (fname); res->uv_load_error = strdup (DLL_ERROR()); return res; } if (NULL == function_name) { - res = calloc (1, sizeof (unit_version_t)); + res = (unit_version_t *)calloc (1, sizeof (unit_version_t)); res->uv_filename = strdup (fname); res->uv_load_error = NULL; return res; @@ -90,7 +88,7 @@ unit_version_t *uv_load_and_check_plugin( { char * err = strdup (DLL_ERROR()); DLL_CLOSE (dll); - res = calloc (1, sizeof (unit_version_t)); + res = (unit_version_t *)calloc (1, sizeof (unit_version_t)); res->uv_filename = strdup (fname); res->uv_load_error = err; return res; @@ -108,7 +106,7 @@ unit_version_t *uv_load_and_check_plugin( res->uv_load_error = "Loaded plugin is not compatible with your version of OS"; return res; } - if (0 != _gate_export (res->uv_gate)) + if (0 != _gate_export ((_gate_export_item_t *)(res->uv_gate))) { /* FreeLibrary (dll); -- result we will return now is in dll's address space */ res->uv_load_error = "Loaded plugin requires core functionality not provided by main application"; diff --git a/libsrc/plugin/plugin_win32.c b/libsrc/plugin/plugin_win32.c index 6a3c8c9760..08997365e1 100644 --- a/libsrc/plugin/plugin_win32.c +++ b/libsrc/plugin/plugin_win32.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -28,8 +28,6 @@ #include #include "plugin.h" -extern int _gate_export (void *tgt); - static char *get_win_error (void) { DWORD err; diff --git a/libsrc/util/Makefile.am b/libsrc/util/Makefile.am index 52ecd7ae3b..e4c1567daa 100644 --- a/libsrc/util/Makefile.am +++ b/libsrc/util/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/buildarg.c b/libsrc/util/buildarg.c index 19a489c591..8b9c2e7cae 100644 --- a/libsrc/util/buildarg.c +++ b/libsrc/util/buildarg.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -116,7 +116,7 @@ build_argv_from_string (const char *s, int *pargc, char ***pargv) if (++argc >= nargv - 1) { nargv += INCR; - argv = (char **) s_realloc (argv, nargv * sizeof (char **)); + argv = (char **) s_realloc (argv, nargv * sizeof (char *)); } } optptr = option; @@ -135,7 +135,7 @@ build_argv_from_string (const char *s, int *pargc, char ***pargv) *pargc = argc; *pargv = argv; if (argc >= nargv) - argv = (char **) s_realloc (argv, ++nargv * sizeof (char **)); + argv = (char **) s_realloc (argv, ++nargv * sizeof (char *)); while (argc < nargv) argv[argc++] = NULL; diff --git a/libsrc/util/cfg2.c b/libsrc/util/cfg2.c index 98688e077b..90b0cbfae6 100644 --- a/libsrc/util/cfg2.c +++ b/libsrc/util/cfg2.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/cslentry.c b/libsrc/util/cslentry.c index a392a3a9b4..da21f8447d 100644 --- a/libsrc/util/cslentry.c +++ b/libsrc/util/cslentry.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/csllkup.c b/libsrc/util/csllkup.c index 5eb26fba1e..4d18f3132a 100644 --- a/libsrc/util/csllkup.c +++ b/libsrc/util/csllkup.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/cslnment.c b/libsrc/util/cslnment.c index 4d1e3359b0..448d102faf 100644 --- a/libsrc/util/cslnment.c +++ b/libsrc/util/cslnment.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/dbgmal.c b/libsrc/util/dbgmal.c index c7820ffc0a..6e72d89fac 100644 --- a/libsrc/util/dbgmal.c +++ b/libsrc/util/dbgmal.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/dbgmal.h b/libsrc/util/dbgmal.h index 755abb08b4..27435a6cfa 100644 --- a/libsrc/util/dbgmal.h +++ b/libsrc/util/dbgmal.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/debug.c b/libsrc/util/debug.c index d94f234af2..cf0e0ea17e 100644 --- a/libsrc/util/debug.c +++ b/libsrc/util/debug.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/dyntab.c b/libsrc/util/dyntab.c index c32624be4e..0448588483 100644 --- a/libsrc/util/dyntab.c +++ b/libsrc/util/dyntab.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/dyntab.h b/libsrc/util/dyntab.h index 0cd0330379..ca194b8a00 100644 --- a/libsrc/util/dyntab.h +++ b/libsrc/util/dyntab.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/expandav.c b/libsrc/util/expandav.c index ec08053e27..54da12e3aa 100644 --- a/libsrc/util/expandav.c +++ b/libsrc/util/expandav.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -110,7 +110,7 @@ handle_response (char *response) if ((response_fd = fopen (response, "r")) == NULL) { log (L_ERR, N_("unable to open response file %s"), response); - terminate (1); + terminate_program (1); } while ((token = get_token (response_fd)) != NULL) diff --git a/libsrc/util/fnqual.c b/libsrc/util/fnqual.c index 8418b0ffcf..d141fd5462 100644 --- a/libsrc/util/fnqual.c +++ b/libsrc/util/fnqual.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/fnsearch.c b/libsrc/util/fnsearch.c index 70feb8152a..fef09c08f9 100644 --- a/libsrc/util/fnsearch.c +++ b/libsrc/util/fnsearch.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/fntodos.c b/libsrc/util/fntodos.c index b377e50098..3d13438a63 100644 --- a/libsrc/util/fntodos.c +++ b/libsrc/util/fntodos.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/fnundos.c b/libsrc/util/fnundos.c index cdb6a0ad7a..3c995a8bcb 100644 --- a/libsrc/util/fnundos.c +++ b/libsrc/util/fnundos.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/getdate.h b/libsrc/util/getdate.h index eaa4f7b46f..ce719ac178 100644 --- a/libsrc/util/getdate.h +++ b/libsrc/util/getdate.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/gettimeofday.c b/libsrc/util/gettimeofday.c index 1aef44d336..7df3488bba 100644 --- a/libsrc/util/gettimeofday.c +++ b/libsrc/util/gettimeofday.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/itypes.h b/libsrc/util/itypes.h index 3921f7d816..531d9fbbe6 100644 --- a/libsrc/util/itypes.h +++ b/libsrc/util/itypes.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/listmac.h b/libsrc/util/listmac.h index 1ac7644606..c4f5f3a3ab 100644 --- a/libsrc/util/listmac.h +++ b/libsrc/util/listmac.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/login_digest.c b/libsrc/util/login_digest.c index f477f3acb6..fa8db13057 100644 --- a/libsrc/util/login_digest.c +++ b/libsrc/util/login_digest.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/logmsg.c b/libsrc/util/logmsg.c index d951d87d32..a912cc1825 100644 --- a/libsrc/util/logmsg.c +++ b/libsrc/util/logmsg.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/logmsg.h b/libsrc/util/logmsg.h index 347829b9f7..cd9beed62c 100644 --- a/libsrc/util/logmsg.h +++ b/libsrc/util/logmsg.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/ltrim.c b/libsrc/util/ltrim.c index e8be85f1d4..40cbe7273e 100644 --- a/libsrc/util/ltrim.c +++ b/libsrc/util/ltrim.c @@ -11,7 +11,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/make_env.c b/libsrc/util/make_env.c index d2ce6ab479..a8426187da 100644 --- a/libsrc/util/make_env.c +++ b/libsrc/util/make_env.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/md5.h b/libsrc/util/md5.h index f73aedc74f..ea090278c5 100644 --- a/libsrc/util/md5.h +++ b/libsrc/util/md5.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/mpl.c b/libsrc/util/mpl.c index c562283dbf..9bd6f4ae74 100644 --- a/libsrc/util/mpl.c +++ b/libsrc/util/mpl.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -58,7 +58,7 @@ getcore (memsz_t size) abort (); # endif log (L_ERR, "out of memory"); - terminate (1); + terminate_program (1); } #endif diff --git a/libsrc/util/mpl.h b/libsrc/util/mpl.h index 71fb543c8f..3ba5bfc27c 100644 --- a/libsrc/util/mpl.h +++ b/libsrc/util/mpl.h @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/ncfg.c b/libsrc/util/ncfg.c index 8fb4e3e047..b92b67cfc6 100644 --- a/libsrc/util/ncfg.c +++ b/libsrc/util/ncfg.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/ncfg.h b/libsrc/util/ncfg.h index 89fa3ffee0..7d29b53027 100644 --- a/libsrc/util/ncfg.h +++ b/libsrc/util/ncfg.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/ntapp.c b/libsrc/util/ntapp.c index 1e088e05e9..aa471e791a 100644 --- a/libsrc/util/ntapp.c +++ b/libsrc/util/ntapp.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/oplthr.h b/libsrc/util/oplthr.h index e33c9d9661..2aee2f8cdb 100644 --- a/libsrc/util/oplthr.h +++ b/libsrc/util/oplthr.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/regerror.c b/libsrc/util/regerror.c index 63d67b2913..1c4e88a0e8 100644 --- a/libsrc/util/regerror.c +++ b/libsrc/util/regerror.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/regexp.h b/libsrc/util/regexp.h index 0ff550d30e..2509cc7dec 100644 --- a/libsrc/util/regexp.h +++ b/libsrc/util/regexp.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/regmagic.h b/libsrc/util/regmagic.h index db0cf7208f..833589702a 100644 --- a/libsrc/util/regmagic.h +++ b/libsrc/util/regmagic.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/rtrim.c b/libsrc/util/rtrim.c index 73122fa523..6f2da45114 100644 --- a/libsrc/util/rtrim.c +++ b/libsrc/util/rtrim.c @@ -14,7 +14,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/setext.c b/libsrc/util/setext.c index 26bc86807c..c97a0438fd 100644 --- a/libsrc/util/setext.c +++ b/libsrc/util/setext.c @@ -16,7 +16,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/setext.h b/libsrc/util/setext.h index d9d441e528..75a5bda807 100644 --- a/libsrc/util/setext.h +++ b/libsrc/util/setext.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/sslengine.c b/libsrc/util/sslengine.c index 09d4d01796..a5ceda17e5 100644 --- a/libsrc/util/sslengine.c +++ b/libsrc/util/sslengine.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/sslengine.h b/libsrc/util/sslengine.h index 289370178e..6f1e9ef7b8 100644 --- a/libsrc/util/sslengine.h +++ b/libsrc/util/sslengine.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/startup.c b/libsrc/util/startup.c index 41393b1753..eb4ee2e7c6 100644 --- a/libsrc/util/startup.c +++ b/libsrc/util/startup.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/startup.h b/libsrc/util/startup.h index 4c51de40e8..e6b525e13e 100644 --- a/libsrc/util/startup.h +++ b/libsrc/util/startup.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -69,7 +69,7 @@ GLOBALREF struct pgm_info program_info; BEGIN_CPLUSPLUS -void terminate (int); +void terminate_program (int); void expand_argv (int *, char ***, int); void initialize_program (int *, char ***); void default_usage (void); diff --git a/libsrc/util/stpcpy.c b/libsrc/util/stpcpy.c index 66320d6f0e..99b507ccfb 100644 --- a/libsrc/util/stpcpy.c +++ b/libsrc/util/stpcpy.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/strcpyin.c b/libsrc/util/strcpyin.c index c0e40c41f2..bfdf36e0af 100644 --- a/libsrc/util/strcpyin.c +++ b/libsrc/util/strcpyin.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/strerror.c b/libsrc/util/strerror.c index 8b21ac781f..91ea237e05 100644 --- a/libsrc/util/strerror.c +++ b/libsrc/util/strerror.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/strfuns.h b/libsrc/util/strfuns.h index ab054c8596..695dfab71f 100644 --- a/libsrc/util/strfuns.h +++ b/libsrc/util/strfuns.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/stricmp.c b/libsrc/util/stricmp.c index 1e79e8d350..7db90b23c1 100644 --- a/libsrc/util/stricmp.c +++ b/libsrc/util/stricmp.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/strindex.c b/libsrc/util/strindex.c index ba2be20730..0afa6d69f0 100644 --- a/libsrc/util/strindex.c +++ b/libsrc/util/strindex.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/strinsrt.c b/libsrc/util/strinsrt.c index 9c030806fa..bc07e08129 100644 --- a/libsrc/util/strinsrt.c +++ b/libsrc/util/strinsrt.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/strlwr.c b/libsrc/util/strlwr.c index e07bf01d29..35a048efbb 100644 --- a/libsrc/util/strlwr.c +++ b/libsrc/util/strlwr.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/strnicmp.c b/libsrc/util/strnicmp.c index 6a04b89193..84d396f336 100644 --- a/libsrc/util/strnicmp.c +++ b/libsrc/util/strnicmp.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/strquote.c b/libsrc/util/strquote.c index 54db9426b3..f19a0783d1 100644 --- a/libsrc/util/strquote.c +++ b/libsrc/util/strquote.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/strupr.c b/libsrc/util/strupr.c index 9583bbf73f..9ad68f9774 100644 --- a/libsrc/util/strupr.c +++ b/libsrc/util/strupr.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/strxpect.c b/libsrc/util/strxpect.c index 8961a1019e..eaa863c6b2 100644 --- a/libsrc/util/strxpect.c +++ b/libsrc/util/strxpect.c @@ -20,7 +20,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/terminat.c b/libsrc/util/terminat.c index 79a7ffb471..9524881251 100644 --- a/libsrc/util/terminat.c +++ b/libsrc/util/terminat.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -31,7 +31,7 @@ void -terminate (int n) +terminate_program (int n) { #ifdef WIN32 EndNTApplication (); diff --git a/libsrc/util/usage.c b/libsrc/util/usage.c index 3990a746c9..7381d0a00b 100644 --- a/libsrc/util/usage.c +++ b/libsrc/util/usage.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/utalloc.h b/libsrc/util/utalloc.h index e9dfedba37..a2bbe229f9 100644 --- a/libsrc/util/utalloc.h +++ b/libsrc/util/utalloc.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/utf8funs.h b/libsrc/util/utf8funs.h index 1ed10a494a..0ac0f307d0 100644 --- a/libsrc/util/utf8funs.h +++ b/libsrc/util/utf8funs.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/virt_mbrlen.c b/libsrc/util/virt_mbrlen.c index 7fe16807bf..b32fe78973 100644 --- a/libsrc/util/virt_mbrlen.c +++ b/libsrc/util/virt_mbrlen.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/virt_mbrlen_z.c b/libsrc/util/virt_mbrlen_z.c index 0e3ca7aa52..478e526d37 100644 --- a/libsrc/util/virt_mbrlen_z.c +++ b/libsrc/util/virt_mbrlen_z.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/virt_mbrtowc.c b/libsrc/util/virt_mbrtowc.c index 897bcbb387..1c6a00f214 100644 --- a/libsrc/util/virt_mbrtowc.c +++ b/libsrc/util/virt_mbrtowc.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/virt_mbrtowc_z.c b/libsrc/util/virt_mbrtowc_z.c index 34f6e34826..2137cf80e7 100644 --- a/libsrc/util/virt_mbrtowc_z.c +++ b/libsrc/util/virt_mbrtowc_z.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/virt_mbsnrtowcs.c b/libsrc/util/virt_mbsnrtowcs.c index da2ce74e9d..549f51668b 100644 --- a/libsrc/util/virt_mbsnrtowcs.c +++ b/libsrc/util/virt_mbsnrtowcs.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/virt_wcrtomb.c b/libsrc/util/virt_wcrtomb.c index 10ad6cb8ba..b2793703ca 100644 --- a/libsrc/util/virt_wcrtomb.c +++ b/libsrc/util/virt_wcrtomb.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/virt_wcs_mask.c b/libsrc/util/virt_wcs_mask.c index 16c0beb422..4c954ac938 100644 --- a/libsrc/util/virt_wcs_mask.c +++ b/libsrc/util/virt_wcs_mask.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/virt_wcsnrtombs.c b/libsrc/util/virt_wcsnrtombs.c index 71b4f9ea8c..5cc869dac6 100644 --- a/libsrc/util/virt_wcsnrtombs.c +++ b/libsrc/util/virt_wcsnrtombs.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/wcslen.c b/libsrc/util/wcslen.c index 4265b50727..bd187bf23c 100644 --- a/libsrc/util/wcslen.c +++ b/libsrc/util/wcslen.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/win32/ptrlong.h b/libsrc/util/win32/ptrlong.h index e8211d9a0a..45899b434c 100644 --- a/libsrc/util/win32/ptrlong.h +++ b/libsrc/util/win32/ptrlong.h @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/win32/syslog.c b/libsrc/util/win32/syslog.c index 99df6fea3b..dbe66d7e6f 100644 --- a/libsrc/util/win32/syslog.c +++ b/libsrc/util/win32/syslog.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/util/win32/syslog.h b/libsrc/util/win32/syslog.h index 73406262d0..4364517718 100644 --- a/libsrc/util/win32/syslog.h +++ b/libsrc/util/win32/syslog.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/zlib/Makefile.am b/libsrc/zlib/Makefile.am index 19f2448bd3..c8e43b8ccd 100644 --- a/libsrc/zlib/Makefile.am +++ b/libsrc/zlib/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/windows/blobs.vcxproj b/windows/blobs.vcxproj index 8253b8d12b..02157ff591 100644 --- a/windows/blobs.vcxproj +++ b/windows/blobs.vcxproj @@ -13,6 +13,7 @@ {72ABF3AE-CF7A-11DA-85E2-A4E5714C712A} blobs + 8.1 @@ -33,10 +34,12 @@ + + x86 diff --git a/windows/burstoff.vcxproj b/windows/burstoff.vcxproj index f986f1992f..a7801af65d 100644 --- a/windows/burstoff.vcxproj +++ b/windows/burstoff.vcxproj @@ -13,6 +13,7 @@ {7B2A50F2-CF7A-11DA-85E2-A4E5714C712A} burstoff + 8.1 diff --git a/windows/creolewiki.vcxproj b/windows/creolewiki.vcxproj index ebae703f4a..9ab4a3525e 100644 --- a/windows/creolewiki.vcxproj +++ b/windows/creolewiki.vcxproj @@ -13,6 +13,7 @@ {ABE43C46-E1C4-11DB-930B-CD6B662399AA} creolewiki + 8.1 @@ -51,6 +52,9 @@ false false + + $(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);c:\cygwin64\bin + %(PreprocessorDefinitions) diff --git a/windows/cursor.vcxproj b/windows/cursor.vcxproj index e70e53100a..8991d88061 100644 --- a/windows/cursor.vcxproj +++ b/windows/cursor.vcxproj @@ -13,6 +13,7 @@ {97D467CE-CF7A-11DA-85E2-A4E5714C712A} cursor + 8.1 diff --git a/windows/cutter.vcxproj b/windows/cutter.vcxproj index 263e180aca..d056a55779 100644 --- a/windows/cutter.vcxproj +++ b/windows/cutter.vcxproj @@ -13,6 +13,7 @@ {6E10B655-C324-491F-B202-73565D6B30FB} cutter + 8.1 diff --git a/windows/dk1t.vcxproj b/windows/dk1t.vcxproj index a0dae8a70a..e78bbbc083 100644 --- a/windows/dk1t.vcxproj +++ b/windows/dk1t.vcxproj @@ -13,6 +13,7 @@ {58F7DCEF-D5DE-402D-8F50-39B67C8B9E9E} dk1t + 8.1 diff --git a/windows/dksrv.vcxproj b/windows/dksrv.vcxproj index fb14d75798..a3598058dd 100644 --- a/windows/dksrv.vcxproj +++ b/windows/dksrv.vcxproj @@ -13,6 +13,7 @@ {58867EBA-CA07-4F41-A966-6245FF14773E} dksrv + 8.1 diff --git a/windows/getdata.vcxproj b/windows/getdata.vcxproj index 91abc426a7..51ff6a266a 100644 --- a/windows/getdata.vcxproj +++ b/windows/getdata.vcxproj @@ -13,6 +13,7 @@ {AFB15514-CF7A-11DA-85E2-A4E5714C712A} getdata + 8.1 diff --git a/windows/hosting_perl.vcxproj b/windows/hosting_perl.vcxproj index 78e66022ca..b486ec0ec5 100644 --- a/windows/hosting_perl.vcxproj +++ b/windows/hosting_perl.vcxproj @@ -13,6 +13,7 @@ {354809B6-CF7B-11DA-85E2-A4E5714C712A} hosting_perl + 8.1 diff --git a/windows/hosting_php.vcxproj b/windows/hosting_php.vcxproj index 9e60c6bbef..c57ce5513f 100644 --- a/windows/hosting_php.vcxproj +++ b/windows/hosting_php.vcxproj @@ -13,6 +13,7 @@ {9D059C10-A1AE-11DC-AE66-B7BFA9FB648A} hosting_php + 8.1 @@ -61,7 +62,7 @@ MaxSpeed - ..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\SDK\$(ShortPlatform)\php56\include\;..\SDK\$(ShortPlatform)\php56\include\main;..\SDK\$(ShortPlatform)\php56\include\Zend;..\SDK\$(ShortPlatform)\php56\include\ext;..\SDK\$(ShortPlatform)\php56\include\regex;..\SDK\$(ShortPlatform)\php56\include\TSRM;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories) + ..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\plugin;..\libsrc\langfunc;..\SDK\$(ShortPlatform)\php56\include;..\SDK\$(ShortPlatform)\php56\include\main;..\SDK\$(ShortPlatform)\php56\include\Zend;..\SDK\$(ShortPlatform)\php56\include\ext;..\SDK\$(ShortPlatform)\php56\include\regex;..\SDK\$(ShortPlatform)\php56\include\TSRM;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories) INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;_CONSOLE;YYTOKENTYPE;_PHP;_PHP_WIN32;_ZEND_CONFIG_W32_H;PHP_WIN32;ZTS;ZEND_DEBUG=0;MSVC5;ZEND_WIN32;_WIN32_WINNT=0x500;%(PreprocessorDefinitions) false @@ -86,7 +87,7 @@ ..\libsrc\Wi;%(AdditionalIncludeDirectories) - dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;php5ts.lib;%(AdditionalDependencies) + dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;..\SDK\$(PlatformShortName)\php56\lib\php5ts.lib;%(AdditionalDependencies) $(OutDir)hosting_php.dll true $(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;../SDK/$(ShortPlatform)/php56/lib;%(AdditionalLibraryDirectories) diff --git a/windows/hosting_python.vcxproj b/windows/hosting_python.vcxproj index 41578cef62..97f3cb5401 100644 --- a/windows/hosting_python.vcxproj +++ b/windows/hosting_python.vcxproj @@ -13,6 +13,7 @@ {B525A234-CF7A-11DA-85E2-A4E5714C712A} hosting_python + 8.1 diff --git a/windows/im.vcxproj b/windows/im.vcxproj index 5160234e6d..9e2bee2b47 100644 --- a/windows/im.vcxproj +++ b/windows/im.vcxproj @@ -13,6 +13,7 @@ {C152ADCC-CF7A-11DA-85E2-A4E5714C712A} im + 8.1 @@ -86,7 +87,7 @@ ..\libsrc\Wi;%(AdditionalIncludeDirectories) - dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;CORE_RL_wand_.lib;CORE_RL_coders_.lib;CORE_RL_magick_.lib;CORE_RL_magick++_.lib;CORE_RL_ttf_.lib;CORE_RL_bzlib_.lib;CORE_RL_zlib_.lib;CORE_RL_lcms_.lib;CORE_RL_tiff_.lib;CORE_RL_filters_.lib;CORE_RL_jpeg_.lib;CORE_RL_jbig_.lib;CORE_RL_jp2_.lib;CORE_RL_png_.lib;CORE_RL_libxml_.lib;CORE_RL_lqr_.lib;CORE_RL_webp_.lib;CORE_RL_cairo_.lib;CORE_RL_pixman_.lib;CORE_RL_librsvg_.lib;CORE_RL_glib_.lib;CORE_RL_pango_.lib;CORE_RL_croco_.lib;CORE_RL_openjpeg_.lib;CORE_RL_exr_.lib;CORE_RL_libraw_.lib;CORE_RL_ffi_.lib;%(AdditionalDependencies) + dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;CORE_RL_bzlib_.lib;CORE_RL_cairo_.lib;CORE_RL_coders_.lib;CORE_RL_croco_.lib;CORE_RL_exr_.lib;CORE_RL_ffi_.lib;CORE_RL_filters_.lib;CORE_RL_glib_.lib;CORE_RL_jbig_.lib;CORE_RL_jp2_.lib;CORE_RL_jpeg_.lib;CORE_RL_lcms_.lib;CORE_RL_libraw_.lib;CORE_RL_librsvg_.lib;CORE_RL_libxml_.lib;CORE_RL_lqr_.lib;CORE_RL_magick_.lib;CORE_RL_Magick++_.lib;CORE_RL_openjpeg_.lib;CORE_RL_pango_.lib;CORE_RL_pixman_.lib;CORE_RL_png_.lib;CORE_RL_tiff_.lib;CORE_RL_ttf_.lib;CORE_RL_wand_.lib;CORE_RL_webp_.lib;CORE_RL_zlib_.lib;%(AdditionalDependencies) $(OutDir)im.dll true $(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;../SDK/$(ShortPlatform)/ImageMagick;%(AdditionalLibraryDirectories) @@ -168,4 +169,4 @@ - \ No newline at end of file + diff --git a/windows/ins.vcxproj b/windows/ins.vcxproj index 47283f830a..8acaa04b3c 100644 --- a/windows/ins.vcxproj +++ b/windows/ins.vcxproj @@ -13,6 +13,7 @@ {C6C66924-CF7A-11DA-85E2-A4E5714C712A} ins + 8.1 diff --git a/windows/isql.vcxproj b/windows/isql.vcxproj index 04184dad11..35849fd8cb 100644 --- a/windows/isql.vcxproj +++ b/windows/isql.vcxproj @@ -14,6 +14,7 @@ isqlo {9FF2579E-CF7B-11DA-85E2-A4E5714C712A} isqlo + 8.1 diff --git a/windows/isql_native.vcxproj b/windows/isql_native.vcxproj index 617b66aa46..280dbf7bc0 100644 --- a/windows/isql_native.vcxproj +++ b/windows/isql_native.vcxproj @@ -14,6 +14,7 @@ isql {AFB1D909-86D0-49DE-8BD8-DF89349F934E} isql + 8.1 diff --git a/windows/libvirtuoso_odbc_t.vcxproj b/windows/libvirtuoso_odbc_t.vcxproj index fe51e1d31c..094cd2d303 100644 --- a/windows/libvirtuoso_odbc_t.vcxproj +++ b/windows/libvirtuoso_odbc_t.vcxproj @@ -15,6 +15,7 @@ {FB836C59-41E1-48EA-A59B-460AB56587EE} libvirtuoso_t Win32Proj + 8.1 diff --git a/windows/maildrop.vcxproj b/windows/maildrop.vcxproj index 460efef6df..3a2178db06 100644 --- a/windows/maildrop.vcxproj +++ b/windows/maildrop.vcxproj @@ -13,6 +13,7 @@ {C5F98602-E5B9-11DA-85E2-A4E5714C712A} maildrop + 8.1 diff --git a/windows/mediawiki.vcxproj b/windows/mediawiki.vcxproj index 6cbeed0bfe..25db0799ab 100644 --- a/windows/mediawiki.vcxproj +++ b/windows/mediawiki.vcxproj @@ -13,6 +13,7 @@ {408E2482-2623-11DB-9BB9-97600548391D} mediawiki + 8.1 @@ -51,6 +52,9 @@ false false + + $(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);c:\cygwin64\bin + %(PreprocessorDefinitions) diff --git a/windows/odbcmail.vcxproj b/windows/odbcmail.vcxproj index 108448aa3f..45e8670519 100644 --- a/windows/odbcmail.vcxproj +++ b/windows/odbcmail.vcxproj @@ -14,6 +14,7 @@ virtmail {4C517D78-E5B9-11DA-85E2-A4E5714C712A} odbcmail + 8.1 diff --git a/windows/scroll.vcxproj b/windows/scroll.vcxproj index f3954489f3..eeac1938c2 100644 --- a/windows/scroll.vcxproj +++ b/windows/scroll.vcxproj @@ -13,6 +13,7 @@ {C9EC4A56-CF7A-11DA-85E2-A4E5714C712A} scroll + 8.1 diff --git a/windows/setcurs.vcxproj b/windows/setcurs.vcxproj index f80e360fef..0ae81295cc 100644 --- a/windows/setcurs.vcxproj +++ b/windows/setcurs.vcxproj @@ -13,6 +13,7 @@ {DCA407C4-CF7A-11DA-85E2-A4E5714C712A} setcurs + 8.1 diff --git a/windows/sqlcode.bat b/windows/sqlcode.bat index 50917d112c..03226ea684 100644 --- a/windows/sqlcode.bat +++ b/windows/sqlcode.bat @@ -2,7 +2,7 @@ set SQL_FILES=sys_unicode3_collations.sql system.sql system2.sql odbccat.sql use set SQL_FILES_1=oledb.sql information_schema.sql set SQL_FILES_WS=../../binsrc/vsp/vsp_auth.sql soap.sql wsrp_ultim.xsl wsrp_resp.xsl wsrp_interm.xsl wsrp_error.xsl soap_sch.xsl soap_import_sch.xsl wsdl_expand.xsl wsdl_parts.xsl wsdl_import.xsl wsdl2rdf.xsl xmlrpc_soap.xsl soap_xmlrpc.xsl soap12_router.xsl ../../binsrc/ws/wsrm/wsrm_ddl.sql ../../binsrc/ws/wsrm/wsrm_xsd.sql ../../binsrc/ws/wsrm/wsrmcli.sql ../../binsrc/ws/wsrm/wsrmsrv.sql ../../binsrc/ws/wstr/wstr_ddl.sql ../../binsrc/ws/wstr/wstrcli.sql ../../binsrc/ws/wstr/wstrsrv.sql ../../binsrc/ws/wsrm/wsrmcall.xsl rdf_net.sql simile.sql http_auth.sql xmla.sql openxml.sql ../../binsrc/vspx/vspx.sql ../../binsrc/vspx/vspx_add_locations.xsl ../../binsrc/vspx/vspx_expand.xsl ../../binsrc/vspx/vspx_pre_xsd.xsl ../../binsrc/vspx/vspx_pre_sql.xsl ../../binsrc/vspx/vspx_log_format.xsl ../../binsrc/vspx/vspx.xsd ../../binsrc/vspx/vspx.xsl set SQL_FILES_REPL=snapshot_repl.sql repl.sql -set SQL_FILES_DAV=../../binsrc/dav/dav.sql ../../binsrc/dav/dav_api.sql ../../binsrc/dav/dav_meta.sql ../../binsrc/dav/dav_acct.sql ../../binsrc/dav/dav_rdf_quad.sql ../../binsrc/vsp/admin/admin_dav/vfs.sql ../../binsrc/dav/davxml2rdfxml.xsl ../../binsrc/dav/davxml2n3xml.xsl ../../binsrc/dav/rdfxml2n3xml.xsl ../../binsrc/dav/n3xml2uriqahtml.xsl ../../binsrc/dav/uriqa.sql ../../binsrc/dav/dav_det.sql ../../binsrc/dav/DET_CatFilter.sql ../../binsrc/dav/DET_HostFs.sql ../../binsrc/dav/DET_ResFilter.sql ../../binsrc/dav/DET_PropFilter.sql ../../binsrc/dav/DET_RDFData.sql ../../binsrc/dav/DET_DynaRes.sql ../../binsrc/dav/Versioning/DET_Versioning.sql xml_view.sql +set SQL_FILES_DAV=../../binsrc/dav/dav.sql ../../binsrc/dav/dav_api.sql ../../binsrc/dav/dav_det.sql ../../binsrc/dav/dav_meta.sql ../../binsrc/dav/dav_acct.sql ../../binsrc/dav/dav_rdf_quad.sql ../../binsrc/vsp/admin/admin_dav/vfs.sql ../../binsrc/dav/davxml2rdfxml.xsl ../../binsrc/dav/davxml2n3xml.xsl ../../binsrc/dav/rdfxml2n3xml.xsl ../../binsrc/dav/n3xml2uriqahtml.xsl ../../binsrc/dav/uriqa.sql ../../binsrc/dav/DET_CatFilter.sql ../../binsrc/dav/DET_HostFs.sql ../../binsrc/dav/DET_ResFilter.sql ../../binsrc/dav/DET_PropFilter.sql ../../binsrc/dav/DET_RDFData.sql ../../binsrc/dav/Versioning/DET_Versioning.sql xml_view.sql set SQL_FILES_DDK=replddk.sql ../../binsrc/dav/davddk.sql mail_cli.sql ../../binsrc/vsp/admin/admin_ddl.sql ../../binsrc/vsp/admin/admin_dav/vfsddk.sql virtual_dir.sql url_rewrite.sql set SQL_FILES_SYS=users.sql qlog.sql set SQL_FILES_UDDI=uddi.sql diff --git a/windows/threads.vcxproj b/windows/threads.vcxproj index a008c40c0c..33b659845a 100644 --- a/windows/threads.vcxproj +++ b/windows/threads.vcxproj @@ -13,6 +13,7 @@ {B619BB2C-A9AC-453D-BA98-3A8F3217B1AB} threads + 8.1 diff --git a/windows/threadw.vcxproj b/windows/threadw.vcxproj index be3368de49..2d6ef0ebbe 100644 --- a/windows/threadw.vcxproj +++ b/windows/threadw.vcxproj @@ -13,6 +13,7 @@ {D3A2882C-410A-4F58-8ACE-A771888073E8} threadw + 8.1 diff --git a/windows/tidy.vcxproj b/windows/tidy.vcxproj index 6bc7c64663..691a57f7ad 100644 --- a/windows/tidy.vcxproj +++ b/windows/tidy.vcxproj @@ -13,6 +13,7 @@ {D9E130E1-7734-43DF-A7EF-15CD95E467EE} tidy + 8.1 @@ -56,7 +57,7 @@ Full false ..\libsrc\Dk;..\libsrc;..\libsrc\util;..\libsrc\util\win32;%(AdditionalIncludeDirectories) - _SSL;_LIBC;IN_LIBUTIL;_GNU_SOURCE;__WITH_LIBDK;BIF_TIDY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions) + _SSL;_LIBC;IN_LIBUTIL;__WITH_LIBDK;_GNU_SOURCE;BIF_TIDY;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;%(PreprocessorDefinitions) false diff --git a/windows/tpcc.vcxproj b/windows/tpcc.vcxproj index 0f49068ff0..cc63fb72e2 100644 --- a/windows/tpcc.vcxproj +++ b/windows/tpcc.vcxproj @@ -13,6 +13,7 @@ {E5D3D9AA-CF7A-11DA-85E2-A4E5714C712A} tpcc + 8.1 diff --git a/windows/urlsimu.vcxproj b/windows/urlsimu.vcxproj index 4f52387ebb..9d7c2afc0d 100644 --- a/windows/urlsimu.vcxproj +++ b/windows/urlsimu.vcxproj @@ -13,6 +13,7 @@ {EF98F42A-CF7A-11DA-85E2-A4E5714C712A} urlsimu + 8.1 diff --git a/windows/util.vcxproj b/windows/util.vcxproj index 03b0441e01..cc9a4987d1 100644 --- a/windows/util.vcxproj +++ b/windows/util.vcxproj @@ -13,6 +13,7 @@ {031DB868-5294-4738-90BA-F80BB2CEA9DC} util + 8.1 @@ -49,6 +50,9 @@ $(ShortPlatform)\$(Configuration)\$(ProjectName)\ $(ShortPlatform)\$(Configuration)\$(ProjectName)\ + + $(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);c:\cygwin64\bin;$(PATH) + X64 @@ -58,7 +62,7 @@ Full false ..\libsrc\Xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\langfunc;..\libsrc\plugin;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories) - DLDAPI_WINDOWS;_SSL;YYTOKENTYPE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;IN_LIBUTIL;_LIBC;_GNU_SOURCE;SUPPORT_UTF8;GLOBALREF=extern;__WITH_LIBDK;PCRE_STATIC;%(PreprocessorDefinitions) + DLDAPI_WINDOWS;_SSL;YYTOKENTYPE;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;NDEBUG;IN_LIBUTIL;_LIBC;_GNU_SOURCE;SUPPORT_UTF8;GLOBALREF=extern;__WITH_LIBDK;PCRE_STATIC;WIN32_LEAN_AND_MEAN;%(PreprocessorDefinitions) false @@ -250,7 +254,6 @@ cd $(ProjectDir) %(RootDir)%(Directory)\export_gate_virtuoso.c;%(Outputs) cd %(RootDir)%(Directory) -set PATH=/usr/bin:%PATH% bash gen_all_gates.sh cd $(ProjectDir) diff --git a/windows/virtodbc.vcxproj b/windows/virtodbc.vcxproj index 7b02ef3d3b..86478223e4 100644 --- a/windows/virtodbc.vcxproj +++ b/windows/virtodbc.vcxproj @@ -13,6 +13,7 @@ {3D1A94CE-CF7B-11DA-85E2-A4E5714C712A} virtodbc + 8.1 @@ -87,7 +88,7 @@ /MACHINE:AMD64 %(AdditionalOptions) - dk1t.lib;threadw.lib;util.lib;legacy_stdio_definitions.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) + dk1t.lib;threadw.lib;util.lib;odbc32.lib;odbccp32.lib;ws2_32.lib;libeay32.lib;ssleay32.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies) $(OutDir)virtodbc.dll true $(ShortPlatform)/$(Configuration)/;../SDK/$(ShortPlatform)/sslsdk/out32dll;%(AdditionalLibraryDirectories) @@ -210,4 +211,4 @@ - \ No newline at end of file + diff --git a/windows/virtoledb.vcxproj b/windows/virtoledb.vcxproj index bac32ab421..624865d204 100644 --- a/windows/virtoledb.vcxproj +++ b/windows/virtoledb.vcxproj @@ -12,6 +12,7 @@ {F357CF96-CF7A-11DA-85E2-A4E5714C712A} + 8.1 @@ -50,6 +51,9 @@ false false + + $(ExecutablePath);c:\cygwin64\bin; + %(PreprocessorDefinitions) diff --git a/windows/virtuoso-opensource.sln b/windows/virtuoso-opensource.sln index 50788452c5..9452ee81b4 100644 --- a/windows/virtuoso-opensource.sln +++ b/windows/virtuoso-opensource.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26430.16 +VisualStudioVersion = 15.0.27703.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blobs", "blobs.vcxproj", "{72ABF3AE-CF7A-11DA-85E2-A4E5714C712A}" EndProject @@ -384,7 +384,6 @@ Global {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|Win32.ActiveCfg = Release|Win32 {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|Win32.Build.0 = Release|Win32 {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|x64.ActiveCfg = Release|x64 - {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|x64.Build.0 = Release|x64 {8D07389F-F48A-49B9-BED9-F71FCBACC4A8}.Release|x86.ActiveCfg = Release|x64 {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64 {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64 @@ -394,7 +393,6 @@ Global {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|Any CPU.ActiveCfg = Release|x64 {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|Win32.ActiveCfg = Release|Win32 {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.ActiveCfg = Release|x64 - {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|x64.Build.0 = Release|x64 {02AD88A0-CF7B-11DA-85E2-A4E5714C712A}.Release|x86.ActiveCfg = Release|x64 {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|Any CPU.ActiveCfg = Release|x64 {0E838FA8-CF7B-11DA-85E2-A4E5714C712A}.Debug|Win32.ActiveCfg = Release|x64 @@ -554,6 +552,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {B157B88D-A07E-4CEB-81E2-EC5F3EFC4E1D} + SolutionGuid = {2864A46E-F5DE-417C-8C5F-FDC186C9D4C7} EndGlobalSection EndGlobal diff --git a/windows/virtuoso_odbc_clr_t.vcxproj b/windows/virtuoso_odbc_clr_t.vcxproj index 1b85bb6749..8e8dd1da36 100644 --- a/windows/virtuoso_odbc_clr_t.vcxproj +++ b/windows/virtuoso_odbc_clr_t.vcxproj @@ -15,6 +15,7 @@ {8D07389F-F48A-49B9-BED9-F71FCBACC4A8} virtuoso_clr_t Win32Proj + 8.1 diff --git a/windows/virtuoso_odbc_javavm_t.vcxproj b/windows/virtuoso_odbc_javavm_t.vcxproj index 905f657d37..422aba0115 100644 --- a/windows/virtuoso_odbc_javavm_t.vcxproj +++ b/windows/virtuoso_odbc_javavm_t.vcxproj @@ -15,6 +15,7 @@ {02AD88A0-CF7B-11DA-85E2-A4E5714C712A} virtuoso_javavm_t Win32Proj + 8.1 diff --git a/windows/virtuoso_odbc_sample_t.vcxproj b/windows/virtuoso_odbc_sample_t.vcxproj index 742f9b227d..45864c8628 100644 --- a/windows/virtuoso_odbc_sample_t.vcxproj +++ b/windows/virtuoso_odbc_sample_t.vcxproj @@ -15,6 +15,7 @@ {0E838FA8-CF7B-11DA-85E2-A4E5714C712A} virtuoso_sample_t Win32Proj + 8.1 diff --git a/windows/virtuoso_odbc_t.vcxproj b/windows/virtuoso_odbc_t.vcxproj index 016daf6aa1..28fb8f008f 100644 --- a/windows/virtuoso_odbc_t.vcxproj +++ b/windows/virtuoso_odbc_t.vcxproj @@ -14,6 +14,7 @@ virtuoso-t {F4E88BFA-FC96-439D-9E67-0A92AB541EE0} virtuoso_t + 8.1 diff --git a/windows/wbxml2.vcxproj b/windows/wbxml2.vcxproj index a7a740a5e7..07ac42fbe7 100644 --- a/windows/wbxml2.vcxproj +++ b/windows/wbxml2.vcxproj @@ -13,6 +13,7 @@ {5582D8D0-DB93-11DB-930B-CD6B662399AA} wbxml2 + 8.1 @@ -62,7 +63,7 @@ MaxSpeed ..\binsrc\driver;..\libsrc\Wi;..\libsrc\langfunc;..\libsrc\Xml.new;..\libsrc\plugin;..\libsrc\Dk;..\binsrc\driver\include;..\libsrc\util\win32;..\libsrc;..\SDK\$(ShortPlatform)\sslsdk\inc32;..\SDK\$(ShortPlatform)\wbxml2;..\SDK\$(ShortPlatform)\wbxml2\expat;%(AdditionalIncludeDirectories) - _SSL;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;LIBWBXML2_EXPORTS;WBXML_LIB_VERBOSE;WBXML_SUPPORT_WML;WBXML_SUPPORT_WTA;WBXML_SUPPORT_SI;WBXML_SUPPORT_SL;WBXML_SUPPORT_CO;WBXML_SUPPORT_PROV;WBXML_SUPPORT_EMN;WBXML_SUPPORT_DRMREL;WBXML_SUPPORT_OTA_SETTINGS;WBXML_SUPPORT_SYNCML;WBXML_SUPPORT_WV;WBXML_ENCODER_USE_STRTBL;WBXML_WRAPPERS;%(PreprocessorDefinitions) + _SSL;INPROCESS_CLIENT;_MBCS;WIN32;_WIN32;WINDOWS;_Windows;YYTOKENTYPE;DLDAPI_WINDOWS;NO_IMPORT;VIRTTP;NDEBUG;_USRDLL;LIBWBXML2_EXPORTS;WBXML_LIB_VERBOSE;WBXML_SUPPORT_WML;WBXML_SUPPORT_WTA;WBXML_SUPPORT_SI;WBXML_SUPPORT_SL;WBXML_SUPPORT_CO;WBXML_SUPPORT_PROV;WBXML_SUPPORT_EMN;WBXML_SUPPORT_DRMREL;WBXML_SUPPORT_OTA_SETTINGS;WBXML_SUPPORT_SYNCML;WBXML_SUPPORT_WV;WBXML_ENCODER_USE_STRTBL;WBXML_WRAPPERS;%(PreprocessorDefinitions) false diff --git a/windows/wi.vcxproj b/windows/wi.vcxproj index 499f3d64b2..656ffbd797 100644 --- a/windows/wi.vcxproj +++ b/windows/wi.vcxproj @@ -13,6 +13,7 @@ {93051962-7797-49F0-8958-BB1CE60FFE6F} wi + 8.1 @@ -48,7 +49,7 @@ $(ShortPlatform)\$(Configuration)\ $(ShortPlatform)\$(Configuration)\$(ProjectName)\ $(ShortPlatform)\$(Configuration)\$(ProjectName)\ - C:\cygwin\bin;$(ExecutablePath) + $(ExecutablePath);C:\cygwin64\bin; @@ -190,7 +191,6 @@ - diff --git a/windows/wic.vcxproj b/windows/wic.vcxproj index 23cbe5a1e5..2e5752017e 100644 --- a/windows/wic.vcxproj +++ b/windows/wic.vcxproj @@ -13,6 +13,7 @@ {A66E395B-18EE-4877-8F0D-386A7BBAB370} wic + 8.1 @@ -49,6 +50,9 @@ $(ShortPlatform)\$(Configuration)\$(ProjectName)\ $(ShortPlatform)\$(Configuration)\$(ProjectName)\ + + $(ExecutablePath);C:\cygwin64\bin; + X64 @@ -56,7 +60,7 @@ Full ..\libsrc\xml.new;..\libsrc;..\libsrc\Dk;..\libsrc\util\win32;..\libsrc\Wi;..\libsrc\zlib;..\binsrc\driver;..\libsrc\langfunc;..\libsrc\plugin;..\SDK\$(ShortPlatform)\sslsdk\inc32;%(AdditionalIncludeDirectories) - _SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;DLDAPI_WINDOWS;NO_IMPORT;PLDBG;YYTOKENTYPE;NDEBUG;%(PreprocessorDefinitions) + _SSL;_LIBC;INPROCESS_CLIENT;_MBCS;WIN32;WINDOWS;_Windows;DLDAPI_WINDOWS;NO_IMPORT;PLDBG;YYTOKENTYPE;NDEBUG;_WIN32;%(PreprocessorDefinitions) false diff --git a/windows/wikiv.vcxproj b/windows/wikiv.vcxproj index 6ec4fe75cb..0da37d8021 100644 --- a/windows/wikiv.vcxproj +++ b/windows/wikiv.vcxproj @@ -13,6 +13,7 @@ {A326A0DF-4F93-4DF6-813D-0B64F98B389F} wikiv + 8.1 @@ -51,6 +52,9 @@ false false + + $(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);c:\cygwin64\bin + %(PreprocessorDefinitions) diff --git a/windows/xml.vcxproj b/windows/xml.vcxproj index a873f84d26..3d65f9439c 100644 --- a/windows/xml.vcxproj +++ b/windows/xml.vcxproj @@ -13,6 +13,7 @@ {0C234EF0-7725-4BDA-A1C3-47F5835A3837} xml + 8.1 @@ -49,6 +50,9 @@ $(ShortPlatform)\$(Configuration)\$(ProjectName)\ $(ShortPlatform)\$(Configuration)\$(ProjectName)\ + + $(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);c:\cygwin64\bin; + X64 diff --git a/windows/zlib.vcxproj b/windows/zlib.vcxproj index 3c1dd075b0..79f2cc6407 100644 --- a/windows/zlib.vcxproj +++ b/windows/zlib.vcxproj @@ -13,6 +13,7 @@ {86645C8E-3BBE-4E1E-A8AE-C6990B4ECC64} zlib + 8.1
    - - - - -
    - - - - - - - - -
    - - - - - - - Resource Types - - - - - -
    -
    -
    - - - - -
    - - - -
    - - - - - - - - - - - - - - - - -
    File Extension - - - - - - - -
    MIME Type - - - - - - - -
    Description - - - - - -
    - - - - - - 'edit') - { - ?> - - - - - '') - { - goto endp; - } - _extension := ''; - _type := ''; - _descr := ''; - _extension := get_keyword('extension', params, ''); - _extension := rtrim(_extension); - _extension := ltrim(_extension); - _type := get_keyword('type', params, ''); - _descr := get_keyword('descr', params, ''); - if (strchr(_extension, '*') is not null) - { - self.vc_error_message := 'Please, enter correct file extenstion (example: txt or doc)'; - self.vc_is_valid := 0; - return; - } - if (_extension is null or _extension = '') - { - self.vc_error_message := 'Please, enter the File Extension'; - self.vc_is_valid := 0; - return; - } - if (_type = '' or _type is null or _type = '*') - { - self.vc_error_message := 'Please, enter correct MIME Type'; - self.vc_is_valid := 0; - return; - } - if (strchr(_extension, '.') = 0) - _extension := right(_extension, length(_extension) - 1); - if (get_keyword('mode', params) = 'create') - { - insert soft WS.WS.SYS_DAV_RES_TYPES (T_EXT, T_TYPE, T_DESCRIPTION) values (_extension, _type, _descr); - } - else if (get_keyword('mode', params) = 'edit') - { - if (exists(select 1 from WS.WS.SYS_DAV_RES_TYPES where T_EXT = _extension)) - { - update WS.WS.SYS_DAV_RES_TYPES set T_TYPE = _type, T_DESCRIPTION = _descr where T_EXT = _extension; - } - else - { - insert soft WS.WS.SYS_DAV_RES_TYPES (T_EXT, T_TYPE, T_DESCRIPTION) values (_extension, _type, _descr); - } - } - endp: - self.vc_redirect ('cont_page.vspx?page=4'); - ]]> - - -
    - '' and self.error_str1 is not null) - http(sprintf('', self.error_str1)); - self.error_str1 := ''; - ?> - - - -
    %s
    -
    -
    - - - diff --git a/binsrc/yacutia/csv_patterns.vspx b/binsrc/yacutia/csv_patterns.vspx deleted file mode 100644 index 1269f9f235..0000000000 --- a/binsrc/yacutia/csv_patterns.vspx +++ /dev/null @@ -1,259 +0,0 @@ - - - - CSV Patterns configuration - - - - - - - - - - - - - - -
    - - - - - -
    - - - - - - - - - - -
    - - - - - Stylesheets - - - - - - - - - - - -
    -
    -
    - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    DescriptionPatternTargetAction
    - - - ' || (control.vc_parent as vspx_row_template).te_rowset[0]; - ]]> - - - - - - - - - - - - - Delete'; - ]]> - - - - - -
    -     - - -
    -
    - - - - (ID: ) - -
    - - -
    - - -
    - - - - - - - - - - if (not self.vc_is_valid) - return; - - declare exit handler for sqlstate '23000' - { - rollback work; - self.vc_is_valid := 0; - self.vc_error_message := 'The values entered conflict with other CSV patters. Please supply correct values.'; - return; - }; - - self.desc1.ufl_value := trim (self.desc1.ufl_value); - self.patt1.ufl_value := trim (self.patt1.ufl_value); - self.tgt1.ufl_value := trim (self.tgt1.ufl_value); - - if (not length (self.desc1.ufl_value) or not length (self.tgt1.ufl_value)) - { - rollback work; - self.vc_is_valid := 0; - self.vc_error_message := 'The description value cannot be empty.'; - return; - } - - if (self.c_mode = 'C/add') - { - insert into DB.DBA.CSV_HEADER_PATTERNS (CSV_DESCRIPTION, CSV_PATTERN, CSV_TARGET, CSV_ID) - values (self.desc1.ufl_value, self.patt1.ufl_value, self.tgt1.ufl_value, sequence_next('DB.DBA.CSV_HEADER_PATTERNS.CSV_ID')); - } - else - { - update DB.DBA.CSV_HEADER_PATTERNS - set CSV_DESCRIPTION = self.desc1.ufl_value, - CSV_PATTERN = self.patt1.ufl_value, - CSV_TARGET = self.tgt1.ufl_value - where CSV_ID = self.c_id; - } - - self.c_mode := 'C/browse'; - self.vc_data_bind (e); - - - -
    -
    -     -     -
    -
    -
    - -
    -     -     -     diff --git a/binsrc/yacutia/databases_udt_edit.vspx b/binsrc/yacutia/databases_udt_edit.vspx deleted file mode 100644 index 5d88d405d5..0000000000 --- a/binsrc/yacutia/databases_udt_edit.vspx +++ /dev/null @@ -1,137 +0,0 @@ - - - - Create New User Defined Type - - - - - - - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - Create UDT - - - - - - - - - -
    -
    -     		- - - Create UDT from WSDL - - - - - - - -
    -
    -     		- - - - - Create UDT from .NET Assembly or Java Class - - - - - -
    -
    -
    - - - - -
    - - - - - - - - - -
    -
    -
    -     -     -     diff --git a/binsrc/yacutia/entity_uri_patterns.vspx b/binsrc/yacutia/entity_uri_patterns.vspx deleted file mode 100644 index 2a93f1a20e..0000000000 --- a/binsrc/yacutia/entity_uri_patterns.vspx +++ /dev/null @@ -1,272 +0,0 @@ - - - - Entity URI configuration - - - - - - - - - - - - - - -
    - - - - - -
    - - - - - - - - - - -
    - - - - - Stylesheets - - - - - - - - - - - -
    -
    -
    - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    CartridgeSource URL patternDestination URL patternDefault modeAction
    - - - - - ' || (control.vc_parent as vspx_row_template).te_rowset[0]; - ]]> - - - - - - - - - - -   - - - - - Delete'; - ]]> - - - - - -
    - -
    -     - - -
    -
    - - - - (ID: ) - -
    - - -
    - - -
    - - -
    - - - - - - - - - - if (not self.vc_is_valid) - return; - - declare exit handler for sqlstate '23000' - { - rollback work; - self.vc_is_valid := 0; - self.vc_error_message := 'The values entered conflict with other GRDDL filter. Please supply correct values.'; - return; - }; - - self.name1.ufl_value := trim (self.name1.ufl_value); - self.srcurl1.ufl_value := trim (self.srcurl1.ufl_value); - self.desturl1.ufl_value := trim (self.desturl1.ufl_value); - self.entityfunc1.ufl_value := trim(self.entityfunc1.ufl_value); - - if (not length (self.name1.ufl_value) or not length (self.desturl1.ufl_value) or not length(self.entityfunc1.ufl_value) ) - { - rollback work; - self.vc_is_valid := 0; - self.vc_error_message := 'The name value cannot be empty.'; - return; - } - - if (self.c_mode = 'C/add') - { - insert into DB.DBA.RDF_ENTITY_URI_CARTRIDGE_MODES (cartridgehookfn, urlsrcpattern, urldestpattern, defaultmode, mappingid) - values (self.name1.ufl_value, self.srcurl1.ufl_value, self.desturl1.ufl_value, self.entityfunc1.ufl_value, sequence_next('DB.DBA.RDF_ENTITY_URI_CARTRIDGE_MODES.mappingid')); - } - else - { - update DB.DBA.RDF_ENTITY_URI_CARTRIDGE_MODES - set cartridgehookfn= self.name1.ufl_value, - urlsrcpattern = self.srcurl1.ufl_value, - urldestpattern = self.desturl1.ufl_value, - defaultmode = self.entityfunc1.ufl_value - where mappingid = self.c_id; - } - - self.c_mode := 'C/browse'; - self.vc_data_bind (e); - - - -
    -
    -     -     -
    -
    -
    - -
    -     -     -     diff --git a/binsrc/yacutia/hosted_page.vspx b/binsrc/yacutia/hosted_page.vspx deleted file mode 100644 index 13866a687a..0000000000 --- a/binsrc/yacutia/hosted_page.vspx +++ /dev/null @@ -1,86 +0,0 @@ - - - - User Defined Types - - - - - - - - - - - - - - -
    - - - - -
    - - - - - - - -
    - - - - - - -   -
    - - - - -
    - - - - - - - - - -
    -
    -
    -     -     -     diff --git a/binsrc/yacutia/ie.vspx b/binsrc/yacutia/ie.vspx deleted file mode 100644 index 2dfacad65e..0000000000 --- a/binsrc/yacutia/ie.vspx +++ /dev/null @@ -1,99 +0,0 @@ - - - - Virtuoso Data - - - - - - - - - - -
    - - - - -
    - - - - - - - - - - - - - - - - - - -
    - Import - - - - - - -
    -
    -     		- - - Export - - - - -
    -
    -
    - - - - -
    - - - - - - -
    -
    -
    -     -     -     diff --git a/binsrc/yacutia/iengine.vspx b/binsrc/yacutia/iengine.vspx deleted file mode 100644 index 740a712563..0000000000 --- a/binsrc/yacutia/iengine.vspx +++ /dev/null @@ -1,593 +0,0 @@ - - - - - Inclusion Engine - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - -
    - - - - - - -
    - - - - - -
    - - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - Path to primary XSLT in DAV - - -
    - URL to use when resource not found - - -
    - Internal debug level - - -
    - Allow internal edits - - -
    - Embed rdf data using JSON-LD in script tags - - - - - - -
    - Embed rdf data using Turtle in script tags - - - - - - -
    - - - - - - - - - - - -
    -     - - - - - - -

    - - - - - -

    - - - - - -
    -     - - - - where { - ?S a sioc:Site; - rdfs:label ?L; - foaf:homepage ?H; - ?P ?B. - filter (str (?P) like '%:p:webdav_base'). - } - ) do - { - self.sites_ds := vector_concat (self.sites_ds, vector (vector (cast (S as varchar), cast (L as varchar), cast (H as varchar), cast (B as varchar)))); - } - self.sites_ds_meta := vector (vector ('S', 182, 0, 256, 1, 0, 1, 0, 0, 0, 0, 0), vector ('L', 182, 0, 256, 1, 0, 1, 0, 0, 0, 0, 0), vector ('H', 182, 0, 256, 1, 0, 1, 0, 0, 0, 0, 0), vector ('B', 182, 0, 256, 1, 0, 1, 0, 0, 0, 0, 0)); - ]]> - - -
    -

    Sites

     -
    - - - Add'; - ]]> - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    SiteHome PageWebDAV BaseAction
    - - - - - - - - - Edit'; - ]]> - - - - - - - - Delete'; - ]]> - - - - - -
    -
    - -
    -
    -

    Rewrite rules

     -
    - - - Add'; - ]]> - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - -
    SiteOld URLNew URLAction
    - - - - - - - - - Edit'; - ]]> - - - - - - - - Delete'; - ]]> - - - - - -
    -
    -     - - -
    - - - - - - - - - - - - - - - - - -
    - - - -
    - - - -
    - - - -
    - - - - - - - - - - - -
    -
    -     - -
    - - - - - - - - - - - - - - - - - -
    - - - -
    - - - -
    - - - -
    - - - - - - - - - - - -
    -
    -     -     -     -
    -
    -
    -
    -     -     -     diff --git a/binsrc/yacutia/inifile.vspx b/binsrc/yacutia/inifile.vspx deleted file mode 100644 index 66d23a99fe..0000000000 --- a/binsrc/yacutia/inifile.vspx +++ /dev/null @@ -1,265 +0,0 @@ - - - - Virtuoso System Parameters - - - - - - - - - - - - - - - - - - - if (cmp = cmp1 or (cmp1 is null and cmp = 1)) - return 'page_tab_selected'; - - return 'page_tab'; - - - - - - - - -

    Virtuoso configuration file ""

    - - - - -
    - - - - -
    - - - - - - - -
    - - - - -   -
    - - - - - -
    - - - - - -
    - - - - - - - - - '); - if ((self.sect = 'Parameters') and (item in ('AllowOSCalls', 'SafeExecutables', 'DbaExecutables', 'DirsAllowed', 'DirsDenied'))) - { - http (sprintf ('', item)); - http (sprintf ('', item_value)); - http (''); - } - else - { - http (sprintf ('', item, item, item)); - http (sprintf ('', item, item_value)); - http (sprintf('', item, self.pos, self.sid, self.realm)); - } - http (''); - } - if ('' <> get_keyword ('add', control.vc_page.vc_event.ve_params, '')) - { - http (''); - http (''); - http (''); - } - ?> - - - -
    NameValueAction
    %V%V %VRemove Remove
    New:
    - - - item) - cfg_write (virtuoso_ini_path(), self.sect, item, ''); - - item_value := cfg_item_value (virtuoso_ini_path(), self.sect, item); - if (new_item_value <> item_value) - cfg_write (virtuoso_ini_path(), self.sect, new_item, new_item_value); - } - } - if ('' <> get_keyword ('_new_item', params, '')) - { - item := get_keyword ('_new_item', params); - item_value := get_keyword ('_new_value', params, ''); - cfg_write (virtuoso_ini_path(), self.sect, item, item_value); - } - http_request_status ('HTTP/1.1 302 Found'); - http_header (sprintf('Location: inifile.vspx?sid=%s&realm=%s&dd_sect=%i\r\n', self.sid , self.realm, self.pos)); - ]]> - - - '); - ?> -
    -
    - -
    -
    -
    -     - - - - -
    - Stop -
    - You are about to remove the parameter "", are you sure? -
    - This removal cannot be undone. Do you wish to continue? -
    - - - - '') - cfg_write(virtuoso_ini_path(), self.sect, self.to_rem, ''); - - self.to_rem := ''; - self.to_del := 0; - http_request_status ('HTTP/1.1 302 Found'); - http_header (sprintf ('Location: inifile.vspx?sid=%s&realm=%s&dd_sect=%i\r\n', self.sid , self.realm, self.pos)); - ]]> - - - - - - - - - -
    -     -     -     -     -     diff --git a/binsrc/yacutia/logging_page.vspx b/binsrc/yacutia/logging_page.vspx deleted file mode 100644 index 8bf40c57a3..0000000000 --- a/binsrc/yacutia/logging_page.vspx +++ /dev/null @@ -1,215 +0,0 @@ - - - - Virtuoso System Statistics - - - - - - - - - - - - - self.autorefresh := get_keyword ('autorefresh', e.ve_params, ''); - self.page := get_keyword ('page', e.ve_params, '1'); - if (self.page = '') - self.page := '1'; - - - - - - - -
    - - - - -
    - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - -   -
    - - - - - - - - -
    -  Data Updated: - - - - auto update interval: - - sec - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -
    -
    -     -     -     -     diff --git a/binsrc/yacutia/login_keys.vspx b/binsrc/yacutia/login_keys.vspx deleted file mode 100644 index 468e64473c..0000000000 --- a/binsrc/yacutia/login_keys.vspx +++ /dev/null @@ -1,328 +0,0 @@ - - - - Login Authentication Keys - - - - - - - - - - - - - - - - - - self.v_services := VAL.DBA.thirdparty_service_labels (); - - - - - - - - - - if (not e.ve_is_post and self.lk_delete is not null) - { - delete from OAUTH..APP_REG where A_ID = self.lk_delete; - } - - - - - - if (not e.ve_is_post and control.te_rowset[0] = self.lk_edit) - { - self.v_type := control.te_rowset[1]; - self.v_name := control.te_rowset[2]; - self.a_version.ufl_value := control.te_rowset[3]; - self.a_url_authenticate.ufl_value := control.te_rowset[4]; - self.a_url_token.ufl_value := control.te_rowset[5]; - self.a_url_userinfo.ufl_value := control.te_rowset[6]; - self.a_key.ufl_value := control.te_rowset[7]; - self.a_secret.ufl_value := control.te_rowset[8]; - } - - - - - - - - - - - - - - -
    Service NameAction
    - - - -
    - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - -
    - - - - - - - - - -
    - - - - - - - - - -
    - - - -
    - - - -
    - - - -
    - - - -
    - - - -
    - - - - self.dataClean (); - self.vc_data_bind (e); - - - - - declare exit handler for SQLSTATE '*' - { - rollback work; - if (__SQL_STATE like 'NV%') - { - self.vc_error_message := VALIDATE.DBA.CLEAR (__SQL_MESSAGE); - self.vc_is_valid := 0; - - return; - } - if (__SQL_STATE = '23000') - { - self.vc_is_valid := 0; - self.vc_error_message := 'The values entered conflict with other data. Please supply correct new values.'; - - return; - }; - resignal; - }; - - if (self.lk_edit is null) - { - self.v_type := self.a_type.ufl_selected; - self.v_name := case when self.v_type then self.a_name_custom.ufl_value else self.a_name.ufl_value end; - } - - if (self.v_type) - { - if (self.lk_edit is null) - VALIDATE.DBA.VALIDATE (self.v_name, vector('name', 'Service Name', 'class', 'varchar', 'minLength', 1, 'maxLength', 128)); - - VALIDATE.DBA.VALIDATE (self.a_url_authenticate.ufl_value, vector('name', 'URL Authenticate', 'class', 'uri', 'minLength', 1)); - VALIDATE.DBA.VALIDATE (self.a_url_token.ufl_value, vector('name', 'URL Token', 'class', 'uri', 'minLength', 1)); - VALIDATE.DBA.VALIDATE (self.a_url_userinfo.ufl_value, vector('name', 'URL User Info', 'class', 'uri', 'minLength', 1)); - } - VALIDATE.DBA.VALIDATE (self.a_key.ufl_value, vector('name', 'Key', 'class', 'varchar', 'minLength', 1)); - VALIDATE.DBA.VALIDATE (self.a_secret.ufl_value, vector('name', 'Secret', 'class', 'varchar', 'minLength', 1)); - - if (self.lk_edit is null) - { - insert into OAUTH..APP_REG (A_OWNER, A_SERVICE_ID, A_TYPE, A_NAME, A_VERSION, A_URL_AUTHENTICATE, A_URL_TOKEN, A_URL_USERINFO, A_KEY, A_SECRET) - values (0, VAL.DBA.user_personal_uri (connection_get ('vspx_user')), self.v_type, self.v_name, self.a_version.ufl_value, self.a_url_authenticate.ufl_value, self.a_url_token.ufl_value, self.a_url_userinfo.ufl_value, self.a_key.ufl_value, self.a_secret.ufl_value); - } - else - { - update OAUTH..APP_REG - set A_VERSION = self.a_version.ufl_value, - A_URL_AUTHENTICATE = self.a_url_authenticate.ufl_value, - A_URL_TOKEN = self.a_url_token.ufl_value, - A_URL_USERINFO = self.a_url_userinfo.ufl_value, - A_KEY = self.a_key.ufl_value, - A_SECRET = self.a_secret.ufl_value - where A_ID = self.lk_edit; - } - - self.dataClean (); - self.vc_data_bind (e); - - -
    -
    - -     -     -     -     diff --git a/binsrc/yacutia/msg_news_groups.vspx b/binsrc/yacutia/msg_news_groups.vspx deleted file mode 100644 index 420c2630bd..0000000000 --- a/binsrc/yacutia/msg_news_groups.vspx +++ /dev/null @@ -1,123 +0,0 @@ - - - - - - - - - Virtuoso NNTP Server Groups Subscriptions Management - - - - - - - - - - - - - - -
    - - - - -
    - - - - - - - - - - - -
    NNTP servers - - - - - - - -
    -
    -
    - - - - -
    - - - - - - - - - - - - - - -
    - Subscribed groups for "" -
    - -
    - -
    - -
    - -
    -
    -
    -     -     -     - diff --git a/binsrc/yacutia/rdf_filters.vspx b/binsrc/yacutia/rdf_filters.vspx deleted file mode 100644 index 084390232e..0000000000 --- a/binsrc/yacutia/rdf_filters.vspx +++ /dev/null @@ -1,491 +0,0 @@ - - - - Sponger - - - - - - - - - - - - ]]> - - - - -
    - - - - - -
    - - - - - - - - - - - - -
    - Extractor Cartridges - - - - - - - - - - - - - - - -
    -
    -
    - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Seq#DescriptionPatternAction
    - - - - - - - ' || (control.vc_parent as vspx_row_template).te_rowset[2]; - ]]> - - - - - - - - - - -   - - - Delete'; - ]]> - - - - - -   - - - - - -   - - - - - -
    -     - -
    -
    - - -
    - - -
    - - -
    - - - - - - -
    - - -
    - - -
    - - -
    - - - - Get Facebook session - - - Get Facebook access token - - - - - - -
    - - - - - - - - - - self.c_id) - { - update DB.DBA.SYS_RDF_MAPPERS set RM_ID = -1 where RM_ID = self.c_id; - if (_id < self.c_id) - { - for (select RM_ID _rm_id from DB.DBA.SYS_RDF_MAPPERS where RM_ID >= _id and RM_ID < self.c_id order by RM_ID desc) do - { - update DB.DBA.SYS_RDF_MAPPERS set RM_ID = RM_ID + 1 where RM_ID = _rm_id; - } - } - else - { - for (select RM_ID _rm_id from DB.DBA.SYS_RDF_MAPPERS where RM_ID > self.c_id and RM_ID <= _id order by RM_ID) do - { - update DB.DBA.SYS_RDF_MAPPERS set RM_ID = RM_ID - 1 where RM_ID = _rm_id; - } - } - update DB.DBA.SYS_RDF_MAPPERS set RM_ID = _id where RM_ID = -1; - } - self.c_mode := 'C/browse'; - self.vc_data_bind (e); - ]]> - - - -
    -
    -     -     -
    -
    -
    - -
    -     -     -     diff --git a/binsrc/yacutia/rdf_filters_pp.vspx b/binsrc/yacutia/rdf_filters_pp.vspx deleted file mode 100644 index b777e37bb7..0000000000 --- a/binsrc/yacutia/rdf_filters_pp.vspx +++ /dev/null @@ -1,487 +0,0 @@ - - - - Meta Cartridges - - - - - - - - - - - - - ]]> - - - - -
    - - - - - -
    - - - - - - - - - - - - -
    - - - Meta Cartridges - - - - - - - - - - - - - -
    -
    -
    - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Seq#IDDescriptionPatternAPI typeAction
    - - - - - - - - - ' || (control.vc_parent as vspx_row_template).te_rowset[2]; - ]]> - - - - - - - - - - - - -   - - - Delete'; - ]]> - - - - - -   - - - - - -   - - - - - -
    -     - - -
    -
    - - -
    - - -
    - - -
    - - - - - - - -
    - - -
    - - -
    - - -
    - - - - Get Facebook session - - - Get Facebook access token - -
    - - - - - - - - - - self.c_seq) - { - if (_seq < self.c_seq) - { - for (select MC_ID _mc_id from DB.DBA.RDF_META_CARTRIDGES where MC_SEQ >= _seq and MC_SEQ < self.c_seq order by MC_SEQ desc) do - { - update DB.DBA.RDF_META_CARTRIDGES set MC_SEQ = MC_SEQ + 1 where MC_ID = _mc_id; - } - } - else - { - for (select MC_ID _mc_id from DB.DBA.RDF_META_CARTRIDGES where MC_SEQ > self.c_seq and MC_SEQ <= _seq order by MC_SEQ) do - { - update DB.DBA.RDF_META_CARTRIDGES set MC_SEQ = MC_SEQ - 1 where MC_ID = _mc_id; - } - } - update DB.DBA.RDF_META_CARTRIDGES set MC_SEQ = _seq where MC_ID = self.c_id; - } - - self.c_mode := 'C/browse'; - self.vc_data_bind (e); - ]]> - - - -
    -
    -     -     -
    -
    -
    - -
    -     -     -     diff --git a/binsrc/yacutia/robot_edit.vspx b/binsrc/yacutia/robot_edit.vspx deleted file mode 100644 index d6137146d9..0000000000 --- a/binsrc/yacutia/robot_edit.vspx +++ /dev/null @@ -1,1077 +0,0 @@ - - - - WebDAV Content Management - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

    - -

    -     - - - - ]]> - - - - - - - -
    - - - - -
    - - - - - - - - -
    - - - - - - - - -   -
    - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Target description - -
    Target URL - -
    Login name on target - -
    Login password on target - -
    Copy to local DAV collection - - 'edit') - { - ?> - - -
    - - 'edit') - { - ?> - - - - - -
    Local resources owner - - - - - -
    Download only newer than - -
    Follow links matching
    (delimited with ;)    		 - -
    Do not follow links matching
    (delimited with ;)    		 - -
    - - - -
    Custom HTTP headers - -
    - -
    XPath expression for links extraction - -
    Crawling depth limit - -
    Update Interval (minutes) - -
    Number of threads - -
    Crawl delay (sec) - -
    Store Function - - - - -
    Extract Function - - - - -
    - - - -
    If Graph IRI is unassigned use this Data Source URL - -
    - - - -
    - - - -
    Follow RDF properties
    (one IRI per row)    		 - -
    - - - -
    - - - -
    - - - -
    - - - -
    - - - -
    - - - -
    - - - -
    - - - -
    - -
    -
      -
    • Cartridges
      • - -
    • Meta Cartridges
      • - -
    -
    -
    -
    -
    - - - - - - - - - -
    - - RDF Cartridge -
    - - - - - - -
    -
    - -
    - - - - - - - - - -
    - - Meta Cartridge -
    - - - - - - -
    -
    - - -
    - -
    -
    - - - - - - - - - self._host) - { - self._host := sav_host; - self.vc_error_message := sprintf ('Host name can not be edited, it must be "%s".', sav_host); - self.vc_is_valid := 0; - return; - } - - if (length (self.tar_uid.ufl_value) and length (self.tar_pwd.ufl_value)) - { - self._auth := concat (self.tar_uid.ufl_value,':',self.tar_pwd.ufl_value); - } - else - { - self._auth := left (ret_arr[1], pos); - } - - if (self.mode = 'edit' and sav_host <> self._host) - { - self._host := sav_host; - self.vc_error_message := sprintf ('Host name can not be edited, it must be "%s".', sav_host); - self.vc_is_valid := 0; - return; - } - - self._descr := trim (get_keyword ('descr', params)); - self._url := ret_arr[2]; - if (ret_arr[4] is not null and length (ret_arr[4]) > 0) - { - self._url := concat (self._url, '?', ret_arr[4]); - self._url := trim (self._url); - } - self._root := trim (get_keyword ('root', params)); - if (self.mode <> 'edit' and right(self._root, 1) <> '/') - self._root := concat(self._root, '/'); - - if (left(self._root, 5) = '/DAV/') - self._root := right(self._root, length(self._root) - 5); - - self._newd := get_keyword ('newd', params); - self._flow := get_keyword ('flow', params); - self._dflow := get_keyword ('dflow', params); - self._store_fn := get_keyword ('store_fn', params); - self._ext_fn := get_keyword ('ext_fn', params); - self._intv := atoi (get_keyword ('intv', params, '0')); - self._other := atoi (get_keyword ('other', params, '0')); - - self._xp_exp := get_keyword ('xp_exp', params, ''); - self._head := get_keyword ('head', params, ''); - self._depth := get_keyword ('depth', params, ''); - - if (self._depth = '' or self._depth = 'unlimited') - self._depth := null; - - if (self._xp_exp = '') - self._xp_exp := null; - - if (self._head = '') - self._head := null; - - if (self._xp_exp is not null) - { - declare exit handler for sqlstate '*' - { - self.vc_is_valid := 0; - self.vc_error_message := 'Invalid XPath expression for URL extraction'; - return 0; - }; - xpath_eval (self._xp_exp, xtree_doc ('')); - } - - self._del := get_keyword ('del', params); - if (self.mode = 'edit') - self._opage := self._opage; - else - self._opage := get_keyword ('opage', params); - - _idx := null; - self._img := get_keyword ('img', params); - self._dav := get_keyword ('dav', params); - self._own := get_keyword ('own', params); - self._redir := get_keyword ('redir', params); - self._store := get_keyword ('store', params, '0'); - self._get_rdf := atoi (get_keyword ('get_rdf', params, '0')); - self._ask_rdf := atoi (get_keyword ('ask_rdf', params, '0')); - self._accept_rdf := atoi (get_keyword ('accept_rdf', params, '0')); - self._convhtml := atoi (get_keyword ('convhtml', params, '0')); - self._bot := atoi (get_keyword ('bot', params, '0')); - self._thr := atoi (get_keyword ('thr', params, '1')); - self._delay := atof (get_keyword ('delay', params, '0')); - - if (get_keyword ('semweb', params) = '1' and 0 = length (self._store_fn) and 0 = length (self._ext_fn)) - { - self._store_fn := 'WS.WS.SITEMAP_RDF_STORE'; - self._ext_fn := 'WS.WS.SITEMAP_XML_PARSE'; - self._ask_rdf := 1; - self._accept_rdf := 1; - } - if (get_keyword ('semweb', params) <> '1' and self._store_fn = 'WS.WS.SITEMAP_RDF_STORE' and self._ext_fn = 'WS.WS.SITEMAP_XML_PARSE') - { - self._store_fn := ''; - self._ext_fn := ''; - } - declare farr any; - self._rdf_flw := get_keyword ('rdf_flw', params, ''); - self._html_meta := atoi (get_keyword ('html_meta', params, '0')); - self._rdf_graph := get_keyword ('rdf_graph', params, ''); - tmp := split_and_decode (self._rdf_flw, 0, '\0\0\n'); - farr := vector (); - foreach (any x in tmp) do - { - x := trim (rtrim (x, '\r\n')); - if (length (x)) - farr := vector_concat (farr, vector (x)); - } - opts := vector (); - -- 'meta_foaf', atoi (get_keyword ('meta_foaf', params, '0')), - -- 'meta_rdf', atoi (get_keyword ('meta_rdf', params, '0')), - -- 'meta_rss', atoi (get_keyword ('meta_rss', params, '0')), - -- 'meta_grddl', atoi (get_keyword ('meta_grddl', params, '0')) - if (length (farr)) - opts := vector_concat (opts, vector ('follow-property', farr)); - - opts := vector_concat (opts, vector ('follow-meta', self._html_meta)); - if (length (self._rdf_graph)) - opts := vector_concat (opts, vector ('rdf-graph', self._rdf_graph)); - - if (self._ask_rdf) - opts := vector_concat (opts, vector ('meta_rdf', 1)); - - self._udata := opts; - - if (self.mode <> 'edit' and self._opage = '1') - self._opage := 'checked'; - - if (self._del = '1') - self._del := 'checked'; - - if (self._img = '1') - self._img := 'checked'; - - if (self._dav = '1') - self._dav := 'checked'; - - if (WS.WS.isempty(self._host) or WS.WS.isempty(self._root) or WS.WS.isempty(self._url)) - { - self.vc_error_message := 'Host, Target collection and Start path must be specified'; - self.vc_is_valid := 0; - return; - } - if (aref(self._url, 0) <> ascii('/')) - self._url := concat('/', self._url); - - if (aref(self._root, 0) = ascii('/') or strstr(self._root , '..') is not null and self.mode <> 'edit') - { - self.vc_error_message := 'The local collection/resource destination MUST be a relative path under WebDAV root collection/resource and cannot contain a ''..''.'; - self.vc_is_valid := 0; - return; - } - if (self._opage = 'checked') - { - declare u_arr any; - declare target_page varchar; - if (self._url not like '%/') - { - u_arr := WS.WS.HREF_TO_ARRAY(self._url, ''); - target_page := u_arr[length (u_arr) - 1]; - } - else - { - target_page := 'index.html'; - } - - -- we'll guess is the root is a collection or not - if (self._root[length(self._root) - 1] = ascii('/')) - self._root := concat(self._root, target_page); - } - if (exists(select 1 from WS.WS.VFS_SITE where VS_ROOT = self._root and VS_HOST = self._host) and self.mode <> 'edit') - { - self.vc_error_message := 'Target resource/collection already specified. Please do specify another target collection or resource'; - self.vc_is_valid := 0; - return; - } - - if (self.mode = 'edit') - { - update WS.WS.VFS_SITE - set VS_DESCR = self._descr, - VS_INX = _idx, - VS_OWN = (select U_ID from WS.WS.SYS_DAV_USER where U_NAME = self._own), - VS_NEWER = stringdate(self._newd), - VS_DEL = self._del, - VS_FOLLOW = self._flow, - VS_NFOLLOW = self._dflow, - VS_SRC = self._img, - VS_OPAGE = self._opage, - VS_METHOD = self._dav, - VS_OPTIONS = self._auth, - VS_URL = self._url, - VS_REDIRECT = self._redir, - VS_STORE = self._store, - VS_DLOAD_META = self._ask_rdf, - VS_UDATA = serialize (self._udata), - VS_STORE_FN = self._store_fn, - VS_EXTRACT_FN = self._ext_fn, - VS_OTHER = case when self._other = 1 then 'checked' else NULL end, - VS_CONVERT_HTML = self._convhtml, - VS_DEPTH = self._depth, - VS_XPATH = self._xp_exp, - VS_ACCEPT_RDF = self._accept_rdf, - VS_THREADS = self._thr, - VS_BOT = self._bot, - VS_DELAY = self._delay, - VS_HEADERS = self._head - where VS_HOST = self._host - and VS_ROOT = self._root; - - if (not exists (select 1 from WS.WS.VFS_QUEUE where VQ_HOST = self._host and VQ_ROOT = self._root and VQ_URL = self._url)) - update WS.WS.VFS_QUEUE set VQ_URL = self._url where VQ_HOST = self._host and VQ_ROOT = self._root and VQ_URL = self._old_url; - - insert soft WS.WS.VFS_QUEUE (VQ_HOST, VQ_URL, VQ_TS, VQ_STAT, VQ_ROOT) - values (self._host, self._url, now(), 'waiting', self._root); - } - else - { - insert into WS.WS.VFS_SITE ( - VS_DESCR, - VS_HOST, - VS_URL, - VS_INX, - VS_OWN, - VS_ROOT, - VS_NEWER, - VS_DEL, - VS_FOLLOW, - VS_NFOLLOW, - VS_SRC, - VS_METHOD, - VS_OTHER, - VS_OPTIONS, - VS_OPAGE, - VS_REDIRECT, - VS_STORE, - VS_DLOAD_META, - VS_UDATA, - VS_STORE_FN, - VS_EXTRACT_FN, - VS_CONVERT_HTML, - VS_XPATH, - VS_DEPTH, - VS_ACCEPT_RDF, - VS_THREADS, - VS_BOT, - VS_DELAY, - VS_HEADERS - ) - values ( - self._descr, - self._host, - self._url, - _idx, - (select U_ID from WS.WS.SYS_DAV_USER where U_NAME = self._own), - self._root, - stringdate (self._newd), - self._del, - self._flow, - self._dflow, - self._img, - self._dav, - case when self._other then 'checked' else NULL end, - self._auth, - self._opage, - self._redir, - self._store, - self._ask_rdf, - serialize (self._udata), - self._store_fn, - self._ext_fn, - self._convhtml, - self._xp_exp, - self._depth, - self._accept_rdf, - self._thr, - self._bot, - self._delay, - self._head - ); - - insert into WS.WS.VFS_QUEUE (VQ_HOST, VQ_URL, VQ_TS, VQ_STAT, VQ_ROOT) - values (self._host, self._url, now(), 'waiting', self._root); - } - - declare _mp, _idx, p_id, _seq, ename, ename_old any; - - _seq := 0; - _idx := 0; - delete from WS.WS.VFS_SITE_RDF_MAP where VM_HOST = self._host and VM_ROOT = self._root; - if (self._get_rdf) - { - while (_mp := adm_next_keyword ('mapper', params, _idx)) - { - _seq := _seq + 1; - p_id := atoi (_mp); - insert into WS.WS.VFS_SITE_RDF_MAP (VM_HOST, VM_ROOT, VM_RDF_MAP, VM_RDF_MAP_TYPE, VM_SEQ) - values (self._host, self._root, p_id, 0, _seq); - } - while (_mp := adm_next_keyword ('metaMapper', params, _idx)) - { - _seq := _seq + 1; - p_id := atoi (_mp); - insert into WS.WS.VFS_SITE_RDF_MAP (VM_HOST, VM_ROOT, VM_RDF_MAP, VM_RDF_MAP_TYPE, VM_SEQ) - values (self._host, self._root, p_id, 1, _seq); - } - } - - ename := concat(self._descr, '(', self._host, ' in /DAV/', self._root, ')'); - if (desc_save <> '') - { - ename_old := concat(desc_save, '(', self._host, ' in /DAV/', self._root, ')'); - if (ename_old <> ename) - delete from DB.DBA.SYS_SCHEDULED_EVENT where SE_NAME = ename_old; - } - if (self._intv = 0) - { - delete from DB.DBA.SYS_SCHEDULED_EVENT where SE_NAME = ename; - } - else - { - insert replacing DB.DBA.SYS_SCHEDULED_EVENT (SE_NAME, SE_START, SE_INTERVAL, SE_SQL) - values (ename, now (), self._intv, concat('WS.WS.SERV_QUEUE_TOP(\'',self._host,'\',\'',self._root,'\', 1, 0, null, null)')); - } - commit work; - - http_request_status ('HTTP/1.1 302 Found'); - http_header(sprintf('Location: cont_page.vspx?page=2&sid=%s&realm=%s\r\n', self.sid, self.realm)); - ]]> - - -
    - * The "Target URL" will be used as a destination Quad Store Graph IRI.
    - If no RDF cartridge is enabled only RDF content will be retrieved and imported i.e., no RDF transformation via Sponger.     -
    -     -
    -
    -
    -     -     -     diff --git a/binsrc/yacutia/robot_export.vspx b/binsrc/yacutia/robot_export.vspx deleted file mode 100644 index 665090bd3e..0000000000 --- a/binsrc/yacutia/robot_export.vspx +++ /dev/null @@ -1,226 +0,0 @@ - - - - WebDAV Content Management - - - - - - - - - - - - - - - - select VS_DESCR into self.site_name from WS.WS.VFS_SITE where VS_HOST = self.host and VS_ROOT = self.root and VS_URL = self.url; - - - - - -
    - - - - -
    - - - - - - - - -
    - - - - - - - - -   -
    - - - - -
    - - - if (e.ve_button = control and e.ve_initiator = self.src_type) - { - self.is_dav_src := 0; - if (get_keyword ('src_type', e.ve_params)) - self.is_dav_src := 1; - } - - - - - - - - - - - - - - - -
    Selected Site
    - - - control.ufl_selected := self.is_dav_src; - - - -
    Destination path - - - - -
    - - - - - - - - 0) - { - self.vc_is_valid := 0; - - if (isstring (_rc)) - self.vc_error_message := _rc; - else if (isnumeric (_rc)) - self.vc_error_message := sprintf ('Error number: %d', _rc); - else - self.vc_error_message := 'Unspecified error'; - - } - else - { - if (length (_dst) > 2) - { - if (aref (_dst, 1) = ascii (':')) - { - if (aref (_dst, 2) = ascii ('\\')) - _dst := replace (_dst, '\\', '/'); - } - } - if (aref (_dst, length (_dst) - 1) <> ascii ('/')) - _dst := concat (_dst, '/'); - self.exp := concat ('Exported to: ', _dst, _root); - self.exps.vc_data_bind (e); - self.expf.vc_enabled := 0; - } - } - else - { - self.vc_error_message := 'Destination path/URL must be supplied.'; - self.vc_is_valid := 0; - } - ]]> - - -
    -     - -
    -
    - -
    -     -
    -
    -
    -     -     -     diff --git a/binsrc/yacutia/robot_queues.vspx b/binsrc/yacutia/robot_queues.vspx deleted file mode 100644 index 57da3610d6..0000000000 --- a/binsrc/yacutia/robot_queues.vspx +++ /dev/null @@ -1,344 +0,0 @@ - - - - WebDAV Content Management - - - - - - - - - - - - - -
    - - - - -
    - - - - - - - - -
    - - - - - - - - -   -
    - - - - -
    - - - - -
    - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    -     -
    - -
    - - - - - - - - - - - - - - -
    DescriptionURLStateAction
    -     - - - - - - -
    - No rows selected -
    -     - - - - - - - - -
    - - - - - - - - - - - - - - - 'waiting'; - commit work; - log_enable (old_mode, 1); - ]]> - - - - - - - -
    -     -     - - - - - -
    - -
    -     -     -
    - -
    - - - - - - - - - - - - - - - -
    DescriptionStart onInterval (minutes)Last executedAction
    -     - - - - - - - - -
    - No rows selected -
    -     - - - - - - - - - -
    - - - - - - - - - - - - - - -
    -     -     - - - - - -
    - -
    -     - -     -
    -
    -
    -
    -     -     -     diff --git a/binsrc/yacutia/robot_sched.vspx b/binsrc/yacutia/robot_sched.vspx deleted file mode 100644 index 7e4cd3c4a2..0000000000 --- a/binsrc/yacutia/robot_sched.vspx +++ /dev/null @@ -1,276 +0,0 @@ - - - - WebDAV Content Management - - - - - - - - - - -

    - -

    -     - - - - - -
    - - - - -
    - - - - - - - - -
    - - - - - - - - -   -
    - - - - -
    - - - - -
    - - - - - - -
    - - - - - - - - - - - -
    -     -
    - - - - - - - - '' or self.vc_is_valid = 0) - { - success: - http_request_status ('HTTP/1.1 302 Found'); - http_header(sprintf('Location: robot_queues.vspx?sid=%s&realm=%s\r\n', self.sid, self.realm)); - return; - } - inter := 0; - if ((control.vc_find_control('start_time') as vspx_field).ufl_value <> '') - { - declare state, msg, m_dta, res varchar; - state := '00000'; - exec('stringdate(?)', state, msg, vector((control.vc_find_control('start_time') as vspx_field).ufl_value), m_dta, res); - if (state <> '00000') - start_str := cast(now() as varchar); - else - start_str := stringdate((control.vc_find_control('start_time') as vspx_field).ufl_value); - } - else - { - start_str := cast(now() as varchar); - } - inter := get_keyword('interval_value', e.ve_params, '10'); - if (exists(select 1 from DB.DBA.SYS_SCHEDULED_EVENT where SE_NAME = self.ename)) - { - update DB.DBA.SYS_SCHEDULED_EVENT set SE_START = start_str, SE_INTERVAL = inter where SE_NAME = self.ename; - } - else - { - insert into SYS_SCHEDULED_EVENT (SE_NAME, SE_START, SE_INTERVAL, SE_SQL) values(self.ename, start_str, inter, concat('WS.WS.SERV_QUEUE_TOP(\'',self.host,'\',\'',self.root,'\', 1, 0, null, null)')); - } - - commit work; - goto success; - ]]> - - - - - - - - - - - - - - - - - -
    Event Name - -
    Start Time - - - - - -
    Interval - - - - - - - -
    - - - 'edit') - { - ?> - - - -
    -
    -
    -
    -     -     -     diff --git a/binsrc/yacutia/robot_sites.vspx b/binsrc/yacutia/robot_sites.vspx deleted file mode 100644 index 79f67f64e3..0000000000 --- a/binsrc/yacutia/robot_sites.vspx +++ /dev/null @@ -1,153 +0,0 @@ - - - - WebDAV Content Management - - - - - - - - - - - - - -
    - - - - -
    - - - - - - - - -
    - - - - - - - - -   -
    - - - - -
    - - - - -
    - - - - - - -
    - - - - - - - - - - - -
    -     -
    -
    - - - - - - - - - - - - - - - - - - - -
    DescriptionURLPages (downloaded/total)Action
    / -  Edit'); - ?> - -
    There are no retrieved sites
    -
    -
    -
    -
    -
    -     -     -     diff --git a/binsrc/yacutia/robot_status.vspx b/binsrc/yacutia/robot_status.vspx deleted file mode 100644 index 01b8c45b13..0000000000 --- a/binsrc/yacutia/robot_status.vspx +++ /dev/null @@ -1,158 +0,0 @@ - - - - Virtuoso Crawler Status - - - - - - - - - - - - diff --git a/docsrc/pdf/Makefile.am b/docsrc/pdf/Makefile.am index a481198fd9..6620700665 100644 --- a/docsrc/pdf/Makefile.am +++ b/docsrc/pdf/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/docsrc/readme.html b/docsrc/readme.html index 49c0f27266..5f422f3fc2 100644 --- a/docsrc/readme.html +++ b/docsrc/readme.html @@ -136,7 +136,7 @@

    Contents

    <?xml version="1.0" encoding="ISO-8859-1"?> <!-- $Id$ - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software --> <chapter label="TBD.xml" id="TBD"> <title>TBD</title> diff --git a/docsrc/releasenotes/Makefile.am b/docsrc/releasenotes/Makefile.am index 62a3c8403d..a57ddcf84e 100644 --- a/docsrc/releasenotes/Makefile.am +++ b/docsrc/releasenotes/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/docsrc/releasenotes/ptrconv.xsl b/docsrc/releasenotes/ptrconv.xsl index 2564c98219..ac386d1d10 100644 --- a/docsrc/releasenotes/ptrconv.xsl +++ b/docsrc/releasenotes/ptrconv.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/releasenotes/ptrconv_element.xsl b/docsrc/releasenotes/ptrconv_element.xsl index 86e34400fd..96023a0382 100644 --- a/docsrc/releasenotes/ptrconv_element.xsl +++ b/docsrc/releasenotes/ptrconv_element.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/releasenotes/relnotes.xml b/docsrc/releasenotes/relnotes.xml index 8dc04863d7..ca5252f145 100644 --- a/docsrc/releasenotes/relnotes.xml +++ b/docsrc/releasenotes/relnotes.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/releasenotes/virtuoso_publish_element.xml b/docsrc/releasenotes/virtuoso_publish_element.xml index 6653683760..a842ee0756 100644 --- a/docsrc/releasenotes/virtuoso_publish_element.xml +++ b/docsrc/releasenotes/virtuoso_publish_element.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/releasenotes/vrelnotes-nw.xml b/docsrc/releasenotes/vrelnotes-nw.xml index ac25c9660a..0222c85b8a 100644 --- a/docsrc/releasenotes/vrelnotes-nw.xml +++ b/docsrc/releasenotes/vrelnotes-nw.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/releasenotes/vrelnotes.xml b/docsrc/releasenotes/vrelnotes.xml index 1c0323336b..c681ae901b 100644 --- a/docsrc/releasenotes/vrelnotes.xml +++ b/docsrc/releasenotes/vrelnotes.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/styleguide/Makefile.am b/docsrc/styleguide/Makefile.am index 8d12ebe6eb..c87bcfe719 100644 --- a/docsrc/styleguide/Makefile.am +++ b/docsrc/styleguide/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/Makefile.am b/docsrc/stylesheets/Makefile.am index 0bc51486c6..e2672f344f 100644 --- a/docsrc/stylesheets/Makefile.am +++ b/docsrc/stylesheets/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/chaptermenu.xsl b/docsrc/stylesheets/chaptermenu.xsl index e8ac39974d..3a45eda4d3 100644 --- a/docsrc/stylesheets/chaptermenu.xsl +++ b/docsrc/stylesheets/chaptermenu.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/chaptermenu_xt.xsl b/docsrc/stylesheets/chaptermenu_xt.xsl index 43e1f517f9..98618b0144 100644 --- a/docsrc/stylesheets/chaptermenu_xt.xsl +++ b/docsrc/stylesheets/chaptermenu_xt.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/config.xsl b/docsrc/stylesheets/config.xsl index d457af69fd..a847c2ced9 100644 --- a/docsrc/stylesheets/config.xsl +++ b/docsrc/stylesheets/config.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_chapter.xsl b/docsrc/stylesheets/html_chapter.xsl index 06fe0c9294..1560a82155 100644 --- a/docsrc/stylesheets/html_chapter.xsl +++ b/docsrc/stylesheets/html_chapter.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_debug.xsl b/docsrc/stylesheets/html_debug.xsl index 50d3006416..0f3e553e03 100644 --- a/docsrc/stylesheets/html_debug.xsl +++ b/docsrc/stylesheets/html_debug.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_functions.xsl b/docsrc/stylesheets/html_functions.xsl index 98ecf96be3..5c53d054fc 100644 --- a/docsrc/stylesheets/html_functions.xsl +++ b/docsrc/stylesheets/html_functions.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_mp_chaptermenu.xsl b/docsrc/stylesheets/html_mp_chaptermenu.xsl index aed95db9d8..59e054cee7 100644 --- a/docsrc/stylesheets/html_mp_chaptermenu.xsl +++ b/docsrc/stylesheets/html_mp_chaptermenu.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_util.xsl b/docsrc/stylesheets/html_util.xsl index 4eeac2b699..7f983330fb 100644 --- a/docsrc/stylesheets/html_util.xsl +++ b/docsrc/stylesheets/html_util.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_virt_chapter.xsl b/docsrc/stylesheets/html_virt_chapter.xsl index b9c21bcb9f..acc03e9636 100644 --- a/docsrc/stylesheets/html_virt_chapter.xsl +++ b/docsrc/stylesheets/html_virt_chapter.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_virt_chapter1.xsl b/docsrc/stylesheets/html_virt_chapter1.xsl index 057a6fecfa..7a3466f5a1 100644 --- a/docsrc/stylesheets/html_virt_chapter1.xsl +++ b/docsrc/stylesheets/html_virt_chapter1.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_virt_chaptermenu.xsl b/docsrc/stylesheets/html_virt_chaptermenu.xsl index 43e1f517f9..98618b0144 100644 --- a/docsrc/stylesheets/html_virt_chaptermenu.xsl +++ b/docsrc/stylesheets/html_virt_chaptermenu.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_virt_common.xsl b/docsrc/stylesheets/html_virt_common.xsl index da7aa3f8fb..f18d5ffd87 100644 --- a/docsrc/stylesheets/html_virt_common.xsl +++ b/docsrc/stylesheets/html_virt_common.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_virt_mp_chaptermenu.xsl b/docsrc/stylesheets/html_virt_mp_chaptermenu.xsl index 4204017dc8..fcf932f0c5 100644 --- a/docsrc/stylesheets/html_virt_mp_chaptermenu.xsl +++ b/docsrc/stylesheets/html_virt_mp_chaptermenu.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_virt_refentry.xsl b/docsrc/stylesheets/html_virt_refentry.xsl index 42615088d2..98481e55bc 100644 --- a/docsrc/stylesheets/html_virt_refentry.xsl +++ b/docsrc/stylesheets/html_virt_refentry.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_virt_util.xsl b/docsrc/stylesheets/html_virt_util.xsl index 68a8fb0e36..c8a5afeeac 100644 --- a/docsrc/stylesheets/html_virt_util.xsl +++ b/docsrc/stylesheets/html_virt_util.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/html_xt_common.xsl b/docsrc/stylesheets/html_xt_common.xsl index 7ecb6c0ee4..6a9e6647d2 100644 --- a/docsrc/stylesheets/html_xt_common.xsl +++ b/docsrc/stylesheets/html_xt_common.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/list_api.xsl b/docsrc/stylesheets/list_api.xsl index 555373f4d8..7939d52e63 100644 --- a/docsrc/stylesheets/list_api.xsl +++ b/docsrc/stylesheets/list_api.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/refentry.xsl b/docsrc/stylesheets/refentry.xsl index 02324e5ea8..1e9b95a94b 100644 --- a/docsrc/stylesheets/refentry.xsl +++ b/docsrc/stylesheets/refentry.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/sections/doc.css b/docsrc/stylesheets/sections/doc.css index ebe92fc235..37b8e7638d 100644 --- a/docsrc/stylesheets/sections/doc.css +++ b/docsrc/stylesheets/sections/doc.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/sections/function_list.xsl b/docsrc/stylesheets/sections/function_list.xsl index 03a51231fe..26c4da7732 100644 --- a/docsrc/stylesheets/sections/function_list.xsl +++ b/docsrc/stylesheets/sections/function_list.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/sections/html_functions.xsl b/docsrc/stylesheets/sections/html_functions.xsl index 12de10c42e..22e6fb4062 100644 --- a/docsrc/stylesheets/sections/html_functions.xsl +++ b/docsrc/stylesheets/sections/html_functions.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/sections/html_inline_refentry.xsl b/docsrc/stylesheets/sections/html_inline_refentry.xsl index 30bae11042..a8e84f1fd0 100644 --- a/docsrc/stylesheets/sections/html_inline_refentry.xsl +++ b/docsrc/stylesheets/sections/html_inline_refentry.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/sections/html_sect1_common.xsl b/docsrc/stylesheets/sections/html_sect1_common.xsl index bb1bd542fc..77f3270027 100644 --- a/docsrc/stylesheets/sections/html_sect1_common.xsl +++ b/docsrc/stylesheets/sections/html_sect1_common.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/sections/html_sect1_tocs.xsl b/docsrc/stylesheets/sections/html_sect1_tocs.xsl index 29b97559e4..980f06a6d7 100644 --- a/docsrc/stylesheets/sections/html_sect1_tocs.xsl +++ b/docsrc/stylesheets/sections/html_sect1_tocs.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/sections/openlink.css b/docsrc/stylesheets/sections/openlink.css index 2f344b501a..434facc422 100644 --- a/docsrc/stylesheets/sections/openlink.css +++ b/docsrc/stylesheets/sections/openlink.css @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/sections/opml_sect1_mp.xsl b/docsrc/stylesheets/sections/opml_sect1_mp.xsl index 3fb20c092f..f16545b2f6 100644 --- a/docsrc/stylesheets/sections/opml_sect1_mp.xsl +++ b/docsrc/stylesheets/sections/opml_sect1_mp.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/sections/sect1_list.xsl b/docsrc/stylesheets/sections/sect1_list.xsl index f3926179d5..51617c0af9 100644 --- a/docsrc/stylesheets/sections/sect1_list.xsl +++ b/docsrc/stylesheets/sections/sect1_list.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/sections/sioc_book.xsl b/docsrc/stylesheets/sections/sioc_book.xsl index d4a064e774..9e49e1e55b 100644 --- a/docsrc/stylesheets/sections/sioc_book.xsl +++ b/docsrc/stylesheets/sections/sioc_book.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/sections/sioc_chap.xsl b/docsrc/stylesheets/sections/sioc_chap.xsl index d5656142c0..de9971f9fa 100644 --- a/docsrc/stylesheets/sections/sioc_chap.xsl +++ b/docsrc/stylesheets/sections/sioc_chap.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/sections/sioc_sect1.xsl b/docsrc/stylesheets/sections/sioc_sect1.xsl index 1a6f620a7b..ea59ed5245 100644 --- a/docsrc/stylesheets/sections/sioc_sect1.xsl +++ b/docsrc/stylesheets/sections/sioc_sect1.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/virt_config.xsl b/docsrc/stylesheets/virt_config.xsl index 744f5da85e..7720ff2e0f 100644 --- a/docsrc/stylesheets/virt_config.xsl +++ b/docsrc/stylesheets/virt_config.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/vsp_contents.xsl b/docsrc/stylesheets/vsp_contents.xsl index a98db71498..b6f8a71dcc 100644 --- a/docsrc/stylesheets/vsp_contents.xsl +++ b/docsrc/stylesheets/vsp_contents.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/stylesheets/vsp_contents_lmvector.xsl b/docsrc/stylesheets/vsp_contents_lmvector.xsl index a53e1f2eac..daeaef86c2 100644 --- a/docsrc/stylesheets/vsp_contents_lmvector.xsl +++ b/docsrc/stylesheets/vsp_contents_lmvector.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/2pc.xml b/docsrc/xmlsource/2pc.xml index a587b0f16f..c4bb2d6daa 100644 --- a/docsrc/xmlsource/2pc.xml +++ b/docsrc/xmlsource/2pc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/DocBook/tblcals.xml b/docsrc/xmlsource/DocBook/tblcals.xml index 7e14785323..13de65ce29 100644 --- a/docsrc/xmlsource/DocBook/tblcals.xml +++ b/docsrc/xmlsource/DocBook/tblcals.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/DocBook/tblxchg.xml b/docsrc/xmlsource/DocBook/tblxchg.xml index e7b49d4d45..ed27960ae2 100644 --- a/docsrc/xmlsource/DocBook/tblxchg.xml +++ b/docsrc/xmlsource/DocBook/tblxchg.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/DocBook/test.xml b/docsrc/xmlsource/DocBook/test.xml index 40c8bdb754..e5c26b8a38 100644 --- a/docsrc/xmlsource/DocBook/test.xml +++ b/docsrc/xmlsource/DocBook/test.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/Makefile.am b/docsrc/xmlsource/Makefile.am index 0153c5d480..1785b90c87 100644 --- a/docsrc/xmlsource/Makefile.am +++ b/docsrc/xmlsource/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/Virtdocs.spp b/docsrc/xmlsource/Virtdocs.spp index 42bc841e2b..ea72b539d2 100644 --- a/docsrc/xmlsource/Virtdocs.spp +++ b/docsrc/xmlsource/Virtdocs.spp @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/XMLDOM.xml b/docsrc/xmlsource/XMLDOM.xml index e93175885e..2263954392 100644 --- a/docsrc/xmlsource/XMLDOM.xml +++ b/docsrc/xmlsource/XMLDOM.xml @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/XMLType.xml b/docsrc/xmlsource/XMLType.xml index 3e6d0533b6..f0f95c6733 100644 --- a/docsrc/xmlsource/XMLType.xml +++ b/docsrc/xmlsource/XMLType.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/_DirInfo.sh b/docsrc/xmlsource/_DirInfo.sh index 7e31da3bcb..e936970a4e 100755 --- a/docsrc/xmlsource/_DirInfo.sh +++ b/docsrc/xmlsource/_DirInfo.sh @@ -10,7 +10,7 @@ out='_DirInfo.xml' echo '' > $out echo '' >> $out echo ' diff --git a/docsrc/xmlsource/_DirInfo.xml b/docsrc/xmlsource/_DirInfo.xml index f597c900ff..1df71ccf16 100644 --- a/docsrc/xmlsource/_DirInfo.xml +++ b/docsrc/xmlsource/_DirInfo.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/accessinterfaces.xml b/docsrc/xmlsource/accessinterfaces.xml index f45abbcb79..ba956b6071 100644 --- a/docsrc/xmlsource/accessinterfaces.xml +++ b/docsrc/xmlsource/accessinterfaces.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -1602,7 +1602,7 @@ VirtuosoRepository("server1:port1,server2:port2,server3", "uid", "pwd"); * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.blogging.xml b/docsrc/xmlsource/adminui.blogging.xml index 529ba0322b..fc22222d4b 100644 --- a/docsrc/xmlsource/adminui.blogging.xml +++ b/docsrc/xmlsource/adminui.blogging.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.dbadmin.xml b/docsrc/xmlsource/adminui.dbadmin.xml index 3ddf95f1b0..7e39a30129 100644 --- a/docsrc/xmlsource/adminui.dbadmin.xml +++ b/docsrc/xmlsource/adminui.dbadmin.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.internetdomains.xml b/docsrc/xmlsource/adminui.internetdomains.xml index 47ffa9ec38..f7a6f08eb5 100644 --- a/docsrc/xmlsource/adminui.internetdomains.xml +++ b/docsrc/xmlsource/adminui.internetdomains.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.mailsrvadm.xml b/docsrc/xmlsource/adminui.mailsrvadm.xml index 21575370d1..c3b4296a4b 100644 --- a/docsrc/xmlsource/adminui.mailsrvadm.xml +++ b/docsrc/xmlsource/adminui.mailsrvadm.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.newssrvadm.xml b/docsrc/xmlsource/adminui.newssrvadm.xml index 2e8fc01871..ae457da68a 100644 --- a/docsrc/xmlsource/adminui.newssrvadm.xml +++ b/docsrc/xmlsource/adminui.newssrvadm.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.querytools.xml b/docsrc/xmlsource/adminui.querytools.xml index f943ec03e4..b6bd15031e 100644 --- a/docsrc/xmlsource/adminui.querytools.xml +++ b/docsrc/xmlsource/adminui.querytools.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.rdfadm.xml b/docsrc/xmlsource/adminui.rdfadm.xml index 1676e392d0..321ca80617 100644 --- a/docsrc/xmlsource/adminui.rdfadm.xml +++ b/docsrc/xmlsource/adminui.rdfadm.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.replicationandsynchronization.xml b/docsrc/xmlsource/adminui.replicationandsynchronization.xml index 8b1741527b..095879281a 100644 --- a/docsrc/xmlsource/adminui.replicationandsynchronization.xml +++ b/docsrc/xmlsource/adminui.replicationandsynchronization.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.runtimehosting.xml b/docsrc/xmlsource/adminui.runtimehosting.xml index eae9bd2aa7..88ecac5cca 100644 --- a/docsrc/xmlsource/adminui.runtimehosting.xml +++ b/docsrc/xmlsource/adminui.runtimehosting.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.webdavadmin.xml b/docsrc/xmlsource/adminui.webdavadmin.xml index dc5ddd4023..40f33b2bea 100644 --- a/docsrc/xmlsource/adminui.webdavadmin.xml +++ b/docsrc/xmlsource/adminui.webdavadmin.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.webservices.xml b/docsrc/xmlsource/adminui.webservices.xml index 8b831e9803..41436bd1e2 100644 --- a/docsrc/xmlsource/adminui.webservices.xml +++ b/docsrc/xmlsource/adminui.webservices.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.xml b/docsrc/xmlsource/adminui.xml index 91bb7d41f1..3536d938db 100644 --- a/docsrc/xmlsource/adminui.xml +++ b/docsrc/xmlsource/adminui.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/adminui.xmlservices.xml b/docsrc/xmlsource/adminui.xmlservices.xml index ccafcb5042..2d77e29828 100644 --- a/docsrc/xmlsource/adminui.xmlservices.xml +++ b/docsrc/xmlsource/adminui.xmlservices.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/aggregates.xml b/docsrc/xmlsource/aggregates.xml index ab6fb70c2c..05644aeefb 100644 --- a/docsrc/xmlsource/aggregates.xml +++ b/docsrc/xmlsource/aggregates.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/appendixa.xml b/docsrc/xmlsource/appendixa.xml index 395489946c..79d23b6f66 100644 --- a/docsrc/xmlsource/appendixa.xml +++ b/docsrc/xmlsource/appendixa.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/backup.xml b/docsrc/xmlsource/backup.xml index fec7c879c2..5a49e2d316 100644 --- a/docsrc/xmlsource/backup.xml +++ b/docsrc/xmlsource/backup.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bidirrepl.xml b/docsrc/xmlsource/bidirrepl.xml index d9416e38f7..8d026d0c83 100644 --- a/docsrc/xmlsource/bidirrepl.xml +++ b/docsrc/xmlsource/bidirrepl.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bidirtransrepl.xml b/docsrc/xmlsource/bidirtransrepl.xml index f8bcdc3549..ed465aa43a 100644 --- a/docsrc/xmlsource/bidirtransrepl.xml +++ b/docsrc/xmlsource/bidirtransrepl.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/blog_atom.xml b/docsrc/xmlsource/blog_atom.xml index e7de39b9f1..2ce352fb52 100644 --- a/docsrc/xmlsource/blog_atom.xml +++ b/docsrc/xmlsource/blog_atom.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/blogger.xml b/docsrc/xmlsource/blogger.xml index b1ecafd443..1feda78c9f 100644 --- a/docsrc/xmlsource/blogger.xml +++ b/docsrc/xmlsource/blogger.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel.xml b/docsrc/xmlsource/bpel.xml index 7d906c4812..0d6f9a4a59 100644 --- a/docsrc/xmlsource/bpel.xml +++ b/docsrc/xmlsource/bpel.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_compile_script.xml b/docsrc/xmlsource/bpel/bpel_compile_script.xml index 43dcfe219b..b16aa77a6c 100644 --- a/docsrc/xmlsource/bpel/bpel_compile_script.xml +++ b/docsrc/xmlsource/bpel/bpel_compile_script.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_copy_script.xml b/docsrc/xmlsource/bpel/bpel_copy_script.xml index f0f9d7835b..1005b22df4 100644 --- a/docsrc/xmlsource/bpel/bpel_copy_script.xml +++ b/docsrc/xmlsource/bpel/bpel_copy_script.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_get_partner_links.xml b/docsrc/xmlsource/bpel/bpel_get_partner_links.xml index 12c4fbadf0..8ce2ab54a7 100644 --- a/docsrc/xmlsource/bpel/bpel_get_partner_links.xml +++ b/docsrc/xmlsource/bpel/bpel_get_partner_links.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_get_var.xml b/docsrc/xmlsource/bpel/bpel_get_var.xml index ba3af865b6..38eea69256 100644 --- a/docsrc/xmlsource/bpel/bpel_get_var.xml +++ b/docsrc/xmlsource/bpel/bpel_get_var.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_import_script.xml b/docsrc/xmlsource/bpel/bpel_import_script.xml index ceb269b1b7..09a55c20fd 100644 --- a/docsrc/xmlsource/bpel/bpel_import_script.xml +++ b/docsrc/xmlsource/bpel/bpel_import_script.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_instance_delete.xml b/docsrc/xmlsource/bpel/bpel_instance_delete.xml index bb53c12d69..a5d7f6f9c6 100644 --- a/docsrc/xmlsource/bpel/bpel_instance_delete.xml +++ b/docsrc/xmlsource/bpel/bpel_instance_delete.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_plink_get_option.xml b/docsrc/xmlsource/bpel/bpel_plink_get_option.xml index c978d6942b..0fd8fe839c 100644 --- a/docsrc/xmlsource/bpel/bpel_plink_get_option.xml +++ b/docsrc/xmlsource/bpel/bpel_plink_get_option.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_plink_set_option.xml b/docsrc/xmlsource/bpel/bpel_plink_set_option.xml index 6f64b6a41c..6fe3b24098 100644 --- a/docsrc/xmlsource/bpel/bpel_plink_set_option.xml +++ b/docsrc/xmlsource/bpel/bpel_plink_set_option.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_purge.xml b/docsrc/xmlsource/bpel/bpel_purge.xml index 278d4d0296..fe4a53f1d7 100644 --- a/docsrc/xmlsource/bpel/bpel_purge.xml +++ b/docsrc/xmlsource/bpel/bpel_purge.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_script_delete.xml b/docsrc/xmlsource/bpel/bpel_script_delete.xml index 6a2322d697..8fac1c713d 100644 --- a/docsrc/xmlsource/bpel/bpel_script_delete.xml +++ b/docsrc/xmlsource/bpel/bpel_script_delete.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_script_obsolete.xml b/docsrc/xmlsource/bpel/bpel_script_obsolete.xml index 6178688481..2847bdc262 100644 --- a/docsrc/xmlsource/bpel/bpel_script_obsolete.xml +++ b/docsrc/xmlsource/bpel/bpel_script_obsolete.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_script_source_update.xml b/docsrc/xmlsource/bpel/bpel_script_source_update.xml index 4d424b7242..e6bec09704 100644 --- a/docsrc/xmlsource/bpel/bpel_script_source_update.xml +++ b/docsrc/xmlsource/bpel/bpel_script_source_update.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_script_upload.xml b/docsrc/xmlsource/bpel/bpel_script_upload.xml index 1e3d4dde96..22f172eb44 100644 --- a/docsrc/xmlsource/bpel/bpel_script_upload.xml +++ b/docsrc/xmlsource/bpel/bpel_script_upload.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_script_version_cleanup.xml b/docsrc/xmlsource/bpel/bpel_script_version_cleanup.xml index 658ecc74b3..432b871557 100644 --- a/docsrc/xmlsource/bpel/bpel_script_version_cleanup.xml +++ b/docsrc/xmlsource/bpel/bpel_script_version_cleanup.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_set_var.xml b/docsrc/xmlsource/bpel/bpel_set_var.xml index caca0e7e5e..c5736f2407 100644 --- a/docsrc/xmlsource/bpel/bpel_set_var.xml +++ b/docsrc/xmlsource/bpel/bpel_set_var.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/bpel/bpel_wsdl_upload.xml b/docsrc/xmlsource/bpel/bpel_wsdl_upload.xml index d7f0287de1..bc65ea1e4b 100644 --- a/docsrc/xmlsource/bpel/bpel_wsdl_upload.xml +++ b/docsrc/xmlsource/bpel/bpel_wsdl_upload.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/cinterface.xml b/docsrc/xmlsource/cinterface.xml index 5569e3eb5b..b44f206df9 100644 --- a/docsrc/xmlsource/cinterface.xml +++ b/docsrc/xmlsource/cinterface.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/concepts.xml b/docsrc/xmlsource/concepts.xml index a54616e629..2373ff19b7 100644 --- a/docsrc/xmlsource/concepts.xml +++ b/docsrc/xmlsource/concepts.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/createassembly.xml b/docsrc/xmlsource/createassembly.xml index 56a994689e..364971e9b9 100644 --- a/docsrc/xmlsource/createassembly.xml +++ b/docsrc/xmlsource/createassembly.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/createexthostproc.xml b/docsrc/xmlsource/createexthostproc.xml index 569b5c0d00..b56b9ec4b6 100644 --- a/docsrc/xmlsource/createexthostproc.xml +++ b/docsrc/xmlsource/createexthostproc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/dbconcepts.xml b/docsrc/xmlsource/dbconcepts.xml index e9bcf5723a..b396b17d24 100644 --- a/docsrc/xmlsource/dbconcepts.xml +++ b/docsrc/xmlsource/dbconcepts.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/dbpump.xml b/docsrc/xmlsource/dbpump.xml index 081d534b90..8418a0c70e 100644 --- a/docsrc/xmlsource/dbpump.xml +++ b/docsrc/xmlsource/dbpump.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/errors.xml b/docsrc/xmlsource/errors.xml index b66581b633..f07c6eae2e 100644 --- a/docsrc/xmlsource/errors.xml +++ b/docsrc/xmlsource/errors.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/exposingws.xml b/docsrc/xmlsource/exposingws.xml index 770d39c4da..42e6c73a67 100644 --- a/docsrc/xmlsource/exposingws.xml +++ b/docsrc/xmlsource/exposingws.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/fault.xml b/docsrc/xmlsource/fault.xml index 10454b2a37..49bf2a3f44 100644 --- a/docsrc/xmlsource/fault.xml +++ b/docsrc/xmlsource/fault.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/freetext.xml b/docsrc/xmlsource/freetext.xml index d67461d4c5..9590cd10cd 100644 --- a/docsrc/xmlsource/freetext.xml +++ b/docsrc/xmlsource/freetext.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/ftp.xml b/docsrc/xmlsource/ftp.xml index b6bbe04cd0..ab7c5bedbc 100644 --- a/docsrc/xmlsource/ftp.xml +++ b/docsrc/xmlsource/ftp.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/BAG_AGG.xml b/docsrc/xmlsource/funcref/BAG_AGG.xml index f15f81591c..172b3c4ba0 100644 --- a/docsrc/xmlsource/funcref/BAG_AGG.xml +++ b/docsrc/xmlsource/funcref/BAG_AGG.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/BAG_CONCAT_AGG.xml b/docsrc/xmlsource/funcref/BAG_CONCAT_AGG.xml index 0dce975ecf..cf6431eae3 100644 --- a/docsrc/xmlsource/funcref/BAG_CONCAT_AGG.xml +++ b/docsrc/xmlsource/funcref/BAG_CONCAT_AGG.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/BAG_OF_NONNULLS_AGG.xml b/docsrc/xmlsource/funcref/BAG_OF_NONNULLS_AGG.xml index 4983182eb7..a2e6a64785 100644 --- a/docsrc/xmlsource/funcref/BAG_OF_NONNULLS_AGG.xml +++ b/docsrc/xmlsource/funcref/BAG_OF_NONNULLS_AGG.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/BAG_OF_NONNULLS_OR_NULL_AGG.xml b/docsrc/xmlsource/funcref/BAG_OF_NONNULLS_OR_NULL_AGG.xml index b91c27db63..a3322981b5 100644 --- a/docsrc/xmlsource/funcref/BAG_OF_NONNULLS_OR_NULL_AGG.xml +++ b/docsrc/xmlsource/funcref/BAG_OF_NONNULLS_OR_NULL_AGG.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/BAG_OR_NULL_AGG.xml b/docsrc/xmlsource/funcref/BAG_OR_NULL_AGG.xml index e30f922fc1..6c08c617ef 100644 --- a/docsrc/xmlsource/funcref/BAG_OR_NULL_AGG.xml +++ b/docsrc/xmlsource/funcref/BAG_OR_NULL_AGG.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/GROUP_CONCAT.xml b/docsrc/xmlsource/funcref/GROUP_CONCAT.xml index 3b28d48d8f..b4b5b771c7 100644 --- a/docsrc/xmlsource/funcref/GROUP_CONCAT.xml +++ b/docsrc/xmlsource/funcref/GROUP_CONCAT.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/GROUP_CONCAT_DISTINCT.xml b/docsrc/xmlsource/funcref/GROUP_CONCAT_DISTINCT.xml index 42f60989a8..c654388507 100644 --- a/docsrc/xmlsource/funcref/GROUP_CONCAT_DISTINCT.xml +++ b/docsrc/xmlsource/funcref/GROUP_CONCAT_DISTINCT.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/GROUP_DIGEST.xml b/docsrc/xmlsource/funcref/GROUP_DIGEST.xml index 60ba2503fb..7c7469e69c 100644 --- a/docsrc/xmlsource/funcref/GROUP_DIGEST.xml +++ b/docsrc/xmlsource/funcref/GROUP_DIGEST.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/GeometryType.xml b/docsrc/xmlsource/funcref/GeometryType.xml index 0841166042..957406ce67 100644 --- a/docsrc/xmlsource/funcref/GeometryType.xml +++ b/docsrc/xmlsource/funcref/GeometryType.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/REPL_ADD_CR.xml b/docsrc/xmlsource/funcref/REPL_ADD_CR.xml index c22da03a94..9c9606d3ef 100644 --- a/docsrc/xmlsource/funcref/REPL_ADD_CR.xml +++ b/docsrc/xmlsource/funcref/REPL_ADD_CR.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/REPL_ADD_DAV_CR.xml b/docsrc/xmlsource/funcref/REPL_ADD_DAV_CR.xml index 96447ba529..9c95f64685 100644 --- a/docsrc/xmlsource/funcref/REPL_ADD_DAV_CR.xml +++ b/docsrc/xmlsource/funcref/REPL_ADD_DAV_CR.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/REPL_ADD_SNAPSHOT_CR.xml b/docsrc/xmlsource/funcref/REPL_ADD_SNAPSHOT_CR.xml index 3e8ddaa808..3490f6e26c 100644 --- a/docsrc/xmlsource/funcref/REPL_ADD_SNAPSHOT_CR.xml +++ b/docsrc/xmlsource/funcref/REPL_ADD_SNAPSHOT_CR.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_PUB.xml b/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_PUB.xml index b485ebc828..2db15e2539 100644 --- a/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_PUB.xml +++ b/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_PUB.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_SUB.xml b/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_SUB.xml index f3944957a0..288544c567 100644 --- a/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_SUB.xml +++ b/docsrc/xmlsource/funcref/REPL_CREATE_SNAPSHOT_SUB.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_PUB.xml b/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_PUB.xml index 659e3f114a..a439f2e8cd 100644 --- a/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_PUB.xml +++ b/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_PUB.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_SUB.xml b/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_SUB.xml index fa8c663a99..808b8adb61 100644 --- a/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_SUB.xml +++ b/docsrc/xmlsource/funcref/REPL_DROP_SNAPSHOT_SUB.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/REPL_INIT_SNAPSHOT.xml b/docsrc/xmlsource/funcref/REPL_INIT_SNAPSHOT.xml index a848cfb66c..922f759e2d 100644 --- a/docsrc/xmlsource/funcref/REPL_INIT_SNAPSHOT.xml +++ b/docsrc/xmlsource/funcref/REPL_INIT_SNAPSHOT.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/REPL_SERVER_NAME.xml b/docsrc/xmlsource/funcref/REPL_SERVER_NAME.xml index 541dee717e..43c42b371b 100644 --- a/docsrc/xmlsource/funcref/REPL_SERVER_NAME.xml +++ b/docsrc/xmlsource/funcref/REPL_SERVER_NAME.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/REPL_SNP_SERVER.xml b/docsrc/xmlsource/funcref/REPL_SNP_SERVER.xml index 7487556846..346f490a22 100644 --- a/docsrc/xmlsource/funcref/REPL_SNP_SERVER.xml +++ b/docsrc/xmlsource/funcref/REPL_SNP_SERVER.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/REPL_UPDATE_SNAPSHOT.xml b/docsrc/xmlsource/funcref/REPL_UPDATE_SNAPSHOT.xml index a37c3bd8f9..defd9d6786 100644 --- a/docsrc/xmlsource/funcref/REPL_UPDATE_SNAPSHOT.xml +++ b/docsrc/xmlsource/funcref/REPL_UPDATE_SNAPSHOT.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/SAMPLE.xml b/docsrc/xmlsource/funcref/SAMPLE.xml index 5ff549d774..46867599e8 100644 --- a/docsrc/xmlsource/funcref/SAMPLE.xml +++ b/docsrc/xmlsource/funcref/SAMPLE.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_Affine.xml b/docsrc/xmlsource/funcref/ST_Affine.xml index 4df6b31485..7a87b5609a 100644 --- a/docsrc/xmlsource/funcref/ST_Affine.xml +++ b/docsrc/xmlsource/funcref/ST_Affine.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_ExteriorRing.xml b/docsrc/xmlsource/funcref/ST_ExteriorRing.xml index fcaaf82427..41416b70d4 100644 --- a/docsrc/xmlsource/funcref/ST_ExteriorRing.xml +++ b/docsrc/xmlsource/funcref/ST_ExteriorRing.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_GeometryN.xml b/docsrc/xmlsource/funcref/ST_GeometryN.xml index 0048a37d48..11eda02479 100644 --- a/docsrc/xmlsource/funcref/ST_GeometryN.xml +++ b/docsrc/xmlsource/funcref/ST_GeometryN.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_InteriorRingN.xml b/docsrc/xmlsource/funcref/ST_InteriorRingN.xml index dca021e0b0..d530230d15 100644 --- a/docsrc/xmlsource/funcref/ST_InteriorRingN.xml +++ b/docsrc/xmlsource/funcref/ST_InteriorRingN.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_M.xml b/docsrc/xmlsource/funcref/ST_M.xml index 7da1e94056..0d98ddfebe 100644 --- a/docsrc/xmlsource/funcref/ST_M.xml +++ b/docsrc/xmlsource/funcref/ST_M.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_MMax.xml b/docsrc/xmlsource/funcref/ST_MMax.xml index e4b1c53b42..e5f152a54e 100644 --- a/docsrc/xmlsource/funcref/ST_MMax.xml +++ b/docsrc/xmlsource/funcref/ST_MMax.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_MMin.xml b/docsrc/xmlsource/funcref/ST_MMin.xml index c62d20b591..7ccfd63f81 100644 --- a/docsrc/xmlsource/funcref/ST_MMin.xml +++ b/docsrc/xmlsource/funcref/ST_MMin.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_NumGeometries.xml b/docsrc/xmlsource/funcref/ST_NumGeometries.xml index 82f3666181..c3d4ca85e3 100644 --- a/docsrc/xmlsource/funcref/ST_NumGeometries.xml +++ b/docsrc/xmlsource/funcref/ST_NumGeometries.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_NumInteriorRings.xml b/docsrc/xmlsource/funcref/ST_NumInteriorRings.xml index e43b14deeb..ef6691f032 100644 --- a/docsrc/xmlsource/funcref/ST_NumInteriorRings.xml +++ b/docsrc/xmlsource/funcref/ST_NumInteriorRings.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_SRID.xml b/docsrc/xmlsource/funcref/ST_SRID.xml index bcdde27649..930b2ed77e 100644 --- a/docsrc/xmlsource/funcref/ST_SRID.xml +++ b/docsrc/xmlsource/funcref/ST_SRID.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_SetSRID.xml b/docsrc/xmlsource/funcref/ST_SetSRID.xml index 0e68bd7318..eab5d79dbc 100644 --- a/docsrc/xmlsource/funcref/ST_SetSRID.xml +++ b/docsrc/xmlsource/funcref/ST_SetSRID.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_TransScale.xml b/docsrc/xmlsource/funcref/ST_TransScale.xml index 77cb6eda36..fbb817cdbf 100644 --- a/docsrc/xmlsource/funcref/ST_TransScale.xml +++ b/docsrc/xmlsource/funcref/ST_TransScale.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_Transform.xml b/docsrc/xmlsource/funcref/ST_Transform.xml index 2d725d8cdd..120003cbbd 100644 --- a/docsrc/xmlsource/funcref/ST_Transform.xml +++ b/docsrc/xmlsource/funcref/ST_Transform.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_Translate.xml b/docsrc/xmlsource/funcref/ST_Translate.xml index 46f311b034..32f34677fc 100644 --- a/docsrc/xmlsource/funcref/ST_Translate.xml +++ b/docsrc/xmlsource/funcref/ST_Translate.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_XMax.xml b/docsrc/xmlsource/funcref/ST_XMax.xml index 133100a7fc..a82aac2ba9 100644 --- a/docsrc/xmlsource/funcref/ST_XMax.xml +++ b/docsrc/xmlsource/funcref/ST_XMax.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_XMin.xml b/docsrc/xmlsource/funcref/ST_XMin.xml index 960cd3521c..e749573e3b 100644 --- a/docsrc/xmlsource/funcref/ST_XMin.xml +++ b/docsrc/xmlsource/funcref/ST_XMin.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_YMax.xml b/docsrc/xmlsource/funcref/ST_YMax.xml index f2243e161e..da1aae75a5 100644 --- a/docsrc/xmlsource/funcref/ST_YMax.xml +++ b/docsrc/xmlsource/funcref/ST_YMax.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_YMin.xml b/docsrc/xmlsource/funcref/ST_YMin.xml index d5ae05c79d..f9f6e42476 100644 --- a/docsrc/xmlsource/funcref/ST_YMin.xml +++ b/docsrc/xmlsource/funcref/ST_YMin.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_Z.xml b/docsrc/xmlsource/funcref/ST_Z.xml index 1fc1d0a7ea..e28f408e9a 100644 --- a/docsrc/xmlsource/funcref/ST_Z.xml +++ b/docsrc/xmlsource/funcref/ST_Z.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_ZMax.xml b/docsrc/xmlsource/funcref/ST_ZMax.xml index ffef2c78d2..64eb178e6a 100644 --- a/docsrc/xmlsource/funcref/ST_ZMax.xml +++ b/docsrc/xmlsource/funcref/ST_ZMax.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_ZMin.xml b/docsrc/xmlsource/funcref/ST_ZMin.xml index 8952014c9f..16e83159e0 100644 --- a/docsrc/xmlsource/funcref/ST_ZMin.xml +++ b/docsrc/xmlsource/funcref/ST_ZMin.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ST_Zmflag.xml b/docsrc/xmlsource/funcref/ST_Zmflag.xml index dbd220d38b..4785bf364d 100644 --- a/docsrc/xmlsource/funcref/ST_Zmflag.xml +++ b/docsrc/xmlsource/funcref/ST_Zmflag.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/TOTP_generate.xml b/docsrc/xmlsource/funcref/TOTP_generate.xml index 6fd655b4d0..73f316068b 100644 --- a/docsrc/xmlsource/funcref/TOTP_generate.xml +++ b/docsrc/xmlsource/funcref/TOTP_generate.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/VECTOR_AGG.xml b/docsrc/xmlsource/funcref/VECTOR_AGG.xml index 5bbfc53253..2262dee785 100644 --- a/docsrc/xmlsource/funcref/VECTOR_AGG.xml +++ b/docsrc/xmlsource/funcref/VECTOR_AGG.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/VECTOR_CONCAT_AGG.xml b/docsrc/xmlsource/funcref/VECTOR_CONCAT_AGG.xml index 7ff1c7dfe9..fb1f306b62 100644 --- a/docsrc/xmlsource/funcref/VECTOR_CONCAT_AGG.xml +++ b/docsrc/xmlsource/funcref/VECTOR_CONCAT_AGG.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/VECTOR_OF_NONNULLS_AGG.xml b/docsrc/xmlsource/funcref/VECTOR_OF_NONNULLS_AGG.xml index 9dcf6967a4..1704eb4e94 100644 --- a/docsrc/xmlsource/funcref/VECTOR_OF_NONNULLS_AGG.xml +++ b/docsrc/xmlsource/funcref/VECTOR_OF_NONNULLS_AGG.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/VECTOR_OF_NONNULLS_OR_NULL_AGG.xml b/docsrc/xmlsource/funcref/VECTOR_OF_NONNULLS_OR_NULL_AGG.xml index 068d6034c0..11c06fedc9 100644 --- a/docsrc/xmlsource/funcref/VECTOR_OF_NONNULLS_OR_NULL_AGG.xml +++ b/docsrc/xmlsource/funcref/VECTOR_OF_NONNULLS_OR_NULL_AGG.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/VECTOR_OR_NULL_AGG.xml b/docsrc/xmlsource/funcref/VECTOR_OR_NULL_AGG.xml index edc4ecc099..10460e1bb4 100644 --- a/docsrc/xmlsource/funcref/VECTOR_OR_NULL_AGG.xml +++ b/docsrc/xmlsource/funcref/VECTOR_OR_NULL_AGG.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLAGG.xml b/docsrc/xmlsource/funcref/XMLAGG.xml index 68ae6e39e3..1967787c4a 100644 --- a/docsrc/xmlsource/funcref/XMLAGG.xml +++ b/docsrc/xmlsource/funcref/XMLAGG.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLATTRIBUTES.xml b/docsrc/xmlsource/funcref/XMLATTRIBUTES.xml index 4b930a3ec2..a599feb7b1 100644 --- a/docsrc/xmlsource/funcref/XMLATTRIBUTES.xml +++ b/docsrc/xmlsource/funcref/XMLATTRIBUTES.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLAddAttribute.xml b/docsrc/xmlsource/funcref/XMLAddAttribute.xml index 7592b56829..a2fecee1d0 100644 --- a/docsrc/xmlsource/funcref/XMLAddAttribute.xml +++ b/docsrc/xmlsource/funcref/XMLAddAttribute.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLAppendChildren.xml b/docsrc/xmlsource/funcref/XMLAppendChildren.xml index 5b36a444c3..0bb58c9789 100644 --- a/docsrc/xmlsource/funcref/XMLAppendChildren.xml +++ b/docsrc/xmlsource/funcref/XMLAppendChildren.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLCONCAT.xml b/docsrc/xmlsource/funcref/XMLCONCAT.xml index e594b383bb..624b57a064 100644 --- a/docsrc/xmlsource/funcref/XMLCONCAT.xml +++ b/docsrc/xmlsource/funcref/XMLCONCAT.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLELEMENT.xml b/docsrc/xmlsource/funcref/XMLELEMENT.xml index 130e50eb85..4ab0a83291 100644 --- a/docsrc/xmlsource/funcref/XMLELEMENT.xml +++ b/docsrc/xmlsource/funcref/XMLELEMENT.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLFOREST.xml b/docsrc/xmlsource/funcref/XMLFOREST.xml index 3a55b7efe7..d839033e0b 100644 --- a/docsrc/xmlsource/funcref/XMLFOREST.xml +++ b/docsrc/xmlsource/funcref/XMLFOREST.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLInsertAfter.xml b/docsrc/xmlsource/funcref/XMLInsertAfter.xml index bd6e1cc809..281b3acac1 100644 --- a/docsrc/xmlsource/funcref/XMLInsertAfter.xml +++ b/docsrc/xmlsource/funcref/XMLInsertAfter.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLInsertBefore.xml b/docsrc/xmlsource/funcref/XMLInsertBefore.xml index 573f85ae1a..9e1cfbbb74 100644 --- a/docsrc/xmlsource/funcref/XMLInsertBefore.xml +++ b/docsrc/xmlsource/funcref/XMLInsertBefore.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLReplace.xml b/docsrc/xmlsource/funcref/XMLReplace.xml index 4ee0a88425..cf553fc263 100644 --- a/docsrc/xmlsource/funcref/XMLReplace.xml +++ b/docsrc/xmlsource/funcref/XMLReplace.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.XMLType.xml b/docsrc/xmlsource/funcref/XMLType.XMLType.xml index cb7ed69635..0677f5c8c7 100644 --- a/docsrc/xmlsource/funcref/XMLType.XMLType.xml +++ b/docsrc/xmlsource/funcref/XMLType.XMLType.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.createNonSchemaBasedXML.xml b/docsrc/xmlsource/funcref/XMLType.createNonSchemaBasedXML.xml index 18b64fd858..992836f488 100644 --- a/docsrc/xmlsource/funcref/XMLType.createNonSchemaBasedXML.xml +++ b/docsrc/xmlsource/funcref/XMLType.createNonSchemaBasedXML.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.createSchemaBasedXML.xml b/docsrc/xmlsource/funcref/XMLType.createSchemaBasedXML.xml index 218ab203f1..f96854acce 100644 --- a/docsrc/xmlsource/funcref/XMLType.createSchemaBasedXML.xml +++ b/docsrc/xmlsource/funcref/XMLType.createSchemaBasedXML.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.createXML.xml b/docsrc/xmlsource/funcref/XMLType.createXML.xml index f5c7c31717..d4c848378b 100644 --- a/docsrc/xmlsource/funcref/XMLType.createXML.xml +++ b/docsrc/xmlsource/funcref/XMLType.createXML.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.existsNode.xml b/docsrc/xmlsource/funcref/XMLType.existsNode.xml index d3b143184f..380a2b199d 100644 --- a/docsrc/xmlsource/funcref/XMLType.existsNode.xml +++ b/docsrc/xmlsource/funcref/XMLType.existsNode.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.extract.xml b/docsrc/xmlsource/funcref/XMLType.extract.xml index ffab65cd2a..f214ba0ec7 100644 --- a/docsrc/xmlsource/funcref/XMLType.extract.xml +++ b/docsrc/xmlsource/funcref/XMLType.extract.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.getClobVal.xml b/docsrc/xmlsource/funcref/XMLType.getClobVal.xml index ebdc52a6cd..beee85978d 100644 --- a/docsrc/xmlsource/funcref/XMLType.getClobVal.xml +++ b/docsrc/xmlsource/funcref/XMLType.getClobVal.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.getNamespace.xml b/docsrc/xmlsource/funcref/XMLType.getNamespace.xml index 0830ec3f91..dbf6d805b9 100644 --- a/docsrc/xmlsource/funcref/XMLType.getNamespace.xml +++ b/docsrc/xmlsource/funcref/XMLType.getNamespace.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.getNumVal.xml b/docsrc/xmlsource/funcref/XMLType.getNumVal.xml index 69a367af06..2181585c34 100644 --- a/docsrc/xmlsource/funcref/XMLType.getNumVal.xml +++ b/docsrc/xmlsource/funcref/XMLType.getNumVal.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.getRootElement.xml b/docsrc/xmlsource/funcref/XMLType.getRootElement.xml index c1ffdc1839..d0a83718bb 100644 --- a/docsrc/xmlsource/funcref/XMLType.getRootElement.xml +++ b/docsrc/xmlsource/funcref/XMLType.getRootElement.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.getSchemaURL.xml b/docsrc/xmlsource/funcref/XMLType.getSchemaURL.xml index 48554d2657..2c90c279e4 100644 --- a/docsrc/xmlsource/funcref/XMLType.getSchemaURL.xml +++ b/docsrc/xmlsource/funcref/XMLType.getSchemaURL.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.getStringVal.xml b/docsrc/xmlsource/funcref/XMLType.getStringVal.xml index 3f1c72b191..abbad27f1e 100644 --- a/docsrc/xmlsource/funcref/XMLType.getStringVal.xml +++ b/docsrc/xmlsource/funcref/XMLType.getStringVal.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.isFragment.xml b/docsrc/xmlsource/funcref/XMLType.isFragment.xml index 1b26aee2a1..8fd8156264 100644 --- a/docsrc/xmlsource/funcref/XMLType.isFragment.xml +++ b/docsrc/xmlsource/funcref/XMLType.isFragment.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.isSchemaBased.xml b/docsrc/xmlsource/funcref/XMLType.isSchemaBased.xml index d53a8488db..4c29b6f7aa 100644 --- a/docsrc/xmlsource/funcref/XMLType.isSchemaBased.xml +++ b/docsrc/xmlsource/funcref/XMLType.isSchemaBased.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.isSchemaValid.xml b/docsrc/xmlsource/funcref/XMLType.isSchemaValid.xml index f7e212881e..590862190d 100644 --- a/docsrc/xmlsource/funcref/XMLType.isSchemaValid.xml +++ b/docsrc/xmlsource/funcref/XMLType.isSchemaValid.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.isSchemaValidated.xml b/docsrc/xmlsource/funcref/XMLType.isSchemaValidated.xml index 6a2d6884bd..cb693234ec 100644 --- a/docsrc/xmlsource/funcref/XMLType.isSchemaValidated.xml +++ b/docsrc/xmlsource/funcref/XMLType.isSchemaValidated.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.schemaValidate.xml b/docsrc/xmlsource/funcref/XMLType.schemaValidate.xml index 2ad49176cd..21213f7185 100644 --- a/docsrc/xmlsource/funcref/XMLType.schemaValidate.xml +++ b/docsrc/xmlsource/funcref/XMLType.schemaValidate.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.setSchemaValidated.xml b/docsrc/xmlsource/funcref/XMLType.setSchemaValidated.xml index 5456e68f69..212647f233 100644 --- a/docsrc/xmlsource/funcref/XMLType.setSchemaValidated.xml +++ b/docsrc/xmlsource/funcref/XMLType.setSchemaValidated.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.toObject.xml b/docsrc/xmlsource/funcref/XMLType.toObject.xml index a86ab3c986..19a1307162 100644 --- a/docsrc/xmlsource/funcref/XMLType.toObject.xml +++ b/docsrc/xmlsource/funcref/XMLType.toObject.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XMLType.transform.xml b/docsrc/xmlsource/funcref/XMLType.transform.xml index ed479296f9..2a07520cd8 100644 --- a/docsrc/xmlsource/funcref/XMLType.transform.xml +++ b/docsrc/xmlsource/funcref/XMLType.transform.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/XQ_SEQUENCE_AGG.xml b/docsrc/xmlsource/funcref/XQ_SEQUENCE_AGG.xml index b693a3f7ac..9536e98a47 100644 --- a/docsrc/xmlsource/funcref/XQ_SEQUENCE_AGG.xml +++ b/docsrc/xmlsource/funcref/XQ_SEQUENCE_AGG.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/abs.xml b/docsrc/xmlsource/funcref/abs.xml index 3d3f837c75..fb76c7c5ba 100644 --- a/docsrc/xmlsource/funcref/abs.xml +++ b/docsrc/xmlsource/funcref/abs.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/adjust_timezone.xml b/docsrc/xmlsource/funcref/adjust_timezone.xml index 1eced9d72e..795c5b0366 100644 --- a/docsrc/xmlsource/funcref/adjust_timezone.xml +++ b/docsrc/xmlsource/funcref/adjust_timezone.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ann_phrase_class_add.xml b/docsrc/xmlsource/funcref/ann_phrase_class_add.xml index 847126e9ce..a13816050b 100644 --- a/docsrc/xmlsource/funcref/ann_phrase_class_add.xml +++ b/docsrc/xmlsource/funcref/ann_phrase_class_add.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ann_phrase_class_del.xml b/docsrc/xmlsource/funcref/ann_phrase_class_del.xml index aed5942b77..b67f47b370 100644 --- a/docsrc/xmlsource/funcref/ann_phrase_class_del.xml +++ b/docsrc/xmlsource/funcref/ann_phrase_class_del.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/any_grants.xml b/docsrc/xmlsource/funcref/any_grants.xml index ddca225e40..309ae6a3dc 100644 --- a/docsrc/xmlsource/funcref/any_grants.xml +++ b/docsrc/xmlsource/funcref/any_grants.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ap_add_phrases.xml b/docsrc/xmlsource/funcref/ap_add_phrases.xml index 76dea8c61b..4cf89b29e8 100644 --- a/docsrc/xmlsource/funcref/ap_add_phrases.xml +++ b/docsrc/xmlsource/funcref/ap_add_phrases.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ap_build_match_list.xml b/docsrc/xmlsource/funcref/ap_build_match_list.xml index 428f239872..ee570ac8dc 100644 --- a/docsrc/xmlsource/funcref/ap_build_match_list.xml +++ b/docsrc/xmlsource/funcref/ap_build_match_list.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/aref.xml b/docsrc/xmlsource/funcref/aref.xml index 77f6b2ea5e..39f21271d3 100644 --- a/docsrc/xmlsource/funcref/aref.xml +++ b/docsrc/xmlsource/funcref/aref.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ascii.xml b/docsrc/xmlsource/funcref/ascii.xml index 3e1e17e3af..4a0205a14e 100644 --- a/docsrc/xmlsource/funcref/ascii.xml +++ b/docsrc/xmlsource/funcref/ascii.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/aset.xml b/docsrc/xmlsource/funcref/aset.xml index 216bf0ce71..be60c81fa0 100644 --- a/docsrc/xmlsource/funcref/aset.xml +++ b/docsrc/xmlsource/funcref/aset.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/atof.xml b/docsrc/xmlsource/funcref/atof.xml index 6549af6328..6ed5817162 100644 --- a/docsrc/xmlsource/funcref/atof.xml +++ b/docsrc/xmlsource/funcref/atof.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/atoi.xml b/docsrc/xmlsource/funcref/atoi.xml index a78471de7b..7184ceb479 100644 --- a/docsrc/xmlsource/funcref/atoi.xml +++ b/docsrc/xmlsource/funcref/atoi.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/att_local_name.xml b/docsrc/xmlsource/funcref/att_local_name.xml index d491837578..7670a95791 100644 --- a/docsrc/xmlsource/funcref/att_local_name.xml +++ b/docsrc/xmlsource/funcref/att_local_name.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/attach_from_csv.xml b/docsrc/xmlsource/funcref/attach_from_csv.xml index 91baccde60..956b6de579 100644 --- a/docsrc/xmlsource/funcref/attach_from_csv.xml +++ b/docsrc/xmlsource/funcref/attach_from_csv.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/backup.xml b/docsrc/xmlsource/funcref/backup.xml index 1720287153..ecb27d07df 100644 --- a/docsrc/xmlsource/funcref/backup.xml +++ b/docsrc/xmlsource/funcref/backup.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/backup_context_clear.xml b/docsrc/xmlsource/funcref/backup_context_clear.xml index 2353da1caa..354276ebd2 100644 --- a/docsrc/xmlsource/funcref/backup_context_clear.xml +++ b/docsrc/xmlsource/funcref/backup_context_clear.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/backup_online.xml b/docsrc/xmlsource/funcref/backup_online.xml index cb24d867b6..4de372b7a7 100644 --- a/docsrc/xmlsource/funcref/backup_online.xml +++ b/docsrc/xmlsource/funcref/backup_online.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_arg.xml b/docsrc/xmlsource/funcref/bif_arg.xml index 823460bce6..4163935919 100644 --- a/docsrc/xmlsource/funcref/bif_arg.xml +++ b/docsrc/xmlsource/funcref/bif_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_array_arg.xml b/docsrc/xmlsource/funcref/bif_array_arg.xml index 2811983ca9..34758d7935 100644 --- a/docsrc/xmlsource/funcref/bif_array_arg.xml +++ b/docsrc/xmlsource/funcref/bif_array_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_array_or_null_arg.xml b/docsrc/xmlsource/funcref/bif_array_or_null_arg.xml index dd39317492..3dbbc7c9b3 100644 --- a/docsrc/xmlsource/funcref/bif_array_or_null_arg.xml +++ b/docsrc/xmlsource/funcref/bif_array_or_null_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_bin_arg.xml b/docsrc/xmlsource/funcref/bif_bin_arg.xml index 586f600b79..3c6c662ed7 100644 --- a/docsrc/xmlsource/funcref/bif_bin_arg.xml +++ b/docsrc/xmlsource/funcref/bif_bin_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_double_arg.xml b/docsrc/xmlsource/funcref/bif_double_arg.xml index 52d0ba6559..b14cdad0ac 100644 --- a/docsrc/xmlsource/funcref/bif_double_arg.xml +++ b/docsrc/xmlsource/funcref/bif_double_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_entity_arg.xml b/docsrc/xmlsource/funcref/bif_entity_arg.xml index f92324a7fb..2e08af3d48 100644 --- a/docsrc/xmlsource/funcref/bif_entity_arg.xml +++ b/docsrc/xmlsource/funcref/bif_entity_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_float_arg.xml b/docsrc/xmlsource/funcref/bif_float_arg.xml index 6f04b85819..359e9ce616 100644 --- a/docsrc/xmlsource/funcref/bif_float_arg.xml +++ b/docsrc/xmlsource/funcref/bif_float_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_funcs.xml b/docsrc/xmlsource/funcref/bif_funcs.xml index eb849f39a1..b22e2c6f9d 100644 --- a/docsrc/xmlsource/funcref/bif_funcs.xml +++ b/docsrc/xmlsource/funcref/bif_funcs.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_long_arg.xml b/docsrc/xmlsource/funcref/bif_long_arg.xml index 13b82119a4..6c373785c4 100644 --- a/docsrc/xmlsource/funcref/bif_long_arg.xml +++ b/docsrc/xmlsource/funcref/bif_long_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_long_or_char_arg.xml b/docsrc/xmlsource/funcref/bif_long_or_char_arg.xml index 37a75e6a75..92811e997c 100644 --- a/docsrc/xmlsource/funcref/bif_long_or_char_arg.xml +++ b/docsrc/xmlsource/funcref/bif_long_or_char_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_string_arg.xml b/docsrc/xmlsource/funcref/bif_string_arg.xml index 7594fd9d3e..57f373d808 100644 --- a/docsrc/xmlsource/funcref/bif_string_arg.xml +++ b/docsrc/xmlsource/funcref/bif_string_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_string_or_null_arg.xml b/docsrc/xmlsource/funcref/bif_string_or_null_arg.xml index ff516cf6c8..cdcd266cb0 100644 --- a/docsrc/xmlsource/funcref/bif_string_or_null_arg.xml +++ b/docsrc/xmlsource/funcref/bif_string_or_null_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_string_or_wide_or_null_arg.xml b/docsrc/xmlsource/funcref/bif_string_or_wide_or_null_arg.xml index 445a860bbd..b1893c1a33 100644 --- a/docsrc/xmlsource/funcref/bif_string_or_wide_or_null_arg.xml +++ b/docsrc/xmlsource/funcref/bif_string_or_wide_or_null_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bif_strses_arg.xml b/docsrc/xmlsource/funcref/bif_strses_arg.xml index 952db35964..15ef3375d8 100644 --- a/docsrc/xmlsource/funcref/bif_strses_arg.xml +++ b/docsrc/xmlsource/funcref/bif_strses_arg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bit_and.xml b/docsrc/xmlsource/funcref/bit_and.xml index 4c62bda995..f25a096398 100644 --- a/docsrc/xmlsource/funcref/bit_and.xml +++ b/docsrc/xmlsource/funcref/bit_and.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bit_not.xml b/docsrc/xmlsource/funcref/bit_not.xml index 49061cccf4..5cb45a0f44 100644 --- a/docsrc/xmlsource/funcref/bit_not.xml +++ b/docsrc/xmlsource/funcref/bit_not.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bit_or.xml b/docsrc/xmlsource/funcref/bit_or.xml index f4215d4f96..58186832ba 100644 --- a/docsrc/xmlsource/funcref/bit_or.xml +++ b/docsrc/xmlsource/funcref/bit_or.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bit_shift.xml b/docsrc/xmlsource/funcref/bit_shift.xml index ca9f5ba9c0..94ac8c9219 100644 --- a/docsrc/xmlsource/funcref/bit_shift.xml +++ b/docsrc/xmlsource/funcref/bit_shift.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bit_xor.xml b/docsrc/xmlsource/funcref/bit_xor.xml index 58f286ca9b..0e1a10e449 100644 --- a/docsrc/xmlsource/funcref/bit_xor.xml +++ b/docsrc/xmlsource/funcref/bit_xor.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/blob_to_string.xml b/docsrc/xmlsource/funcref/blob_to_string.xml index 7690ab6c8e..9b5e333a85 100644 --- a/docsrc/xmlsource/funcref/blob_to_string.xml +++ b/docsrc/xmlsource/funcref/blob_to_string.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/blob_to_string_output.xml b/docsrc/xmlsource/funcref/blob_to_string_output.xml index fa62bbdb1a..f28c7f699f 100644 --- a/docsrc/xmlsource/funcref/blob_to_string_output.xml +++ b/docsrc/xmlsource/funcref/blob_to_string_output.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/blogger.deletePost.xml b/docsrc/xmlsource/funcref/blogger.deletePost.xml index dfe2389ab9..0ac8122a7c 100644 --- a/docsrc/xmlsource/funcref/blogger.deletePost.xml +++ b/docsrc/xmlsource/funcref/blogger.deletePost.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/blogger.editPost.xml b/docsrc/xmlsource/funcref/blogger.editPost.xml index 2cae93f58a..eb54d01405 100644 --- a/docsrc/xmlsource/funcref/blogger.editPost.xml +++ b/docsrc/xmlsource/funcref/blogger.editPost.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/blogger.getPost.xml b/docsrc/xmlsource/funcref/blogger.getPost.xml index 325e362f0c..6c98359ca4 100644 --- a/docsrc/xmlsource/funcref/blogger.getPost.xml +++ b/docsrc/xmlsource/funcref/blogger.getPost.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/blogger.getRecentPosts.xml b/docsrc/xmlsource/funcref/blogger.getRecentPosts.xml index d5431cbf73..52b292beee 100644 --- a/docsrc/xmlsource/funcref/blogger.getRecentPosts.xml +++ b/docsrc/xmlsource/funcref/blogger.getRecentPosts.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/blogger.getTemplate.xml b/docsrc/xmlsource/funcref/blogger.getTemplate.xml index 7f6559138a..1dcb0ca7c6 100644 --- a/docsrc/xmlsource/funcref/blogger.getTemplate.xml +++ b/docsrc/xmlsource/funcref/blogger.getTemplate.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/blogger.getUserInfo.xml b/docsrc/xmlsource/funcref/blogger.getUserInfo.xml index 2f8273b53c..e4c7cf9aa2 100644 --- a/docsrc/xmlsource/funcref/blogger.getUserInfo.xml +++ b/docsrc/xmlsource/funcref/blogger.getUserInfo.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/blogger.getUsersBlogs.xml b/docsrc/xmlsource/funcref/blogger.getUsersBlogs.xml index 7c450778a0..e9937ec520 100644 --- a/docsrc/xmlsource/funcref/blogger.getUsersBlogs.xml +++ b/docsrc/xmlsource/funcref/blogger.getUsersBlogs.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/blogger.newPost.xml b/docsrc/xmlsource/funcref/blogger.newPost.xml index b1d557a496..7bf1ddbb80 100644 --- a/docsrc/xmlsource/funcref/blogger.newPost.xml +++ b/docsrc/xmlsource/funcref/blogger.newPost.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/blogger.setTemplate.xml b/docsrc/xmlsource/funcref/blogger.setTemplate.xml index ba3c52b794..120182d823 100644 --- a/docsrc/xmlsource/funcref/blogger.setTemplate.xml +++ b/docsrc/xmlsource/funcref/blogger.setTemplate.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/bookmark.xml b/docsrc/xmlsource/funcref/bookmark.xml index 484a07cd7a..2c1b4f3274 100644 --- a/docsrc/xmlsource/funcref/bookmark.xml +++ b/docsrc/xmlsource/funcref/bookmark.xml @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ceiling.xml b/docsrc/xmlsource/funcref/ceiling.xml index 21c3b2d04f..3cb212678a 100644 --- a/docsrc/xmlsource/funcref/ceiling.xml +++ b/docsrc/xmlsource/funcref/ceiling.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/cfg_item_count.xml b/docsrc/xmlsource/funcref/cfg_item_count.xml index cda49f1d5b..92ec992e15 100644 --- a/docsrc/xmlsource/funcref/cfg_item_count.xml +++ b/docsrc/xmlsource/funcref/cfg_item_count.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/cfg_item_name.xml b/docsrc/xmlsource/funcref/cfg_item_name.xml index 52787d4e9c..b4afb2fd24 100644 --- a/docsrc/xmlsource/funcref/cfg_item_name.xml +++ b/docsrc/xmlsource/funcref/cfg_item_name.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/cfg_item_value.xml b/docsrc/xmlsource/funcref/cfg_item_value.xml index d3918dec42..0ba3b1693a 100644 --- a/docsrc/xmlsource/funcref/cfg_item_value.xml +++ b/docsrc/xmlsource/funcref/cfg_item_value.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/cfg_section_count.xml b/docsrc/xmlsource/funcref/cfg_section_count.xml index 93ccfaa906..26f02358f5 100644 --- a/docsrc/xmlsource/funcref/cfg_section_count.xml +++ b/docsrc/xmlsource/funcref/cfg_section_count.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/cfg_section_name.xml b/docsrc/xmlsource/funcref/cfg_section_name.xml index a56bed9504..18d1c2f232 100644 --- a/docsrc/xmlsource/funcref/cfg_section_name.xml +++ b/docsrc/xmlsource/funcref/cfg_section_name.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/cfg_write.xml b/docsrc/xmlsource/funcref/cfg_write.xml index b9c1d4f378..d0f35689b8 100644 --- a/docsrc/xmlsource/funcref/cfg_write.xml +++ b/docsrc/xmlsource/funcref/cfg_write.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/charset_define.xml b/docsrc/xmlsource/funcref/charset_define.xml index 35939d0b65..4540d4d9ae 100644 --- a/docsrc/xmlsource/funcref/charset_define.xml +++ b/docsrc/xmlsource/funcref/charset_define.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/charset_recode.xml b/docsrc/xmlsource/funcref/charset_recode.xml index caebe41ebc..cdbc379ef4 100644 --- a/docsrc/xmlsource/funcref/charset_recode.xml +++ b/docsrc/xmlsource/funcref/charset_recode.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/charsets_list.xml b/docsrc/xmlsource/funcref/charsets_list.xml index 38cf53df17..5797fa34fd 100644 --- a/docsrc/xmlsource/funcref/charsets_list.xml +++ b/docsrc/xmlsource/funcref/charsets_list.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/checkpoint_interval.xml b/docsrc/xmlsource/funcref/checkpoint_interval.xml index 5880837aeb..486f2d9c95 100644 --- a/docsrc/xmlsource/funcref/checkpoint_interval.xml +++ b/docsrc/xmlsource/funcref/checkpoint_interval.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/chr.xml b/docsrc/xmlsource/funcref/chr.xml index b95d5f69f8..df7c85d2ac 100644 --- a/docsrc/xmlsource/funcref/chr.xml +++ b/docsrc/xmlsource/funcref/chr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/cl_exec.xml b/docsrc/xmlsource/funcref/cl_exec.xml index 22237f470f..b244a1551a 100644 --- a/docsrc/xmlsource/funcref/cl_exec.xml +++ b/docsrc/xmlsource/funcref/cl_exec.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/client_attr.xml b/docsrc/xmlsource/funcref/client_attr.xml index f882a089ed..5d6ce6e183 100644 --- a/docsrc/xmlsource/funcref/client_attr.xml +++ b/docsrc/xmlsource/funcref/client_attr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/collation_define.xml b/docsrc/xmlsource/funcref/collation_define.xml index 1ae8a17f48..a37f1e9f0c 100644 --- a/docsrc/xmlsource/funcref/collation_define.xml +++ b/docsrc/xmlsource/funcref/collation_define.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/complete_table_name.xml b/docsrc/xmlsource/funcref/complete_table_name.xml index 919310bd71..5c81573b9a 100644 --- a/docsrc/xmlsource/funcref/complete_table_name.xml +++ b/docsrc/xmlsource/funcref/complete_table_name.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/composite.xml b/docsrc/xmlsource/funcref/composite.xml index 9f7d38855d..624f875f1e 100644 --- a/docsrc/xmlsource/funcref/composite.xml +++ b/docsrc/xmlsource/funcref/composite.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/composite_ref.xml b/docsrc/xmlsource/funcref/composite_ref.xml index b39f53756e..0cbba8e499 100644 --- a/docsrc/xmlsource/funcref/composite_ref.xml +++ b/docsrc/xmlsource/funcref/composite_ref.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/concat.xml b/docsrc/xmlsource/funcref/concat.xml index 12aa6fce2c..df15ff53f5 100644 --- a/docsrc/xmlsource/funcref/concat.xml +++ b/docsrc/xmlsource/funcref/concat.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/concatenate.xml b/docsrc/xmlsource/funcref/concatenate.xml index fe63458fff..bd073327b9 100644 --- a/docsrc/xmlsource/funcref/concatenate.xml +++ b/docsrc/xmlsource/funcref/concatenate.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/connection_get.xml b/docsrc/xmlsource/funcref/connection_get.xml index c6430fd014..5488e84b2c 100644 --- a/docsrc/xmlsource/funcref/connection_get.xml +++ b/docsrc/xmlsource/funcref/connection_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/connection_id.xml b/docsrc/xmlsource/funcref/connection_id.xml index c76066a8c6..fc04ddedfc 100644 --- a/docsrc/xmlsource/funcref/connection_id.xml +++ b/docsrc/xmlsource/funcref/connection_id.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/connection_is_dirty.xml b/docsrc/xmlsource/funcref/connection_is_dirty.xml index 123aa29967..8e7738217d 100644 --- a/docsrc/xmlsource/funcref/connection_is_dirty.xml +++ b/docsrc/xmlsource/funcref/connection_is_dirty.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/connection_set.xml b/docsrc/xmlsource/funcref/connection_set.xml index a92a08e031..f97e6fe1e3 100644 --- a/docsrc/xmlsource/funcref/connection_set.xml +++ b/docsrc/xmlsource/funcref/connection_set.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/connection_vars.xml b/docsrc/xmlsource/funcref/connection_vars.xml index 2fed4e955a..06e0cc7d1b 100644 --- a/docsrc/xmlsource/funcref/connection_vars.xml +++ b/docsrc/xmlsource/funcref/connection_vars.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/connection_vars_set.xml b/docsrc/xmlsource/funcref/connection_vars_set.xml index a541d4523a..1e4860518e 100644 --- a/docsrc/xmlsource/funcref/connection_vars_set.xml +++ b/docsrc/xmlsource/funcref/connection_vars_set.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/contains.xml b/docsrc/xmlsource/funcref/contains.xml index 6e92737d04..cf21bb8fc5 100644 --- a/docsrc/xmlsource/funcref/contains.xml +++ b/docsrc/xmlsource/funcref/contains.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/corr.xml b/docsrc/xmlsource/funcref/corr.xml index 0c4d160506..f004b4b7e9 100644 --- a/docsrc/xmlsource/funcref/corr.xml +++ b/docsrc/xmlsource/funcref/corr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/cov_load.xml b/docsrc/xmlsource/funcref/cov_load.xml index 5bae844ac3..663f949ff7 100644 --- a/docsrc/xmlsource/funcref/cov_load.xml +++ b/docsrc/xmlsource/funcref/cov_load.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/cov_report.xml b/docsrc/xmlsource/funcref/cov_report.xml index cfe1abdc0b..cca23081e8 100644 --- a/docsrc/xmlsource/funcref/cov_report.xml +++ b/docsrc/xmlsource/funcref/cov_report.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/cov_store.xml b/docsrc/xmlsource/funcref/cov_store.xml index fec58b30ae..45be457e4a 100644 --- a/docsrc/xmlsource/funcref/cov_store.xml +++ b/docsrc/xmlsource/funcref/cov_store.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/covar_pop.xml b/docsrc/xmlsource/funcref/covar_pop.xml index 793b9836f7..bc294e46d1 100644 --- a/docsrc/xmlsource/funcref/covar_pop.xml +++ b/docsrc/xmlsource/funcref/covar_pop.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/covar_samp.xml b/docsrc/xmlsource/funcref/covar_samp.xml index 30a55ea57d..2c20dad353 100644 --- a/docsrc/xmlsource/funcref/covar_samp.xml +++ b/docsrc/xmlsource/funcref/covar_samp.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/createXML.xml b/docsrc/xmlsource/funcref/createXML.xml index 131bf5d340..6e33f2fded 100644 --- a/docsrc/xmlsource/funcref/createXML.xml +++ b/docsrc/xmlsource/funcref/createXML.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/csv_cols_def.xml b/docsrc/xmlsource/funcref/csv_cols_def.xml index e733e30c78..3b8eb62383 100644 --- a/docsrc/xmlsource/funcref/csv_cols_def.xml +++ b/docsrc/xmlsource/funcref/csv_cols_def.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/csv_load.xml b/docsrc/xmlsource/funcref/csv_load.xml index b6c18edca5..30902a38f8 100644 --- a/docsrc/xmlsource/funcref/csv_load.xml +++ b/docsrc/xmlsource/funcref/csv_load.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/csv_load_file.xml b/docsrc/xmlsource/funcref/csv_load_file.xml index 7c186c1e6d..d9cc8675f0 100644 --- a/docsrc/xmlsource/funcref/csv_load_file.xml +++ b/docsrc/xmlsource/funcref/csv_load_file.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/csv_parse.xml b/docsrc/xmlsource/funcref/csv_parse.xml index 579ef653ea..56a6d40773 100644 --- a/docsrc/xmlsource/funcref/csv_parse.xml +++ b/docsrc/xmlsource/funcref/csv_parse.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/csv_table_def.xml b/docsrc/xmlsource/funcref/csv_table_def.xml index d4fadd77cf..d14ded1aa0 100644 --- a/docsrc/xmlsource/funcref/csv_table_def.xml +++ b/docsrc/xmlsource/funcref/csv_table_def.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/curdate.xml b/docsrc/xmlsource/funcref/curdate.xml index cf62ebd1fb..062dc233ec 100644 --- a/docsrc/xmlsource/funcref/curdate.xml +++ b/docsrc/xmlsource/funcref/curdate.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/curdatetime.xml b/docsrc/xmlsource/funcref/curdatetime.xml index 9d40cb5f3b..6fb80d97fc 100644 --- a/docsrc/xmlsource/funcref/curdatetime.xml +++ b/docsrc/xmlsource/funcref/curdatetime.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/curdatetimeoffset.xml b/docsrc/xmlsource/funcref/curdatetimeoffset.xml index c640d644f3..71fd1d549b 100644 --- a/docsrc/xmlsource/funcref/curdatetimeoffset.xml +++ b/docsrc/xmlsource/funcref/curdatetimeoffset.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/current_charset.xml b/docsrc/xmlsource/funcref/current_charset.xml index fe11aef05c..8278f96bb4 100644 --- a/docsrc/xmlsource/funcref/current_charset.xml +++ b/docsrc/xmlsource/funcref/current_charset.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/current_timestamp.xml b/docsrc/xmlsource/funcref/current_timestamp.xml index 750619c082..76e021ba65 100644 --- a/docsrc/xmlsource/funcref/current_timestamp.xml +++ b/docsrc/xmlsource/funcref/current_timestamp.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/curutcdatetime.xml b/docsrc/xmlsource/funcref/curutcdatetime.xml index 5121162e9d..b14b98b111 100644 --- a/docsrc/xmlsource/funcref/curutcdatetime.xml +++ b/docsrc/xmlsource/funcref/curutcdatetime.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dateadd.xml b/docsrc/xmlsource/funcref/dateadd.xml index 5425de5e68..4e698ffdc3 100644 --- a/docsrc/xmlsource/funcref/dateadd.xml +++ b/docsrc/xmlsource/funcref/dateadd.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/datediff.xml b/docsrc/xmlsource/funcref/datediff.xml index 0f3271c587..8dccff6418 100644 --- a/docsrc/xmlsource/funcref/datediff.xml +++ b/docsrc/xmlsource/funcref/datediff.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/datestring.xml b/docsrc/xmlsource/funcref/datestring.xml index fe76e78656..2f62ac4dc2 100644 --- a/docsrc/xmlsource/funcref/datestring.xml +++ b/docsrc/xmlsource/funcref/datestring.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/datestring_gmt.xml b/docsrc/xmlsource/funcref/datestring_gmt.xml index 557b9e0bd5..75882975d5 100644 --- a/docsrc/xmlsource/funcref/datestring_gmt.xml +++ b/docsrc/xmlsource/funcref/datestring_gmt.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dav_api_add.xml b/docsrc/xmlsource/funcref/dav_api_add.xml index 82c2ef6403..44950832ff 100644 --- a/docsrc/xmlsource/funcref/dav_api_add.xml +++ b/docsrc/xmlsource/funcref/dav_api_add.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dav_api_change.xml b/docsrc/xmlsource/funcref/dav_api_change.xml index 204f8165f8..e21c248bd8 100644 --- a/docsrc/xmlsource/funcref/dav_api_change.xml +++ b/docsrc/xmlsource/funcref/dav_api_change.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dav_api_search.xml b/docsrc/xmlsource/funcref/dav_api_search.xml index 235d79dcd9..bed3fb9aae 100644 --- a/docsrc/xmlsource/funcref/dav_api_search.xml +++ b/docsrc/xmlsource/funcref/dav_api_search.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dav_api_user.xml b/docsrc/xmlsource/funcref/dav_api_user.xml index 123dbd76b6..ecb4ee510d 100644 --- a/docsrc/xmlsource/funcref/dav_api_user.xml +++ b/docsrc/xmlsource/funcref/dav_api_user.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dav_exp.xml b/docsrc/xmlsource/funcref/dav_exp.xml index 67eee93f95..38d5d8240f 100644 --- a/docsrc/xmlsource/funcref/dav_exp.xml +++ b/docsrc/xmlsource/funcref/dav_exp.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dayname.xml b/docsrc/xmlsource/funcref/dayname.xml index 6e880430e8..f5fb4b110c 100644 --- a/docsrc/xmlsource/funcref/dayname.xml +++ b/docsrc/xmlsource/funcref/dayname.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dayofmonth.xml b/docsrc/xmlsource/funcref/dayofmonth.xml index 309a8f7709..4b6e70226e 100644 --- a/docsrc/xmlsource/funcref/dayofmonth.xml +++ b/docsrc/xmlsource/funcref/dayofmonth.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dayofweek.xml b/docsrc/xmlsource/funcref/dayofweek.xml index 6a3b171263..c770eddfed 100644 --- a/docsrc/xmlsource/funcref/dayofweek.xml +++ b/docsrc/xmlsource/funcref/dayofweek.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dayofyear.xml b/docsrc/xmlsource/funcref/dayofyear.xml index 69fc98a385..0d935c1c10 100644 --- a/docsrc/xmlsource/funcref/dayofyear.xml +++ b/docsrc/xmlsource/funcref/dayofyear.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dbf_set.xml b/docsrc/xmlsource/funcref/dbf_set.xml index d75751c2a9..24567a5caa 100644 --- a/docsrc/xmlsource/funcref/dbf_set.xml +++ b/docsrc/xmlsource/funcref/dbf_set.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dbg_obj_print.xml b/docsrc/xmlsource/funcref/dbg_obj_print.xml index d91bc0d883..51fe6f7858 100644 --- a/docsrc/xmlsource/funcref/dbg_obj_print.xml +++ b/docsrc/xmlsource/funcref/dbg_obj_print.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dbg_printf.xml b/docsrc/xmlsource/funcref/dbg_printf.xml index ce9fe8262c..a6f028976a 100644 --- a/docsrc/xmlsource/funcref/dbg_printf.xml +++ b/docsrc/xmlsource/funcref/dbg_printf.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dbname.xml b/docsrc/xmlsource/funcref/dbname.xml index eb22a855c8..713dc56fcc 100644 --- a/docsrc/xmlsource/funcref/dbname.xml +++ b/docsrc/xmlsource/funcref/dbname.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/decrypt.xml b/docsrc/xmlsource/funcref/decrypt.xml index ef2b06492d..5c959c43b9 100644 --- a/docsrc/xmlsource/funcref/decrypt.xml +++ b/docsrc/xmlsource/funcref/decrypt.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/delay.xml b/docsrc/xmlsource/funcref/delay.xml index ce773e6ef7..44b338096b 100644 --- a/docsrc/xmlsource/funcref/delay.xml +++ b/docsrc/xmlsource/funcref/delay.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_dec_or_remove.xml b/docsrc/xmlsource/funcref/dict_dec_or_remove.xml index 9be59056dd..bb35ec20db 100644 --- a/docsrc/xmlsource/funcref/dict_dec_or_remove.xml +++ b/docsrc/xmlsource/funcref/dict_dec_or_remove.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_destructive_list_rnd_keys.xml b/docsrc/xmlsource/funcref/dict_destructive_list_rnd_keys.xml index 351f338f41..7424f62a6a 100644 --- a/docsrc/xmlsource/funcref/dict_destructive_list_rnd_keys.xml +++ b/docsrc/xmlsource/funcref/dict_destructive_list_rnd_keys.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_duplicate.xml b/docsrc/xmlsource/funcref/dict_duplicate.xml index 578a7b2004..efe94b3a95 100644 --- a/docsrc/xmlsource/funcref/dict_duplicate.xml +++ b/docsrc/xmlsource/funcref/dict_duplicate.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_get.xml b/docsrc/xmlsource/funcref/dict_get.xml index 8f0dd0cacb..1cd636b8a3 100644 --- a/docsrc/xmlsource/funcref/dict_get.xml +++ b/docsrc/xmlsource/funcref/dict_get.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_inc_or_put.xml b/docsrc/xmlsource/funcref/dict_inc_or_put.xml index b1461cf192..ff53dae33c 100644 --- a/docsrc/xmlsource/funcref/dict_inc_or_put.xml +++ b/docsrc/xmlsource/funcref/dict_inc_or_put.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_iter_next.xml b/docsrc/xmlsource/funcref/dict_iter_next.xml index 04fcd04be3..b68290a5b7 100644 --- a/docsrc/xmlsource/funcref/dict_iter_next.xml +++ b/docsrc/xmlsource/funcref/dict_iter_next.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_iter_rewind.xml b/docsrc/xmlsource/funcref/dict_iter_rewind.xml index 3693906d66..4e52107a67 100644 --- a/docsrc/xmlsource/funcref/dict_iter_rewind.xml +++ b/docsrc/xmlsource/funcref/dict_iter_rewind.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_list_keys.xml b/docsrc/xmlsource/funcref/dict_list_keys.xml index a6f99772e0..b2a690bb88 100644 --- a/docsrc/xmlsource/funcref/dict_list_keys.xml +++ b/docsrc/xmlsource/funcref/dict_list_keys.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_new.xml b/docsrc/xmlsource/funcref/dict_new.xml index 683d42b83b..5d6878352e 100644 --- a/docsrc/xmlsource/funcref/dict_new.xml +++ b/docsrc/xmlsource/funcref/dict_new.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_put.xml b/docsrc/xmlsource/funcref/dict_put.xml index 3c1e0ffab5..fea18ccc93 100644 --- a/docsrc/xmlsource/funcref/dict_put.xml +++ b/docsrc/xmlsource/funcref/dict_put.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_remove.xml b/docsrc/xmlsource/funcref/dict_remove.xml index e264d56ee6..5d0a7d2021 100644 --- a/docsrc/xmlsource/funcref/dict_remove.xml +++ b/docsrc/xmlsource/funcref/dict_remove.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_size.xml b/docsrc/xmlsource/funcref/dict_size.xml index ce05980b8e..50a6413e2e 100644 --- a/docsrc/xmlsource/funcref/dict_size.xml +++ b/docsrc/xmlsource/funcref/dict_size.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_to_vector.xml b/docsrc/xmlsource/funcref/dict_to_vector.xml index cb6ec023e2..0607d9c345 100644 --- a/docsrc/xmlsource/funcref/dict_to_vector.xml +++ b/docsrc/xmlsource/funcref/dict_to_vector.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dict_zap.xml b/docsrc/xmlsource/funcref/dict_zap.xml index b5cd0a9d05..4e66641b7b 100644 --- a/docsrc/xmlsource/funcref/dict_zap.xml +++ b/docsrc/xmlsource/funcref/dict_zap.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/disconnect_user.xml b/docsrc/xmlsource/funcref/disconnect_user.xml index 8e1b3c0e7d..7c84bd4085 100644 --- a/docsrc/xmlsource/funcref/disconnect_user.xml +++ b/docsrc/xmlsource/funcref/disconnect_user.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dist_from_point_to_line_segment.xml b/docsrc/xmlsource/funcref/dist_from_point_to_line_segment.xml index 9ee5be5802..bad9475aab 100644 --- a/docsrc/xmlsource/funcref/dist_from_point_to_line_segment.xml +++ b/docsrc/xmlsource/funcref/dist_from_point_to_line_segment.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dns_txt_get.xml b/docsrc/xmlsource/funcref/dns_txt_get.xml index 0cc8f2491f..8be18ef583 100644 --- a/docsrc/xmlsource/funcref/dns_txt_get.xml +++ b/docsrc/xmlsource/funcref/dns_txt_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dsig_template_ext.xml b/docsrc/xmlsource/funcref/dsig_template_ext.xml index 396feea43e..7525348513 100644 --- a/docsrc/xmlsource/funcref/dsig_template_ext.xml +++ b/docsrc/xmlsource/funcref/dsig_template_ext.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dt_set_tz.xml b/docsrc/xmlsource/funcref/dt_set_tz.xml index 37876451c0..fc838774c4 100644 --- a/docsrc/xmlsource/funcref/dt_set_tz.xml +++ b/docsrc/xmlsource/funcref/dt_set_tz.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/dvector.xml b/docsrc/xmlsource/funcref/dvector.xml index 2d81e62640..e4544f9f78 100644 --- a/docsrc/xmlsource/funcref/dvector.xml +++ b/docsrc/xmlsource/funcref/dvector.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/earth_radius.xml b/docsrc/xmlsource/funcref/earth_radius.xml index cd51a1ca5b..651b8c1c59 100644 --- a/docsrc/xmlsource/funcref/earth_radius.xml +++ b/docsrc/xmlsource/funcref/earth_radius.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/either.xml b/docsrc/xmlsource/funcref/either.xml index 02f2115c37..bbbc5655a5 100644 --- a/docsrc/xmlsource/funcref/either.xml +++ b/docsrc/xmlsource/funcref/either.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/elh_get_handler.xml b/docsrc/xmlsource/funcref/elh_get_handler.xml index be479eeff7..c8ce1ffc4d 100644 --- a/docsrc/xmlsource/funcref/elh_get_handler.xml +++ b/docsrc/xmlsource/funcref/elh_get_handler.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/elh_load_handler.xml b/docsrc/xmlsource/funcref/elh_load_handler.xml index 2629bdba16..8aa7728f0d 100644 --- a/docsrc/xmlsource/funcref/elh_load_handler.xml +++ b/docsrc/xmlsource/funcref/elh_load_handler.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/encode_b32_num.xml b/docsrc/xmlsource/funcref/encode_b32_num.xml index 72d60f1003..5ec84c1719 100644 --- a/docsrc/xmlsource/funcref/encode_b32_num.xml +++ b/docsrc/xmlsource/funcref/encode_b32_num.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/encode_base64.xml b/docsrc/xmlsource/funcref/encode_base64.xml index 85c4f9e043..a9e19c35ca 100644 --- a/docsrc/xmlsource/funcref/encode_base64.xml +++ b/docsrc/xmlsource/funcref/encode_base64.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/end_result.xml b/docsrc/xmlsource/funcref/end_result.xml index e7ca19d4a3..2e959a4460 100644 --- a/docsrc/xmlsource/funcref/end_result.xml +++ b/docsrc/xmlsource/funcref/end_result.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ends_with.xml b/docsrc/xmlsource/funcref/ends_with.xml index bc712b0171..02cd44e6bf 100644 --- a/docsrc/xmlsource/funcref/ends_with.xml +++ b/docsrc/xmlsource/funcref/ends_with.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/equ.xml b/docsrc/xmlsource/funcref/equ.xml index d0cee7f2f0..8a42a475c3 100644 --- a/docsrc/xmlsource/funcref/equ.xml +++ b/docsrc/xmlsource/funcref/equ.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/exec.xml b/docsrc/xmlsource/funcref/exec.xml index fda46b2f6d..10e642b006 100644 --- a/docsrc/xmlsource/funcref/exec.xml +++ b/docsrc/xmlsource/funcref/exec.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/exec_close.xml b/docsrc/xmlsource/funcref/exec_close.xml index a6c0fb1daa..536f28120c 100644 --- a/docsrc/xmlsource/funcref/exec_close.xml +++ b/docsrc/xmlsource/funcref/exec_close.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/exec_metadata.xml b/docsrc/xmlsource/funcref/exec_metadata.xml index 3cad136862..0fb79f6927 100644 --- a/docsrc/xmlsource/funcref/exec_metadata.xml +++ b/docsrc/xmlsource/funcref/exec_metadata.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/exec_next.xml b/docsrc/xmlsource/funcref/exec_next.xml index d9099e2b17..c6e465d9db 100644 --- a/docsrc/xmlsource/funcref/exec_next.xml +++ b/docsrc/xmlsource/funcref/exec_next.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/exec_result.xml b/docsrc/xmlsource/funcref/exec_result.xml index 8e90517038..8ce4cb7413 100644 --- a/docsrc/xmlsource/funcref/exec_result.xml +++ b/docsrc/xmlsource/funcref/exec_result.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/exec_result_names.xml b/docsrc/xmlsource/funcref/exec_result_names.xml index 471939df91..b4d79e6bd1 100644 --- a/docsrc/xmlsource/funcref/exec_result_names.xml +++ b/docsrc/xmlsource/funcref/exec_result_names.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/exec_score.xml b/docsrc/xmlsource/funcref/exec_score.xml index 0c4ecc7a37..e1d374a504 100644 --- a/docsrc/xmlsource/funcref/exec_score.xml +++ b/docsrc/xmlsource/funcref/exec_score.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/exp.xml b/docsrc/xmlsource/funcref/exp.xml index 9c3fa806cb..b09852e875 100644 --- a/docsrc/xmlsource/funcref/exp.xml +++ b/docsrc/xmlsource/funcref/exp.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/explain.xml b/docsrc/xmlsource/funcref/explain.xml index 80058a9e33..2dfb7c6adb 100644 --- a/docsrc/xmlsource/funcref/explain.xml +++ b/docsrc/xmlsource/funcref/explain.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/file_delete.xml b/docsrc/xmlsource/funcref/file_delete.xml index 071abb585f..7d13639313 100644 --- a/docsrc/xmlsource/funcref/file_delete.xml +++ b/docsrc/xmlsource/funcref/file_delete.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/file_dirlist.xml b/docsrc/xmlsource/funcref/file_dirlist.xml index 72ac3aae11..3582f7f402 100644 --- a/docsrc/xmlsource/funcref/file_dirlist.xml +++ b/docsrc/xmlsource/funcref/file_dirlist.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/file_mkdir.xml b/docsrc/xmlsource/funcref/file_mkdir.xml index c92593f1b1..1b9c0c74d2 100644 --- a/docsrc/xmlsource/funcref/file_mkdir.xml +++ b/docsrc/xmlsource/funcref/file_mkdir.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/file_mkpath.xml b/docsrc/xmlsource/funcref/file_mkpath.xml index ee1b8bd1b1..81b8fb91a9 100644 --- a/docsrc/xmlsource/funcref/file_mkpath.xml +++ b/docsrc/xmlsource/funcref/file_mkpath.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/file_open.xml b/docsrc/xmlsource/funcref/file_open.xml index 5ff5adc403..0e67b59066 100644 --- a/docsrc/xmlsource/funcref/file_open.xml +++ b/docsrc/xmlsource/funcref/file_open.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/file_stat.xml b/docsrc/xmlsource/funcref/file_stat.xml index 5b8af9af5c..a77362fa65 100644 --- a/docsrc/xmlsource/funcref/file_stat.xml +++ b/docsrc/xmlsource/funcref/file_stat.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/file_to_string.xml b/docsrc/xmlsource/funcref/file_to_string.xml index 953f1e68f2..3e95698576 100644 --- a/docsrc/xmlsource/funcref/file_to_string.xml +++ b/docsrc/xmlsource/funcref/file_to_string.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/file_to_string_output.xml b/docsrc/xmlsource/funcref/file_to_string_output.xml index 9c7fa3a94b..2d6aa3b693 100644 --- a/docsrc/xmlsource/funcref/file_to_string_output.xml +++ b/docsrc/xmlsource/funcref/file_to_string_output.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/file_unlink.xml b/docsrc/xmlsource/funcref/file_unlink.xml index 05e0ff2e3a..655af1ed43 100644 --- a/docsrc/xmlsource/funcref/file_unlink.xml +++ b/docsrc/xmlsource/funcref/file_unlink.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/fk_check_input_values.xml b/docsrc/xmlsource/funcref/fk_check_input_values.xml index 2f585f440e..89ab073713 100644 --- a/docsrc/xmlsource/funcref/fk_check_input_values.xml +++ b/docsrc/xmlsource/funcref/fk_check_input_values.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/floor.xml b/docsrc/xmlsource/funcref/floor.xml index c4fdd8e163..f416d5ba9d 100644 --- a/docsrc/xmlsource/funcref/floor.xml +++ b/docsrc/xmlsource/funcref/floor.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/forget_timezone.xml b/docsrc/xmlsource/funcref/forget_timezone.xml index 33a4f0eee8..9244a8c987 100644 --- a/docsrc/xmlsource/funcref/forget_timezone.xml +++ b/docsrc/xmlsource/funcref/forget_timezone.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ft_set_file.xml b/docsrc/xmlsource/funcref/ft_set_file.xml index 5e27e45313..eb9249f6a5 100644 --- a/docsrc/xmlsource/funcref/ft_set_file.xml +++ b/docsrc/xmlsource/funcref/ft_set_file.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ftp_get.xml b/docsrc/xmlsource/funcref/ftp_get.xml index 0f4311678b..b03bdac3fc 100644 --- a/docsrc/xmlsource/funcref/ftp_get.xml +++ b/docsrc/xmlsource/funcref/ftp_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ftp_ls.xml b/docsrc/xmlsource/funcref/ftp_ls.xml index 69b93220f2..9fdbf41dcc 100644 --- a/docsrc/xmlsource/funcref/ftp_ls.xml +++ b/docsrc/xmlsource/funcref/ftp_ls.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ftp_put.xml b/docsrc/xmlsource/funcref/ftp_put.xml index f8569b33b7..9e9152ff89 100644 --- a/docsrc/xmlsource/funcref/ftp_put.xml +++ b/docsrc/xmlsource/funcref/ftp_put.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/geo_delete.xml b/docsrc/xmlsource/funcref/geo_delete.xml index b4fa2f5308..b2d100f2a6 100644 --- a/docsrc/xmlsource/funcref/geo_delete.xml +++ b/docsrc/xmlsource/funcref/geo_delete.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/geo_insert.xml b/docsrc/xmlsource/funcref/geo_insert.xml index 324cbca830..7b87dc6041 100644 --- a/docsrc/xmlsource/funcref/geo_insert.xml +++ b/docsrc/xmlsource/funcref/geo_insert.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/get_certificate_info.xml b/docsrc/xmlsource/funcref/get_certificate_info.xml index 39ea32efe7..c6d80d9b88 100644 --- a/docsrc/xmlsource/funcref/get_certificate_info.xml +++ b/docsrc/xmlsource/funcref/get_certificate_info.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/get_csv_row.xml b/docsrc/xmlsource/funcref/get_csv_row.xml index 0a3bd30acb..1136147a6a 100644 --- a/docsrc/xmlsource/funcref/get_csv_row.xml +++ b/docsrc/xmlsource/funcref/get_csv_row.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/get_keyword.xml b/docsrc/xmlsource/funcref/get_keyword.xml index ce69563a6d..bf29b41c41 100644 --- a/docsrc/xmlsource/funcref/get_keyword.xml +++ b/docsrc/xmlsource/funcref/get_keyword.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/get_keyword_ucase.xml b/docsrc/xmlsource/funcref/get_keyword_ucase.xml index 43a7913286..9f396975c6 100644 --- a/docsrc/xmlsource/funcref/get_keyword_ucase.xml +++ b/docsrc/xmlsource/funcref/get_keyword_ucase.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/get_timestamp.xml b/docsrc/xmlsource/funcref/get_timestamp.xml index 3ad1fc7345..d3333bc650 100644 --- a/docsrc/xmlsource/funcref/get_timestamp.xml +++ b/docsrc/xmlsource/funcref/get_timestamp.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/getdate.xml b/docsrc/xmlsource/funcref/getdate.xml index 7c8b1562a0..4252d35eb9 100644 --- a/docsrc/xmlsource/funcref/getdate.xml +++ b/docsrc/xmlsource/funcref/getdate.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/gvector_digit_sort.xml b/docsrc/xmlsource/funcref/gvector_digit_sort.xml index 793bfcfe3e..60e799aa8a 100644 --- a/docsrc/xmlsource/funcref/gvector_digit_sort.xml +++ b/docsrc/xmlsource/funcref/gvector_digit_sort.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/gvector_sort.xml b/docsrc/xmlsource/funcref/gvector_sort.xml index 3c87665e63..9bd7c3b321 100644 --- a/docsrc/xmlsource/funcref/gvector_sort.xml +++ b/docsrc/xmlsource/funcref/gvector_sort.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/gz_compress.xml b/docsrc/xmlsource/funcref/gz_compress.xml index 79d5a4b521..af5e483bda 100644 --- a/docsrc/xmlsource/funcref/gz_compress.xml +++ b/docsrc/xmlsource/funcref/gz_compress.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/gz_file_open.xml b/docsrc/xmlsource/funcref/gz_file_open.xml index 7caa30c2b3..c15bb8df2f 100644 --- a/docsrc/xmlsource/funcref/gz_file_open.xml +++ b/docsrc/xmlsource/funcref/gz_file_open.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/gz_uncompress.xml b/docsrc/xmlsource/funcref/gz_uncompress.xml index 0808cfc08b..9767d39e20 100644 --- a/docsrc/xmlsource/funcref/gz_uncompress.xml +++ b/docsrc/xmlsource/funcref/gz_uncompress.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/haversine_deg_km.xml b/docsrc/xmlsource/funcref/haversine_deg_km.xml index 9cac62c682..ca56d3bea8 100644 --- a/docsrc/xmlsource/funcref/haversine_deg_km.xml +++ b/docsrc/xmlsource/funcref/haversine_deg_km.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/hour.xml b/docsrc/xmlsource/funcref/hour.xml index 91beff2ebc..5cb369b5e2 100644 --- a/docsrc/xmlsource/funcref/hour.xml +++ b/docsrc/xmlsource/funcref/hour.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/hs_resolve.xml b/docsrc/xmlsource/funcref/hs_resolve.xml index 1d996cc127..87136958b6 100644 --- a/docsrc/xmlsource/funcref/hs_resolve.xml +++ b/docsrc/xmlsource/funcref/hs_resolve.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http.xml b/docsrc/xmlsource/funcref/http.xml index 6c28a9f137..035f11da17 100644 --- a/docsrc/xmlsource/funcref/http.xml +++ b/docsrc/xmlsource/funcref/http.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_acl_get.xml b/docsrc/xmlsource/funcref/http_acl_get.xml index 8a633d6427..afeb7866ce 100644 --- a/docsrc/xmlsource/funcref/http_acl_get.xml +++ b/docsrc/xmlsource/funcref/http_acl_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_acl_remove.xml b/docsrc/xmlsource/funcref/http_acl_remove.xml index f507ed6fcc..90a5a7fd04 100644 --- a/docsrc/xmlsource/funcref/http_acl_remove.xml +++ b/docsrc/xmlsource/funcref/http_acl_remove.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_acl_set.xml b/docsrc/xmlsource/funcref/http_acl_set.xml index 2278ddec0d..879c9a198e 100644 --- a/docsrc/xmlsource/funcref/http_acl_set.xml +++ b/docsrc/xmlsource/funcref/http_acl_set.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_body_read.xml b/docsrc/xmlsource/funcref/http_body_read.xml index eb0aa73e89..00253e0cac 100644 --- a/docsrc/xmlsource/funcref/http_body_read.xml +++ b/docsrc/xmlsource/funcref/http_body_read.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_client.xml b/docsrc/xmlsource/funcref/http_client.xml index 847979abc8..dc1944f29e 100644 --- a/docsrc/xmlsource/funcref/http_client.xml +++ b/docsrc/xmlsource/funcref/http_client.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_client_ext.xml b/docsrc/xmlsource/funcref/http_client_ext.xml index 2b875059c7..b47bd8732c 100644 --- a/docsrc/xmlsource/funcref/http_client_ext.xml +++ b/docsrc/xmlsource/funcref/http_client_ext.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_client_ip.xml b/docsrc/xmlsource/funcref/http_client_ip.xml index 0ad178a5e9..1a5a7979ba 100644 --- a/docsrc/xmlsource/funcref/http_client_ip.xml +++ b/docsrc/xmlsource/funcref/http_client_ip.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_debug_log.xml b/docsrc/xmlsource/funcref/http_debug_log.xml index 403a66aed3..adc5d762f0 100644 --- a/docsrc/xmlsource/funcref/http_debug_log.xml +++ b/docsrc/xmlsource/funcref/http_debug_log.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_enable_gz.xml b/docsrc/xmlsource/funcref/http_enable_gz.xml index 725abec9b2..789b38ff2d 100644 --- a/docsrc/xmlsource/funcref/http_enable_gz.xml +++ b/docsrc/xmlsource/funcref/http_enable_gz.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_file.xml b/docsrc/xmlsource/funcref/http_file.xml index 612ba0b35f..681b579819 100644 --- a/docsrc/xmlsource/funcref/http_file.xml +++ b/docsrc/xmlsource/funcref/http_file.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_flush.xml b/docsrc/xmlsource/funcref/http_flush.xml index aae4ba8f6f..b6a30e5f8a 100644 --- a/docsrc/xmlsource/funcref/http_flush.xml +++ b/docsrc/xmlsource/funcref/http_flush.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_get.xml b/docsrc/xmlsource/funcref/http_get.xml index e18da4c0d5..b74a415355 100644 --- a/docsrc/xmlsource/funcref/http_get.xml +++ b/docsrc/xmlsource/funcref/http_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_header.xml b/docsrc/xmlsource/funcref/http_header.xml index cc7a42e0a8..6518d56a63 100644 --- a/docsrc/xmlsource/funcref/http_header.xml +++ b/docsrc/xmlsource/funcref/http_header.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_header_get.xml b/docsrc/xmlsource/funcref/http_header_get.xml index 3dc74f4c3e..f77be67aa8 100644 --- a/docsrc/xmlsource/funcref/http_header_get.xml +++ b/docsrc/xmlsource/funcref/http_header_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_internal_redirect.xml b/docsrc/xmlsource/funcref/http_internal_redirect.xml index dca951f593..2de55cb3d1 100644 --- a/docsrc/xmlsource/funcref/http_internal_redirect.xml +++ b/docsrc/xmlsource/funcref/http_internal_redirect.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_kill.xml b/docsrc/xmlsource/funcref/http_kill.xml index 4091cac034..5030ae9bb6 100644 --- a/docsrc/xmlsource/funcref/http_kill.xml +++ b/docsrc/xmlsource/funcref/http_kill.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_listen_host.xml b/docsrc/xmlsource/funcref/http_listen_host.xml index ea61f2c630..9be775a507 100644 --- a/docsrc/xmlsource/funcref/http_listen_host.xml +++ b/docsrc/xmlsource/funcref/http_listen_host.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_lock.xml b/docsrc/xmlsource/funcref/http_lock.xml index 12cc4e3728..cb7e7cfeba 100644 --- a/docsrc/xmlsource/funcref/http_lock.xml +++ b/docsrc/xmlsource/funcref/http_lock.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_map_get.xml b/docsrc/xmlsource/funcref/http_map_get.xml index e81be048e3..ddab74b554 100644 --- a/docsrc/xmlsource/funcref/http_map_get.xml +++ b/docsrc/xmlsource/funcref/http_map_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_map_table.xml b/docsrc/xmlsource/funcref/http_map_table.xml index c5a5f8d41e..bdf52ce0a3 100644 --- a/docsrc/xmlsource/funcref/http_map_table.xml +++ b/docsrc/xmlsource/funcref/http_map_table.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_nt_triple.xml b/docsrc/xmlsource/funcref/http_nt_triple.xml index 6805dddafa..cb94e1c754 100644 --- a/docsrc/xmlsource/funcref/http_nt_triple.xml +++ b/docsrc/xmlsource/funcref/http_nt_triple.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_param.xml b/docsrc/xmlsource/funcref/http_param.xml index af59bcb37c..1ad442fc2b 100644 --- a/docsrc/xmlsource/funcref/http_param.xml +++ b/docsrc/xmlsource/funcref/http_param.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_path.xml b/docsrc/xmlsource/funcref/http_path.xml index 1ce209be69..1f33ed08d4 100644 --- a/docsrc/xmlsource/funcref/http_path.xml +++ b/docsrc/xmlsource/funcref/http_path.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_pending_req.xml b/docsrc/xmlsource/funcref/http_pending_req.xml index b8aa50ecdc..23672b44d7 100644 --- a/docsrc/xmlsource/funcref/http_pending_req.xml +++ b/docsrc/xmlsource/funcref/http_pending_req.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_physical_path.xml b/docsrc/xmlsource/funcref/http_physical_path.xml index 5aeae5c0a3..25a757a016 100644 --- a/docsrc/xmlsource/funcref/http_physical_path.xml +++ b/docsrc/xmlsource/funcref/http_physical_path.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_proxy.xml b/docsrc/xmlsource/funcref/http_proxy.xml index b923935db7..72afe5ca2b 100644 --- a/docsrc/xmlsource/funcref/http_proxy.xml +++ b/docsrc/xmlsource/funcref/http_proxy.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_request_get.xml b/docsrc/xmlsource/funcref/http_request_get.xml index af73aa9c71..06ca818cf0 100644 --- a/docsrc/xmlsource/funcref/http_request_get.xml +++ b/docsrc/xmlsource/funcref/http_request_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_request_header.xml b/docsrc/xmlsource/funcref/http_request_header.xml index f57fd8a263..76c0f18360 100644 --- a/docsrc/xmlsource/funcref/http_request_header.xml +++ b/docsrc/xmlsource/funcref/http_request_header.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_request_header_full.xml b/docsrc/xmlsource/funcref/http_request_header_full.xml index 01998c6792..2dab47e695 100644 --- a/docsrc/xmlsource/funcref/http_request_header_full.xml +++ b/docsrc/xmlsource/funcref/http_request_header_full.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_request_status.xml b/docsrc/xmlsource/funcref/http_request_status.xml index b3ea43d8f9..6f27a94970 100644 --- a/docsrc/xmlsource/funcref/http_request_status.xml +++ b/docsrc/xmlsource/funcref/http_request_status.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_rewrite.xml b/docsrc/xmlsource/funcref/http_rewrite.xml index 4e96ea228b..ebc80ce11b 100644 --- a/docsrc/xmlsource/funcref/http_rewrite.xml +++ b/docsrc/xmlsource/funcref/http_rewrite.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_root.xml b/docsrc/xmlsource/funcref/http_root.xml index e8b12ad87b..57627af9e2 100644 --- a/docsrc/xmlsource/funcref/http_root.xml +++ b/docsrc/xmlsource/funcref/http_root.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_st_dxf_entity.xml b/docsrc/xmlsource/funcref/http_st_dxf_entity.xml index e957d65cd5..71a42adf55 100644 --- a/docsrc/xmlsource/funcref/http_st_dxf_entity.xml +++ b/docsrc/xmlsource/funcref/http_st_dxf_entity.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_st_ewkt.xml b/docsrc/xmlsource/funcref/http_st_ewkt.xml index e07286e56c..cb0c50d24f 100644 --- a/docsrc/xmlsource/funcref/http_st_ewkt.xml +++ b/docsrc/xmlsource/funcref/http_st_ewkt.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_ttl_triple.xml b/docsrc/xmlsource/funcref/http_ttl_triple.xml index 311508a062..aad537dfd1 100644 --- a/docsrc/xmlsource/funcref/http_ttl_triple.xml +++ b/docsrc/xmlsource/funcref/http_ttl_triple.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_unlock.xml b/docsrc/xmlsource/funcref/http_unlock.xml index 99d752fc82..05245d8df7 100644 --- a/docsrc/xmlsource/funcref/http_unlock.xml +++ b/docsrc/xmlsource/funcref/http_unlock.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_url.xml b/docsrc/xmlsource/funcref/http_url.xml index 6eada2ecfb..3e692a3f1c 100644 --- a/docsrc/xmlsource/funcref/http_url.xml +++ b/docsrc/xmlsource/funcref/http_url.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_value.xml b/docsrc/xmlsource/funcref/http_value.xml index 3c47d29e2e..bd937da60e 100644 --- a/docsrc/xmlsource/funcref/http_value.xml +++ b/docsrc/xmlsource/funcref/http_value.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/http_xslt.xml b/docsrc/xmlsource/funcref/http_xslt.xml index c354c6a9e8..3bc46851a5 100644 --- a/docsrc/xmlsource/funcref/http_xslt.xml +++ b/docsrc/xmlsource/funcref/http_xslt.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/identity_value.xml b/docsrc/xmlsource/funcref/identity_value.xml index 66711d5810..9243060fee 100644 --- a/docsrc/xmlsource/funcref/identity_value.xml +++ b/docsrc/xmlsource/funcref/identity_value.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/imap_get.xml b/docsrc/xmlsource/funcref/imap_get.xml index a282ac9955..9e35384c65 100644 --- a/docsrc/xmlsource/funcref/imap_get.xml +++ b/docsrc/xmlsource/funcref/imap_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/import_clr.xml b/docsrc/xmlsource/funcref/import_clr.xml index 3a0885e68c..02a56241ab 100644 --- a/docsrc/xmlsource/funcref/import_clr.xml +++ b/docsrc/xmlsource/funcref/import_clr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/import_jar.xml b/docsrc/xmlsource/funcref/import_jar.xml index 549b9c8c11..3bb0b3ac09 100644 --- a/docsrc/xmlsource/funcref/import_jar.xml +++ b/docsrc/xmlsource/funcref/import_jar.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/initcap.xml b/docsrc/xmlsource/funcref/initcap.xml index 4f0fc1779f..2c5c07928d 100644 --- a/docsrc/xmlsource/funcref/initcap.xml +++ b/docsrc/xmlsource/funcref/initcap.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/internal_to_sql_type.xml b/docsrc/xmlsource/funcref/internal_to_sql_type.xml index c5436912ae..0d049b9480 100644 --- a/docsrc/xmlsource/funcref/internal_to_sql_type.xml +++ b/docsrc/xmlsource/funcref/internal_to_sql_type.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/internal_type.xml b/docsrc/xmlsource/funcref/internal_type.xml index 7dcd2eb87a..4e616adc2f 100644 --- a/docsrc/xmlsource/funcref/internal_type.xml +++ b/docsrc/xmlsource/funcref/internal_type.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/internal_type_name.xml b/docsrc/xmlsource/funcref/internal_type_name.xml index 5aec3d2336..4d2d4e4705 100644 --- a/docsrc/xmlsource/funcref/internal_type_name.xml +++ b/docsrc/xmlsource/funcref/internal_type_name.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/iri_split.xml b/docsrc/xmlsource/funcref/iri_split.xml index f1dcb686c3..2f466528f0 100644 --- a/docsrc/xmlsource/funcref/iri_split.xml +++ b/docsrc/xmlsource/funcref/iri_split.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/is_timezoneless.xml b/docsrc/xmlsource/funcref/is_timezoneless.xml index 06677fbbf6..1ac4b886a2 100644 --- a/docsrc/xmlsource/funcref/is_timezoneless.xml +++ b/docsrc/xmlsource/funcref/is_timezoneless.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isarray.xml b/docsrc/xmlsource/funcref/isarray.xml index 471abf73c9..d3785b8da8 100644 --- a/docsrc/xmlsource/funcref/isarray.xml +++ b/docsrc/xmlsource/funcref/isarray.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isbinary.xml b/docsrc/xmlsource/funcref/isbinary.xml index 4dfa106061..635f6b4ff6 100644 --- a/docsrc/xmlsource/funcref/isbinary.xml +++ b/docsrc/xmlsource/funcref/isbinary.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isblob.xml b/docsrc/xmlsource/funcref/isblob.xml index f1cb3e82b3..0eaecfd8c3 100644 --- a/docsrc/xmlsource/funcref/isblob.xml +++ b/docsrc/xmlsource/funcref/isblob.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isdouble.xml b/docsrc/xmlsource/funcref/isdouble.xml index ec817ac0d6..b6cac67300 100644 --- a/docsrc/xmlsource/funcref/isdouble.xml +++ b/docsrc/xmlsource/funcref/isdouble.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isentity.xml b/docsrc/xmlsource/funcref/isentity.xml index 17a3c08d91..0cd18e9f92 100644 --- a/docsrc/xmlsource/funcref/isentity.xml +++ b/docsrc/xmlsource/funcref/isentity.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isfinitenumeric.xml b/docsrc/xmlsource/funcref/isfinitenumeric.xml index 2b8a75723d..f0146a10e9 100644 --- a/docsrc/xmlsource/funcref/isfinitenumeric.xml +++ b/docsrc/xmlsource/funcref/isfinitenumeric.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isfloat.xml b/docsrc/xmlsource/funcref/isfloat.xml index 232884f32c..4892558a7b 100644 --- a/docsrc/xmlsource/funcref/isfloat.xml +++ b/docsrc/xmlsource/funcref/isfloat.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isgeometry.xml b/docsrc/xmlsource/funcref/isgeometry.xml index 6d56c2d6c7..84cb1e270f 100644 --- a/docsrc/xmlsource/funcref/isgeometry.xml +++ b/docsrc/xmlsource/funcref/isgeometry.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isinteger.xml b/docsrc/xmlsource/funcref/isinteger.xml index 2847d38369..b405d67406 100644 --- a/docsrc/xmlsource/funcref/isinteger.xml +++ b/docsrc/xmlsource/funcref/isinteger.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isnull.xml b/docsrc/xmlsource/funcref/isnull.xml index 7a8a918851..df5b50f2cf 100644 --- a/docsrc/xmlsource/funcref/isnull.xml +++ b/docsrc/xmlsource/funcref/isnull.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isnumeric.xml b/docsrc/xmlsource/funcref/isnumeric.xml index 4dd90b8c54..2e3871e28e 100644 --- a/docsrc/xmlsource/funcref/isnumeric.xml +++ b/docsrc/xmlsource/funcref/isnumeric.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isref.xml b/docsrc/xmlsource/funcref/isref.xml index 3d44fe9bc5..19a57d7f86 100644 --- a/docsrc/xmlsource/funcref/isref.xml +++ b/docsrc/xmlsource/funcref/isref.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/isstring.xml b/docsrc/xmlsource/funcref/isstring.xml index 54c68c55b7..2de9dfd921 100644 --- a/docsrc/xmlsource/funcref/isstring.xml +++ b/docsrc/xmlsource/funcref/isstring.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/iszero.xml b/docsrc/xmlsource/funcref/iszero.xml index 4eb5f09f7c..6c5844b67f 100644 --- a/docsrc/xmlsource/funcref/iszero.xml +++ b/docsrc/xmlsource/funcref/iszero.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/java_call_method.xml b/docsrc/xmlsource/funcref/java_call_method.xml index 47b784316f..20507a34e5 100644 --- a/docsrc/xmlsource/funcref/java_call_method.xml +++ b/docsrc/xmlsource/funcref/java_call_method.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/java_get_property.xml b/docsrc/xmlsource/funcref/java_get_property.xml index 36c776c1ce..8e914cfdd6 100644 --- a/docsrc/xmlsource/funcref/java_get_property.xml +++ b/docsrc/xmlsource/funcref/java_get_property.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/java_load_class.xml b/docsrc/xmlsource/funcref/java_load_class.xml index 07601ac9e6..1b7a367fae 100644 --- a/docsrc/xmlsource/funcref/java_load_class.xml +++ b/docsrc/xmlsource/funcref/java_load_class.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/java_new_object.xml b/docsrc/xmlsource/funcref/java_new_object.xml index 81d9491cee..bb3a401d3a 100644 --- a/docsrc/xmlsource/funcref/java_new_object.xml +++ b/docsrc/xmlsource/funcref/java_new_object.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/java_set_property.xml b/docsrc/xmlsource/funcref/java_set_property.xml index a31f5d0197..22d2ba66ab 100644 --- a/docsrc/xmlsource/funcref/java_set_property.xml +++ b/docsrc/xmlsource/funcref/java_set_property.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/java_vm_attach.xml b/docsrc/xmlsource/funcref/java_vm_attach.xml index 8405990c0c..5fa7e9913a 100644 --- a/docsrc/xmlsource/funcref/java_vm_attach.xml +++ b/docsrc/xmlsource/funcref/java_vm_attach.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/java_vm_detach.xml b/docsrc/xmlsource/funcref/java_vm_detach.xml index 0635a84543..3138ca88a5 100644 --- a/docsrc/xmlsource/funcref/java_vm_detach.xml +++ b/docsrc/xmlsource/funcref/java_vm_detach.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/json_parse.xml b/docsrc/xmlsource/funcref/json_parse.xml index ef0057006c..100d19a49e 100644 --- a/docsrc/xmlsource/funcref/json_parse.xml +++ b/docsrc/xmlsource/funcref/json_parse.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/jvm_ref_import.xml b/docsrc/xmlsource/funcref/jvm_ref_import.xml index 0102ac8385..d46c4d354f 100644 --- a/docsrc/xmlsource/funcref/jvm_ref_import.xml +++ b/docsrc/xmlsource/funcref/jvm_ref_import.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/key_estimate.xml b/docsrc/xmlsource/funcref/key_estimate.xml index de010490ec..af1fda158b 100644 --- a/docsrc/xmlsource/funcref/key_estimate.xml +++ b/docsrc/xmlsource/funcref/key_estimate.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/lcase.xml b/docsrc/xmlsource/funcref/lcase.xml index 7f3bb0af7e..f805688c84 100644 --- a/docsrc/xmlsource/funcref/lcase.xml +++ b/docsrc/xmlsource/funcref/lcase.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ld_dir.xml b/docsrc/xmlsource/funcref/ld_dir.xml index 986f3e3b84..989b08aecd 100644 --- a/docsrc/xmlsource/funcref/ld_dir.xml +++ b/docsrc/xmlsource/funcref/ld_dir.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ld_dir_all.xml b/docsrc/xmlsource/funcref/ld_dir_all.xml index 6e40132033..0fa670f5c2 100644 --- a/docsrc/xmlsource/funcref/ld_dir_all.xml +++ b/docsrc/xmlsource/funcref/ld_dir_all.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ldap_add.xml b/docsrc/xmlsource/funcref/ldap_add.xml index 07d2ea9c3c..3cdf74e9af 100644 --- a/docsrc/xmlsource/funcref/ldap_add.xml +++ b/docsrc/xmlsource/funcref/ldap_add.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ldap_delete.xml b/docsrc/xmlsource/funcref/ldap_delete.xml index faf7b1e3d1..bca413a0a3 100644 --- a/docsrc/xmlsource/funcref/ldap_delete.xml +++ b/docsrc/xmlsource/funcref/ldap_delete.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ldap_modify.xml b/docsrc/xmlsource/funcref/ldap_modify.xml index 5d4b0bad26..c2fb53ba09 100644 --- a/docsrc/xmlsource/funcref/ldap_modify.xml +++ b/docsrc/xmlsource/funcref/ldap_modify.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ldap_search.xml b/docsrc/xmlsource/funcref/ldap_search.xml index cfa1878092..fce912a3b4 100644 --- a/docsrc/xmlsource/funcref/ldap_search.xml +++ b/docsrc/xmlsource/funcref/ldap_search.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/left.xml b/docsrc/xmlsource/funcref/left.xml index e85239a1fd..345c3b6609 100644 --- a/docsrc/xmlsource/funcref/left.xml +++ b/docsrc/xmlsource/funcref/left.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/length.xml b/docsrc/xmlsource/funcref/length.xml index 920bf4727c..2be6e03b8b 100644 --- a/docsrc/xmlsource/funcref/length.xml +++ b/docsrc/xmlsource/funcref/length.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/lfs_exp.xml b/docsrc/xmlsource/funcref/lfs_exp.xml index aacd1252a8..69e0645537 100644 --- a/docsrc/xmlsource/funcref/lfs_exp.xml +++ b/docsrc/xmlsource/funcref/lfs_exp.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/lh_get_handler.xml b/docsrc/xmlsource/funcref/lh_get_handler.xml index 9473e34e29..df66abfa2b 100644 --- a/docsrc/xmlsource/funcref/lh_get_handler.xml +++ b/docsrc/xmlsource/funcref/lh_get_handler.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/lh_load_handler.xml b/docsrc/xmlsource/funcref/lh_load_handler.xml index 93be8dd38f..008f77748a 100644 --- a/docsrc/xmlsource/funcref/lh_load_handler.xml +++ b/docsrc/xmlsource/funcref/lh_load_handler.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/locate.xml b/docsrc/xmlsource/funcref/locate.xml index 6a8aca5eaa..518e4658e2 100644 --- a/docsrc/xmlsource/funcref/locate.xml +++ b/docsrc/xmlsource/funcref/locate.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/log.xml b/docsrc/xmlsource/funcref/log.xml index 29b082b9ad..a9f9d23bb7 100644 --- a/docsrc/xmlsource/funcref/log.xml +++ b/docsrc/xmlsource/funcref/log.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/log10.xml b/docsrc/xmlsource/funcref/log10.xml index 8e0394e03f..06232a34b6 100644 --- a/docsrc/xmlsource/funcref/log10.xml +++ b/docsrc/xmlsource/funcref/log10.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/log_enable.xml b/docsrc/xmlsource/funcref/log_enable.xml index 64d3e270c5..1d66c9bef1 100644 --- a/docsrc/xmlsource/funcref/log_enable.xml +++ b/docsrc/xmlsource/funcref/log_enable.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/log_text.xml b/docsrc/xmlsource/funcref/log_text.xml index 66190d4994..5d836e5af7 100644 --- a/docsrc/xmlsource/funcref/log_text.xml +++ b/docsrc/xmlsource/funcref/log_text.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/lower.xml b/docsrc/xmlsource/funcref/lower.xml index 7e992bd1bc..970cba7bb4 100644 --- a/docsrc/xmlsource/funcref/lower.xml +++ b/docsrc/xmlsource/funcref/lower.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ltrim.xml b/docsrc/xmlsource/funcref/ltrim.xml index 0f50d674ee..c3ca11b109 100644 --- a/docsrc/xmlsource/funcref/ltrim.xml +++ b/docsrc/xmlsource/funcref/ltrim.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/make_array.xml b/docsrc/xmlsource/funcref/make_array.xml index bf20818c7b..2d7e63a35d 100644 --- a/docsrc/xmlsource/funcref/make_array.xml +++ b/docsrc/xmlsource/funcref/make_array.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/make_string.xml b/docsrc/xmlsource/funcref/make_string.xml index f79faa01ed..e536304c10 100644 --- a/docsrc/xmlsource/funcref/make_string.xml +++ b/docsrc/xmlsource/funcref/make_string.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/md5.xml b/docsrc/xmlsource/funcref/md5.xml index e39cfc310b..795b1bd186 100644 --- a/docsrc/xmlsource/funcref/md5.xml +++ b/docsrc/xmlsource/funcref/md5.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/md5_final.xml b/docsrc/xmlsource/funcref/md5_final.xml index df6a6d473a..db647c211f 100644 --- a/docsrc/xmlsource/funcref/md5_final.xml +++ b/docsrc/xmlsource/funcref/md5_final.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/md5_init.xml b/docsrc/xmlsource/funcref/md5_init.xml index bb9ffdf72a..f4ec529f9a 100644 --- a/docsrc/xmlsource/funcref/md5_init.xml +++ b/docsrc/xmlsource/funcref/md5_init.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/md5_update.xml b/docsrc/xmlsource/funcref/md5_update.xml index 84c494c32c..b5b6d5fe07 100644 --- a/docsrc/xmlsource/funcref/md5_update.xml +++ b/docsrc/xmlsource/funcref/md5_update.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/metaWeblog.editPost.xml b/docsrc/xmlsource/funcref/metaWeblog.editPost.xml index 26cd5fc9c3..58f8063055 100644 --- a/docsrc/xmlsource/funcref/metaWeblog.editPost.xml +++ b/docsrc/xmlsource/funcref/metaWeblog.editPost.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/metaWeblog.getPost.xml b/docsrc/xmlsource/funcref/metaWeblog.getPost.xml index 1a8c1a7468..340c91c3c4 100644 --- a/docsrc/xmlsource/funcref/metaWeblog.getPost.xml +++ b/docsrc/xmlsource/funcref/metaWeblog.getPost.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/metaWeblog.getRecentPosts.xml b/docsrc/xmlsource/funcref/metaWeblog.getRecentPosts.xml index 8ae9fbd43d..42721e9c47 100644 --- a/docsrc/xmlsource/funcref/metaWeblog.getRecentPosts.xml +++ b/docsrc/xmlsource/funcref/metaWeblog.getRecentPosts.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/metaWeblog.newPost.xml b/docsrc/xmlsource/funcref/metaWeblog.newPost.xml index c64ab7642f..8601858d2d 100644 --- a/docsrc/xmlsource/funcref/metaWeblog.newPost.xml +++ b/docsrc/xmlsource/funcref/metaWeblog.newPost.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mime_body.xml b/docsrc/xmlsource/funcref/mime_body.xml index e0302e513f..cf89dbe6eb 100644 --- a/docsrc/xmlsource/funcref/mime_body.xml +++ b/docsrc/xmlsource/funcref/mime_body.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mime_part.xml b/docsrc/xmlsource/funcref/mime_part.xml index 38482cc5ea..142565b86a 100644 --- a/docsrc/xmlsource/funcref/mime_part.xml +++ b/docsrc/xmlsource/funcref/mime_part.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mime_tree.xml b/docsrc/xmlsource/funcref/mime_tree.xml index e66916862f..0cc680acb4 100644 --- a/docsrc/xmlsource/funcref/mime_tree.xml +++ b/docsrc/xmlsource/funcref/mime_tree.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/minute.xml b/docsrc/xmlsource/funcref/minute.xml index c0084b7c08..e0ece1d20f 100644 --- a/docsrc/xmlsource/funcref/minute.xml +++ b/docsrc/xmlsource/funcref/minute.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mod.xml b/docsrc/xmlsource/funcref/mod.xml index cba31af5c2..40b879e174 100644 --- a/docsrc/xmlsource/funcref/mod.xml +++ b/docsrc/xmlsource/funcref/mod.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/month.xml b/docsrc/xmlsource/funcref/month.xml index 8ff530e191..1502f9fa1b 100644 --- a/docsrc/xmlsource/funcref/month.xml +++ b/docsrc/xmlsource/funcref/month.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/monthname.xml b/docsrc/xmlsource/funcref/monthname.xml index 64a640b8a3..5e476531c5 100644 --- a/docsrc/xmlsource/funcref/monthname.xml +++ b/docsrc/xmlsource/funcref/monthname.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/msec_time.xml b/docsrc/xmlsource/funcref/msec_time.xml index 2679aa58be..8a18cbbe4e 100644 --- a/docsrc/xmlsource/funcref/msec_time.xml +++ b/docsrc/xmlsource/funcref/msec_time.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mt.getCategoryList.xml b/docsrc/xmlsource/funcref/mt.getCategoryList.xml index cac5d2fef0..2513c02329 100644 --- a/docsrc/xmlsource/funcref/mt.getCategoryList.xml +++ b/docsrc/xmlsource/funcref/mt.getCategoryList.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mt.getPostCategories.xml b/docsrc/xmlsource/funcref/mt.getPostCategories.xml index bdf2f0e6e9..58e1c6ebbc 100644 --- a/docsrc/xmlsource/funcref/mt.getPostCategories.xml +++ b/docsrc/xmlsource/funcref/mt.getPostCategories.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mt.getRecentPostTitles.xml b/docsrc/xmlsource/funcref/mt.getRecentPostTitles.xml index f4ae550840..d6ce7eaf64 100644 --- a/docsrc/xmlsource/funcref/mt.getRecentPostTitles.xml +++ b/docsrc/xmlsource/funcref/mt.getRecentPostTitles.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mt.getTrackbackPings.xml b/docsrc/xmlsource/funcref/mt.getTrackbackPings.xml index cf9a2ff3bf..e886041e54 100644 --- a/docsrc/xmlsource/funcref/mt.getTrackbackPings.xml +++ b/docsrc/xmlsource/funcref/mt.getTrackbackPings.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mt.publishPost.xml b/docsrc/xmlsource/funcref/mt.publishPost.xml index 803957cd17..c1ab5c6012 100644 --- a/docsrc/xmlsource/funcref/mt.publishPost.xml +++ b/docsrc/xmlsource/funcref/mt.publishPost.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mt.setPostCategories.xml b/docsrc/xmlsource/funcref/mt.setPostCategories.xml index 4d73d59a74..4e41345fee 100644 --- a/docsrc/xmlsource/funcref/mt.setPostCategories.xml +++ b/docsrc/xmlsource/funcref/mt.setPostCategories.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mt.supportedMethods.xml b/docsrc/xmlsource/funcref/mt.supportedMethods.xml index 6196143f1e..1b5287655b 100644 --- a/docsrc/xmlsource/funcref/mt.supportedMethods.xml +++ b/docsrc/xmlsource/funcref/mt.supportedMethods.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mts_connect.xml b/docsrc/xmlsource/funcref/mts_connect.xml index 731f9435e9..508217dfaa 100644 --- a/docsrc/xmlsource/funcref/mts_connect.xml +++ b/docsrc/xmlsource/funcref/mts_connect.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mts_get_timeout.xml b/docsrc/xmlsource/funcref/mts_get_timeout.xml index 1c3d7a50cb..655e8873e8 100644 --- a/docsrc/xmlsource/funcref/mts_get_timeout.xml +++ b/docsrc/xmlsource/funcref/mts_get_timeout.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mts_set_timeout.xml b/docsrc/xmlsource/funcref/mts_set_timeout.xml index de03271045..245d2aca93 100644 --- a/docsrc/xmlsource/funcref/mts_set_timeout.xml +++ b/docsrc/xmlsource/funcref/mts_set_timeout.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/mts_status.xml b/docsrc/xmlsource/funcref/mts_status.xml index 47c428ce26..406a03c8db 100644 --- a/docsrc/xmlsource/funcref/mts_status.xml +++ b/docsrc/xmlsource/funcref/mts_status.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/name_part.xml b/docsrc/xmlsource/funcref/name_part.xml index 0de8d8560c..a806e268e8 100644 --- a/docsrc/xmlsource/funcref/name_part.xml +++ b/docsrc/xmlsource/funcref/name_part.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/nm_max.xml b/docsrc/xmlsource/funcref/nm_max.xml index 9efbe19eda..24c985d4bc 100644 --- a/docsrc/xmlsource/funcref/nm_max.xml +++ b/docsrc/xmlsource/funcref/nm_max.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/nm_max_notnull.xml b/docsrc/xmlsource/funcref/nm_max_notnull.xml index b7ec52e01f..358ac5cd57 100644 --- a/docsrc/xmlsource/funcref/nm_max_notnull.xml +++ b/docsrc/xmlsource/funcref/nm_max_notnull.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/nm_min.xml b/docsrc/xmlsource/funcref/nm_min.xml index 78d4f3d7ca..d6de1f276f 100644 --- a/docsrc/xmlsource/funcref/nm_min.xml +++ b/docsrc/xmlsource/funcref/nm_min.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/nm_min_notnull.xml b/docsrc/xmlsource/funcref/nm_min_notnull.xml index 154d35165d..1bd936eb96 100644 --- a/docsrc/xmlsource/funcref/nm_min_notnull.xml +++ b/docsrc/xmlsource/funcref/nm_min_notnull.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/nntp_auth_get.xml b/docsrc/xmlsource/funcref/nntp_auth_get.xml index edae85b5f7..e2e89a342b 100644 --- a/docsrc/xmlsource/funcref/nntp_auth_get.xml +++ b/docsrc/xmlsource/funcref/nntp_auth_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/nntp_auth_post.xml b/docsrc/xmlsource/funcref/nntp_auth_post.xml index 9c0715fd81..31dc2ab233 100644 --- a/docsrc/xmlsource/funcref/nntp_auth_post.xml +++ b/docsrc/xmlsource/funcref/nntp_auth_post.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/nntp_get.xml b/docsrc/xmlsource/funcref/nntp_get.xml index 44eacd52b4..64f4349600 100644 --- a/docsrc/xmlsource/funcref/nntp_get.xml +++ b/docsrc/xmlsource/funcref/nntp_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/nntp_post.xml b/docsrc/xmlsource/funcref/nntp_post.xml index d662840ac7..3e87248b05 100644 --- a/docsrc/xmlsource/funcref/nntp_post.xml +++ b/docsrc/xmlsource/funcref/nntp_post.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/now.xml b/docsrc/xmlsource/funcref/now.xml index 6e4e7ea3b5..c7c23c5745 100644 --- a/docsrc/xmlsource/funcref/now.xml +++ b/docsrc/xmlsource/funcref/now.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/openxml.xml b/docsrc/xmlsource/funcref/openxml.xml index 8da78633a2..db335b72d7 100644 --- a/docsrc/xmlsource/funcref/openxml.xml +++ b/docsrc/xmlsource/funcref/openxml.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/os_chmod.xml b/docsrc/xmlsource/funcref/os_chmod.xml index d56507619e..aa6bf10b4d 100644 --- a/docsrc/xmlsource/funcref/os_chmod.xml +++ b/docsrc/xmlsource/funcref/os_chmod.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/os_chown.xml b/docsrc/xmlsource/funcref/os_chown.xml index c6a3f1d86e..8a97b434eb 100644 --- a/docsrc/xmlsource/funcref/os_chown.xml +++ b/docsrc/xmlsource/funcref/os_chown.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/pem_certificates_to_array.xml b/docsrc/xmlsource/funcref/pem_certificates_to_array.xml index 273b216b77..4b8fcf75a6 100644 --- a/docsrc/xmlsource/funcref/pem_certificates_to_array.xml +++ b/docsrc/xmlsource/funcref/pem_certificates_to_array.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/pldbg_stats.xml b/docsrc/xmlsource/funcref/pldbg_stats.xml index 3b726379b4..a654d844be 100644 --- a/docsrc/xmlsource/funcref/pldbg_stats.xml +++ b/docsrc/xmlsource/funcref/pldbg_stats.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/pldbg_stats_load.xml b/docsrc/xmlsource/funcref/pldbg_stats_load.xml index 611b01b509..cb7c4810ed 100644 --- a/docsrc/xmlsource/funcref/pldbg_stats_load.xml +++ b/docsrc/xmlsource/funcref/pldbg_stats_load.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/pop3_get.xml b/docsrc/xmlsource/funcref/pop3_get.xml index 52b9504d5e..164c104431 100644 --- a/docsrc/xmlsource/funcref/pop3_get.xml +++ b/docsrc/xmlsource/funcref/pop3_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/position.xml b/docsrc/xmlsource/funcref/position.xml index 7bb53d264f..84fe120394 100644 --- a/docsrc/xmlsource/funcref/position.xml +++ b/docsrc/xmlsource/funcref/position.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/postgis_proj_version.xml b/docsrc/xmlsource/funcref/postgis_proj_version.xml index 4b31630118..e70034d86a 100644 --- a/docsrc/xmlsource/funcref/postgis_proj_version.xml +++ b/docsrc/xmlsource/funcref/postgis_proj_version.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/power.xml b/docsrc/xmlsource/funcref/power.xml index 148c7c73f3..ca6d367dc0 100644 --- a/docsrc/xmlsource/funcref/power.xml +++ b/docsrc/xmlsource/funcref/power.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/prof_enable.xml b/docsrc/xmlsource/funcref/prof_enable.xml index 77722c1a9e..810bd5d220 100644 --- a/docsrc/xmlsource/funcref/prof_enable.xml +++ b/docsrc/xmlsource/funcref/prof_enable.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/prof_sample.xml b/docsrc/xmlsource/funcref/prof_sample.xml index 216f8d117a..5e989b279a 100644 --- a/docsrc/xmlsource/funcref/prof_sample.xml +++ b/docsrc/xmlsource/funcref/prof_sample.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/quarter.xml b/docsrc/xmlsource/funcref/quarter.xml index 1c635748be..fdd3c9e51d 100644 --- a/docsrc/xmlsource/funcref/quarter.xml +++ b/docsrc/xmlsource/funcref/quarter.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/quote_dotted.xml b/docsrc/xmlsource/funcref/quote_dotted.xml index 02fc0b8a1f..b609777894 100644 --- a/docsrc/xmlsource/funcref/quote_dotted.xml +++ b/docsrc/xmlsource/funcref/quote_dotted.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/randomize.xml b/docsrc/xmlsource/funcref/randomize.xml index ea19c22a4e..bdebd787cb 100644 --- a/docsrc/xmlsource/funcref/randomize.xml +++ b/docsrc/xmlsource/funcref/randomize.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rclose.xml b/docsrc/xmlsource/funcref/rclose.xml index 5ac459837c..5ed03283c9 100644 --- a/docsrc/xmlsource/funcref/rclose.xml +++ b/docsrc/xmlsource/funcref/rclose.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_64bit_upgrade.xml b/docsrc/xmlsource/funcref/rdf_64bit_upgrade.xml index 67955ed243..69d32330e6 100644 --- a/docsrc/xmlsource/funcref/rdf_64bit_upgrade.xml +++ b/docsrc/xmlsource/funcref/rdf_64bit_upgrade.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_all_user_perms_del.xml b/docsrc/xmlsource/funcref/rdf_all_user_perms_del.xml index e7fc3bf0a8..54cac6349a 100644 --- a/docsrc/xmlsource/funcref/rdf_all_user_perms_del.xml +++ b/docsrc/xmlsource/funcref/rdf_all_user_perms_del.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_audit_metadata.xml b/docsrc/xmlsource/funcref/rdf_audit_metadata.xml index b377a68eff..068a7b3adc 100644 --- a/docsrc/xmlsource/funcref/rdf_audit_metadata.xml +++ b/docsrc/xmlsource/funcref/rdf_audit_metadata.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_backup_metadata.xml b/docsrc/xmlsource/funcref/rdf_backup_metadata.xml index b0d2f99b00..22f2528540 100644 --- a/docsrc/xmlsource/funcref/rdf_backup_metadata.xml +++ b/docsrc/xmlsource/funcref/rdf_backup_metadata.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_convert_rdfxml_to_ttl.xml b/docsrc/xmlsource/funcref/rdf_convert_rdfxml_to_ttl.xml index 3237dcf81a..b34d42e9c3 100644 --- a/docsrc/xmlsource/funcref/rdf_convert_rdfxml_to_ttl.xml +++ b/docsrc/xmlsource/funcref/rdf_convert_rdfxml_to_ttl.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_datatype_of_obj.xml b/docsrc/xmlsource/funcref/rdf_datatype_of_obj.xml index adcd3b6f5b..390e3387c9 100644 --- a/docsrc/xmlsource/funcref/rdf_datatype_of_obj.xml +++ b/docsrc/xmlsource/funcref/rdf_datatype_of_obj.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_default_user_perms_del.xml b/docsrc/xmlsource/funcref/rdf_default_user_perms_del.xml index a3ca3f04c9..045ea9eb1e 100644 --- a/docsrc/xmlsource/funcref/rdf_default_user_perms_del.xml +++ b/docsrc/xmlsource/funcref/rdf_default_user_perms_del.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_default_user_perms_set.xml b/docsrc/xmlsource/funcref/rdf_default_user_perms_set.xml index 20bfc86d1e..1e4b00effd 100644 --- a/docsrc/xmlsource/funcref/rdf_default_user_perms_set.xml +++ b/docsrc/xmlsource/funcref/rdf_default_user_perms_set.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_geo_add.xml b/docsrc/xmlsource/funcref/rdf_geo_add.xml index 861f1c5166..5a28804af5 100644 --- a/docsrc/xmlsource/funcref/rdf_geo_add.xml +++ b/docsrc/xmlsource/funcref/rdf_geo_add.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_geo_fill.xml b/docsrc/xmlsource/funcref/rdf_geo_fill.xml index 04826bc19a..827f2bf0c5 100644 --- a/docsrc/xmlsource/funcref/rdf_geo_fill.xml +++ b/docsrc/xmlsource/funcref/rdf_geo_fill.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_graph_collect_fp_list.xml b/docsrc/xmlsource/funcref/rdf_graph_collect_fp_list.xml index 26c6a7b7d8..e6020d4537 100644 --- a/docsrc/xmlsource/funcref/rdf_graph_collect_fp_list.xml +++ b/docsrc/xmlsource/funcref/rdf_graph_collect_fp_list.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_graph_diff.xml b/docsrc/xmlsource/funcref/rdf_graph_diff.xml index 8dcc777148..f93e8fb880 100644 --- a/docsrc/xmlsource/funcref/rdf_graph_diff.xml +++ b/docsrc/xmlsource/funcref/rdf_graph_diff.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_graph_group_create.xml b/docsrc/xmlsource/funcref/rdf_graph_group_create.xml index 833dc62be2..7ee329a0db 100644 --- a/docsrc/xmlsource/funcref/rdf_graph_group_create.xml +++ b/docsrc/xmlsource/funcref/rdf_graph_group_create.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_graph_group_ins.xml b/docsrc/xmlsource/funcref/rdf_graph_group_ins.xml index 4e6c0043fc..dd7210e140 100644 --- a/docsrc/xmlsource/funcref/rdf_graph_group_ins.xml +++ b/docsrc/xmlsource/funcref/rdf_graph_group_ins.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_graph_security_audit.xml b/docsrc/xmlsource/funcref/rdf_graph_security_audit.xml index ae6a3a7d70..eeb6125cc3 100644 --- a/docsrc/xmlsource/funcref/rdf_graph_security_audit.xml +++ b/docsrc/xmlsource/funcref/rdf_graph_security_audit.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_graph_user_perms_del.xml b/docsrc/xmlsource/funcref/rdf_graph_user_perms_del.xml index 74785091d3..ccdeff83bc 100644 --- a/docsrc/xmlsource/funcref/rdf_graph_user_perms_del.xml +++ b/docsrc/xmlsource/funcref/rdf_graph_user_perms_del.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_graph_user_perms_set.xml b/docsrc/xmlsource/funcref/rdf_graph_user_perms_set.xml index fdf6a6b953..e3a352964f 100644 --- a/docsrc/xmlsource/funcref/rdf_graph_user_perms_set.xml +++ b/docsrc/xmlsource/funcref/rdf_graph_user_perms_set.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_langmatches.xml b/docsrc/xmlsource/funcref/rdf_langmatches.xml index 3992bfa858..6a7dfadac9 100644 --- a/docsrc/xmlsource/funcref/rdf_langmatches.xml +++ b/docsrc/xmlsource/funcref/rdf_langmatches.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_load_rdfa.xml b/docsrc/xmlsource/funcref/rdf_load_rdfa.xml index 463b2637d2..1901ad37d0 100644 --- a/docsrc/xmlsource/funcref/rdf_load_rdfa.xml +++ b/docsrc/xmlsource/funcref/rdf_load_rdfa.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_load_rdfxml.xml b/docsrc/xmlsource/funcref/rdf_load_rdfxml.xml index a5043a7067..78baf4ef41 100644 --- a/docsrc/xmlsource/funcref/rdf_load_rdfxml.xml +++ b/docsrc/xmlsource/funcref/rdf_load_rdfxml.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_load_rdfxml_mt.xml b/docsrc/xmlsource/funcref/rdf_load_rdfxml_mt.xml index 5ce16f2a3f..f4698e3c08 100644 --- a/docsrc/xmlsource/funcref/rdf_load_rdfxml_mt.xml +++ b/docsrc/xmlsource/funcref/rdf_load_rdfxml_mt.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_load_stop.xml b/docsrc/xmlsource/funcref/rdf_load_stop.xml index cea17e13a5..e48d28cbc3 100644 --- a/docsrc/xmlsource/funcref/rdf_load_stop.xml +++ b/docsrc/xmlsource/funcref/rdf_load_stop.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_load_turtle.xml b/docsrc/xmlsource/funcref/rdf_load_turtle.xml index a7efa2f21e..aacb7c6792 100644 --- a/docsrc/xmlsource/funcref/rdf_load_turtle.xml +++ b/docsrc/xmlsource/funcref/rdf_load_turtle.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_loader_run.xml b/docsrc/xmlsource/funcref/rdf_loader_run.xml index 93ea56725b..a9ad341c47 100644 --- a/docsrc/xmlsource/funcref/rdf_loader_run.xml +++ b/docsrc/xmlsource/funcref/rdf_loader_run.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_now_impl.xml b/docsrc/xmlsource/funcref/rdf_now_impl.xml index 243606c35d..810711654f 100644 --- a/docsrc/xmlsource/funcref/rdf_now_impl.xml +++ b/docsrc/xmlsource/funcref/rdf_now_impl.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_quad_uri.xml b/docsrc/xmlsource/funcref/rdf_quad_uri.xml index d148b8a3eb..a47b21feeb 100644 --- a/docsrc/xmlsource/funcref/rdf_quad_uri.xml +++ b/docsrc/xmlsource/funcref/rdf_quad_uri.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_quad_uri_l.xml b/docsrc/xmlsource/funcref/rdf_quad_uri_l.xml index 219b70218c..8b3ae7d81a 100644 --- a/docsrc/xmlsource/funcref/rdf_quad_uri_l.xml +++ b/docsrc/xmlsource/funcref/rdf_quad_uri_l.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_quad_uri_l_typed.xml b/docsrc/xmlsource/funcref/rdf_quad_uri_l_typed.xml index 54d7d7d911..851ebe0643 100644 --- a/docsrc/xmlsource/funcref/rdf_quad_uri_l_typed.xml +++ b/docsrc/xmlsource/funcref/rdf_quad_uri_l_typed.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_regex.xml b/docsrc/xmlsource/funcref/rdf_regex.xml index bf6bf8798f..b7f0d6601f 100644 --- a/docsrc/xmlsource/funcref/rdf_regex.xml +++ b/docsrc/xmlsource/funcref/rdf_regex.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_repl_graph_del.xml b/docsrc/xmlsource/funcref/rdf_repl_graph_del.xml index 4b1b51de7b..52ed3a26f5 100644 --- a/docsrc/xmlsource/funcref/rdf_repl_graph_del.xml +++ b/docsrc/xmlsource/funcref/rdf_repl_graph_del.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_repl_graph_ins.xml b/docsrc/xmlsource/funcref/rdf_repl_graph_ins.xml index 5c7760a64f..09bed64e0e 100644 --- a/docsrc/xmlsource/funcref/rdf_repl_graph_ins.xml +++ b/docsrc/xmlsource/funcref/rdf_repl_graph_ins.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_repl_start.xml b/docsrc/xmlsource/funcref/rdf_repl_start.xml index 2d316421ac..0732e733cb 100644 --- a/docsrc/xmlsource/funcref/rdf_repl_start.xml +++ b/docsrc/xmlsource/funcref/rdf_repl_start.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_repl_stop.xml b/docsrc/xmlsource/funcref/rdf_repl_stop.xml index 61c2b20c7f..c4b66d3f40 100644 --- a/docsrc/xmlsource/funcref/rdf_repl_stop.xml +++ b/docsrc/xmlsource/funcref/rdf_repl_stop.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_repl_sync.xml b/docsrc/xmlsource/funcref/rdf_repl_sync.xml index 89455730be..d8363a819d 100644 --- a/docsrc/xmlsource/funcref/rdf_repl_sync.xml +++ b/docsrc/xmlsource/funcref/rdf_repl_sync.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_restore_metadata.xml b/docsrc/xmlsource/funcref/rdf_restore_metadata.xml index 740a496bba..6b43f01b63 100644 --- a/docsrc/xmlsource/funcref/rdf_restore_metadata.xml +++ b/docsrc/xmlsource/funcref/rdf_restore_metadata.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_suo_apply_patch.xml b/docsrc/xmlsource/funcref/rdf_suo_apply_patch.xml index 4e7bae7a5e..cec1702a56 100644 --- a/docsrc/xmlsource/funcref/rdf_suo_apply_patch.xml +++ b/docsrc/xmlsource/funcref/rdf_suo_apply_patch.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_suo_diff_ttl.xml b/docsrc/xmlsource/funcref/rdf_suo_diff_ttl.xml index 49e8e2d019..b73526bda6 100644 --- a/docsrc/xmlsource/funcref/rdf_suo_diff_ttl.xml +++ b/docsrc/xmlsource/funcref/rdf_suo_diff_ttl.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_triples_to_rdf_xml_text.xml b/docsrc/xmlsource/funcref/rdf_triples_to_rdf_xml_text.xml index c70def2e18..a96d0f2acf 100644 --- a/docsrc/xmlsource/funcref/rdf_triples_to_rdf_xml_text.xml +++ b/docsrc/xmlsource/funcref/rdf_triples_to_rdf_xml_text.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_triples_to_ttl.xml b/docsrc/xmlsource/funcref/rdf_triples_to_ttl.xml index b256835653..8b793d8672 100644 --- a/docsrc/xmlsource/funcref/rdf_triples_to_ttl.xml +++ b/docsrc/xmlsource/funcref/rdf_triples_to_ttl.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_ttl2hash.xml b/docsrc/xmlsource/funcref/rdf_ttl2hash.xml index 5ecae6d449..019457a18f 100644 --- a/docsrc/xmlsource/funcref/rdf_ttl2hash.xml +++ b/docsrc/xmlsource/funcref/rdf_ttl2hash.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_view_sync_to_physical.xml b/docsrc/xmlsource/funcref/rdf_view_sync_to_physical.xml index 7d501d4a85..6bcb7035eb 100644 --- a/docsrc/xmlsource/funcref/rdf_view_sync_to_physical.xml +++ b/docsrc/xmlsource/funcref/rdf_view_sync_to_physical.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdf_void_store.xml b/docsrc/xmlsource/funcref/rdf_void_store.xml index c691cb425d..6ebb539214 100644 --- a/docsrc/xmlsource/funcref/rdf_void_store.xml +++ b/docsrc/xmlsource/funcref/rdf_void_store.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rdfs_rule_set.xml b/docsrc/xmlsource/funcref/rdfs_rule_set.xml index 211022553f..43c1ce8878 100644 --- a/docsrc/xmlsource/funcref/rdfs_rule_set.xml +++ b/docsrc/xmlsource/funcref/rdfs_rule_set.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/read_log.xml b/docsrc/xmlsource/funcref/read_log.xml index ee84ccd5a3..afac589cd5 100644 --- a/docsrc/xmlsource/funcref/read_log.xml +++ b/docsrc/xmlsource/funcref/read_log.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regexp_instr.xml b/docsrc/xmlsource/funcref/regexp_instr.xml index e207f029a8..b65b66e344 100644 --- a/docsrc/xmlsource/funcref/regexp_instr.xml +++ b/docsrc/xmlsource/funcref/regexp_instr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regexp_like.xml b/docsrc/xmlsource/funcref/regexp_like.xml index e8d00642f0..55f86239d5 100644 --- a/docsrc/xmlsource/funcref/regexp_like.xml +++ b/docsrc/xmlsource/funcref/regexp_like.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regexp_match.xml b/docsrc/xmlsource/funcref/regexp_match.xml index 46c8589ad4..ad537d91f5 100644 --- a/docsrc/xmlsource/funcref/regexp_match.xml +++ b/docsrc/xmlsource/funcref/regexp_match.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regexp_parse.xml b/docsrc/xmlsource/funcref/regexp_parse.xml index dbd7100d5c..0efa1e6d1d 100644 --- a/docsrc/xmlsource/funcref/regexp_parse.xml +++ b/docsrc/xmlsource/funcref/regexp_parse.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regexp_replace.xml b/docsrc/xmlsource/funcref/regexp_replace.xml index 48936d3fe8..49c802d528 100644 --- a/docsrc/xmlsource/funcref/regexp_replace.xml +++ b/docsrc/xmlsource/funcref/regexp_replace.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regexp_substr.xml b/docsrc/xmlsource/funcref/regexp_substr.xml index a2f28ac5bd..08f6bf6598 100644 --- a/docsrc/xmlsource/funcref/regexp_substr.xml +++ b/docsrc/xmlsource/funcref/regexp_substr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/registry_get.xml b/docsrc/xmlsource/funcref/registry_get.xml index aefa2d33bf..495ee2e868 100644 --- a/docsrc/xmlsource/funcref/registry_get.xml +++ b/docsrc/xmlsource/funcref/registry_get.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/registry_get_all.xml b/docsrc/xmlsource/funcref/registry_get_all.xml index a935da5667..6a4d6d0aa6 100644 --- a/docsrc/xmlsource/funcref/registry_get_all.xml +++ b/docsrc/xmlsource/funcref/registry_get_all.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/registry_name_is_protected.xml b/docsrc/xmlsource/funcref/registry_name_is_protected.xml index e9ad8001a4..f2dc7cfeaf 100644 --- a/docsrc/xmlsource/funcref/registry_name_is_protected.xml +++ b/docsrc/xmlsource/funcref/registry_name_is_protected.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/registry_remove.xml b/docsrc/xmlsource/funcref/registry_remove.xml index ff97469568..9a7f873248 100644 --- a/docsrc/xmlsource/funcref/registry_remove.xml +++ b/docsrc/xmlsource/funcref/registry_remove.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/registry_set.xml b/docsrc/xmlsource/funcref/registry_set.xml index b0af8fe794..7341691efd 100644 --- a/docsrc/xmlsource/funcref/registry_set.xml +++ b/docsrc/xmlsource/funcref/registry_set.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regr_avgx.xml b/docsrc/xmlsource/funcref/regr_avgx.xml index da5dbb8718..164d537ef7 100644 --- a/docsrc/xmlsource/funcref/regr_avgx.xml +++ b/docsrc/xmlsource/funcref/regr_avgx.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regr_avgy.xml b/docsrc/xmlsource/funcref/regr_avgy.xml index b7a1080f82..d07b7c0bb6 100644 --- a/docsrc/xmlsource/funcref/regr_avgy.xml +++ b/docsrc/xmlsource/funcref/regr_avgy.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regr_count.xml b/docsrc/xmlsource/funcref/regr_count.xml index f91ecd3c3b..57615c6697 100644 --- a/docsrc/xmlsource/funcref/regr_count.xml +++ b/docsrc/xmlsource/funcref/regr_count.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regr_intercept.xml b/docsrc/xmlsource/funcref/regr_intercept.xml index e72639959b..42bf1bdc0d 100644 --- a/docsrc/xmlsource/funcref/regr_intercept.xml +++ b/docsrc/xmlsource/funcref/regr_intercept.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regr_r2.xml b/docsrc/xmlsource/funcref/regr_r2.xml index 24ca920bf9..b6a946bf5f 100644 --- a/docsrc/xmlsource/funcref/regr_r2.xml +++ b/docsrc/xmlsource/funcref/regr_r2.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regr_slope.xml b/docsrc/xmlsource/funcref/regr_slope.xml index 630790e193..3e4a556875 100644 --- a/docsrc/xmlsource/funcref/regr_slope.xml +++ b/docsrc/xmlsource/funcref/regr_slope.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regr_sxx.xml b/docsrc/xmlsource/funcref/regr_sxx.xml index 7ad45741e2..bbfd0f736b 100644 --- a/docsrc/xmlsource/funcref/regr_sxx.xml +++ b/docsrc/xmlsource/funcref/regr_sxx.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regr_sxy.xml b/docsrc/xmlsource/funcref/regr_sxy.xml index 7533670a39..17c280cab2 100644 --- a/docsrc/xmlsource/funcref/regr_sxy.xml +++ b/docsrc/xmlsource/funcref/regr_sxy.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/regr_syy.xml b/docsrc/xmlsource/funcref/regr_syy.xml index 7ab08f5a57..6f5d27cf98 100644 --- a/docsrc/xmlsource/funcref/regr_syy.xml +++ b/docsrc/xmlsource/funcref/regr_syy.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repeat.xml b/docsrc/xmlsource/funcref/repeat.xml index e4cd13aaf8..efc5036994 100644 --- a/docsrc/xmlsource/funcref/repeat.xml +++ b/docsrc/xmlsource/funcref/repeat.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_disconnect.xml b/docsrc/xmlsource/funcref/repl_disconnect.xml index be7834d93d..5b1936deba 100644 --- a/docsrc/xmlsource/funcref/repl_disconnect.xml +++ b/docsrc/xmlsource/funcref/repl_disconnect.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_grant.xml b/docsrc/xmlsource/funcref/repl_grant.xml index 9e19b188bb..421bd716ec 100644 --- a/docsrc/xmlsource/funcref/repl_grant.xml +++ b/docsrc/xmlsource/funcref/repl_grant.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_init_copy.xml b/docsrc/xmlsource/funcref/repl_init_copy.xml index 30a3241ef2..a3e698cbda 100644 --- a/docsrc/xmlsource/funcref/repl_init_copy.xml +++ b/docsrc/xmlsource/funcref/repl_init_copy.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_new_log.xml b/docsrc/xmlsource/funcref/repl_new_log.xml index 48596b7898..3845ebdfe1 100644 --- a/docsrc/xmlsource/funcref/repl_new_log.xml +++ b/docsrc/xmlsource/funcref/repl_new_log.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_pub_add.xml b/docsrc/xmlsource/funcref/repl_pub_add.xml index 05ae3617ec..2b3a19ac3f 100644 --- a/docsrc/xmlsource/funcref/repl_pub_add.xml +++ b/docsrc/xmlsource/funcref/repl_pub_add.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_pub_init_image.xml b/docsrc/xmlsource/funcref/repl_pub_init_image.xml index a383312238..0768122407 100644 --- a/docsrc/xmlsource/funcref/repl_pub_init_image.xml +++ b/docsrc/xmlsource/funcref/repl_pub_init_image.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_pub_remove.xml b/docsrc/xmlsource/funcref/repl_pub_remove.xml index fc51479347..f969381520 100644 --- a/docsrc/xmlsource/funcref/repl_pub_remove.xml +++ b/docsrc/xmlsource/funcref/repl_pub_remove.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_publish.xml b/docsrc/xmlsource/funcref/repl_publish.xml index 2fb2062cdc..1398712b91 100644 --- a/docsrc/xmlsource/funcref/repl_publish.xml +++ b/docsrc/xmlsource/funcref/repl_publish.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_purge.xml b/docsrc/xmlsource/funcref/repl_purge.xml index 4da854c174..b21a23c8e2 100644 --- a/docsrc/xmlsource/funcref/repl_purge.xml +++ b/docsrc/xmlsource/funcref/repl_purge.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_revoke.xml b/docsrc/xmlsource/funcref/repl_revoke.xml index 0ff2231d7a..d849ce7c3f 100644 --- a/docsrc/xmlsource/funcref/repl_revoke.xml +++ b/docsrc/xmlsource/funcref/repl_revoke.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_sched_init.xml b/docsrc/xmlsource/funcref/repl_sched_init.xml index 47ba2fd3ed..1cb4cc1ce8 100644 --- a/docsrc/xmlsource/funcref/repl_sched_init.xml +++ b/docsrc/xmlsource/funcref/repl_sched_init.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_server.xml b/docsrc/xmlsource/funcref/repl_server.xml index 4127542eac..8a74cd8f0b 100644 --- a/docsrc/xmlsource/funcref/repl_server.xml +++ b/docsrc/xmlsource/funcref/repl_server.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_server_rename.xml b/docsrc/xmlsource/funcref/repl_server_rename.xml index 0dfc80a035..ae32784818 100644 --- a/docsrc/xmlsource/funcref/repl_server_rename.xml +++ b/docsrc/xmlsource/funcref/repl_server_rename.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_stat.xml b/docsrc/xmlsource/funcref/repl_stat.xml index cdee72fd4b..fcc57f53e7 100644 --- a/docsrc/xmlsource/funcref/repl_stat.xml +++ b/docsrc/xmlsource/funcref/repl_stat.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_status.xml b/docsrc/xmlsource/funcref/repl_status.xml index f169f50de1..c9ea95ab5d 100644 --- a/docsrc/xmlsource/funcref/repl_status.xml +++ b/docsrc/xmlsource/funcref/repl_status.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_subscribe.xml b/docsrc/xmlsource/funcref/repl_subscribe.xml index dfac07f4d5..67d00d88f0 100644 --- a/docsrc/xmlsource/funcref/repl_subscribe.xml +++ b/docsrc/xmlsource/funcref/repl_subscribe.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_sync.xml b/docsrc/xmlsource/funcref/repl_sync.xml index 300eef6981..5518fbb5d6 100644 --- a/docsrc/xmlsource/funcref/repl_sync.xml +++ b/docsrc/xmlsource/funcref/repl_sync.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_sync_all.xml b/docsrc/xmlsource/funcref/repl_sync_all.xml index f75756ad4d..c64169ae2a 100644 --- a/docsrc/xmlsource/funcref/repl_sync_all.xml +++ b/docsrc/xmlsource/funcref/repl_sync_all.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_text.xml b/docsrc/xmlsource/funcref/repl_text.xml index 12796efbf7..c5c42cb917 100644 --- a/docsrc/xmlsource/funcref/repl_text.xml +++ b/docsrc/xmlsource/funcref/repl_text.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_this_server.xml b/docsrc/xmlsource/funcref/repl_this_server.xml index 3af9e890a3..57ce19d11d 100644 --- a/docsrc/xmlsource/funcref/repl_this_server.xml +++ b/docsrc/xmlsource/funcref/repl_this_server.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_unpublish.xml b/docsrc/xmlsource/funcref/repl_unpublish.xml index 439ea20314..cff3b227c7 100644 --- a/docsrc/xmlsource/funcref/repl_unpublish.xml +++ b/docsrc/xmlsource/funcref/repl_unpublish.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/repl_unsubscribe.xml b/docsrc/xmlsource/funcref/repl_unsubscribe.xml index 3a9871e8a7..d129d1316d 100644 --- a/docsrc/xmlsource/funcref/repl_unsubscribe.xml +++ b/docsrc/xmlsource/funcref/repl_unsubscribe.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/replace.xml b/docsrc/xmlsource/funcref/replace.xml index 8e65dffd42..b460738a2f 100644 --- a/docsrc/xmlsource/funcref/replace.xml +++ b/docsrc/xmlsource/funcref/replace.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/replay.xml b/docsrc/xmlsource/funcref/replay.xml index ec61401cde..e23ee55fdc 100644 --- a/docsrc/xmlsource/funcref/replay.xml +++ b/docsrc/xmlsource/funcref/replay.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/result.xml b/docsrc/xmlsource/funcref/result.xml index 7c19e9e320..7cc1bfe25f 100644 --- a/docsrc/xmlsource/funcref/result.xml +++ b/docsrc/xmlsource/funcref/result.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/result_names.xml b/docsrc/xmlsource/funcref/result_names.xml index 48b1b0c60d..913dfbcc62 100644 --- a/docsrc/xmlsource/funcref/result_names.xml +++ b/docsrc/xmlsource/funcref/result_names.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rexecute.xml b/docsrc/xmlsource/funcref/rexecute.xml index af7a57b6d2..e75bcfbdcf 100644 --- a/docsrc/xmlsource/funcref/rexecute.xml +++ b/docsrc/xmlsource/funcref/rexecute.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/right.xml b/docsrc/xmlsource/funcref/right.xml index 53ddcb4e4f..af2c3a491b 100644 --- a/docsrc/xmlsource/funcref/right.xml +++ b/docsrc/xmlsource/funcref/right.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rmoreresults.xml b/docsrc/xmlsource/funcref/rmoreresults.xml index f98b1208a7..ab1f09a83b 100644 --- a/docsrc/xmlsource/funcref/rmoreresults.xml +++ b/docsrc/xmlsource/funcref/rmoreresults.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rnd.xml b/docsrc/xmlsource/funcref/rnd.xml index 28b997a204..d79556e41d 100644 --- a/docsrc/xmlsource/funcref/rnd.xml +++ b/docsrc/xmlsource/funcref/rnd.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rnext.xml b/docsrc/xmlsource/funcref/rnext.xml index 62311f9990..d361210e8a 100644 --- a/docsrc/xmlsource/funcref/rnext.xml +++ b/docsrc/xmlsource/funcref/rnext.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/row_count.xml b/docsrc/xmlsource/funcref/row_count.xml index 6975a19a54..b81ba52d02 100644 --- a/docsrc/xmlsource/funcref/row_count.xml +++ b/docsrc/xmlsource/funcref/row_count.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rowvector_digit_sort.xml b/docsrc/xmlsource/funcref/rowvector_digit_sort.xml index d7db60cfe6..7b2e4e79b2 100644 --- a/docsrc/xmlsource/funcref/rowvector_digit_sort.xml +++ b/docsrc/xmlsource/funcref/rowvector_digit_sort.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rstmtexec.xml b/docsrc/xmlsource/funcref/rstmtexec.xml index fac43202bf..ee2b2f450d 100644 --- a/docsrc/xmlsource/funcref/rstmtexec.xml +++ b/docsrc/xmlsource/funcref/rstmtexec.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/rtrim.xml b/docsrc/xmlsource/funcref/rtrim.xml index 9fb9c021c6..fa34131113 100644 --- a/docsrc/xmlsource/funcref/rtrim.xml +++ b/docsrc/xmlsource/funcref/rtrim.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/search_excerpt.xml b/docsrc/xmlsource/funcref/search_excerpt.xml index 14f31626c2..62c59a5a58 100644 --- a/docsrc/xmlsource/funcref/search_excerpt.xml +++ b/docsrc/xmlsource/funcref/search_excerpt.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/second.xml b/docsrc/xmlsource/funcref/second.xml index 3615abcd65..74b5b39cb7 100644 --- a/docsrc/xmlsource/funcref/second.xml +++ b/docsrc/xmlsource/funcref/second.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sequence_get_all.xml b/docsrc/xmlsource/funcref/sequence_get_all.xml index 4039625ebb..efee577197 100644 --- a/docsrc/xmlsource/funcref/sequence_get_all.xml +++ b/docsrc/xmlsource/funcref/sequence_get_all.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sequence_next.xml b/docsrc/xmlsource/funcref/sequence_next.xml index 0b4efc7c8e..a13eac57e3 100644 --- a/docsrc/xmlsource/funcref/sequence_next.xml +++ b/docsrc/xmlsource/funcref/sequence_next.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sequence_remove.xml b/docsrc/xmlsource/funcref/sequence_remove.xml index 5d71623861..16634c5e96 100644 --- a/docsrc/xmlsource/funcref/sequence_remove.xml +++ b/docsrc/xmlsource/funcref/sequence_remove.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sequence_set.xml b/docsrc/xmlsource/funcref/sequence_set.xml index db30ac310c..36bf238521 100644 --- a/docsrc/xmlsource/funcref/sequence_set.xml +++ b/docsrc/xmlsource/funcref/sequence_set.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/serialize.xml b/docsrc/xmlsource/funcref/serialize.xml index f19ea93274..7f081e0696 100644 --- a/docsrc/xmlsource/funcref/serialize.xml +++ b/docsrc/xmlsource/funcref/serialize.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/serialize_to_UTF8_xml.xml b/docsrc/xmlsource/funcref/serialize_to_UTF8_xml.xml index 331536ee07..e903eed52f 100644 --- a/docsrc/xmlsource/funcref/serialize_to_UTF8_xml.xml +++ b/docsrc/xmlsource/funcref/serialize_to_UTF8_xml.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/serv_queue_top.xml b/docsrc/xmlsource/funcref/serv_queue_top.xml index 5e5088da1d..442ef87d74 100644 --- a/docsrc/xmlsource/funcref/serv_queue_top.xml +++ b/docsrc/xmlsource/funcref/serv_queue_top.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/server_root.xml b/docsrc/xmlsource/funcref/server_root.xml index 07314285e1..19ec80c0f9 100644 --- a/docsrc/xmlsource/funcref/server_root.xml +++ b/docsrc/xmlsource/funcref/server_root.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ses_connect.xml b/docsrc/xmlsource/funcref/ses_connect.xml index a88ac9c60c..1e36a9d7d1 100644 --- a/docsrc/xmlsource/funcref/ses_connect.xml +++ b/docsrc/xmlsource/funcref/ses_connect.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ses_disconnect.xml b/docsrc/xmlsource/funcref/ses_disconnect.xml index 1e25802e45..1ecaeecc73 100644 --- a/docsrc/xmlsource/funcref/ses_disconnect.xml +++ b/docsrc/xmlsource/funcref/ses_disconnect.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ses_read_line.xml b/docsrc/xmlsource/funcref/ses_read_line.xml index 1d49a1f88e..8d7dcd88e0 100644 --- a/docsrc/xmlsource/funcref/ses_read_line.xml +++ b/docsrc/xmlsource/funcref/ses_read_line.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/ses_write.xml b/docsrc/xmlsource/funcref/ses_write.xml index 52487f1adf..11c801c214 100644 --- a/docsrc/xmlsource/funcref/ses_write.xml +++ b/docsrc/xmlsource/funcref/ses_write.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/set_identity_column.xml b/docsrc/xmlsource/funcref/set_identity_column.xml index 727b5efd4f..7452a41849 100644 --- a/docsrc/xmlsource/funcref/set_identity_column.xml +++ b/docsrc/xmlsource/funcref/set_identity_column.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/set_row_count.xml b/docsrc/xmlsource/funcref/set_row_count.xml index bd0cce45c8..d2fad96421 100644 --- a/docsrc/xmlsource/funcref/set_row_count.xml +++ b/docsrc/xmlsource/funcref/set_row_count.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/set_user_id.xml b/docsrc/xmlsource/funcref/set_user_id.xml index d2da4929f7..294c346a4b 100644 --- a/docsrc/xmlsource/funcref/set_user_id.xml +++ b/docsrc/xmlsource/funcref/set_user_id.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sha1_digest.xml b/docsrc/xmlsource/funcref/sha1_digest.xml index ca49e58fb3..eeaf180ee2 100644 --- a/docsrc/xmlsource/funcref/sha1_digest.xml +++ b/docsrc/xmlsource/funcref/sha1_digest.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sign.xml b/docsrc/xmlsource/funcref/sign.xml index b18ce8f548..a6a65f6c26 100644 --- a/docsrc/xmlsource/funcref/sign.xml +++ b/docsrc/xmlsource/funcref/sign.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/signal.xml b/docsrc/xmlsource/funcref/signal.xml index 09a65c1ac0..064f9840f0 100644 --- a/docsrc/xmlsource/funcref/signal.xml +++ b/docsrc/xmlsource/funcref/signal.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sinv_create_inverse.xml b/docsrc/xmlsource/funcref/sinv_create_inverse.xml index 48acf25fad..55846144b0 100644 --- a/docsrc/xmlsource/funcref/sinv_create_inverse.xml +++ b/docsrc/xmlsource/funcref/sinv_create_inverse.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sinv_create_key_mapping.xml b/docsrc/xmlsource/funcref/sinv_create_key_mapping.xml index daa6bc6843..a649b0ba9c 100644 --- a/docsrc/xmlsource/funcref/sinv_create_key_mapping.xml +++ b/docsrc/xmlsource/funcref/sinv_create_key_mapping.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sinv_drop_inverse.xml b/docsrc/xmlsource/funcref/sinv_drop_inverse.xml index 3c8db7cb7d..fb06cd3ee6 100644 --- a/docsrc/xmlsource/funcref/sinv_drop_inverse.xml +++ b/docsrc/xmlsource/funcref/sinv_drop_inverse.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/smime_decrypt.xml b/docsrc/xmlsource/funcref/smime_decrypt.xml index 2808c1701e..48cd36d87e 100644 --- a/docsrc/xmlsource/funcref/smime_decrypt.xml +++ b/docsrc/xmlsource/funcref/smime_decrypt.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/smime_encrypt.xml b/docsrc/xmlsource/funcref/smime_encrypt.xml index d72670bde9..8cd86126e7 100644 --- a/docsrc/xmlsource/funcref/smime_encrypt.xml +++ b/docsrc/xmlsource/funcref/smime_encrypt.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/smime_sign.xml b/docsrc/xmlsource/funcref/smime_sign.xml index e9641ef75c..9153e86f26 100644 --- a/docsrc/xmlsource/funcref/smime_sign.xml +++ b/docsrc/xmlsource/funcref/smime_sign.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/smime_verify.xml b/docsrc/xmlsource/funcref/smime_verify.xml index fd370f68cc..fb6e4a5925 100644 --- a/docsrc/xmlsource/funcref/smime_verify.xml +++ b/docsrc/xmlsource/funcref/smime_verify.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/smtp_send.xml b/docsrc/xmlsource/funcref/smtp_send.xml index c65d314627..c63b493896 100644 --- a/docsrc/xmlsource/funcref/smtp_send.xml +++ b/docsrc/xmlsource/funcref/smtp_send.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/soap_box_structure.xml b/docsrc/xmlsource/funcref/soap_box_structure.xml index fdafecc011..fb248b143b 100644 --- a/docsrc/xmlsource/funcref/soap_box_structure.xml +++ b/docsrc/xmlsource/funcref/soap_box_structure.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/soap_box_xml_entity.xml b/docsrc/xmlsource/funcref/soap_box_xml_entity.xml index 23cf7e9c8f..11785a54a2 100644 --- a/docsrc/xmlsource/funcref/soap_box_xml_entity.xml +++ b/docsrc/xmlsource/funcref/soap_box_xml_entity.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/soap_call.xml b/docsrc/xmlsource/funcref/soap_call.xml index 082c9673a4..c7a1680e3d 100644 --- a/docsrc/xmlsource/funcref/soap_call.xml +++ b/docsrc/xmlsource/funcref/soap_call.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/soap_client.xml b/docsrc/xmlsource/funcref/soap_client.xml index 8d5f4018ed..eb2a416a32 100644 --- a/docsrc/xmlsource/funcref/soap_client.xml +++ b/docsrc/xmlsource/funcref/soap_client.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/soap_current_url.xml b/docsrc/xmlsource/funcref/soap_current_url.xml index ed6568e773..ae2a2bc79b 100644 --- a/docsrc/xmlsource/funcref/soap_current_url.xml +++ b/docsrc/xmlsource/funcref/soap_current_url.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/soap_dt_define.xml b/docsrc/xmlsource/funcref/soap_dt_define.xml index 396d8b8428..2ffffde70f 100644 --- a/docsrc/xmlsource/funcref/soap_dt_define.xml +++ b/docsrc/xmlsource/funcref/soap_dt_define.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/soap_make_error.xml b/docsrc/xmlsource/funcref/soap_make_error.xml index 2868313e25..5bf5f3931b 100644 --- a/docsrc/xmlsource/funcref/soap_make_error.xml +++ b/docsrc/xmlsource/funcref/soap_make_error.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/soap_print_box.xml b/docsrc/xmlsource/funcref/soap_print_box.xml index 4689a299a1..ff3f85f2b6 100644 --- a/docsrc/xmlsource/funcref/soap_print_box.xml +++ b/docsrc/xmlsource/funcref/soap_print_box.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/soap_sdl.xml b/docsrc/xmlsource/funcref/soap_sdl.xml index 2f29d53fd5..4462b4e926 100644 --- a/docsrc/xmlsource/funcref/soap_sdl.xml +++ b/docsrc/xmlsource/funcref/soap_sdl.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/soap_server.xml b/docsrc/xmlsource/funcref/soap_server.xml index 75b603f1d9..e07d04b6eb 100644 --- a/docsrc/xmlsource/funcref/soap_server.xml +++ b/docsrc/xmlsource/funcref/soap_server.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/soap_wsdl.xml b/docsrc/xmlsource/funcref/soap_wsdl.xml index 9a1ba0e387..368964e07d 100644 --- a/docsrc/xmlsource/funcref/soap_wsdl.xml +++ b/docsrc/xmlsource/funcref/soap_wsdl.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/soap_wsdl_import.xml b/docsrc/xmlsource/funcref/soap_wsdl_import.xml index d0bf39dab6..6cc056da58 100644 --- a/docsrc/xmlsource/funcref/soap_wsdl_import.xml +++ b/docsrc/xmlsource/funcref/soap_wsdl_import.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/space.xml b/docsrc/xmlsource/funcref/space.xml index c6dd1807c4..7612dbcba3 100644 --- a/docsrc/xmlsource/funcref/space.xml +++ b/docsrc/xmlsource/funcref/space.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sparql_eval.xml b/docsrc/xmlsource/funcref/sparql_eval.xml index e71cc56afd..2cc81e63e6 100644 --- a/docsrc/xmlsource/funcref/sparql_eval.xml +++ b/docsrc/xmlsource/funcref/sparql_eval.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sparql_eval_to_array.xml b/docsrc/xmlsource/funcref/sparql_eval_to_array.xml index 7989396510..56a6b4c11a 100644 --- a/docsrc/xmlsource/funcref/sparql_eval_to_array.xml +++ b/docsrc/xmlsource/funcref/sparql_eval_to_array.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sparql_rdb2rdf_codegen.xml b/docsrc/xmlsource/funcref/sparql_rdb2rdf_codegen.xml index e52f21e6ad..82c3df4532 100644 --- a/docsrc/xmlsource/funcref/sparql_rdb2rdf_codegen.xml +++ b/docsrc/xmlsource/funcref/sparql_rdb2rdf_codegen.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sparql_rdb2rdf_list_tables.xml b/docsrc/xmlsource/funcref/sparql_rdb2rdf_list_tables.xml index 144824fa3c..66178c54c1 100644 --- a/docsrc/xmlsource/funcref/sparql_rdb2rdf_list_tables.xml +++ b/docsrc/xmlsource/funcref/sparql_rdb2rdf_list_tables.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sparql_rexec.xml b/docsrc/xmlsource/funcref/sparql_rexec.xml index 88698ef688..15fd2ca12c 100644 --- a/docsrc/xmlsource/funcref/sparql_rexec.xml +++ b/docsrc/xmlsource/funcref/sparql_rexec.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sparql_rexec_to_array.xml b/docsrc/xmlsource/funcref/sparql_rexec_to_array.xml index 27481c4958..6bf0f2f8cb 100644 --- a/docsrc/xmlsource/funcref/sparql_rexec_to_array.xml +++ b/docsrc/xmlsource/funcref/sparql_rexec_to_array.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sparql_rexec_with_meta.xml b/docsrc/xmlsource/funcref/sparql_rexec_with_meta.xml index 1fdb9cbd85..f9f404d722 100644 --- a/docsrc/xmlsource/funcref/sparql_rexec_with_meta.xml +++ b/docsrc/xmlsource/funcref/sparql_rexec_with_meta.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sparql_select_known_graphs.xml b/docsrc/xmlsource/funcref/sparql_select_known_graphs.xml index ebfdf1018d..46e2477f30 100644 --- a/docsrc/xmlsource/funcref/sparql_select_known_graphs.xml +++ b/docsrc/xmlsource/funcref/sparql_select_known_graphs.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sparql_to_sql_text.xml b/docsrc/xmlsource/funcref/sparql_to_sql_text.xml index 4519c3ced8..207398a136 100644 --- a/docsrc/xmlsource/funcref/sparql_to_sql_text.xml +++ b/docsrc/xmlsource/funcref/sparql_to_sql_text.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/split_decode.xml b/docsrc/xmlsource/funcref/split_decode.xml index 5cccfa8b5e..e79ab8894c 100644 --- a/docsrc/xmlsource/funcref/split_decode.xml +++ b/docsrc/xmlsource/funcref/split_decode.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/spotlight_metadata.xml b/docsrc/xmlsource/funcref/spotlight_metadata.xml index ab5ca8f7ac..16549e863c 100644 --- a/docsrc/xmlsource/funcref/spotlight_metadata.xml +++ b/docsrc/xmlsource/funcref/spotlight_metadata.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sprintf.xml b/docsrc/xmlsource/funcref/sprintf.xml index 49e7eb89ae..2c2d8b365d 100644 --- a/docsrc/xmlsource/funcref/sprintf.xml +++ b/docsrc/xmlsource/funcref/sprintf.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sprintf_inverse.xml b/docsrc/xmlsource/funcref/sprintf_inverse.xml index 0200c09d83..8fe05052ca 100644 --- a/docsrc/xmlsource/funcref/sprintf_inverse.xml +++ b/docsrc/xmlsource/funcref/sprintf_inverse.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sprintf_iri.xml b/docsrc/xmlsource/funcref/sprintf_iri.xml index 900338606e..689c6774a4 100644 --- a/docsrc/xmlsource/funcref/sprintf_iri.xml +++ b/docsrc/xmlsource/funcref/sprintf_iri.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sprintf_iri_or_null.xml b/docsrc/xmlsource/funcref/sprintf_iri_or_null.xml index 81b6fc37a9..8f3954a750 100644 --- a/docsrc/xmlsource/funcref/sprintf_iri_or_null.xml +++ b/docsrc/xmlsource/funcref/sprintf_iri_or_null.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sprintf_or_null.xml b/docsrc/xmlsource/funcref/sprintf_or_null.xml index 1ab5f54707..ebe95f7183 100644 --- a/docsrc/xmlsource/funcref/sprintf_or_null.xml +++ b/docsrc/xmlsource/funcref/sprintf_or_null.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_columns.xml b/docsrc/xmlsource/funcref/sql_columns.xml index c139acec90..e009c33ebd 100644 --- a/docsrc/xmlsource/funcref/sql_columns.xml +++ b/docsrc/xmlsource/funcref/sql_columns.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_config_data_sources.xml b/docsrc/xmlsource/funcref/sql_config_data_sources.xml index 19e5914077..c9d73b6f3d 100644 --- a/docsrc/xmlsource/funcref/sql_config_data_sources.xml +++ b/docsrc/xmlsource/funcref/sql_config_data_sources.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_data_sources.xml b/docsrc/xmlsource/funcref/sql_data_sources.xml index 264e0c7ff2..290181aa1d 100644 --- a/docsrc/xmlsource/funcref/sql_data_sources.xml +++ b/docsrc/xmlsource/funcref/sql_data_sources.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_driver_connect.xml b/docsrc/xmlsource/funcref/sql_driver_connect.xml index 49e43907f7..442673d91f 100644 --- a/docsrc/xmlsource/funcref/sql_driver_connect.xml +++ b/docsrc/xmlsource/funcref/sql_driver_connect.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_get_installed_drivers.xml b/docsrc/xmlsource/funcref/sql_get_installed_drivers.xml index d596216ce6..daf5c383ab 100644 --- a/docsrc/xmlsource/funcref/sql_get_installed_drivers.xml +++ b/docsrc/xmlsource/funcref/sql_get_installed_drivers.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_get_private_profile_string.xml b/docsrc/xmlsource/funcref/sql_get_private_profile_string.xml index 45a060bae3..e8b6d10bf5 100644 --- a/docsrc/xmlsource/funcref/sql_get_private_profile_string.xml +++ b/docsrc/xmlsource/funcref/sql_get_private_profile_string.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_gettypeinfo.xml b/docsrc/xmlsource/funcref/sql_gettypeinfo.xml index c0994f4aac..0edfeca3d8 100644 --- a/docsrc/xmlsource/funcref/sql_gettypeinfo.xml +++ b/docsrc/xmlsource/funcref/sql_gettypeinfo.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_primary_keys.xml b/docsrc/xmlsource/funcref/sql_primary_keys.xml index b1946a0a01..16877e2458 100644 --- a/docsrc/xmlsource/funcref/sql_primary_keys.xml +++ b/docsrc/xmlsource/funcref/sql_primary_keys.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_procedures.xml b/docsrc/xmlsource/funcref/sql_procedures.xml index 2a67356371..bec10d6d04 100644 --- a/docsrc/xmlsource/funcref/sql_procedures.xml +++ b/docsrc/xmlsource/funcref/sql_procedures.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_remove_dsn_from_ini.xml b/docsrc/xmlsource/funcref/sql_remove_dsn_from_ini.xml index 9a9f6e166c..d667eddab4 100644 --- a/docsrc/xmlsource/funcref/sql_remove_dsn_from_ini.xml +++ b/docsrc/xmlsource/funcref/sql_remove_dsn_from_ini.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_special_columns.xml b/docsrc/xmlsource/funcref/sql_special_columns.xml index 0e28e4981b..0a56ff2d32 100644 --- a/docsrc/xmlsource/funcref/sql_special_columns.xml +++ b/docsrc/xmlsource/funcref/sql_special_columns.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_statistics.xml b/docsrc/xmlsource/funcref/sql_statistics.xml index 2b1a68a2d3..a45eae8d4f 100644 --- a/docsrc/xmlsource/funcref/sql_statistics.xml +++ b/docsrc/xmlsource/funcref/sql_statistics.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_tables.xml b/docsrc/xmlsource/funcref/sql_tables.xml index 8d74367913..d4611f347d 100644 --- a/docsrc/xmlsource/funcref/sql_tables.xml +++ b/docsrc/xmlsource/funcref/sql_tables.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_transact.xml b/docsrc/xmlsource/funcref/sql_transact.xml index f7f67d8ddb..3d0368efb7 100644 --- a/docsrc/xmlsource/funcref/sql_transact.xml +++ b/docsrc/xmlsource/funcref/sql_transact.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_write_file_dsn.xml b/docsrc/xmlsource/funcref/sql_write_file_dsn.xml index 5311dc742e..8fdf6088f7 100644 --- a/docsrc/xmlsource/funcref/sql_write_file_dsn.xml +++ b/docsrc/xmlsource/funcref/sql_write_file_dsn.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sql_write_private_profile_string.xml b/docsrc/xmlsource/funcref/sql_write_private_profile_string.xml index 5e3e880ffa..1bf530c66c 100644 --- a/docsrc/xmlsource/funcref/sql_write_private_profile_string.xml +++ b/docsrc/xmlsource/funcref/sql_write_private_profile_string.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sqrt.xml b/docsrc/xmlsource/funcref/sqrt.xml index 7c38f25aec..0b1f63338b 100644 --- a/docsrc/xmlsource/funcref/sqrt.xml +++ b/docsrc/xmlsource/funcref/sqrt.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_astext.xml b/docsrc/xmlsource/funcref/st_astext.xml index 604e0f4a52..6290825c99 100644 --- a/docsrc/xmlsource/funcref/st_astext.xml +++ b/docsrc/xmlsource/funcref/st_astext.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_contains.xml b/docsrc/xmlsource/funcref/st_contains.xml index 100a593ec9..89146dbcbf 100644 --- a/docsrc/xmlsource/funcref/st_contains.xml +++ b/docsrc/xmlsource/funcref/st_contains.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_distance.xml b/docsrc/xmlsource/funcref/st_distance.xml index f20e0ab064..89d1d5a572 100644 --- a/docsrc/xmlsource/funcref/st_distance.xml +++ b/docsrc/xmlsource/funcref/st_distance.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_earth_radius.xml b/docsrc/xmlsource/funcref/st_earth_radius.xml index e644b83418..6d84c476a8 100644 --- a/docsrc/xmlsource/funcref/st_earth_radius.xml +++ b/docsrc/xmlsource/funcref/st_earth_radius.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_ewkt_read.xml b/docsrc/xmlsource/funcref/st_ewkt_read.xml index c56b58b3b4..24320367c6 100644 --- a/docsrc/xmlsource/funcref/st_ewkt_read.xml +++ b/docsrc/xmlsource/funcref/st_ewkt_read.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_geomfromtext.xml b/docsrc/xmlsource/funcref/st_geomfromtext.xml index 5b8c7c974f..14fee09ab3 100644 --- a/docsrc/xmlsource/funcref/st_geomfromtext.xml +++ b/docsrc/xmlsource/funcref/st_geomfromtext.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_get_bounding_box.xml b/docsrc/xmlsource/funcref/st_get_bounding_box.xml index e511e766e3..dcea762f98 100644 --- a/docsrc/xmlsource/funcref/st_get_bounding_box.xml +++ b/docsrc/xmlsource/funcref/st_get_bounding_box.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_get_bounding_box_n.xml b/docsrc/xmlsource/funcref/st_get_bounding_box_n.xml index 47295cb09c..025214f824 100644 --- a/docsrc/xmlsource/funcref/st_get_bounding_box_n.xml +++ b/docsrc/xmlsource/funcref/st_get_bounding_box_n.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_intersects.xml b/docsrc/xmlsource/funcref/st_intersects.xml index 61ff0da6b6..4b76bce589 100644 --- a/docsrc/xmlsource/funcref/st_intersects.xml +++ b/docsrc/xmlsource/funcref/st_intersects.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_linestring.xml b/docsrc/xmlsource/funcref/st_linestring.xml index 4b305df23e..05f65c32b8 100644 --- a/docsrc/xmlsource/funcref/st_linestring.xml +++ b/docsrc/xmlsource/funcref/st_linestring.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_may_intersect.xml b/docsrc/xmlsource/funcref/st_may_intersect.xml index 4a7098da0f..0c97a7b8ff 100644 --- a/docsrc/xmlsource/funcref/st_may_intersect.xml +++ b/docsrc/xmlsource/funcref/st_may_intersect.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_point.xml b/docsrc/xmlsource/funcref/st_point.xml index 3f3eba2842..f4c4b1af1b 100644 --- a/docsrc/xmlsource/funcref/st_point.xml +++ b/docsrc/xmlsource/funcref/st_point.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_transform_by_custom_projection.xml b/docsrc/xmlsource/funcref/st_transform_by_custom_projection.xml index 58a03595f9..a5aa36245d 100644 --- a/docsrc/xmlsource/funcref/st_transform_by_custom_projection.xml +++ b/docsrc/xmlsource/funcref/st_transform_by_custom_projection.xml @@ -4,7 +4,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_within.xml b/docsrc/xmlsource/funcref/st_within.xml index a5901bd069..5ea932b078 100644 --- a/docsrc/xmlsource/funcref/st_within.xml +++ b/docsrc/xmlsource/funcref/st_within.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_x.xml b/docsrc/xmlsource/funcref/st_x.xml index 0d66d26798..910b48b9d1 100644 --- a/docsrc/xmlsource/funcref/st_x.xml +++ b/docsrc/xmlsource/funcref/st_x.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/st_y.xml b/docsrc/xmlsource/funcref/st_y.xml index 8cda7776be..b67eb9db2f 100644 --- a/docsrc/xmlsource/funcref/st_y.xml +++ b/docsrc/xmlsource/funcref/st_y.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/starts_with.xml b/docsrc/xmlsource/funcref/starts_with.xml index 9db07d87f3..d01d00370e 100644 --- a/docsrc/xmlsource/funcref/starts_with.xml +++ b/docsrc/xmlsource/funcref/starts_with.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/stat_export.xml b/docsrc/xmlsource/funcref/stat_export.xml index ddd1f55416..9d9a81e865 100644 --- a/docsrc/xmlsource/funcref/stat_export.xml +++ b/docsrc/xmlsource/funcref/stat_export.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/stat_import.xml b/docsrc/xmlsource/funcref/stat_import.xml index d7a95e23d6..87a284d116 100644 --- a/docsrc/xmlsource/funcref/stat_import.xml +++ b/docsrc/xmlsource/funcref/stat_import.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/status.xml b/docsrc/xmlsource/funcref/status.xml index 1d40819aa5..387b95bc57 100644 --- a/docsrc/xmlsource/funcref/status.xml +++ b/docsrc/xmlsource/funcref/status.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/stddev.xml b/docsrc/xmlsource/funcref/stddev.xml index dfc9112b3c..97d5dcc959 100644 --- a/docsrc/xmlsource/funcref/stddev.xml +++ b/docsrc/xmlsource/funcref/stddev.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/stddev_pop.xml b/docsrc/xmlsource/funcref/stddev_pop.xml index b222beee9a..f176ecdc7a 100644 --- a/docsrc/xmlsource/funcref/stddev_pop.xml +++ b/docsrc/xmlsource/funcref/stddev_pop.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/stddev_samp.xml b/docsrc/xmlsource/funcref/stddev_samp.xml index 7def645396..f73c5d273c 100644 --- a/docsrc/xmlsource/funcref/stddev_samp.xml +++ b/docsrc/xmlsource/funcref/stddev_samp.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/strcasestr.xml b/docsrc/xmlsource/funcref/strcasestr.xml index 050d0e1414..e2c11fcaa3 100644 --- a/docsrc/xmlsource/funcref/strcasestr.xml +++ b/docsrc/xmlsource/funcref/strcasestr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/strchr.xml b/docsrc/xmlsource/funcref/strchr.xml index 9d32f8ae34..1a86ff3734 100644 --- a/docsrc/xmlsource/funcref/strchr.xml +++ b/docsrc/xmlsource/funcref/strchr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/strcontains.xml b/docsrc/xmlsource/funcref/strcontains.xml index b15ed035d8..3047885b7c 100644 --- a/docsrc/xmlsource/funcref/strcontains.xml +++ b/docsrc/xmlsource/funcref/strcontains.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/string_output.xml b/docsrc/xmlsource/funcref/string_output.xml index 212e6c8c52..513bbf499e 100644 --- a/docsrc/xmlsource/funcref/string_output.xml +++ b/docsrc/xmlsource/funcref/string_output.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/string_output_flush.xml b/docsrc/xmlsource/funcref/string_output_flush.xml index 13426b887e..f59df15334 100644 --- a/docsrc/xmlsource/funcref/string_output_flush.xml +++ b/docsrc/xmlsource/funcref/string_output_flush.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/string_output_gz_compress.xml b/docsrc/xmlsource/funcref/string_output_gz_compress.xml index b8a80a7cb1..e1c1c4bcad 100644 --- a/docsrc/xmlsource/funcref/string_output_gz_compress.xml +++ b/docsrc/xmlsource/funcref/string_output_gz_compress.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/string_output_string.xml b/docsrc/xmlsource/funcref/string_output_string.xml index fbd7e20772..2699266166 100644 --- a/docsrc/xmlsource/funcref/string_output_string.xml +++ b/docsrc/xmlsource/funcref/string_output_string.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/string_to_file.xml b/docsrc/xmlsource/funcref/string_to_file.xml index 6321c62690..a1ffad500e 100644 --- a/docsrc/xmlsource/funcref/string_to_file.xml +++ b/docsrc/xmlsource/funcref/string_to_file.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/stringdate.xml b/docsrc/xmlsource/funcref/stringdate.xml index 4dc824189e..2cc666f7c5 100644 --- a/docsrc/xmlsource/funcref/stringdate.xml +++ b/docsrc/xmlsource/funcref/stringdate.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/stringtime.xml b/docsrc/xmlsource/funcref/stringtime.xml index ec10901fee..97f8e2e1cc 100644 --- a/docsrc/xmlsource/funcref/stringtime.xml +++ b/docsrc/xmlsource/funcref/stringtime.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/strrchr.xml b/docsrc/xmlsource/funcref/strrchr.xml index df4601ba5a..d301e624fb 100644 --- a/docsrc/xmlsource/funcref/strrchr.xml +++ b/docsrc/xmlsource/funcref/strrchr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/strstr.xml b/docsrc/xmlsource/funcref/strstr.xml index b0c63c85dc..50702a14d8 100644 --- a/docsrc/xmlsource/funcref/strstr.xml +++ b/docsrc/xmlsource/funcref/strstr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sub_schedule.xml b/docsrc/xmlsource/funcref/sub_schedule.xml index 99eae7d81a..3cb9d9e83b 100644 --- a/docsrc/xmlsource/funcref/sub_schedule.xml +++ b/docsrc/xmlsource/funcref/sub_schedule.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/subseq.xml b/docsrc/xmlsource/funcref/subseq.xml index 70be120a93..dd09125b3d 100644 --- a/docsrc/xmlsource/funcref/subseq.xml +++ b/docsrc/xmlsource/funcref/subseq.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/substring.xml b/docsrc/xmlsource/funcref/substring.xml index 553be358aa..7fd2b59b04 100644 --- a/docsrc/xmlsource/funcref/substring.xml +++ b/docsrc/xmlsource/funcref/substring.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sync_repl.xml b/docsrc/xmlsource/funcref/sync_repl.xml index 0e76aaf676..7ae21bb48b 100644 --- a/docsrc/xmlsource/funcref/sync_repl.xml +++ b/docsrc/xmlsource/funcref/sync_repl.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sys_db_stat.xml b/docsrc/xmlsource/funcref/sys_db_stat.xml index b74d660300..06af55edd6 100644 --- a/docsrc/xmlsource/funcref/sys_db_stat.xml +++ b/docsrc/xmlsource/funcref/sys_db_stat.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sys_lockdown.xml b/docsrc/xmlsource/funcref/sys_lockdown.xml index 1041af35be..a472527ce7 100644 --- a/docsrc/xmlsource/funcref/sys_lockdown.xml +++ b/docsrc/xmlsource/funcref/sys_lockdown.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sys_stat.xml b/docsrc/xmlsource/funcref/sys_stat.xml index 35d677161b..25dd98b9f3 100644 --- a/docsrc/xmlsource/funcref/sys_stat.xml +++ b/docsrc/xmlsource/funcref/sys_stat.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sys_stat_analyze.xml b/docsrc/xmlsource/funcref/sys_stat_analyze.xml index e625fe9b61..74204e1afe 100644 --- a/docsrc/xmlsource/funcref/sys_stat_analyze.xml +++ b/docsrc/xmlsource/funcref/sys_stat_analyze.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sys_stat_histogram.xml b/docsrc/xmlsource/funcref/sys_stat_histogram.xml index 1843db6421..1b42bbafaf 100644 --- a/docsrc/xmlsource/funcref/sys_stat_histogram.xml +++ b/docsrc/xmlsource/funcref/sys_stat_histogram.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/system.xml b/docsrc/xmlsource/funcref/system.xml index 23bcaad32c..a630967664 100644 --- a/docsrc/xmlsource/funcref/system.xml +++ b/docsrc/xmlsource/funcref/system.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/sysutcdatetime.xml b/docsrc/xmlsource/funcref/sysutcdatetime.xml index 1f46255cbf..17de3b4325 100644 --- a/docsrc/xmlsource/funcref/sysutcdatetime.xml +++ b/docsrc/xmlsource/funcref/sysutcdatetime.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/table_drop_policy.xml b/docsrc/xmlsource/funcref/table_drop_policy.xml index 601f4a1a54..0ccca766ab 100644 --- a/docsrc/xmlsource/funcref/table_drop_policy.xml +++ b/docsrc/xmlsource/funcref/table_drop_policy.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/table_set_policy.xml b/docsrc/xmlsource/funcref/table_set_policy.xml index 299a22764a..acb03231ad 100644 --- a/docsrc/xmlsource/funcref/table_set_policy.xml +++ b/docsrc/xmlsource/funcref/table_set_policy.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/tcpip_gethostbyaddr.xml b/docsrc/xmlsource/funcref/tcpip_gethostbyaddr.xml index e7a47e145b..272f761a67 100644 --- a/docsrc/xmlsource/funcref/tcpip_gethostbyaddr.xml +++ b/docsrc/xmlsource/funcref/tcpip_gethostbyaddr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/tcpip_gethostbyname.xml b/docsrc/xmlsource/funcref/tcpip_gethostbyname.xml index 818d689bd2..e3f4a2c703 100644 --- a/docsrc/xmlsource/funcref/tcpip_gethostbyname.xml +++ b/docsrc/xmlsource/funcref/tcpip_gethostbyname.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/funcref/template.sh b/docsrc/xmlsource/funcref/template.sh index cb88e90158..565975f3b7 100755 --- a/docsrc/xmlsource/funcref/template.sh +++ b/docsrc/xmlsource/funcref/template.sh @@ -25,7 +25,7 @@ cat > "${tgt}" < - + diff --git a/docsrc/xmlsource/vaddistr.xml b/docsrc/xmlsource/vaddistr.xml index 24e1e54c06..9f3fe6c882 100644 --- a/docsrc/xmlsource/vaddistr.xml +++ b/docsrc/xmlsource/vaddistr.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the @@ -710,7 +710,7 @@ set of documentation files. - + diff --git a/docsrc/xmlsource/vdbconcepts.xml b/docsrc/xmlsource/vdbconcepts.xml index 4b6f27b5fb..adce3e7773 100644 --- a/docsrc/xmlsource/vdbconcepts.xml +++ b/docsrc/xmlsource/vdbconcepts.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vfoafssl.xml b/docsrc/xmlsource/vfoafssl.xml index 398e54c781..38cd66db1e 100644 --- a/docsrc/xmlsource/vfoafssl.xml +++ b/docsrc/xmlsource/vfoafssl.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/virtclientref.xml b/docsrc/xmlsource/virtclientref.xml index 6fa0dd5d96..6390a46e49 100644 --- a/docsrc/xmlsource/virtclientref.xml +++ b/docsrc/xmlsource/virtclientref.xml @@ -5,7 +5,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/virtwhitepaper.xml b/docsrc/xmlsource/virtwhitepaper.xml index bdadd457c6..b619f51a99 100644 --- a/docsrc/xmlsource/virtwhitepaper.xml +++ b/docsrc/xmlsource/virtwhitepaper.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/voauth.xml b/docsrc/xmlsource/voauth.xml index 5a34c4e5e5..f1bd63ef01 100644 --- a/docsrc/xmlsource/voauth.xml +++ b/docsrc/xmlsource/voauth.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vsmx.xml b/docsrc/xmlsource/vsmx.xml index 8337b3007d..84a5e1a70f 100644 --- a/docsrc/xmlsource/vsmx.xml +++ b/docsrc/xmlsource/vsmx.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vsp.xml b/docsrc/xmlsource/vsp.xml index 6a40911895..2913c2d0af 100644 --- a/docsrc/xmlsource/vsp.xml +++ b/docsrc/xmlsource/vsp.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vsptraining.xml b/docsrc/xmlsource/vsptraining.xml index b447b38d4c..92c56b72b3 100644 --- a/docsrc/xmlsource/vsptraining.xml +++ b/docsrc/xmlsource/vsptraining.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx.xml b/docsrc/xmlsource/vspx.xml index 490bc73500..19efaa124b 100644 --- a/docsrc/xmlsource/vspx.xml +++ b/docsrc/xmlsource/vspx.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_button.xml b/docsrc/xmlsource/vspx_ref/vspx_button.xml index 15eb196162..3efa7146fc 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_button.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_button.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_check_box.xml b/docsrc/xmlsource/vspx_ref/vspx_check_box.xml index f133c6ab98..453ac54f44 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_check_box.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_check_box.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_data_grid.xml b/docsrc/xmlsource/vspx_ref/vspx_data_grid.xml index 86fd287a8f..29f37b52e9 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_data_grid.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_data_grid.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_data_list.xml b/docsrc/xmlsource/vspx_ref/vspx_data_list.xml index d2283f0950..498b299fa0 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_data_list.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_data_list.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_data_set.xml b/docsrc/xmlsource/vspx_ref/vspx_data_set.xml index 4b4910091f..1a909293b9 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_data_set.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_data_set.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_error_summary.xml b/docsrc/xmlsource/vspx_ref/vspx_error_summary.xml index ad3d771100..381a050582 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_error_summary.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_error_summary.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_field.xml b/docsrc/xmlsource/vspx_ref/vspx_field.xml index b5a6d56bbc..c79603db82 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_field.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_field.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_form.xml b/docsrc/xmlsource/vspx_ref/vspx_form.xml index 0149c439c6..945a18ed3d 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_form.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_form.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_include.xml b/docsrc/xmlsource/vspx_ref/vspx_include.xml index c58612696d..0d7473046e 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_include.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_include.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_label.xml b/docsrc/xmlsource/vspx_ref/vspx_label.xml index b83ddbcc3c..1fb1e8b328 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_label.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_label.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_login.xml b/docsrc/xmlsource/vspx_ref/vspx_login.xml index 0a3eb09545..3fbe41fd96 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_login.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_login.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_login_form.xml b/docsrc/xmlsource/vspx_ref/vspx_login_form.xml index 0d82102e7b..1fb8b9e9ec 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_login_form.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_login_form.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_page.xml b/docsrc/xmlsource/vspx_ref/vspx_page.xml index 3f4ac55b95..e7baf45b2e 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_page.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_page.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_radio_button.xml b/docsrc/xmlsource/vspx_ref/vspx_radio_button.xml index 401247df70..ca8d66825a 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_radio_button.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_radio_button.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_select_list.xml b/docsrc/xmlsource/vspx_ref/vspx_select_list.xml index e0ec5b73b7..d78dc2a896 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_select_list.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_select_list.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_tab.xml b/docsrc/xmlsource/vspx_ref/vspx_tab.xml index c7ffde93d7..37e4f88777 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_tab.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_tab.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_template.xml b/docsrc/xmlsource/vspx_ref/vspx_template.xml index 7eaa816e4d..a32d515c58 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_template.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_template.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_text.xml b/docsrc/xmlsource/vspx_ref/vspx_text.xml index e6c15e9346..1946928372 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_text.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_text.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_textarea.xml b/docsrc/xmlsource/vspx_ref/vspx_textarea.xml index 6b07089dce..06a4230243 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_textarea.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_textarea.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_tree.xml b/docsrc/xmlsource/vspx_ref/vspx_tree.xml index ad94fffd43..10d8f43e24 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_tree.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_tree.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_update_field.xml b/docsrc/xmlsource/vspx_ref/vspx_update_field.xml index 8662497e49..ad44acf7df 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_update_field.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_update_field.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_url.xml b/docsrc/xmlsource/vspx_ref/vspx_url.xml index 1ffc52186e..5b061420cd 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_url.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_url.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_validator.xml b/docsrc/xmlsource/vspx_ref/vspx_validator.xml index e254cab4a4..7409e6e901 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_validator.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_validator.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/vspx_ref/vspx_variable.xml b/docsrc/xmlsource/vspx_ref/vspx_variable.xml index 27af051bbd..6afe78c862 100644 --- a/docsrc/xmlsource/vspx_ref/vspx_variable.xml +++ b/docsrc/xmlsource/vspx_ref/vspx_variable.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/web_acl.xml b/docsrc/xmlsource/web_acl.xml index eee74beb7c..a45aa69acd 100644 --- a/docsrc/xmlsource/web_acl.xml +++ b/docsrc/xmlsource/web_acl.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/webandxml.xml b/docsrc/xmlsource/webandxml.xml index 91d4c654f5..7649bac8a9 100644 --- a/docsrc/xmlsource/webandxml.xml +++ b/docsrc/xmlsource/webandxml.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/webappdevelopment.xml b/docsrc/xmlsource/webappdevelopment.xml index f1b88780bc..7c76faf392 100644 --- a/docsrc/xmlsource/webappdevelopment.xml +++ b/docsrc/xmlsource/webappdevelopment.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/webdav.xml b/docsrc/xmlsource/webdav.xml index 34b6d7e408..7b77d4e8d0 100644 --- a/docsrc/xmlsource/webdav.xml +++ b/docsrc/xmlsource/webdav.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/webserver.xml b/docsrc/xmlsource/webserver.xml index be5da4d33b..f9ef75ec57 100644 --- a/docsrc/xmlsource/webserver.xml +++ b/docsrc/xmlsource/webserver.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/webservices.xml b/docsrc/xmlsource/webservices.xml index fbab95939f..d5c3ca8760 100644 --- a/docsrc/xmlsource/webservices.xml +++ b/docsrc/xmlsource/webservices.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/ws-rm.xml b/docsrc/xmlsource/ws-rm.xml index 7e11e16dd2..f7e4941c3b 100644 --- a/docsrc/xmlsource/ws-rm.xml +++ b/docsrc/xmlsource/ws-rm.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/ws-routing.xml b/docsrc/xmlsource/ws-routing.xml index 7270ec4b34..5d647a1c0e 100644 --- a/docsrc/xmlsource/ws-routing.xml +++ b/docsrc/xmlsource/ws-routing.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/ws-security.xml b/docsrc/xmlsource/ws-security.xml index 9ea38a6ac9..fb44b57b1f 100644 --- a/docsrc/xmlsource/ws-security.xml +++ b/docsrc/xmlsource/ws-security.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/ws-trust.xml b/docsrc/xmlsource/ws-trust.xml index a1f8cf406e..c6ea7d7c1e 100644 --- a/docsrc/xmlsource/ws-trust.xml +++ b/docsrc/xmlsource/ws-trust.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/wsdl.xml b/docsrc/xmlsource/wsdl.xml index 6f4469dc26..1e2ffebd64 100644 --- a/docsrc/xmlsource/wsdl.xml +++ b/docsrc/xmlsource/wsdl.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xa.xml b/docsrc/xmlsource/xa.xml index 16c0264315..d7d5b45c8f 100644 --- a/docsrc/xmlsource/xa.xml +++ b/docsrc/xmlsource/xa.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmla.xml b/docsrc/xmlsource/xmla.xml index a58805d9d5..42a8d08c45 100644 --- a/docsrc/xmlsource/xmla.xml +++ b/docsrc/xmlsource/xmla.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/_xpf_template.xml b/docsrc/xmlsource/xmlref/_xpf_template.xml index 20101a3b51..689aaaffbe 100644 --- a/docsrc/xmlsource/xmlref/_xpf_template.xml +++ b/docsrc/xmlsource/xmlref/_xpf_template.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf__sql__column.xml b/docsrc/xmlsource/xmlref/xpf__sql__column.xml index fe792be532..0e563c1a11 100644 --- a/docsrc/xmlsource/xmlref/xpf__sql__column.xml +++ b/docsrc/xmlsource/xmlref/xpf__sql__column.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_and.xml b/docsrc/xmlsource/xmlref/xpf_and.xml index d5ddf995ce..986a675c40 100644 --- a/docsrc/xmlsource/xmlref/xpf_and.xml +++ b/docsrc/xmlsource/xmlref/xpf_and.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_append.xml b/docsrc/xmlsource/xmlref/xpf_append.xml index 09b115bcc5..3a51e1f802 100644 --- a/docsrc/xmlsource/xmlref/xpf_append.xml +++ b/docsrc/xmlsource/xmlref/xpf_append.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_assign.xml b/docsrc/xmlsource/xmlref/xpf_assign.xml index 503d296a84..02c6e1c89e 100644 --- a/docsrc/xmlsource/xmlref/xpf_assign.xml +++ b/docsrc/xmlsource/xmlref/xpf_assign.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_avg.xml b/docsrc/xmlsource/xmlref/xpf_avg.xml index be191981a3..2c37684af9 100644 --- a/docsrc/xmlsource/xmlref/xpf_avg.xml +++ b/docsrc/xmlsource/xmlref/xpf_avg.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_boolean.xml b/docsrc/xmlsource/xmlref/xpf_boolean.xml index 6144a951d8..bc5a94c117 100644 --- a/docsrc/xmlsource/xmlref/xpf_boolean.xml +++ b/docsrc/xmlsource/xmlref/xpf_boolean.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_ceiling.xml b/docsrc/xmlsource/xmlref/xpf_ceiling.xml index a7c2e5a94f..1fbc392072 100644 --- a/docsrc/xmlsource/xmlref/xpf_ceiling.xml +++ b/docsrc/xmlsource/xmlref/xpf_ceiling.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_collection.xml b/docsrc/xmlsource/xmlref/xpf_collection.xml index 58c7602cdf..f64e1ea084 100644 --- a/docsrc/xmlsource/xmlref/xpf_collection.xml +++ b/docsrc/xmlsource/xmlref/xpf_collection.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_concat.xml b/docsrc/xmlsource/xmlref/xpf_concat.xml index 4ba2368d11..c18384bdf6 100644 --- a/docsrc/xmlsource/xmlref/xpf_concat.xml +++ b/docsrc/xmlsource/xmlref/xpf_concat.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_contains.xml b/docsrc/xmlsource/xmlref/xpf_contains.xml index f5e0b996e9..920c18449a 100644 --- a/docsrc/xmlsource/xmlref/xpf_contains.xml +++ b/docsrc/xmlsource/xmlref/xpf_contains.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_count.xml b/docsrc/xmlsource/xmlref/xpf_count.xml index 9ef62eebe7..f262046c60 100644 --- a/docsrc/xmlsource/xmlref/xpf_count.xml +++ b/docsrc/xmlsource/xmlref/xpf_count.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_create_attribute.xml b/docsrc/xmlsource/xmlref/xpf_create_attribute.xml index f231994fdf..be30480125 100644 --- a/docsrc/xmlsource/xmlref/xpf_create_attribute.xml +++ b/docsrc/xmlsource/xmlref/xpf_create_attribute.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_create_comment.xml b/docsrc/xmlsource/xmlref/xpf_create_comment.xml index f3a07beaa0..e37d7c0dc2 100644 --- a/docsrc/xmlsource/xmlref/xpf_create_comment.xml +++ b/docsrc/xmlsource/xmlref/xpf_create_comment.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_create_element.xml b/docsrc/xmlsource/xmlref/xpf_create_element.xml index 8811d15c93..fe77890c01 100644 --- a/docsrc/xmlsource/xmlref/xpf_create_element.xml +++ b/docsrc/xmlsource/xmlref/xpf_create_element.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_create_pi.xml b/docsrc/xmlsource/xmlref/xpf_create_pi.xml index 58e80b7219..d3b24be919 100644 --- a/docsrc/xmlsource/xmlref/xpf_create_pi.xml +++ b/docsrc/xmlsource/xmlref/xpf_create_pi.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_current.xml b/docsrc/xmlsource/xmlref/xpf_current.xml index 7649e4ce86..50f385aed5 100644 --- a/docsrc/xmlsource/xmlref/xpf_current.xml +++ b/docsrc/xmlsource/xmlref/xpf_current.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_deass.xml b/docsrc/xmlsource/xmlref/xpf_deass.xml index 20101a3b51..689aaaffbe 100644 --- a/docsrc/xmlsource/xmlref/xpf_deass.xml +++ b/docsrc/xmlsource/xmlref/xpf_deass.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_distinct.xml b/docsrc/xmlsource/xmlref/xpf_distinct.xml index 649529fb38..5b29ef187e 100644 --- a/docsrc/xmlsource/xmlref/xpf_distinct.xml +++ b/docsrc/xmlsource/xmlref/xpf_distinct.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_doc.xml b/docsrc/xmlsource/xmlref/xpf_doc.xml index 046f5d0ec4..40b6deb782 100644 --- a/docsrc/xmlsource/xmlref/xpf_doc.xml +++ b/docsrc/xmlsource/xmlref/xpf_doc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_document.xml b/docsrc/xmlsource/xmlref/xpf_document.xml index 05672e727a..57a3ec40ca 100644 --- a/docsrc/xmlsource/xmlref/xpf_document.xml +++ b/docsrc/xmlsource/xmlref/xpf_document.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_document_literal.xml b/docsrc/xmlsource/xmlref/xpf_document_literal.xml index 68d3c31b08..51381bdf92 100644 --- a/docsrc/xmlsource/xmlref/xpf_document_literal.xml +++ b/docsrc/xmlsource/xmlref/xpf_document_literal.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_empty.xml b/docsrc/xmlsource/xmlref/xpf_empty.xml index a65bf8f1c4..1ccdae4166 100644 --- a/docsrc/xmlsource/xmlref/xpf_empty.xml +++ b/docsrc/xmlsource/xmlref/xpf_empty.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_ends_with.xml b/docsrc/xmlsource/xmlref/xpf_ends_with.xml index a48f8ccd0b..74b52a888c 100644 --- a/docsrc/xmlsource/xmlref/xpf_ends_with.xml +++ b/docsrc/xmlsource/xmlref/xpf_ends_with.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_every.xml b/docsrc/xmlsource/xmlref/xpf_every.xml index 0f2de3397d..960337efa5 100644 --- a/docsrc/xmlsource/xmlref/xpf_every.xml +++ b/docsrc/xmlsource/xmlref/xpf_every.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_except.xml b/docsrc/xmlsource/xmlref/xpf_except.xml index 7bd7914786..ff8d93170b 100644 --- a/docsrc/xmlsource/xmlref/xpf_except.xml +++ b/docsrc/xmlsource/xmlref/xpf_except.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_false.xml b/docsrc/xmlsource/xmlref/xpf_false.xml index 4cfb911860..23bd69d4bd 100644 --- a/docsrc/xmlsource/xmlref/xpf_false.xml +++ b/docsrc/xmlsource/xmlref/xpf_false.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_filter.xml b/docsrc/xmlsource/xmlref/xpf_filter.xml index 392a336b88..f6cdbd0f46 100644 --- a/docsrc/xmlsource/xmlref/xpf_filter.xml +++ b/docsrc/xmlsource/xmlref/xpf_filter.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_floor.xml b/docsrc/xmlsource/xmlref/xpf_floor.xml index 295b662406..5f5e879d8d 100644 --- a/docsrc/xmlsource/xmlref/xpf_floor.xml +++ b/docsrc/xmlsource/xmlref/xpf_floor.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_for.xml b/docsrc/xmlsource/xmlref/xpf_for.xml index 29ea694d02..272d5f77c3 100644 --- a/docsrc/xmlsource/xmlref/xpf_for.xml +++ b/docsrc/xmlsource/xmlref/xpf_for.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_format_number.xml b/docsrc/xmlsource/xmlref/xpf_format_number.xml index 77cf01e20b..288d3f1485 100644 --- a/docsrc/xmlsource/xmlref/xpf_format_number.xml +++ b/docsrc/xmlsource/xmlref/xpf_format_number.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_function_available.xml b/docsrc/xmlsource/xmlref/xpf_function_available.xml index c0790c0d01..78e148fda9 100644 --- a/docsrc/xmlsource/xmlref/xpf_function_available.xml +++ b/docsrc/xmlsource/xmlref/xpf_function_available.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_generate_id.xml b/docsrc/xmlsource/xmlref/xpf_generate_id.xml index e47f419a25..d5b67922a7 100644 --- a/docsrc/xmlsource/xmlref/xpf_generate_id.xml +++ b/docsrc/xmlsource/xmlref/xpf_generate_id.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_id.xml b/docsrc/xmlsource/xmlref/xpf_id.xml index 787e93d8c7..023e127b94 100644 --- a/docsrc/xmlsource/xmlref/xpf_id.xml +++ b/docsrc/xmlsource/xmlref/xpf_id.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_if.xml b/docsrc/xmlsource/xmlref/xpf_if.xml index ac9020de6c..2ecb6bab70 100644 --- a/docsrc/xmlsource/xmlref/xpf_if.xml +++ b/docsrc/xmlsource/xmlref/xpf_if.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_intersect.xml b/docsrc/xmlsource/xmlref/xpf_intersect.xml index c3f3d511d0..01c8575b68 100644 --- a/docsrc/xmlsource/xmlref/xpf_intersect.xml +++ b/docsrc/xmlsource/xmlref/xpf_intersect.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_is_after.xml b/docsrc/xmlsource/xmlref/xpf_is_after.xml index b0d9404986..8cefc4d583 100644 --- a/docsrc/xmlsource/xmlref/xpf_is_after.xml +++ b/docsrc/xmlsource/xmlref/xpf_is_after.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_is_before.xml b/docsrc/xmlsource/xmlref/xpf_is_before.xml index 3c278a7f4d..62736ff5ac 100644 --- a/docsrc/xmlsource/xmlref/xpf_is_before.xml +++ b/docsrc/xmlsource/xmlref/xpf_is_before.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_iterate.xml b/docsrc/xmlsource/xmlref/xpf_iterate.xml index 7fd0d58ce9..b7f361d5a6 100644 --- a/docsrc/xmlsource/xmlref/xpf_iterate.xml +++ b/docsrc/xmlsource/xmlref/xpf_iterate.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_iterate_rev.xml b/docsrc/xmlsource/xmlref/xpf_iterate_rev.xml index 769a750fb1..7620ab4e7d 100644 --- a/docsrc/xmlsource/xmlref/xpf_iterate_rev.xml +++ b/docsrc/xmlsource/xmlref/xpf_iterate_rev.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_key.xml b/docsrc/xmlsource/xmlref/xpf_key.xml index abd40c0376..07cb29b251 100644 --- a/docsrc/xmlsource/xmlref/xpf_key.xml +++ b/docsrc/xmlsource/xmlref/xpf_key.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_lang.xml b/docsrc/xmlsource/xmlref/xpf_lang.xml index 5dcdcba770..994c25fe2f 100644 --- a/docsrc/xmlsource/xmlref/xpf_lang.xml +++ b/docsrc/xmlsource/xmlref/xpf_lang.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_last.xml b/docsrc/xmlsource/xmlref/xpf_last.xml index 2e118074d1..3bf9781895 100644 --- a/docsrc/xmlsource/xmlref/xpf_last.xml +++ b/docsrc/xmlsource/xmlref/xpf_last.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_let.xml b/docsrc/xmlsource/xmlref/xpf_let.xml index 84decb5715..f0a9dcb0ed 100644 --- a/docsrc/xmlsource/xmlref/xpf_let.xml +++ b/docsrc/xmlsource/xmlref/xpf_let.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_list.xml b/docsrc/xmlsource/xmlref/xpf_list.xml index ef28d8cadb..5b83b5a8e3 100644 --- a/docsrc/xmlsource/xmlref/xpf_list.xml +++ b/docsrc/xmlsource/xmlref/xpf_list.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_local_name.xml b/docsrc/xmlsource/xmlref/xpf_local_name.xml index 2407eb2e29..a457d11624 100644 --- a/docsrc/xmlsource/xmlref/xpf_local_name.xml +++ b/docsrc/xmlsource/xmlref/xpf_local_name.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_max.xml b/docsrc/xmlsource/xmlref/xpf_max.xml index c3ab19902b..d140552d01 100644 --- a/docsrc/xmlsource/xmlref/xpf_max.xml +++ b/docsrc/xmlsource/xmlref/xpf_max.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_min.xml b/docsrc/xmlsource/xmlref/xpf_min.xml index 790c48aed8..6bd05c8929 100644 --- a/docsrc/xmlsource/xmlref/xpf_min.xml +++ b/docsrc/xmlsource/xmlref/xpf_min.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_name.xml b/docsrc/xmlsource/xmlref/xpf_name.xml index 0982d76829..d7d9e2130a 100644 --- a/docsrc/xmlsource/xmlref/xpf_name.xml +++ b/docsrc/xmlsource/xmlref/xpf_name.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_namespace_uri.xml b/docsrc/xmlsource/xmlref/xpf_namespace_uri.xml index e8af59f720..f5c1400e93 100644 --- a/docsrc/xmlsource/xmlref/xpf_namespace_uri.xml +++ b/docsrc/xmlsource/xmlref/xpf_namespace_uri.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_normalize_space.xml b/docsrc/xmlsource/xmlref/xpf_normalize_space.xml index 8d3b821932..da4d74a847 100644 --- a/docsrc/xmlsource/xmlref/xpf_normalize_space.xml +++ b/docsrc/xmlsource/xmlref/xpf_normalize_space.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_not.xml b/docsrc/xmlsource/xmlref/xpf_not.xml index 15eba7ac54..421b04726c 100644 --- a/docsrc/xmlsource/xmlref/xpf_not.xml +++ b/docsrc/xmlsource/xmlref/xpf_not.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_number.xml b/docsrc/xmlsource/xmlref/xpf_number.xml index af3a6a6294..2eaf552cec 100644 --- a/docsrc/xmlsource/xmlref/xpf_number.xml +++ b/docsrc/xmlsource/xmlref/xpf_number.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_or.xml b/docsrc/xmlsource/xmlref/xpf_or.xml index e64c684166..699c5cef64 100644 --- a/docsrc/xmlsource/xmlref/xpf_or.xml +++ b/docsrc/xmlsource/xmlref/xpf_or.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_position.xml b/docsrc/xmlsource/xmlref/xpf_position.xml index dbdf999e06..fe269c6a85 100644 --- a/docsrc/xmlsource/xmlref/xpf_position.xml +++ b/docsrc/xmlsource/xmlref/xpf_position.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_processXQuery.xml b/docsrc/xmlsource/xmlref/xpf_processXQuery.xml index 653f72ff96..b705f72b14 100644 --- a/docsrc/xmlsource/xmlref/xpf_processXQuery.xml +++ b/docsrc/xmlsource/xmlref/xpf_processXQuery.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_processXSLT.xml b/docsrc/xmlsource/xmlref/xpf_processXSLT.xml index cf5eda20fb..cbfa2a50fe 100644 --- a/docsrc/xmlsource/xmlref/xpf_processXSLT.xml +++ b/docsrc/xmlsource/xmlref/xpf_processXSLT.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_processXSQL.xml b/docsrc/xmlsource/xmlref/xpf_processXSQL.xml index b67b43a24b..4e8922d65a 100644 --- a/docsrc/xmlsource/xmlref/xpf_processXSQL.xml +++ b/docsrc/xmlsource/xmlref/xpf_processXSQL.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_progn.xml b/docsrc/xmlsource/xmlref/xpf_progn.xml index 85280041a7..5603cf9b43 100644 --- a/docsrc/xmlsource/xmlref/xpf_progn.xml +++ b/docsrc/xmlsource/xmlref/xpf_progn.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_replace.xml b/docsrc/xmlsource/xmlref/xpf_replace.xml index 78670d9908..c4a7cdb755 100644 --- a/docsrc/xmlsource/xmlref/xpf_replace.xml +++ b/docsrc/xmlsource/xmlref/xpf_replace.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_round.xml b/docsrc/xmlsource/xmlref/xpf_round.xml index 98a56ef736..e92bf00d52 100644 --- a/docsrc/xmlsource/xmlref/xpf_round.xml +++ b/docsrc/xmlsource/xmlref/xpf_round.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_round_number.xml b/docsrc/xmlsource/xmlref/xpf_round_number.xml index ff32bc3052..77a31c4b2e 100644 --- a/docsrc/xmlsource/xmlref/xpf_round_number.xml +++ b/docsrc/xmlsource/xmlref/xpf_round_number.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_serialize.xml b/docsrc/xmlsource/xmlref/xpf_serialize.xml index 19dada6e03..3a8eac51c5 100644 --- a/docsrc/xmlsource/xmlref/xpf_serialize.xml +++ b/docsrc/xmlsource/xmlref/xpf_serialize.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_shallow.xml b/docsrc/xmlsource/xmlref/xpf_shallow.xml index e0d424bfa4..eef5ac8066 100644 --- a/docsrc/xmlsource/xmlref/xpf_shallow.xml +++ b/docsrc/xmlsource/xmlref/xpf_shallow.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_some.xml b/docsrc/xmlsource/xmlref/xpf_some.xml index dca0a37ecb..f328157251 100644 --- a/docsrc/xmlsource/xmlref/xpf_some.xml +++ b/docsrc/xmlsource/xmlref/xpf_some.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_starts_with.xml b/docsrc/xmlsource/xmlref/xpf_starts_with.xml index c905de01e3..b9d538cec2 100644 --- a/docsrc/xmlsource/xmlref/xpf_starts_with.xml +++ b/docsrc/xmlsource/xmlref/xpf_starts_with.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_string.xml b/docsrc/xmlsource/xmlref/xpf_string.xml index 83155e7b11..eb5ceb590b 100644 --- a/docsrc/xmlsource/xmlref/xpf_string.xml +++ b/docsrc/xmlsource/xmlref/xpf_string.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_string_length.xml b/docsrc/xmlsource/xmlref/xpf_string_length.xml index ed9b78ee5b..ec47b52d95 100644 --- a/docsrc/xmlsource/xmlref/xpf_string_length.xml +++ b/docsrc/xmlsource/xmlref/xpf_string_length.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_substring.xml b/docsrc/xmlsource/xmlref/xpf_substring.xml index 8771efe3aa..31b89095fd 100644 --- a/docsrc/xmlsource/xmlref/xpf_substring.xml +++ b/docsrc/xmlsource/xmlref/xpf_substring.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_substring_after.xml b/docsrc/xmlsource/xmlref/xpf_substring_after.xml index 10bd612679..39c9aa2406 100644 --- a/docsrc/xmlsource/xmlref/xpf_substring_after.xml +++ b/docsrc/xmlsource/xmlref/xpf_substring_after.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_substring_before.xml b/docsrc/xmlsource/xmlref/xpf_substring_before.xml index 2fa40018f9..e0c67e2e4e 100644 --- a/docsrc/xmlsource/xmlref/xpf_substring_before.xml +++ b/docsrc/xmlsource/xmlref/xpf_substring_before.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_sum.xml b/docsrc/xmlsource/xmlref/xpf_sum.xml index 240199a056..9cbb134a4b 100644 --- a/docsrc/xmlsource/xmlref/xpf_sum.xml +++ b/docsrc/xmlsource/xmlref/xpf_sum.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_system_property.xml b/docsrc/xmlsource/xmlref/xpf_system_property.xml index 0fb96e3d6a..726a655461 100644 --- a/docsrc/xmlsource/xmlref/xpf_system_property.xml +++ b/docsrc/xmlsource/xmlref/xpf_system_property.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_text_contains.xml b/docsrc/xmlsource/xmlref/xpf_text_contains.xml index 21e0b9fb16..1cefae6f07 100644 --- a/docsrc/xmlsource/xmlref/xpf_text_contains.xml +++ b/docsrc/xmlsource/xmlref/xpf_text_contains.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_translate.xml b/docsrc/xmlsource/xmlref/xpf_translate.xml index 3f914855f0..901d7293a9 100644 --- a/docsrc/xmlsource/xmlref/xpf_translate.xml +++ b/docsrc/xmlsource/xmlref/xpf_translate.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_true.xml b/docsrc/xmlsource/xmlref/xpf_true.xml index de5904f13f..8431b57c4a 100644 --- a/docsrc/xmlsource/xmlref/xpf_true.xml +++ b/docsrc/xmlsource/xmlref/xpf_true.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_tuple.xml b/docsrc/xmlsource/xmlref/xpf_tuple.xml index cf540a6fcf..2ae924e660 100644 --- a/docsrc/xmlsource/xmlref/xpf_tuple.xml +++ b/docsrc/xmlsource/xmlref/xpf_tuple.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_union.xml b/docsrc/xmlsource/xmlref/xpf_union.xml index a1d872d18a..1b67e8cc09 100644 --- a/docsrc/xmlsource/xmlref/xpf_union.xml +++ b/docsrc/xmlsource/xmlref/xpf_union.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_unordered.xml b/docsrc/xmlsource/xmlref/xpf_unordered.xml index f4c17549cf..ab5603d0b2 100644 --- a/docsrc/xmlsource/xmlref/xpf_unordered.xml +++ b/docsrc/xmlsource/xmlref/xpf_unordered.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_unparsed_entity_uri.xml b/docsrc/xmlsource/xmlref/xpf_unparsed_entity_uri.xml index e579a2a1a1..f5bdaedfb7 100644 --- a/docsrc/xmlsource/xmlref/xpf_unparsed_entity_uri.xml +++ b/docsrc/xmlsource/xmlref/xpf_unparsed_entity_uri.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_urlify.xml b/docsrc/xmlsource/xmlref/xpf_urlify.xml index 29712ad50e..fc034717f5 100644 --- a/docsrc/xmlsource/xmlref/xpf_urlify.xml +++ b/docsrc/xmlsource/xmlref/xpf_urlify.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlref/xpf_xmlview.xml b/docsrc/xmlsource/xmlref/xpf_xmlview.xml index 71f3a59932..11b5c2274e 100644 --- a/docsrc/xmlsource/xmlref/xpf_xmlview.xml +++ b/docsrc/xmlsource/xmlref/xpf_xmlview.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlrpc.xml b/docsrc/xmlsource/xmlrpc.xml index a9dcb2a4ea..9e510222a8 100644 --- a/docsrc/xmlsource/xmlrpc.xml +++ b/docsrc/xmlsource/xmlrpc.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlschema.xml b/docsrc/xmlsource/xmlschema.xml index d59b754159..e1e748660f 100644 --- a/docsrc/xmlsource/xmlschema.xml +++ b/docsrc/xmlsource/xmlschema.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmltableview.xml b/docsrc/xmlsource/xmltableview.xml index 1eb1db71dc..09815f0a18 100644 --- a/docsrc/xmlsource/xmltableview.xml +++ b/docsrc/xmlsource/xmltableview.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmltemplates.xml b/docsrc/xmlsource/xmltemplates.xml index 372afd8f39..e4ed2b8313 100644 --- a/docsrc/xmlsource/xmltemplates.xml +++ b/docsrc/xmlsource/xmltemplates.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xmlview.xml b/docsrc/xmlsource/xmlview.xml index 5793b4b09d..20e4a43d08 100644 --- a/docsrc/xmlsource/xmlview.xml +++ b/docsrc/xmlsource/xmlview.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xpfs.xml b/docsrc/xmlsource/xpfs.xml index 5daa7e19bf..b4eec30c52 100644 --- a/docsrc/xmlsource/xpfs.xml +++ b/docsrc/xmlsource/xpfs.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xquery.xml b/docsrc/xmlsource/xquery.xml index 3ec26df1bf..f134b2105f 100644 --- a/docsrc/xmlsource/xquery.xml +++ b/docsrc/xmlsource/xquery.xml @@ -3,7 +3,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xslttrans.xml b/docsrc/xmlsource/xslttrans.xml index 9ef231b717..8be2584372 100644 --- a/docsrc/xmlsource/xslttrans.xml +++ b/docsrc/xmlsource/xslttrans.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/xsql.xml b/docsrc/xmlsource/xsql.xml index 126f3f9523..2969ea3138 100644 --- a/docsrc/xmlsource/xsql.xml +++ b/docsrc/xmlsource/xsql.xml @@ -4,7 +4,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/xmlsource/yacsqlgrammar.xml b/docsrc/xmlsource/yacsqlgrammar.xml index 576d5c7b30..83bc399978 100644 --- a/docsrc/xmlsource/yacsqlgrammar.xml +++ b/docsrc/xmlsource/yacsqlgrammar.xml @@ -5,7 +5,7 @@ This file is part of the OpenLink Software Virtuoso Open-Source (VOS) project. - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software This project is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -32,7 +32,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk.h b/libsrc/Dk.h index 1dd03f235b..e74767efc0 100644 --- a/libsrc/Dk.h +++ b/libsrc/Dk.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -29,6 +29,20 @@ #ifndef _DK_H #define _DK_H /* libutil needs this name !!! */ +#ifndef VIRT_C_LINKAGE +#ifdef __cplusplus +#define VIRT_C_LINKAGE "C" +#define VIRT_API_BEGIN extern "C" { +#define VIRT_API_END } +#else +#define VIRT_C_LINKAGE +#define VIRT_API_BEGIN +#define VIRT_API_END +#endif +#endif + +#include "Dk/Dksystem.h" + #include "plugin/exe_export.h" #ifdef LONGJMP_DEBUG @@ -37,8 +51,6 @@ extern void ldbg_longjmp (jmp_buf env, int value); #define longjmp(buf,val) ldbg_longjmp((buf),(val)) #endif -#include "Dk/Dksystem.h" - /* These are about to disappear when merge is complete */ #define PMN_THREADS /* Activate new threading model */ #define PMN_LOG /* Activate new logging */ @@ -69,6 +81,10 @@ extern void ldbg_longjmp (jmp_buf env, int value); # define LOW_ORDER_FIRST #endif +# define _IEEE_FLOATS + +VIRT_API_BEGIN + #include "Dk/Dkparam.h" #include "Dk/Dktypes.h" #include "Dk/Dktrace.h" @@ -98,6 +114,8 @@ extern void ldbg_longjmp (jmp_buf env, int value); #include "Dk/Dkstubs.h" +VIRT_API_END + /* * Localization macros */ @@ -120,9 +138,4 @@ extern void ldbg_longjmp (jmp_buf env, int value); #endif /* ENABLE_NLS */ -#if defined (MAC_OS_X_VERSION_10_9) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_9) -#include -#define __builtin_ia32_loadups(p) _mm_loadu_ps((p)) -#endif - #endif /* _DK_H */ diff --git a/libsrc/Dk/Dkalloc.c b/libsrc/Dk/Dkalloc.c index a1fb1c2930..f2072fc8de 100644 --- a/libsrc/Dk/Dkalloc.c +++ b/libsrc/Dk/Dkalloc.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkalloc.h b/libsrc/Dk/Dkalloc.h index 4c792a1dbf..f56e56e66a 100644 --- a/libsrc/Dk/Dkalloc.h +++ b/libsrc/Dk/Dkalloc.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkbasket.c b/libsrc/Dk/Dkbasket.c index 78a6778055..e11141b62f 100644 --- a/libsrc/Dk/Dkbasket.c +++ b/libsrc/Dk/Dkbasket.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkbasket.h b/libsrc/Dk/Dkbasket.h index ab1b374d06..1cde32c140 100644 --- a/libsrc/Dk/Dkbasket.h +++ b/libsrc/Dk/Dkbasket.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkbox.c b/libsrc/Dk/Dkbox.c index 60d4ad63b9..36358f7216 100644 --- a/libsrc/Dk/Dkbox.c +++ b/libsrc/Dk/Dkbox.c @@ -18,7 +18,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkbox.h b/libsrc/Dk/Dkbox.h index 3797707e1e..dfdd124774 100644 --- a/libsrc/Dk/Dkbox.h +++ b/libsrc/Dk/Dkbox.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkconfig.h b/libsrc/Dk/Dkconfig.h index 05695962a7..f5bd7a693e 100644 --- a/libsrc/Dk/Dkconfig.h +++ b/libsrc/Dk/Dkconfig.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkconfig.w32 b/libsrc/Dk/Dkconfig.w32 index 0828f3e705..982ede4707 100644 --- a/libsrc/Dk/Dkconfig.w32 +++ b/libsrc/Dk/Dkconfig.w32 @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkconfig.w64 b/libsrc/Dk/Dkconfig.w64 index ecf0d2b960..31537f2f59 100644 --- a/libsrc/Dk/Dkconfig.w64 +++ b/libsrc/Dk/Dkconfig.w64 @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkdevice.c b/libsrc/Dk/Dkdevice.c index 3a7c038119..82a3ea0d3e 100644 --- a/libsrc/Dk/Dkdevice.c +++ b/libsrc/Dk/Dkdevice.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkdevice.h b/libsrc/Dk/Dkdevice.h index 9b9230ea38..6361b819df 100644 --- a/libsrc/Dk/Dkdevice.h +++ b/libsrc/Dk/Dkdevice.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkernel.c b/libsrc/Dk/Dkernel.c index f8f5fe9fc5..859253a7c0 100644 --- a/libsrc/Dk/Dkernel.c +++ b/libsrc/Dk/Dkernel.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -55,10 +55,6 @@ int LEVEL_VAR = 4; #endif -#ifdef WIN32 -#define strcasecmp _stricmp -#endif - #ifdef _SSL #include @@ -71,11 +67,14 @@ int LEVEL_VAR = 4; #include #include #include +#include static void ssl_server_init (); int ssl_ctx_set_cipher_list(SSL_CTX *ctx, char *cipher_list); int ssl_ctx_set_protocol_options(SSL_CTX *ctx, char *protocol); +int ssl_ctx_set_dhparam(SSL_CTX *ctx, char * dhparam); +int ssl_ctx_set_ecdh_curve(SSL_CTX *ctx, char * curve); #ifndef NO_THREAD static int ssl_server_accept (dk_session_t * listen, dk_session_t * ses); @@ -87,6 +86,8 @@ int32 ssl_server_verify_depth = 0; char *ssl_server_verify_file = NULL; char *ssl_server_cipher_list = NULL; char *ssl_server_protocols = NULL; +char *ssl_server_dhparam = NULL; +char *ssl_server_ecdh_curve = NULL; #endif #ifndef NO_THREAD @@ -5087,14 +5088,15 @@ ssl_thread_setup () #define SSL_PROTOCOL_TLSV1 (1<<2) #define SSL_PROTOCOL_TLSV1_1 (1<<3) #define SSL_PROTOCOL_TLSV1_2 (1<<4) +#define SSL_PROTOCOL_TLSV1_3 (1<<5) #if OPENSSL_VERSION_NUMBER >= 0x1000100FL -#define SSL_PROTOCOL_ALL (SSL_PROTOCOL_TLSV1_1|SSL_PROTOCOL_TLSV1_2) +#define SSL_PROTOCOL_ALL (SSL_PROTOCOL_TLSV1_2|SSL_PROTOCOL_TLSV1_3) #else -#define SSL_PROTOCOL_ALL (SSL_PROTOCOL_TLSV1) +#define SSL_PROTOCOL_ALL (SSL_PROTOCOL_TLSV1|SSL_PROTOCOL_TLSV1_1|SSL_PROTOCOL_TLSV1_2) #endif -#define VIRTUOSO_DEFAULT_CIPHER_LIST "HIGH:!aNULL:!eNULL:!RC4:!DES:!MD5:!PSK:!SRP:!KRB5:!SSLv2:!EXP:!MEDIUM:!LOW:!DES-CBC-SHA:@STRENGTH" +#define VIRTUOSO_DEFAULT_CIPHER_LIST "HIGH:!aNULL:!eNULL:!MD5:!RC4:!RSA" int ssl_ctx_set_cipher_list (SSL_CTX * ctx, char *cipher_list) @@ -5105,7 +5107,7 @@ ssl_ctx_set_cipher_list (SSL_CTX * ctx, char *cipher_list) if (!cipher_list || !*cipher_list || !strcasecmp(cipher_list, "default")) cipher_list = VIRTUOSO_DEFAULT_CIPHER_LIST; - if (!SSL_CTX_set_cipher_list (ssl_server_ctx, cipher_list)) + if (!SSL_CTX_set_cipher_list (ctx, cipher_list)) { log_error ("SSL: Failed setting cipher list [%s]", cipher_list); return 0; @@ -5119,7 +5121,6 @@ int ssl_ctx_set_protocol_options(SSL_CTX *ctx, char *protocol) { int proto = SSL_PROTOCOL_NONE; - long ctx_options; int i; /* @@ -5185,73 +5186,221 @@ ssl_ctx_set_protocol_options(SSL_CTX *ctx, char *protocol) /* * Start by enabling all options */ - ctx_options = SSL_OP_ALL; + SSL_CTX_set_options (ctx, SSL_OP_ALL); /* * Always disable SSLv2, as per RFC 6176 */ - ctx_options |= SSL_OP_NO_SSLv2; + SSL_CTX_set_options (ctx, SSL_OP_NO_SSLv2); /* - * Warn when user enables SSLv3 protocol + * Always disable SSLv3 as well */ - if (!(proto & SSL_PROTOCOL_SSLV3)) - ctx_options |= SSL_OP_NO_SSLv3; - else - log_warning ("SSL: Enabling legacy protocol SSLv3 which may be vulnerable"); + SSL_CTX_set_options (ctx, SSL_OP_NO_SSLv3); + /* + * Show warning if user enabled the TLSv1 protocol + */ +#if defined (SSL_OP_NO_TLSv1) + SSL_CTX_clear_options (ctx, SSL_OP_NO_TLSv1); if (!(proto & SSL_PROTOCOL_TLSV1)) - ctx_options |= SSL_OP_NO_TLSv1; + SSL_CTX_set_options (ctx, SSL_OP_NO_TLSv1); else log_warning ("SSL: Enabling legacy protocol TLS 1.0 which may be vulnerable"); +#endif /* * Check rest of protocols */ - #if defined (SSL_OP_NO_TLSv1_1) + SSL_CTX_clear_options (ctx, SSL_OP_NO_TLSv1_1); if (!(proto & SSL_PROTOCOL_TLSV1_1)) - ctx_options |= SSL_OP_NO_TLSv1_1; + SSL_CTX_set_options (ctx, SSL_OP_NO_TLSv1_1); #endif #if defined (SSL_OP_NO_TLSv1_2) + SSL_CTX_clear_options (ctx, SSL_OP_NO_TLSv1_2); if (!(proto & SSL_PROTOCOL_TLSV1_2)) - ctx_options |= SSL_OP_NO_TLSv1_2; + SSL_CTX_set_options (ctx, SSL_OP_NO_TLSv1_2); +#endif + +#if defined (SSL_OP_NO_TLSv1_3) + SSL_CTX_clear_options (ctx, SSL_OP_NO_TLSv1_3); + if (!(proto & SSL_PROTOCOL_TLSV1_3)) + SSL_CTX_set_options (ctx, SSL_OP_NO_TLSv1_3); #endif /* * Disable compression on OpenSSL >= 1.0 to fix "CRIME" attack */ #ifdef SSL_OP_NO_COMPRESSION - ctx_options |= SSL_OP_NO_COMPRESSION; + SSL_CTX_set_options (ctx, SSL_OP_NO_COMPRESSION); #endif /* * Server prefers cipher in order it listed */ #ifdef SSL_OP_CIPHER_SERVER_PREFERENCE - ctx_options |= SSL_OP_CIPHER_SERVER_PREFERENCE; + SSL_CTX_set_options (ctx, SSL_OP_CIPHER_SERVER_PREFERENCE); #endif + +#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION + SSL_CTX_set_options (ctx, SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION); +#endif + + return 1; +} + +int +ssl_ctx_set_ecdh_curve (SSL_CTX * ctx, char *curve) +{ +#ifndef OPENSSL_NO_ECDH + + if (!curve) + curve = "auto"; + /* - * Configure additional options + * Configure ECDH */ - ctx_options |= SSL_OP_SINGLE_DH_USE; + SSL_CTX_set_options (ctx, SSL_OP_SINGLE_ECDH_USE); -#ifdef SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION - ctx_options |= SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION; + /* + * Set default curve(s) for ECDH + */ + +#if defined (SSL_CTX_set1_curves_list) || defined (SSL_CTRL_SET_CURVES_LIST) + /* + * OpenSSL 1.0.2+ can use a cuve list instead of a single curve + */ +#if defined (SSL_CTRL_SET_ECDH_AUTO) + SSL_CTX_set_ecdh_auto (ctx, 1); /* For OpenSSL 1.0.2+ */ +#endif + + if (!strcasecmp(curve, "auto")) + return 1; + + /* + * Try setting list of curves + */ + if (SSL_CTX_set1_curves_list(ctx, curve) == 0) + return 0; + +#else + + /* + * Try setting the specified curve with default of prime256v1 + */ + { + EC_KEY *eckey = NULL; + int nid; + + if (!strcasecmp(curve, "auto")) + curve = "prime256v1"; + + nid = OBJ_sn2nid(curve); + if (nid == 0) + return 0; + eckey = EC_KEY_new_by_curve_name (nid); + if (eckey == NULL) + return 0; + SSL_CTX_set_tmp_ecdh (ctx, eckey); + EC_KEY_free (eckey); + } +#endif #endif + return 1; +} + +int +ssl_ctx_set_dhparam (SSL_CTX * ctx, char *dh_file) +{ + DH *dh = NULL; + BIO *bio = NULL; + int ok = 0; + /* - * Set options + * If the dba provided a filename, try to read the DH from */ - if (!SSL_CTX_set_options (ctx, ctx_options)) + if (dh_file) { - log_error ("SSL: Failed setting protocol options [%s] [%lx]", protocol, ctx_options); - return 0; + bio = BIO_new_file (dh_file, "r"); + if (bio) + dh = PEM_read_bio_DHparams (bio, NULL, NULL, NULL); + if (!dh) + goto cleanup; } - return 1; +#ifndef VIRTUOSO_NO_INTERNAL_DH + /* + * If dba has not provided a custom dhparam, then use a built-in version + */ + if (!dh) + { + static unsigned char dh2048_p[] = { + 0x90, 0xE0, 0xDE, 0x4C, 0x70, 0x1D, 0xCB, 0x0F, 0xD9, 0x2E, + 0xD9, 0x44, 0x3C, 0x99, 0x99, 0x4C, 0x92, 0x41, 0x3F, 0x09, + 0x65, 0xB9, 0x7D, 0xAD, 0xEE, 0xD2, 0x73, 0xAC, 0x17, 0x46, + 0x6E, 0x7F, 0x6D, 0x42, 0x36, 0xC8, 0x19, 0x0D, 0x69, 0xF4, + 0xA2, 0x4D, 0x83, 0x7E, 0x15, 0x3A, 0xB8, 0x09, 0x86, 0xA5, + 0xA6, 0x9E, 0xD5, 0x72, 0xBF, 0xD9, 0x64, 0xE0, 0x14, 0x09, + 0x27, 0xC0, 0x13, 0x73, 0x98, 0xAC, 0xB2, 0xD6, 0x8A, 0xC8, + 0x4F, 0xD1, 0x41, 0x45, 0x10, 0x08, 0xA2, 0x4F, 0xA9, 0xD9, + 0xD0, 0xAF, 0x9B, 0x98, 0xF1, 0xAF, 0x52, 0x17, 0xB1, 0x9E, + 0x0B, 0x87, 0xCE, 0x6F, 0xDC, 0xA3, 0x42, 0x56, 0xFD, 0x04, + 0xBD, 0xBF, 0x57, 0xCB, 0xB8, 0xB3, 0x62, 0x36, 0x3E, 0x2C, + 0xC0, 0xA0, 0x37, 0xC3, 0x1B, 0x22, 0x8B, 0x25, 0x9A, 0x69, + 0xF3, 0x94, 0xF7, 0x14, 0x7B, 0xAA, 0x2E, 0xD3, 0x79, 0x20, + 0x93, 0x58, 0xA5, 0xD7, 0x84, 0x69, 0x94, 0x5E, 0xB0, 0x72, + 0x7A, 0x7A, 0x4E, 0x70, 0x64, 0x10, 0x69, 0xAD, 0x51, 0x7A, + 0xDE, 0xD2, 0x03, 0xE0, 0xDE, 0x0C, 0xEC, 0xA8, 0xB1, 0x41, + 0x08, 0x54, 0x76, 0xF5, 0x09, 0xF4, 0xBE, 0xA6, 0xAF, 0x13, + 0x1F, 0xCB, 0xF7, 0xA6, 0xE4, 0x43, 0x62, 0x7D, 0xDC, 0x4B, + 0x43, 0x4F, 0x64, 0x00, 0x44, 0xBC, 0xE3, 0x6F, 0x61, 0x81, + 0xEF, 0x4D, 0x3B, 0x43, 0x37, 0x9E, 0xA2, 0x88, 0xAE, 0x8C, + 0x26, 0x05, 0x0A, 0xD2, 0x41, 0xA2, 0x28, 0xDD, 0x1A, 0xEE, + 0x8C, 0x2A, 0xDB, 0x39, 0xF8, 0x43, 0xB3, 0xD4, 0x3B, 0xC9, + 0x9B, 0x8B, 0xBA, 0xCA, 0xEC, 0x91, 0x12, 0x0E, 0xA5, 0xDC, + 0x4F, 0x61, 0xD8, 0xBB, 0x3E, 0x9D, 0x7B, 0x7D, 0x76, 0x3F, + 0xF5, 0xDA, 0xC1, 0xFA, 0x72, 0x37, 0x0B, 0xD9, 0xC3, 0xED, + 0xC0, 0x2C, 0x70, 0x71, 0x77, 0x6B + }; + static unsigned char dh2048_g[] = { + 0x02 + }; + + if ((dh = DH_new ()) == NULL) + goto cleanup; + + dh->p = BN_bin2bn (dh2048_p, sizeof (dh2048_p), NULL); + dh->g = BN_bin2bn (dh2048_g, sizeof (dh2048_g), NULL); + + if (dh->p == NULL || dh->g == NULL) + goto cleanup; + } +#endif + + /* + * Always create a new key when using temporary DH parameters + */ + SSL_CTX_set_options (ctx, SSL_OP_SINGLE_DH_USE); + + /* + * Assign dh + */ + SSL_CTX_set_tmp_dh (ctx, dh); + + /* + * Signal success + */ + ok = 1; + +cleanup: + BIO_free (bio); + DH_free (dh); + + return ok; } @@ -5272,13 +5421,32 @@ ssl_server_init () SSL_load_error_strings (); ERR_load_crypto_strings (); -#ifndef WIN32 + /* + * Make sure the PRNG is properly seeded + */ + do { unsigned char tmp[1024]; + int pid; + timeout_t tm; + +#ifndef NDEBUG + log_debug ("Initializing PRNG"); +#endif + + /* Add current pid to seed */ + pid = getpid (); + RAND_seed (&pid, sizeof (pid)); + + /* Add current time in secs + usec to seed */ + get_real_time (&tm); + RAND_seed (&tm, sizeof (tm)); + + /* Read one block of random bytes and feed it back to seed */ RAND_bytes (tmp, sizeof (tmp)); - RAND_add (tmp, sizeof (tmp), (double) (sizeof (tmp))); + RAND_add (tmp, sizeof (tmp), (double) (sizeof (tmp) * 0.9)); } -#endif + while (!RAND_status ()); SSLeay_add_all_algorithms (); PKCS12_PBE_add (); /* stub */ @@ -5301,11 +5469,25 @@ ssl_server_init () */ if (!ssl_ctx_set_protocol_options (ssl_server_ctx, ssl_server_protocols)) { + log_error ("Error setting SSL Protocols [%s]", ssl_server_protocols); ERR_print_errors_fp (stderr); call_exit (-1); } if (!ssl_ctx_set_cipher_list (ssl_server_ctx, ssl_server_cipher_list)) { + log_error ("Error setting SSL Cipher list [%s]", ssl_server_cipher_list); + ERR_print_errors_fp (stderr); + call_exit (-1); + } + if (!ssl_ctx_set_dhparam (ssl_server_ctx, ssl_server_dhparam)) + { + log_error ("Error setting SSL DH param [%s]", ssl_server_dhparam); + ERR_print_errors_fp (stderr); + call_exit (-1); + } + if (!ssl_ctx_set_ecdh_curve (ssl_server_ctx, ssl_server_ecdh_curve)) + { + log_error ("Error setting SSL ECDH curve [%s]", ssl_server_ecdh_curve); ERR_print_errors_fp (stderr); call_exit (-1); } diff --git a/libsrc/Dk/Dkernel.h b/libsrc/Dk/Dkernel.h index 9a0b5113e5..88b3d8250d 100644 --- a/libsrc/Dk/Dkernel.h +++ b/libsrc/Dk/Dkernel.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkhash.c b/libsrc/Dk/Dkhash.c index f5fb4052e7..e82c61662c 100644 --- a/libsrc/Dk/Dkhash.c +++ b/libsrc/Dk/Dkhash.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkhash.h b/libsrc/Dk/Dkhash.h index 5d9e22a76b..fbd8822732 100644 --- a/libsrc/Dk/Dkhash.h +++ b/libsrc/Dk/Dkhash.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkhash64.h b/libsrc/Dk/Dkhash64.h index 6e90da6de7..2ba8af825b 100644 --- a/libsrc/Dk/Dkhash64.h +++ b/libsrc/Dk/Dkhash64.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkhashext.c b/libsrc/Dk/Dkhashext.c index c5785590f8..7f655a79a6 100644 --- a/libsrc/Dk/Dkhashext.c +++ b/libsrc/Dk/Dkhashext.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -457,12 +457,11 @@ DBG_NAME (box_dv_dict_iterator) (DBG_PARAMS caddr_t ht_box) res->hit_chilum = (char *)(-1); if (NULL != ht) { - if (NULL != ht->ht_mutex) - mutex_enter (ht->ht_mutex); + int rdlocked; + HT_RDLOCK_COND(ht,rdlocked); res->hit_dict_version = ht->ht_dict_version; ht->ht_dict_refctr += 1; - if (NULL != ht->ht_mutex) - mutex_leave (ht->ht_mutex); + HT_UNLOCK_COND(ht,rdlocked); } else res->hit_dict_version = 0; @@ -482,13 +481,13 @@ box_dict_hashtable_copy_hook (caddr_t orig) id_hash_t *res; caddr_t key, val; id_hash_iterator_t hit; + int rdlocked; #ifndef NDEBUG if (0 >= orig_dict->ht_dict_refctr) GPF_T; #endif res = (id_hash_t *) dk_alloc_box (sizeof (id_hash_t), DV_DICT_HASHTABLE); - if (orig_dict->ht_mutex) - mutex_enter (orig_dict->ht_mutex); + HT_RDLOCK_COND(orig_dict,rdlocked); buckets = (((id_hash_t *) orig_dict)->ht_inserts - ((id_hash_t *) orig_dict)->ht_deletes); if (buckets < orig_dict->ht_buckets) buckets = orig_dict->ht_buckets; @@ -508,11 +507,9 @@ box_dict_hashtable_copy_hook (caddr_t orig) val_copy = box_copy_tree (((caddr_t *)val)[0]); id_hash_set (res, (caddr_t) (&key_copy), (caddr_t) (&val_copy)); } - if (orig_dict->ht_mutex) - { - res->ht_mutex = mutex_allocate (); - mutex_leave (orig_dict->ht_mutex); - } + if (rdlocked) + res->ht_rwlock = rwlock_allocate (); + HT_UNLOCK_COND(orig_dict,rdlocked); return (caddr_t) res; } @@ -565,11 +562,11 @@ box_dict_iterator_copy_hook (caddr_t orig_iter) if (0 >= org->hit_hash->ht_dict_refctr) GPF_T; #endif - if ((org->hit_hash->ht_mutex) && (ID_HASH_LOCK_REFCOUNT != org->hit_hash->ht_dict_refctr)) + if ((org->hit_hash->ht_rwlock) && (ID_HASH_LOCK_REFCOUNT != org->hit_hash->ht_dict_refctr)) { - mutex_enter (org->hit_hash->ht_mutex); + rwlock_wrlock (org->hit_hash->ht_rwlock); org->hit_hash->ht_dict_refctr += 1; - mutex_leave (org->hit_hash->ht_mutex); + rwlock_unlock (org->hit_hash->ht_rwlock); } else org->hit_hash->ht_dict_refctr += 1; @@ -584,23 +581,23 @@ box_dict_iterator_destr_hook (caddr_t iter) id_hash_iterator_t *hit = (id_hash_iterator_t *) iter; if ((hit->hit_hash) && (ID_HASH_LOCK_REFCOUNT != hit->hit_hash->ht_dict_refctr)) { - dk_mutex_t *mtx = hit->hit_hash->ht_mutex; + rwlock_t *rwl = hit->hit_hash->ht_rwlock; #ifndef NDEBUG if (0 >= hit->hit_hash->ht_dict_refctr) GPF_T; #endif - if (NULL != mtx) + if (NULL != rwl) { - mutex_enter (mtx); + rwlock_wrlock (rwl); hit->hit_hash->ht_dict_refctr -= 1; if (0 == hit->hit_hash->ht_dict_refctr) { dk_free_box ((caddr_t) (hit->hit_hash)); - mutex_leave (mtx); - mutex_free (mtx); + rwlock_unlock (rwl); + rwlock_free (rwl); } else - mutex_leave (mtx); + rwlock_unlock (rwl); } else { diff --git a/libsrc/Dk/Dkhashext.h b/libsrc/Dk/Dkhashext.h index fc4ed88fcd..ca02f99b98 100644 --- a/libsrc/Dk/Dkhashext.h +++ b/libsrc/Dk/Dkhashext.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -81,7 +81,7 @@ struct id_hash_s size_t ht_dict_mem_in_use; /*!< Approximate size of dictonary in memory. Each stored item adds length of key + lenght of the data + size of hash table entry. That is filled only if \c ht_dict_max_mem_in_use is not zero */ size_t ht_dict_max_entries; /*!< Maximum number of entries kept in dictonary */ size_t ht_dict_max_mem_in_use; /*!< Memory size limit to prevent exausting of the physical memory */ - dk_mutex_t * ht_mutex; /*!< Optional mutex, esp. popular when this is a dictionary propagated across threads of async queue. The mutex is NOT owned by the hashtable box! */ + rwlock_t * ht_rwlock; /*!< Optional rwlock, esp. popular when this is a dictionary propagated across threads of async queue. The rwlock is NOT owned by the hashtable box! */ id_hash_free_t ht_free_hook; void * ht_mp; #ifdef RH_TRACE @@ -91,8 +91,13 @@ struct id_hash_s #endif }; +#define HT_RDLOCK(ht) rwlock_rdlock ((ht)->ht_rwlock) +#define HT_WRLOCK(ht) rwlock_wrlock ((ht)->ht_rwlock) +#define HT_UNLOCK(ht) rwlock_unlock ((ht)->ht_rwlock) - +#define HT_RDLOCK_COND(ht,locked) (((locked) = (NULL != (ht)->ht_rwlock)) ? (rwlock_rdlock ((ht)->ht_rwlock), 1) : 0) +#define HT_WRLOCK_COND(ht,locked) (((locked) = (NULL != (ht)->ht_rwlock)) ? (rwlock_wrlock ((ht)->ht_rwlock), 1) : 0) +#define HT_UNLOCK_COND(ht,locked) ((locked) && (rwlock_unlock ((ht)->ht_rwlock), 1)) typedef struct id_hash_iterator_s { diff --git a/libsrc/Dk/Dkhashext_t.c b/libsrc/Dk/Dkhashext_t.c index 802281e52d..42f3a604c5 100644 --- a/libsrc/Dk/Dkhashext_t.c +++ b/libsrc/Dk/Dkhashext_t.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkhashext_template.c b/libsrc/Dk/Dkhashext_template.c index 6038da979c..56d18a0ad0 100644 --- a/libsrc/Dk/Dkhashext_template.c +++ b/libsrc/Dk/Dkhashext_template.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dklongjmp.c b/libsrc/Dk/Dklongjmp.c index 449dc20493..3d6656702e 100644 --- a/libsrc/Dk/Dklongjmp.c +++ b/libsrc/Dk/Dklongjmp.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkmarshal.c b/libsrc/Dk/Dkmarshal.c index da15a2141e..2b1c624141 100644 --- a/libsrc/Dk/Dkmarshal.c +++ b/libsrc/Dk/Dkmarshal.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -31,25 +31,14 @@ # include /* for ntohl, htonl */ #endif -#if defined (i386) || \ - defined (_WIN64) || \ - defined (_M_IX86) || \ - defined (_M_ALPHA) || \ - defined (mc68000) || \ - defined (sparc) || \ - defined (__x86_64) || \ - defined (__alpha) || \ - defined (__powerpc) || \ - defined (mips) || \ - defined (__OS2__) || \ - defined (_IBMR2) -# define _IEEE_FLOATS -#elif defined (OPL_SOURCE) +#ifndef _IEEE_FLOATS +#if defined (OPL_SOURCE) # include #else # include # include #endif +#endif macro_char_func readtable[256]; ses_write_func writetable[256]; diff --git a/libsrc/Dk/Dkmarshal.h b/libsrc/Dk/Dkmarshal.h index 965e93458b..ba262ec3ef 100644 --- a/libsrc/Dk/Dkmarshal.h +++ b/libsrc/Dk/Dkmarshal.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkmem.c b/libsrc/Dk/Dkmem.c index 2847854edc..3b022dc7cf 100644 --- a/libsrc/Dk/Dkmem.c +++ b/libsrc/Dk/Dkmem.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkparam.h b/libsrc/Dk/Dkparam.h index bbadde2706..f5e7519268 100644 --- a/libsrc/Dk/Dkparam.h +++ b/libsrc/Dk/Dkparam.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkpool.c b/libsrc/Dk/Dkpool.c index eb4881341c..77d1072c23 100644 --- a/libsrc/Dk/Dkpool.c +++ b/libsrc/Dk/Dkpool.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkpool.h b/libsrc/Dk/Dkpool.h index e9eaa2c651..6ff9713415 100644 --- a/libsrc/Dk/Dkpool.h +++ b/libsrc/Dk/Dkpool.h @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkresource.c b/libsrc/Dk/Dkresource.c index 4ca48e77ff..a8d1c98779 100644 --- a/libsrc/Dk/Dkresource.c +++ b/libsrc/Dk/Dkresource.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkresource.h b/libsrc/Dk/Dkresource.h index 32f2d2b0f2..ae2f391d12 100644 --- a/libsrc/Dk/Dkresource.h +++ b/libsrc/Dk/Dkresource.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkrusage.c b/libsrc/Dk/Dkrusage.c index 4b44685396..33c2003fc3 100644 --- a/libsrc/Dk/Dkrusage.c +++ b/libsrc/Dk/Dkrusage.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkses2.c b/libsrc/Dk/Dkses2.c index 9c09908373..c42ce0267b 100644 --- a/libsrc/Dk/Dkses2.c +++ b/libsrc/Dk/Dkses2.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dksesinp.c b/libsrc/Dk/Dksesinp.c index 9671941084..ac4718ea78 100644 --- a/libsrc/Dk/Dksesinp.c +++ b/libsrc/Dk/Dksesinp.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dksession.c b/libsrc/Dk/Dksession.c index fe582ae38a..4e6741708b 100644 --- a/libsrc/Dk/Dksession.c +++ b/libsrc/Dk/Dksession.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dksession.h b/libsrc/Dk/Dksession.h index 4adac0a846..7fd6f603f6 100644 --- a/libsrc/Dk/Dksession.h +++ b/libsrc/Dk/Dksession.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dksesstr.c b/libsrc/Dk/Dksesstr.c index ce845980d7..167f3f1a9b 100644 --- a/libsrc/Dk/Dksesstr.c +++ b/libsrc/Dk/Dksesstr.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -299,21 +299,27 @@ strdev_write (session_t * ses2, char *buffer, int bytes) { char fname[PATH_MAX + 1]; snprintf (fname, sizeof (fname), "%s/sesXXXXXX", ses_tmp_dir); + +#if defined (HAVE_MKSTEMP64) && defined (FILE64) + ses2->ses_file->ses_file_descriptor = mkstemp64 (fname); +#elif defined (HAVE_MKSTEMP) + ses2->ses_file->ses_file_descriptor = mkstemp (fname); +#else mktemp (fname); #if defined (WIN32) -# define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY +# define OPEN_FLAGS O_CREAT | O_RDWR | O_BINARY | O_EXCL | O_TEMPORARY #elif defined (FILE64) -# define OPEN_FLAGS O_RDWR | O_CREAT | O_BINARY | O_EXCL | O_LARGEFILE +# define OPEN_FLAGS O_RDWR | O_CREAT | O_BINARY | O_EXCL | O_LARGEFILE #else -# define OPEN_FLAGS O_RDWR | O_CREAT | O_BINARY | O_EXCL +# define OPEN_FLAGS O_RDWR | O_CREAT | O_BINARY | O_EXCL #endif #ifdef WIN32 ses2->ses_file->ses_file_descriptor = _open (fname, OPEN_FLAGS, 0600); #else ses2->ses_file->ses_file_descriptor = open (fname, OPEN_FLAGS, 0600); - unlink (fname); +#endif #endif if (ses2->ses_file->ses_file_descriptor < 0) { @@ -322,7 +328,12 @@ strdev_write (session_t * ses2, char *buffer, int bytes) ses2->ses_file->ses_file_descriptor = 0; } else - ses2->ses_file->ses_temp_file_name = box_dv_short_string (fname); + { + ses2->ses_file->ses_temp_file_name = box_dv_short_string (fname); + } +#if !defined (WIN32) + unlink (fname); +#endif ses2->ses_file->ses_fd_fill = ses2->ses_file->ses_fd_read = 0; } } @@ -1322,7 +1333,7 @@ strses_get_part_1 (dk_session_t * ses, void *buf2, int64 starting_ofs, long nbyt dest_readed = 0; do { - long to_read = MIN (sizeof (buffer), src_n_bytes); + long to_read = MIN (sizeof (src_buffer), src_n_bytes); readed = strf_read (ses_file, src_buffer, to_read); if (readed == -1) break; diff --git a/libsrc/Dk/Dksesstr.h b/libsrc/Dk/Dksesstr.h index 2fabc10171..48ee607029 100644 --- a/libsrc/Dk/Dksesstr.h +++ b/libsrc/Dk/Dksesstr.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dksestcp.c b/libsrc/Dk/Dksestcp.c index 0d6dea20bb..042866c666 100644 --- a/libsrc/Dk/Dksestcp.c +++ b/libsrc/Dk/Dksestcp.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dksestcp.h b/libsrc/Dk/Dksestcp.h index 80e370f0af..7ea574d987 100644 --- a/libsrc/Dk/Dksestcp.h +++ b/libsrc/Dk/Dksestcp.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dksestcpint.h b/libsrc/Dk/Dksestcpint.h index 70c275d409..4827a0d393 100644 --- a/libsrc/Dk/Dksestcpint.h +++ b/libsrc/Dk/Dksestcpint.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dksets.c b/libsrc/Dk/Dksets.c index 3aaafd0ada..f62ba99859 100644 --- a/libsrc/Dk/Dksets.c +++ b/libsrc/Dk/Dksets.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dksets.h b/libsrc/Dk/Dksets.h index f89d59a5e8..a596932a28 100644 --- a/libsrc/Dk/Dksets.h +++ b/libsrc/Dk/Dksets.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dksimd.h b/libsrc/Dk/Dksimd.h index 8903e0d253..6fccfaff4c 100644 --- a/libsrc/Dk/Dksimd.h +++ b/libsrc/Dk/Dksimd.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkstkern.c b/libsrc/Dk/Dkstkern.c index e76c841b16..dab95ba8f1 100644 --- a/libsrc/Dk/Dkstkern.c +++ b/libsrc/Dk/Dkstkern.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkstubs.c b/libsrc/Dk/Dkstubs.c index 48f8472b3a..fc85fcb90e 100644 --- a/libsrc/Dk/Dkstubs.c +++ b/libsrc/Dk/Dkstubs.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkstubs.h b/libsrc/Dk/Dkstubs.h index 6e944ce022..bef49e8c40 100644 --- a/libsrc/Dk/Dkstubs.h +++ b/libsrc/Dk/Dkstubs.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dksystem.h b/libsrc/Dk/Dksystem.h index 17a9c62af8..cf863a04c1 100644 --- a/libsrc/Dk/Dksystem.h +++ b/libsrc/Dk/Dksystem.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -80,12 +80,9 @@ # ifdef HAVE_MEMORY_H # include # endif -#endif - -#if !defined(__FreeBSD__) #ifdef HAVE_MALLOC_H # include -#else +#elif !defined (__cplusplus) void *malloc (); void *calloc (); void *realloc (); @@ -180,6 +177,14 @@ char *strtok_r (); #endif +#ifndef __attribute__ +/* This feature is available in gcc versions 2.5 and later. */ +# if (! defined __GNUC__ || __GNUC__ < 2 \ + || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)) +# define __attribute__(Spec) /* empty */ +# endif +#endif + /* * Easier way of checking GCC version */ @@ -200,10 +205,18 @@ char *strtok_r (); # define NORETURN /*NOTHING*/ #endif +#ifdef __cplusplus +#define DK_INLINE inline +#else #ifdef __GNUC__ # define DK_INLINE __inline__ #else # define DK_INLINE #endif +#endif + +#ifdef WIN32 +#define strcasecmp _stricmp +#endif #endif diff --git a/libsrc/Dk/Dktrace.h b/libsrc/Dk/Dktrace.h index 26b9b13373..a8d418e37f 100644 --- a/libsrc/Dk/Dktrace.h +++ b/libsrc/Dk/Dktrace.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dktypes.h b/libsrc/Dk/Dktypes.h index bce0e31db5..1e9930b94d 100644 --- a/libsrc/Dk/Dktypes.h +++ b/libsrc/Dk/Dktypes.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -221,9 +221,11 @@ round (double x) #ifdef _finite #define isfinite(val) _finite (val) #else +#ifndef __cplusplus #error "Neither isfinite() nor _finite() is defined in standard headers" #endif #endif +#endif #ifndef DBL_POS_INF #if defined(INFINITY) diff --git a/libsrc/Dk/Dkutil.c b/libsrc/Dk/Dkutil.c index 4bd15db431..687d6cc903 100644 --- a/libsrc/Dk/Dkutil.c +++ b/libsrc/Dk/Dkutil.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkutil.h b/libsrc/Dk/Dkutil.h index 48cc097bbc..89c83a9621 100644 --- a/libsrc/Dk/Dkutil.h +++ b/libsrc/Dk/Dkutil.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Dkword.h b/libsrc/Dk/Dkword.h index d8cabafe5e..aaae50b323 100644 --- a/libsrc/Dk/Dkword.h +++ b/libsrc/Dk/Dkword.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/Makefile.am b/libsrc/Dk/Makefile.am index 31d0ce6619..9362cc500f 100644 --- a/libsrc/Dk/Makefile.am +++ b/libsrc/Dk/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/Dk/mhash.h b/libsrc/Dk/mhash.h index 5ae1d89976..edbff76302 100644 --- a/libsrc/Dk/mhash.h +++ b/libsrc/Dk/mhash.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/.gitignore b/libsrc/JDBCDriverType4/.gitignore new file mode 100644 index 0000000000..c512be5a38 --- /dev/null +++ b/libsrc/JDBCDriverType4/.gitignore @@ -0,0 +1,5 @@ +testsuite4.jar +*.pdf +doc/ +virtuoso/jdbc2/ +testsuite_4.0/testsuite diff --git a/libsrc/JDBCDriverType4/Makefile.am b/libsrc/JDBCDriverType4/Makefile.am index f41afd45cc..1c2a9ecdfa 100644 --- a/libsrc/JDBCDriverType4/Makefile.am +++ b/libsrc/JDBCDriverType4/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -19,18 +19,6 @@ # # -if WITH_JDK2 -JDK2_TARGETS = jdk2-target -JDK2_TEST = jdk2-test -JDK3_DOC = jdk2-doc -endif - -if WITH_JDK3 -JDK3_TARGETS = jdk3-target -JDK3_TEST = jdk3-test -JDK3_DOC = jdk3-doc -endif - if WITH_JDK4 JDK4_TARGETS = jdk4-target JDK4_TEST = jdk4-test @@ -49,64 +37,26 @@ JDK4_2_TEST = jdk4_2-test JDK4_2_DOC = jdk4_2-doc endif -JDK_TESTS = $(JDK2_TEST) $(JDK3_TEST) $(JDK4_TEST) $(JDK4_1_TEST) $(JDK4_2_TEST) +JDK_TESTS = $(JDK4_TEST) $(JDK4_1_TEST) $(JDK4_2_TEST) -SUBDIRS = . virtuoso testsuite_2.0 testsuite_3.0 testsuite_4.0 +SUBDIRS = . testsuite_4.0 -all-am: $(JDK2_TARGETS) $(JDK3_TARGETS) $(JDK4_TARGETS) $(JDK4_1_TARGETS) $(JDK4_2_TARGETS) +all-am: $(JDK4_TARGETS) $(JDK4_1_TARGETS) $(JDK4_2_TARGETS) -doc: $(JDK2_DOC) $(JDK3_DOC) $(JDK4_DOC) $(JDK4_1_DOC) $(JDK4_2_DOC) +doc: $(JDK4_DOC) $(JDK4_1_DOC) $(JDK4_2_DOC) run-tests: $(MAKE) $(JDK_TESTS) -# -# JDK 1.3 / JDBC 2.0 -# -.PHONY: jdk2-target -jdk2-target: - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) std2 - -.PHONY: jdk2-target-ssl -jdk2-target-ssl: - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) ssl2 - -.PHONY: jdk2-doc -jdk2-doc: - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) doc2 - -.PHONY: jdk2-test -jdk2-test: - env "JDK2=@ac_jdk2_path@" $(SHELL) ./test2.sh "jdbc:virtuoso://localhost:$(PORT)/" - - -# -# JDK 1.4+1.5 / JDBC 3.0 -# -.PHONY: jdk3-target -jdk3-target: - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) std3 - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) ssl3 - -.PHONY: jdk3-test -jdk3-test: - env "JDK3=@ac_jdk3_path@" $(SHELL) ./test3.sh "jdbc:virtuoso://localhost:$(PORT)/" - -.PHONY: jdk3-doc -jdk3-doc: - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) doc3 - - # # JDK 1.6 / JDBC 4.0 # .PHONY: jdk4-target jdk4-target: - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) std4 - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) ssl4 + @cd virtuoso/jdbc; $(MAKE) -$(MAKEFLAGS) std4 .PHONY: jdk4-test jdk4-test: @@ -114,7 +64,7 @@ jdk4-test: .PHONY: jdk4-doc jdk4-doc: - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) doc4 + @cd virtuoso/jdbc; $(MAKE) -$(MAKEFLAGS) doc4 # @@ -122,8 +72,7 @@ jdk4-doc: # .PHONY: jdk4_1-target jdk4_1-target: - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) std4_1 - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) ssl4_1 + @cd virtuoso/jdbc; $(MAKE) -$(MAKEFLAGS) std4_1 .PHONY: jdk4_1-test jdk4_1-test: @@ -131,7 +80,7 @@ jdk4_1-test: .PHONY: jdk4_1-doc jdk4_1-doc: - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) doc4_1 + @cd virtuoso/jdbc; $(MAKE) -$(MAKEFLAGS) doc4_1 # @@ -139,8 +88,7 @@ jdk4_1-doc: # .PHONY: jdk4_2-target jdk4_2-target: - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) std4_2 - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) ssl4_2 + @cd virtuoso/jdbc; $(MAKE) -$(MAKEFLAGS) std4_2 .PHONY: jdk4_2-test jdk4_2-test: @@ -148,27 +96,21 @@ jdk4_2-test: .PHONY: jdk4_2-doc jdk4_2-doc: - @cd virtuoso/jdbc2; $(MAKE) -$(MAKEFLAGS) doc4_2 + @cd virtuoso/jdbc; $(MAKE) -$(MAKEFLAGS) doc4_2 # # Install/uninstall # install-data-local: - -$(MKDIR_P) "$(DESTDIR)${libdir}/jdbc-2.0" - -$(MKDIR_P) "$(DESTDIR)${libdir}/jdbc-3.0" -$(MKDIR_P) "$(DESTDIR)${libdir}/jdbc-4.0" -$(MKDIR_P) "$(DESTDIR)${libdir}/jdbc-4.1" -$(MKDIR_P) "$(DESTDIR)${libdir}/jdbc-4.2" - -cp virtjdbc2.jar "$(DESTDIR)${libdir}/jdbc-2.0" - -cp virtjdbc3.jar virtjdbc3ssl.jar "$(DESTDIR)${libdir}/jdbc-3.0" - -cp virtjdbc4.jar virtjdbc4ssl.jar "$(DESTDIR)${libdir}/jdbc-4.0" - -cp virtjdbc4_1.jar virtjdbc4_1ssl.jar "$(DESTDIR)${libdir}/jdbc-4.1" - -cp virtjdbc4_2.jar virtjdbc4_2ssl.jar "$(DESTDIR)${libdir}/jdbc-4.2" + -cp virtjdbc4.jar "$(DESTDIR)${libdir}/jdbc-4.0" + -cp virtjdbc4_1.jar "$(DESTDIR)${libdir}/jdbc-4.1" + -cp virtjdbc4_2.jar "$(DESTDIR)${libdir}/jdbc-4.2" uninstall-local: - -rm -rf "$(DESTDIR)${libdir}/jdbc-2.0" - -rm -rf "$(DESTDIR)${libdir}/jdbc-3.0" -rm -rf "$(DESTDIR)${libdir}/jdbc-4.0" -rm -rf "$(DESTDIR)${libdir}/jdbc-4.1" -rm -rf "$(DESTDIR)${libdir}/jdbc-4.2" @@ -186,24 +128,12 @@ EXTRA_DIST = \ manifest*.main \ openlink/util/*.java \ termcap \ - test2.bat \ - test2.sh \ - test3.bat \ - test3.sh \ test4.bat \ test4.sh \ test4_1.bat \ test4_1.sh \ test4_2.bat \ test4_2.sh \ - test.bat \ - test.sh \ - virtjdbc2.jar \ - virtjdbc3.jar \ - virtjdbc3ssl.jar \ virtjdbc4.jar \ - virtjdbc4ssl.jar \ virtjdbc4_1.jar \ - virtjdbc4_1ssl.jar \ - virtjdbc4_2.jar \ - virtjdbc4_2ssl.jar + virtjdbc4_2.jar diff --git a/libsrc/JDBCDriverType4/java.sql.Driver3 b/libsrc/JDBCDriverType4/java.sql.Driver3 deleted file mode 100644 index 21cdd0b219..0000000000 --- a/libsrc/JDBCDriverType4/java.sql.Driver3 +++ /dev/null @@ -1 +0,0 @@ -virtuoso.jdbc3.Driver \ No newline at end of file diff --git a/libsrc/JDBCDriverType4/manifest2.main b/libsrc/JDBCDriverType4/manifest2.main deleted file mode 100644 index 24f4d66bca..0000000000 --- a/libsrc/JDBCDriverType4/manifest2.main +++ /dev/null @@ -1 +0,0 @@ -Main-Class: virtuoso.jdbc2.Driver diff --git a/libsrc/JDBCDriverType4/manifest3.main b/libsrc/JDBCDriverType4/manifest3.main deleted file mode 100644 index 9dddd4cc53..0000000000 --- a/libsrc/JDBCDriverType4/manifest3.main +++ /dev/null @@ -1 +0,0 @@ -Main-Class: virtuoso.jdbc3.Driver diff --git a/libsrc/JDBCDriverType4/openlink/util/BaseMessage.java b/libsrc/JDBCDriverType4/openlink/util/BaseMessage.java index 0376f560af..9f24c0dac7 100644 --- a/libsrc/JDBCDriverType4/openlink/util/BaseMessage.java +++ b/libsrc/JDBCDriverType4/openlink/util/BaseMessage.java @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -37,15 +37,7 @@ abstract public class BaseMessage { protected String defaultMessage; protected String msgPrefix; -#if JDK_VER >= 16 - public static final String err_Prefix = "[OpenLink][OPLJDBC4]"; -#elif JDK_VER >= 14 - public static final String err_Prefix = "[OpenLink][OPLJDBC3]"; -#elif JDK_VER >= 12 - public static final String err_Prefix = "[OpenLink][OPLJDBC2]"; -#else - public static final String err_Prefix = "[OpenLink][OPLJDBC]"; -#endif + public static final String err_Prefix = "[OpenLink][OPLJDBC4]"; protected void init(String resourceFile) { defaultMessage = RESBUNDLE_NOTFOUND + (resourceFile != null ? resourceFile : "null") + "'"; diff --git a/libsrc/JDBCDriverType4/openlink/util/OPLHeapBlob.java b/libsrc/JDBCDriverType4/openlink/util/OPLHeapBlob.java index 3106a423a6..83b70e8081 100644 --- a/libsrc/JDBCDriverType4/openlink/util/OPLHeapBlob.java +++ b/libsrc/JDBCDriverType4/openlink/util/OPLHeapBlob.java @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -209,7 +209,6 @@ public long position(Blob pattern, long start) throws SQLException { } // -------------------------- JDBC 3.0 ----------------------------------- -#if JDK_VER >= 14 /** * Writes the given array of bytes to the BLOB value that @@ -309,7 +308,6 @@ public void truncate(long len) throws SQLException { } } -#if JDK_VER >= 16 /** * This method frees the Blob object and releases the resources that * it holds. The object is invalid once the free @@ -358,8 +356,6 @@ public InputStream getBinaryStream(long pos, long length) throws SQLException } -#endif -#endif private void ensureOpen() throws SQLException { if (blobData == null) @@ -443,7 +439,6 @@ private void ensureOpen() throws IOException { throw new IOException(OPLMessage_u.getMessage(OPLMessage_u.erru_Stream_is_closed )); } } -/*DROP_FOR_JDBC2*/ // === Inner class =========================================== protected class BlobOutputStream extends OutputStream { @@ -503,6 +498,5 @@ private void ensureOpen() throws IOException { throw new IOException(OPLMessage_u.getMessage(OPLMessage_u.erru_Stream_is_closed )); } } -/*_DROP_FOR_JDBC2*/ } diff --git a/libsrc/JDBCDriverType4/openlink/util/OPLHeapClob.java b/libsrc/JDBCDriverType4/openlink/util/OPLHeapClob.java index 9835d2812b..8ebddb6aa8 100644 --- a/libsrc/JDBCDriverType4/openlink/util/OPLHeapClob.java +++ b/libsrc/JDBCDriverType4/openlink/util/OPLHeapClob.java @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -228,7 +228,6 @@ public long position(Clob searchstr, long start) throws SQLException { //---------------------------- jdbc 3.0 ----------------------------------- -#if JDK_VER >= 14 /** * Writes the given Java String to the CLOB @@ -346,7 +345,6 @@ public void truncate(long len) throws SQLException { } } -#if JDK_VER >= 16 /** * This method frees the Clob object and releases the resources the resources * that it holds. The object is invalid once the free method @@ -394,8 +392,6 @@ public Reader getCharacterStream(long pos, long length) throws SQLException } -#endif -#endif private void ensureOpen() throws SQLException { @@ -574,7 +570,6 @@ public synchronized void close() throws IOException } -#if JDK_VER >= 14 // === Inner class =========================================== protected class BlobOutputWriter extends Writer { @@ -683,6 +678,5 @@ private void ensureOpen() throws IOException { } } -#endif } diff --git a/libsrc/JDBCDriverType4/openlink/util/OPLHeapNClob.java b/libsrc/JDBCDriverType4/openlink/util/OPLHeapNClob.java index 1cfc822010..157c8d7e02 100644 --- a/libsrc/JDBCDriverType4/openlink/util/OPLHeapNClob.java +++ b/libsrc/JDBCDriverType4/openlink/util/OPLHeapNClob.java @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/openlink/util/OPLMessage_u.java b/libsrc/JDBCDriverType4/openlink/util/OPLMessage_u.java index f480bc9b2c..44bf4a90b5 100644 --- a/libsrc/JDBCDriverType4/openlink/util/OPLMessage_u.java +++ b/libsrc/JDBCDriverType4/openlink/util/OPLMessage_u.java @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/openlink/util/Vector.java b/libsrc/JDBCDriverType4/openlink/util/Vector.java index e6591cdd14..651c4dc175 100644 --- a/libsrc/JDBCDriverType4/openlink/util/Vector.java +++ b/libsrc/JDBCDriverType4/openlink/util/Vector.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -37,7 +37,7 @@ public class Vector // The number of valid objects in the array protected int elementCount; - // The increment of the array when ther's no space left + // The increment of the array when there is no space left protected int capacityIncrement; /** diff --git a/libsrc/JDBCDriverType4/openlink/util/VectorOfDouble.java b/libsrc/JDBCDriverType4/openlink/util/VectorOfDouble.java index 73ecd1b707..abfd5bdc34 100644 --- a/libsrc/JDBCDriverType4/openlink/util/VectorOfDouble.java +++ b/libsrc/JDBCDriverType4/openlink/util/VectorOfDouble.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/openlink/util/VectorOfFloat.java b/libsrc/JDBCDriverType4/openlink/util/VectorOfFloat.java index b97bee18ff..3dd18a7176 100644 --- a/libsrc/JDBCDriverType4/openlink/util/VectorOfFloat.java +++ b/libsrc/JDBCDriverType4/openlink/util/VectorOfFloat.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/openlink/util/VectorOfLong.java b/libsrc/JDBCDriverType4/openlink/util/VectorOfLong.java index 4798bae5d3..43cd3df86c 100644 --- a/libsrc/JDBCDriverType4/openlink/util/VectorOfLong.java +++ b/libsrc/JDBCDriverType4/openlink/util/VectorOfLong.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/openlink/util/messages_u.java b/libsrc/JDBCDriverType4/openlink/util/messages_u.java index fe77408081..3c6f120148 100644 --- a/libsrc/JDBCDriverType4/openlink/util/messages_u.java +++ b/libsrc/JDBCDriverType4/openlink/util/messages_u.java @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/test.bat b/libsrc/JDBCDriverType4/test.bat deleted file mode 100644 index 5b04f9de35..0000000000 --- a/libsrc/JDBCDriverType4/test.bat +++ /dev/null @@ -1,44 +0,0 @@ -rem -rem $Id$ -rem -rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -rem project. -rem -rem Copyright (C) 1998-2018 OpenLink Software -rem -rem This project is free software; you can redistribute it and/or modify it -rem under the terms of the GNU General Public License as published by the -rem Free Software Foundation; only version 2 of the License, dated June 1991. -rem -rem This program is distributed in the hope that it will be useful, but -rem WITHOUT ANY WARRANTY; without even the implied warranty of -rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -rem General Public License for more details. -rem -rem You should have received a copy of the GNU General Public License along -rem with this program; if not, write to the Free Software Foundation, Inc., -rem 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -rem - -set JAVA_HOME=%JDK1% -set CLASSPATH=%JAVA_HOME%\lib\classes.zip - -echo "............. Test the JDBC 1.2 driver" -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestClean %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestURL %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestDatabaseMetaData %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestSimpleExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestPrepareExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestCallableExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestExecuteFetch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestExecuteBlob termcap %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestSimpleExecuteBatch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestPrepareBatch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestScroll %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestScrollManual %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestScrollPrepare %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestVarbinary %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestNumeric %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.test2276 %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestTimeUpdate %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;..\classes\virtjdbc.jar;testsuite.jar testsuite.TestMoreRes %1% diff --git a/libsrc/JDBCDriverType4/test.sh b/libsrc/JDBCDriverType4/test.sh deleted file mode 100755 index a86f53e9ac..0000000000 --- a/libsrc/JDBCDriverType4/test.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# $Id$ -# -# This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -# project. -# -# Copyright (C) 1998-2018 OpenLink Software -# -# This project is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License, dated June 1991. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -CLASSPATH=./security/jnet.jar:./security/jsse.jar:./security/jcert.jar -JAVA=$JDK1/java -export JAVA CLASSPATH - -echo "............. Test the JDBC 1.2 driver" -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestClean -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestURL $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestDatabaseMetaData $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestSimpleExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestExecuteFetch $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestExecuteBlob termcap $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestSimpleExecuteBatch $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestPrepareExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestPrepareBatch $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestCallableExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestScroll $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestScrollManual $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestScrollPrepare $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestVarbinary $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestNumeric $1 -rm -f bloor.pdf -cat testsuite2.jar testsuite2.jar testsuite2.jar > bloor.pdf -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestBlob edsj -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.test2276 $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestTimeUpdate $1 -$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestMoreRes $1 diff --git a/libsrc/JDBCDriverType4/test2.bat b/libsrc/JDBCDriverType4/test2.bat deleted file mode 100644 index 01a49a58ed..0000000000 --- a/libsrc/JDBCDriverType4/test2.bat +++ /dev/null @@ -1,49 +0,0 @@ -rem -rem $Id$ -rem -rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -rem project. -rem -rem Copyright (C) 1998-2018 OpenLink Software -rem -rem This project is free software; you can redistribute it and/or modify it -rem under the terms of the GNU General Public License as published by the -rem Free Software Foundation; only version 2 of the License, dated June 1991. -rem -rem This program is distributed in the hope that it will be useful, but -rem WITHOUT ANY WARRANTY; without even the implied warranty of -rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -rem General Public License for more details. -rem -rem You should have received a copy of the GNU General Public License along -rem with this program; if not, write to the Free Software Foundation, Inc., -rem 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -rem - -set JAVA_HOME=%JDK2% -set CLASSPATH=%JAVA_HOME%\jre\lib\rt.jar - -echo "............. Test the JDBC 2.0 driver" -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestClean %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestURL %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestDatabaseMetaData %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestSimpleExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestExecuteFetch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestExecuteBlob termcap %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestExecuteClob termcap %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestSimpleExecuteBatch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestPrepareExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestPrepareBatch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestCallableExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestScroll %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestScrollManual %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestScrollPrepare %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestVarbinary %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestNumeric %1% -del bloor.pdf -copy testsuite2.jar bloor.pdf -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestBlob edsj -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.test2276 %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestTimeUpdate %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.SPRgetColumns %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc2.jar;testsuite2.jar testsuite.TestMoreRes %1% diff --git a/libsrc/JDBCDriverType4/test2.sh b/libsrc/JDBCDriverType4/test2.sh deleted file mode 100755 index efc0ea374e..0000000000 --- a/libsrc/JDBCDriverType4/test2.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# $Id$ -# -# This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -# project. -# -# Copyright (C) 1998-2018 OpenLink Software -# -# This project is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License, dated June 1991. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -CLASSPATH=. -CLASSPATHSSL=.:./security/jdk1.2/jnet.jar:./security/jdk1.2/jsse.jar:./security/jdk1.2/jcert.jar -JAVA=$JDK2/java -export JAVA CLASSPATH CLASSPATHSSL - - -echo "............. Test the JDBC 2.0 driver without SSL" -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestClean $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestURL $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestDatabaseMetaData $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestSimpleExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestExecuteFetch $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestExecuteBlob termcap $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestExecuteClob termcap $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestSimpleExecuteBatch $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestPrepareExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestPrepareBatch $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestCallableExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestScroll $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestScrollManual $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestScrollPrepare $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestVarbinary $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestNumeric $1 -rm -f bloor.pdf -cat testsuite2.jar testsuite2.jar testsuite2.jar > bloor.pdf -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestBlob edsj $1 -diff bloor.pdf out.pdf -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.test2276 $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestTimeUpdate $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.SPRgetColumns $1 -$JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestMoreRes $1 -#echo "............. Test the JDBC 2.0 driver with SSL" -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestClean $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestURL $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestDatabaseMetaData $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestSimpleExecute $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestExecuteFetch $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestExecuteBlob termcap $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestExecuteClob termcap $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestSimpleExecuteBatch $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestPrepareExecute $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestPrepareBatch $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestCallableExecute $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestScroll $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestVarbinary $2 -#$JAVA -classpath $CLASSPATHSSL:virtjdbc2ssl.jar:testsuite2.jar testsuite.TestNumeric $2 diff --git a/libsrc/JDBCDriverType4/test3.bat b/libsrc/JDBCDriverType4/test3.bat deleted file mode 100644 index ab181ec654..0000000000 --- a/libsrc/JDBCDriverType4/test3.bat +++ /dev/null @@ -1,53 +0,0 @@ -rem -rem $Id$ -rem -rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -rem project. -rem -rem Copyright (C) 1998-2018 OpenLink Software -rem -rem This project is free software; you can redistribute it and/or modify it -rem under the terms of the GNU General Public License as published by the -rem Free Software Foundation; only version 2 of the License, dated June 1991. -rem -rem This program is distributed in the hope that it will be useful, but -rem WITHOUT ANY WARRANTY; without even the implied warranty of -rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -rem General Public License for more details. -rem -rem You should have received a copy of the GNU General Public License along -rem with this program; if not, write to the Free Software Foundation, Inc., -rem 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -rem - -set JAVA_HOME=%JDK3% -set CLASSPATH=%JAVA_HOME%\jre\lib\rt.jar - -echo "............. Test the JDBC 3.0 driver" -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestClean %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestURL %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestDatabaseMetaData %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestSimpleExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestExecuteFetch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestExecuteBlob termcap %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestExecuteClob termcap %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestSimpleExecuteBatch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestPrepareExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestPrepareBatch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestCallableExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestScroll %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestScrollManual %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestScrollPrepare %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestVarbinary %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestNumeric %1% -del bloor.pdf -copy testsuite3.jar bloor.pdf -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestBlob edsj -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.test2276 %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestTimeUpdate %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.SPRgetColumns %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestMoreRes %1% -rem GK: not for now : no URL parsing -rem %JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestDataSource %1% - -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc3ssl.jar;testsuite3.jar testsuite.TestDateTime %1% diff --git a/libsrc/JDBCDriverType4/test3.sh b/libsrc/JDBCDriverType4/test3.sh deleted file mode 100755 index 977dbf88a0..0000000000 --- a/libsrc/JDBCDriverType4/test3.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# $Id$ -# -# This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -# project. -# -# Copyright (C) 1998-2018 OpenLink Software -# -# This project is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License, dated June 1991. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -CLASSPATH=. -CLASSPATHSSL=. -JAVA=$JDK3/java -export JAVA CLASSPATH CLASSPATHSSL - -echo "............. Test the JDBC 3.0 driver without SSL" -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestClean $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestURL $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestDatabaseMetaData $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestSimpleExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestExecuteFetch $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestExecuteBlob termcap $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestExecuteClob termcap $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestSimpleExecuteBatch $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestPrepareExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestPrepareBatch $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestCallableExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestScroll $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestScrollManual $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestScrollPrepare $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestVarbinary $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestNumeric $1 -rm -f bloor.pdf -cat testsuite3.jar testsuite3.jar testsuite3.jar > bloor.pdf -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestBlob edsj $1 -diff bloor.pdf out.pdf -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.test2276 $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestTimeUpdate $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.SPRgetColumns $1 -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestMoreRes $1 -#GK: not for now : no params passing -# $JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestDataSource $1 - -$JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestDateTime $1 diff --git a/libsrc/JDBCDriverType4/test4.bat b/libsrc/JDBCDriverType4/test4.bat index c860a467b0..5c6c74a356 100644 --- a/libsrc/JDBCDriverType4/test4.bat +++ b/libsrc/JDBCDriverType4/test4.bat @@ -4,7 +4,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the @@ -24,30 +24,30 @@ set JAVA_HOME=%JDK4% set CLASSPATH=%JAVA_HOME%\jre\lib\rt.jar echo "............. Test the JDBC 4.0 driver" -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestClean %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestURL %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestDatabaseMetaData %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestSimpleExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestExecuteFetch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestExecuteBlob termcap %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestExecuteClob termcap %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestSimpleExecuteBatch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestPrepareExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestPrepareBatch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestCallableExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestScroll %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestScrollManual %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestScrollPrepare %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestVarbinary %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestNumeric %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestClean %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestURL %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestDatabaseMetaData %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestSimpleExecute %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestExecuteFetch %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestExecuteBlob termcap %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestExecuteClob termcap %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestSimpleExecuteBatch %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestPrepareExecute %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestPrepareBatch %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestCallableExecute %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestScroll %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestScrollManual %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestScrollPrepare %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestVarbinary %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestNumeric %1% del bloor.pdf copy testsuite4.jar bloor.pdf -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestBlob edsj -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.test2276 %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestTimeUpdate %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.SPRgetColumns %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestMoreRes %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestBlob edsj +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.test2276 %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestTimeUpdate %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.SPRgetColumns %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestMoreRes %1% rem GK: not for now : no URL parsing -rem %JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestDataSource %1% +rem %JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestDataSource %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4ssl.jar;testsuite4.jar testsuite.TestDateTime %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4.jar;testsuite4.jar testsuite.TestDateTime %1% diff --git a/libsrc/JDBCDriverType4/test4.sh b/libsrc/JDBCDriverType4/test4.sh index a42dbce993..80e437db0c 100755 --- a/libsrc/JDBCDriverType4/test4.sh +++ b/libsrc/JDBCDriverType4/test4.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -26,32 +26,32 @@ CLASSPATHSSL=. JAVA=$JDK4/java export JAVA CLASSPATH CLASSPATHSSL -echo "............. Test the JDBC 4.0 driver without SSL" -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestClean $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestURL $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestDatabaseMetaData $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestSimpleExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestExecuteFetch $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestExecuteBlob termcap $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestExecuteClob termcap $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestSimpleExecuteBatch $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestPrepareExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestPrepareBatch $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestCallableExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestScroll $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestScrollManual $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestScrollPrepare $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestVarbinary $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestNumeric $1 +echo "............. Test the JDBC 4.0 driver" +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestClean $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestURL $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestDatabaseMetaData $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestSimpleExecute $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestExecuteFetch $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestExecuteBlob termcap $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestExecuteClob termcap $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestSimpleExecuteBatch $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestPrepareExecute $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestPrepareBatch $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestCallableExecute $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestScroll $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestScrollManual $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestScrollPrepare $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestVarbinary $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestNumeric $1 rm -f bloor.pdf -cat testsuite3.jar testsuite3.jar testsuite3.jar > bloor.pdf -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestBlob edsj $1 +cat testsuite4.jar testsuite4.jar testsuite4.jar > bloor.pdf +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestBlob edsj $1 diff bloor.pdf out.pdf -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.test2276 $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestTimeUpdate $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.SPRgetColumns $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestMoreRes $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.test2276 $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestTimeUpdate $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.SPRgetColumns $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestMoreRes $1 #GK: not for now : no params passing -# $JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestDataSource $1 +# $JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestDataSource $1 -$JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestDateTime $1 +$JAVA -classpath $CLASSPATH:virtjdbc4.jar:testsuite4.jar testsuite.TestDateTime $1 diff --git a/libsrc/JDBCDriverType4/test4_1.bat b/libsrc/JDBCDriverType4/test4_1.bat index 1ab7c0622b..3dd03881c4 100644 --- a/libsrc/JDBCDriverType4/test4_1.bat +++ b/libsrc/JDBCDriverType4/test4_1.bat @@ -4,7 +4,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the @@ -24,30 +24,30 @@ set JAVA_HOME=%JDK4% set CLASSPATH=%JAVA_HOME%\jre\lib\rt.jar echo "............. Test the JDBC 4.1 driver" -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestClean %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestURL %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestDatabaseMetaData %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestSimpleExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestExecuteFetch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestExecuteBlob termcap %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestExecuteClob termcap %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestSimpleExecuteBatch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestPrepareExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestPrepareBatch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestCallableExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestScroll %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestScrollManual %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestScrollPrepare %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestVarbinary %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestNumeric %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestClean %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestURL %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestDatabaseMetaData %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestSimpleExecute %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestExecuteFetch %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestExecuteBlob termcap %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestExecuteClob termcap %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestSimpleExecuteBatch %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestPrepareExecute %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestPrepareBatch %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestCallableExecute %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestScroll %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestScrollManual %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestScrollPrepare %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestVarbinary %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestNumeric %1% del bloor.pdf copy testsuite4.jar bloor.pdf -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestBlob edsj -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.test2276 %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestTimeUpdate %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.SPRgetColumns %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestMoreRes %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestBlob edsj +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.test2276 %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestTimeUpdate %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.SPRgetColumns %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestMoreRes %1% rem GK: not for now : no URL parsing -rem %JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestDataSource %1% +rem %JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestDataSource %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1ssl.jar;testsuite4.jar testsuite.TestDateTime %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_1.jar;testsuite4.jar testsuite.TestDateTime %1% diff --git a/libsrc/JDBCDriverType4/test4_1.sh b/libsrc/JDBCDriverType4/test4_1.sh index 84944b9f2c..55ceadb86b 100755 --- a/libsrc/JDBCDriverType4/test4_1.sh +++ b/libsrc/JDBCDriverType4/test4_1.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -23,35 +23,35 @@ CLASSPATH=. CLASSPATHSSL=. -JAVA=$JDK4/java +JAVA=$JDK4_1/java export JAVA CLASSPATH CLASSPATHSSL echo "............. Test the JDBC 4.1 driver without SSL" -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestClean $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestURL $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestDatabaseMetaData $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestSimpleExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestExecuteFetch $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestExecuteBlob termcap $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestExecuteClob termcap $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestSimpleExecuteBatch $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestPrepareExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestPrepareBatch $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestCallableExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestScroll $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestScrollManual $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestScrollPrepare $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestVarbinary $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestNumeric $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestClean $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestURL $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestDatabaseMetaData $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestSimpleExecute $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestExecuteFetch $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestExecuteBlob termcap $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestExecuteClob termcap $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestSimpleExecuteBatch $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestPrepareExecute $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestPrepareBatch $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestCallableExecute $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestScroll $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestScrollManual $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestScrollPrepare $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestVarbinary $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestNumeric $1 rm -f bloor.pdf -cat testsuite3.jar testsuite3.jar testsuite3.jar > bloor.pdf -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestBlob edsj $1 +cat testsuite4.jar testsuite4.jar testsuite4.jar > bloor.pdf +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestBlob edsj $1 diff bloor.pdf out.pdf -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.test2276 $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestTimeUpdate $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.SPRgetColumns $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestMoreRes $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.test2276 $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestTimeUpdate $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.SPRgetColumns $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestMoreRes $1 #GK: not for now : no params passing -# $JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestDataSource $1 +# $JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestDataSource $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_1ssl.jar:testsuite4.jar testsuite.TestDateTime $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_1.jar:testsuite4.jar testsuite.TestDateTime $1 diff --git a/libsrc/JDBCDriverType4/test4_2.bat b/libsrc/JDBCDriverType4/test4_2.bat index 5db3054dc8..0fad223602 100644 --- a/libsrc/JDBCDriverType4/test4_2.bat +++ b/libsrc/JDBCDriverType4/test4_2.bat @@ -4,7 +4,7 @@ rem rem This file is part of the OpenLink Software Virtuoso Open-Source (VOS) rem project. rem -rem Copyright (C) 1998-2018 OpenLink Software +rem Copyright (C) 1998-2019 OpenLink Software rem rem This project is free software; you can redistribute it and/or modify it rem under the terms of the GNU General Public License as published by the @@ -24,30 +24,30 @@ set JAVA_HOME=%JDK4% set CLASSPATH=%JAVA_HOME%\jre\lib\rt.jar echo "............. Test the JDBC 4.2 driver" -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestClean %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestURL %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestDatabaseMetaData %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestSimpleExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestExecuteFetch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestExecuteBlob termcap %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestExecuteClob termcap %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestSimpleExecuteBatch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestPrepareExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestPrepareBatch %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestCallableExecute %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestScroll %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestScrollManual %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestScrollPrepare %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestVarbinary %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestNumeric %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestClean %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestURL %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestDatabaseMetaData %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestSimpleExecute %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestExecuteFetch %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestExecuteBlob termcap %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestExecuteClob termcap %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestSimpleExecuteBatch %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestPrepareExecute %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestPrepareBatch %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestCallableExecute %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestScroll %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestScrollManual %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestScrollPrepare %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestVarbinary %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestNumeric %1% del bloor.pdf copy testsuite4.jar bloor.pdf -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestBlob edsj -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.test2276 %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestTimeUpdate %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.SPRgetColumns %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestMoreRes %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestBlob edsj +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.test2276 %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestTimeUpdate %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.SPRgetColumns %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestMoreRes %1% rem GK: not for now : no URL parsing -rem %JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestDataSource %1% +rem %JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestDataSource %1% -%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2ssl.jar;testsuite4.jar testsuite.TestDateTime %1% +%JAVA_HOME%\bin\java -classpath %CLASSPATH%;virtjdbc4_2.jar;testsuite4.jar testsuite.TestDateTime %1% diff --git a/libsrc/JDBCDriverType4/test4_2.sh b/libsrc/JDBCDriverType4/test4_2.sh index c3c5e9985b..5eaf3f911f 100755 --- a/libsrc/JDBCDriverType4/test4_2.sh +++ b/libsrc/JDBCDriverType4/test4_2.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -23,35 +23,35 @@ CLASSPATH=. CLASSPATHSSL=. -JAVA=$JDK4/java +JAVA=$JDK4_2/java export JAVA CLASSPATH CLASSPATHSSL -echo "............. Test the JDBC 4.2 driver without SSL" -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestClean $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestURL $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestDatabaseMetaData $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestSimpleExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestExecuteFetch $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestExecuteBlob termcap $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestExecuteClob termcap $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestSimpleExecuteBatch $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestPrepareExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestPrepareBatch $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestCallableExecute $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestScroll $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestScrollManual $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestScrollPrepare $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestVarbinary $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestNumeric $1 +echo "............. Test the JDBC 4.2 driver" +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestClean $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestURL $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestDatabaseMetaData $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestSimpleExecute $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestExecuteFetch $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestExecuteBlob termcap $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestExecuteClob termcap $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestSimpleExecuteBatch $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestPrepareExecute $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestPrepareBatch $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestCallableExecute $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestScroll $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestScrollManual $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestScrollPrepare $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestVarbinary $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestNumeric $1 rm -f bloor.pdf -cat testsuite3.jar testsuite3.jar testsuite3.jar > bloor.pdf -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestBlob edsj $1 +cat testsuite4.jar testsuite4.jar testsuite4.jar > bloor.pdf +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestBlob edsj $1 diff bloor.pdf out.pdf -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.test2276 $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestTimeUpdate $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.SPRgetColumns $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestMoreRes $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.test2276 $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestTimeUpdate $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.SPRgetColumns $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestMoreRes $1 #GK: not for now : no params passing -# $JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestDataSource $1 +# $JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestDataSource $1 -$JAVA -classpath $CLASSPATH:virtjdbc4_2ssl.jar:testsuite4.jar testsuite.TestDateTime $1 +$JAVA -classpath $CLASSPATH:virtjdbc4_2.jar:testsuite4.jar testsuite.TestDateTime $1 diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/SPRgetColumns.java b/libsrc/JDBCDriverType4/testsuite_2.0/SPRgetColumns.java deleted file mode 100644 index 3af7564971..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/SPRgetColumns.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; -import java.sql.*; - - -public class SPRgetColumns -{ - public static void main(String[] args) throws SQLException, ClassNotFoundException - { - try - { - String url; - System.out.print("bug 1743: metadata calls "); - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - Connection conn = DriverManager.getConnection(url, "dba", "dba"); - DatabaseMetaData dbmd = conn.getMetaData(); - ResultSet rs = dbmd.getColumns("", "", "", ""); - - // GET ALL RESULTS - StringBuffer buf = new StringBuffer(); - ResultSetMetaData rsmd = rs.getMetaData(); - int numCols = rsmd.getColumnCount(); - int i, rowcount = 0; - - // get column header info - for (i=1; i <= numCols; i++) { - if (i > 1) buf.append(","); - buf.append(rsmd.getColumnLabel(i)); - } - buf.append("\n"); - - // break it off at 100 rows max - while (rs.next() && rowcount < 100) { - // Loop through each column, getting the column - // data and displaying - - for (i=1; i <= numCols; i++) { - if (i > 1) buf.append(","); - buf.append(rs.getString(i)); - } - buf.append("\n"); - rowcount++; - } - - rs.close(); - conn.close(); - System.out.println(" PASSED"); - } - catch (Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } -} diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestBlob.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestBlob.java deleted file mode 100644 index a307fac6e9..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestBlob.java +++ /dev/null @@ -1,232 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.util.*; -import java.io.*; -import java.sql.*; - -public class TestBlob -{ - - // ************************************************************ - public static void main(String[] args) throws Exception - { - - - System.out.println("driver"); - Connection conn = null; - if (args.length == 0) - { - System.err.println("Usage: TestEmpty ora | eds | edsj | ms7 | tds"); - System.exit(1); - } - System.out.println("connect"); - if (args[0].equals("eds")) - { - Class.forName("sun.jdbc.odbc.JdbcOdbcDriver"); - conn = DriverManager.getConnection("jdbc:odbc:Local ES","EWSYS","EWSYS"); - } - - else if (args[0].equals("edsj")) - { - Class.forName("virtuoso.jdbc2.Driver"); - // conn = DriverManager.getConnection ("jdbc:virtuoso://localhost:1111","EWSYS","EWSYS"); - if (args.length < 2) - conn = DriverManager.getConnection ("jdbc:virtuoso://localhost:1111/timeout=60","dba","dba"); - else - conn = DriverManager.getConnection (args[1],"dba","dba"); - } - else if (args[0].equals("ora")) - { - Class.forName("oracle.jdbc.driver.OracleDriver"); - conn = DriverManager.getConnection ("jdbc:oracle:thin:@localhost:1521:ent70071","EWSYS","EWSYS"); - } - else if (args[0].equals("ms7")) - { - Class.forName("sun.jdbc.odbc.JdbcOdbcDriver"); - conn = DriverManager.getConnection("jdbc:odbc:Local ES MS7","EWSYS","EWSYS"); - } - else if (args[0].equals("tds")) - { - DriverManager.setLogStream(System.out); - Class.forName("com.thinweb.tds.Driver"); - conn = DriverManager.getConnection("jdbc:twtds:sqlserver://sgaetjen/EWSYS","EWSYS","EWSYS"); - } - else if (args[0].equals("spr")) - { - DriverManager.setLogStream(System.out); - Class.forName("com.inet.tds.TdsDriver"); - conn = DriverManager.getConnection("jdbc:inetdae7:sgaetjen","EWSYS","EWSYS"); - } - conn.setAutoCommit(false); - System.out.println( "DRIVER NAME:" + conn.getMetaData().getDriverName() ); - System.out.println( "DRIVER VER:" + conn.getMetaData().getDriverVersion() ); - - System.out.println("(TRANSACTION_READ_COMMITTED) :" + Connection.TRANSACTION_READ_COMMITTED); - System.out.println("(TRANSACTION_READ_UNCOMMITTED) :" + Connection.TRANSACTION_READ_UNCOMMITTED); - System.out.println("(TRANSACTION_REPEATABLE_READ) :" + Connection.TRANSACTION_REPEATABLE_READ); - System.out.println("(TRANSACTION_SERIALIZABLE) :" + Connection.TRANSACTION_SERIALIZABLE); - System.out.println("(TRANSACTION_NONE) :" + Connection.TRANSACTION_NONE); - - int transactionIsolation = conn.getTransactionIsolation(); - System.out.println("connected: default isolation="+transactionIsolation+":"+Connection.TRANSACTION_NONE); - - conn.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); - - - try - { - - Statement stmt = conn.createStatement(); - try { - stmt.executeUpdate ("drop table EX..TESTBLOB"); - } catch (Exception e) { } - - stmt.executeUpdate ("create table EX..TESTBLOB ( BLOB_COL LONG VARBINARY )"); - // create table EX..TESTBLOB ( BLOB_COL LONG VARBINARY ); - PreparedStatement ps = conn.prepareStatement("insert into EX..TESTBLOB (BLOB_COL) values(?)"); - - /* - String data = new String("113066"); - byte byteData[]; - byteData = data.getBytes(); - */ - - File file = new File ("bloor.pdf"); - BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file)); - byte[] byteData = new byte [ (int) file.length() ]; - bufferedInputStream.read(byteData); - bufferedInputStream.close(); - - // ps.setBinaryStream(index,new ByteArrayInputStream(byteData),byteData.length); - ps.setBytes(1, byteData); - - System.out.println("insert execute update" ); - int ires = ps.executeUpdate(); - System.out.println("insert results:"+ires); - ps.close(); - System.out.println("insert commit"); - conn.commit(); - - - System.out.println("********* SELECT *****************************"); - ps = conn.prepareStatement("SELECT BLOB_COL FROM EX..TESTBLOB"); - System.out.println("select execute"); - ResultSet rs = ps.executeQuery(); - while ( rs.next() ) - { - System.out.println("result0"); - - // reads 12 bytes and returns - // byte[] x = rs.getBytes("BLOB_COL"); - - InputStream stream = rs.getBinaryStream("BLOB_COL"); - ByteArrayOutputStream ostream = new ByteArrayOutputStream(); - - - - // very slow processing - // throws read timeout periodically after a few hundred bytes - // or stops processing after 3600 bytes - /* - int c; - int index = 0; - while ((c = stream.read()) != -1) - { - ++index; - if (( index % 100 ) == 0 ) - System.err.println ( "bytes read: " + index ); - ostream.write(c); - } - */ - - - /* - java.io.IOException - at virtuoso.jdbc2.VirtuosoBlobStream.read(VirtuosoBlobStream.java:93) - at java.io.InputStream.read(InputStream.java:91) - at TestBlob.main(TestBlob.java:140) - */ - - int length; - // int index = 0; - System.out.println("result1"); - // while ((length = stream.read(buffer)) != -1) - while (true) - { - byte[] buffer = new byte[32767]; - System.out.println("result2"); - length = stream.read(buffer); - System.out.println("result3:" + length); - if ( length < 0 ) - break; - ostream.write(buffer, 0, length); - } - - byte[] x = ostream.toByteArray(); - - // String x = new String ( buffer ); - System.out.println ( "select results: len=" +x.length); - if (x.length != byteData.length) - throw new Exception ("different length orig=" + byteData.length + " returned=" + x.length); - for (int inx = 0; inx < x.length; inx++) - if (x[inx] != byteData[inx]) - throw new Exception ("different content orig=" + byteData[inx] + " returned=" + byteData[inx]); - - FileOutputStream os = new FileOutputStream ("out.pdf"); - os.write (x); - } - rs.close(); - ps.close(); - - try { - stmt.executeUpdate ("drop table EX..TESTBLOB"); - } catch (Exception e) { } - } - catch ( SQLException e ) - { - System.err.println ( "SQLEXP:" + e); - System.err.println ( "SQLEXP(error code):" + e.getErrorCode() ); - System.err.println ( "SQLEXP(sql state):" + e.getSQLState() ); - e.printStackTrace(); - } - catch ( Exception e ) - { - System.err.println ( "************* exception 1:" + e); - e.printStackTrace(); - } - - try - { - System.out.println("close"); - conn.commit(); - conn.close(); - System.out.println("done"); - } - catch ( Exception c2 ) - { - System.err.println ( "************* exception close:" + c2); - c2.printStackTrace(); - } - } -} diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestCallableExecute.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestCallableExecute.java deleted file mode 100644 index 4f0b4448b7..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestCallableExecute.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestCallableExecute -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("--------------------- Test of CallableStatement -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - try { - stmt.executeUpdate("DROP PROCEDURE VJDBC_BENCHMARK"); - } catch (Exception e) {} - try { - stmt.executeUpdate("DROP TABLE ex..history"); - } catch (Exception e) {} - try { - stmt.executeUpdate("DROP TABLE ex..accounts"); - } catch (Exception e) {} - try { - stmt.executeUpdate("DROP TABLE ex..tellers"); - } catch (Exception e) {} - try { - stmt.executeUpdate("DROP TABLE ex..branches"); - } catch (Exception e) {} - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("CREATE TABLE ex..branches (Bid integer,Bbalance integer,filler character(92),primary key (Bid))") == 0) - if(stmt.executeUpdate("CREATE TABLE ex..tellers (Tid integer,Bid integer,Tbalance integer,filler character(88),primary key (Tid),foreign key (Bid) references ex..branches)") == 0) - if(stmt.executeUpdate("CREATE TABLE ex..accounts (Aid integer,Bid integer,Abalance integer,filler character(88),primary key (Aid),foreign key (Bid) references ex..branches)") == 0) - if(stmt.executeUpdate("CREATE TABLE ex..history (Tid integer,Bid integer,Aid integer,delta integer,ti timestamp,filler character(24),foreign key (Tid) references ex..tellers,foreign key (Bid) references ex..branches,foreign key (Aid) references ex..accounts)") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - stmt.execute("create procedure VJDBC_BENCHMARK(IN br integer,IN delta integer,OUT Bbalance integer) { declare cr cursor for select Bbalance from ex..branches where Bid=br; update ex..branches set Bbalance = Bbalance + delta where Bid = br; open cr; fetch cr into Bbalance; close cr; }"); - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO ex..branches(Bid,Bbalance) VALUES (0,0)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a CallableStatement class attached to this connection"); - CallableStatement stmtc = connection.prepareCall("{fn VJDBC_BENCHMARK(?,?,?) }"); - if(stmtc instanceof virtuoso.jdbc2.VirtuosoCallableStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute procedure"); - stmtc.setInt(1,0); - stmtc.setInt(2,100); - stmtc.registerOutParameter(3,Types.INTEGER); - if(stmtc.executeUpdate() == 0) - if(stmtc.getInt(3) == 100) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute cleanup"); - stmt.executeUpdate("DROP PROCEDURE VJDBC_BENCHMARK"); - if(stmt.executeUpdate("DROP TABLE ex..history") == 0) - if(stmt.executeUpdate("DROP TABLE ex..accounts") == 0) - if(stmt.executeUpdate("DROP TABLE ex..tellers") == 0) - if(stmt.executeUpdate("DROP TABLE ex..branches") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestClean.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestClean.java deleted file mode 100644 index 4dcd13bc1d..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestClean.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestClean -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - Statement stmt = connection.createStatement(); - try - { - stmt.executeQuery("drop table EX..DEMO"); - } - catch(SQLException e) - { - } - try - { - stmt.executeQuery("drop table EX..EBLOB"); - } - catch(SQLException e) - { - } - try - { - stmt.executeQuery("drop table EX..ECLOB"); - } - catch(SQLException e) - { - } - stmt.close(); - connection.close(); - System.exit(0); - } - catch(Exception e) - { - System.exit(1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestDatabaseMetaData.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestDatabaseMetaData.java deleted file mode 100644 index f2b8f08c18..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestDatabaseMetaData.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestDatabaseMetaData -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("---------------------- Test of DatabaseMetaData -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - DatabaseMetaData metadata = connection.getMetaData(); - System.out.print("Get the DatabaseMetaData class"); - if(metadata instanceof virtuoso.jdbc2.VirtuosoDatabaseMetaData) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println("Get the JDBC driver name : " + metadata.getDriverName()); - System.out.println("Get the JDBC driver version : " + metadata.getDriverVersion()); - System.out.println("Get the database product name : " + metadata.getDatabaseProductName()); - System.out.println("Get the database product version : " + metadata.getDatabaseProductVersion()); - System.out.print("Check the JDBC URL returned and passed"); - if(metadata.getURL().equals(url)) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Check the user name returned and passed"); - if(metadata.getUserName().equals("dba")) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteBlob.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteBlob.java deleted file mode 100644 index b864135dbc..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteBlob.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; -import java.io.*; - -public class TestExecuteBlob -{ - public static void main(String args[]) - { - try - { - String url, filename; - if(args.length != 2) - { - url = "jdbc:virtuoso://localhost:1111"; - filename = "termcap"; - } - else - { - url = args[1]; - filename = args[0]; - } - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("--------------------- Test of the blob features -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..EBLOB"); - } catch (Exception e) { } - try { - stmt.executeUpdate ("drop table EX..ECLOB"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..EBLOB (ID integer,FILLER long varbinary,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - java.io.FileInputStream fs = new java.io.FileInputStream(filename); - PreparedStatement pstmt = connection.prepareStatement("insert into EX..EBLOB(ID,FILLER) values(?,?)"); - pstmt.setLong(1,3000); - pstmt.setBinaryStream(2,fs,1024 * 20); - pstmt.execute(); - System.out.println(" PASSED"); - System.out.println("Execute SELECT"); - ResultSet rs = stmt.executeQuery("select * from EX..EBLOB"); - rs.next(); - Blob blob = rs.getBlob(2); - System.out.println(new String(blob.getBytes(4060,1024 * 2))); - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - stmt.executeUpdate("drop table EX..EBLOB"); - System.out.println(" PASSED"); - System.out.print("Close statement at " + url); - pstmt.close(); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Create a Statement class attached to this connection"); - stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..ECLOB (ID integer,FILLER long varchar,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - String value = " declare x integer; x := 5; return x; "; - pstmt = connection.prepareStatement("insert into EX..ECLOB(ID,FILLER) values(?,?)"); - pstmt.setLong(1,1); - pstmt.setAsciiStream(2,new ByteArrayInputStream(value.getBytes()),value.length()); - if(pstmt.executeUpdate()!=1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("select * from EX..ECLOB"); - rs.next(); - if(rs.getInt(1) != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - InputStream instream = rs.getAsciiStream(2); - StringBuffer buf = new StringBuffer(); - int ch; - while((ch = instream.read()) != -1) - buf.append((char)ch); - if(!buf.toString().equals(value)) - { - System.out.println(" FAILED"); - System.exit(-1); - } - byte []array = rs.getBytes(2); - if(!(new String(array).equals(value))) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - stmt.executeUpdate("drop table EX..ECLOB"); - System.out.println(" PASSED"); - System.out.print("Close statement at " + url); - pstmt.close(); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Create a Statement class attached to this connection"); - stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..ECLOB (ID integer,FILLER long varchar,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - value = " declare x integer; x := 5; return x; "; - pstmt = connection.prepareStatement("insert into EX..ECLOB(ID,FILLER) values(?,?)"); - pstmt.setLong(1,1); - pstmt.setBytes(2,value.getBytes()); - if(pstmt.executeUpdate()!=1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("select * from EX..ECLOB"); - rs.next(); - if(rs.getInt(1) != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - array = rs.getBytes(2); - if(!(new String(array).equals(value))) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - stmt.executeUpdate("drop table EX..ECLOB"); - System.out.println(" PASSED"); - System.out.print("Close statement at " + url); - pstmt.close(); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteClob.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteClob.java deleted file mode 100644 index 21991f8e4a..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteClob.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestExecuteClob -{ - public static void main(String args[]) - { - try - { - String url, filename; - if(args.length != 2) - { - url = "jdbc:virtuoso://localhost:1111"; - filename = "termcap"; - } - else - { - url = args[1]; - filename = args[0]; - } - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("--------------------- Test of the clob features -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..ECLOB"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..ECLOB (ID integer,FILLER long varchar,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - java.io.FileInputStream fs = new java.io.FileInputStream(filename); - PreparedStatement pstmt = connection.prepareStatement("insert into EX..ECLOB(id,FILLER) values(?,?)"); - pstmt.setLong(1,3000); - pstmt.setAsciiStream(2,fs,1024 * 20); - pstmt.execute(); - System.out.println(" PASSED"); - System.out.println("Execute SELECT"); - ResultSet rs = stmt.executeQuery("select * from EX..ECLOB"); - rs.next(); - Clob clob = rs.getClob(2); - System.out.println(new String(clob.getSubString(4060,1024 * 2))); - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - stmt.executeUpdate("drop table EX..ECLOB"); - System.out.println(" PASSED"); - System.out.print("Close statement at " + url); - pstmt.close(); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteFetch.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteFetch.java deleted file mode 100644 index a89ee7f944..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestExecuteFetch.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestExecuteFetch -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("--------------------- Test of the fetch execute -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Set fetch size attached to this statement"); - stmt.setMaxRows(10); - stmt.setFetchSize(10); - if(stmt.getMaxRows() == 10 && stmt.getFetchSize() == 10) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println("Execute select * from INFORMATION_SCHEMA.TABLES"); - boolean more = stmt.execute("select * from INFORMATION_SCHEMA.TABLES"); - ResultSetMetaData data = stmt.getResultSet().getMetaData(); - for(int i = 1;i <= data.getColumnCount();i++) - System.out.println(data.getColumnLabel(i) + "\t" + data.getColumnTypeName(i)); - while(more) - { - ResultSet rs = stmt.getResultSet(); - while(rs.next()) - for(int i = 1;i <= data.getColumnCount();i++) - { - if(i == 1 || i == 2) - { - String s = stmt.getResultSet().getString(i); - if(stmt.getResultSet().wasNull()) - System.out.print("NULL\t"); - else - System.out.print(s + "\t"); - } - } - System.out.println(); - more = stmt.getMoreResults(); - } - System.out.println(" PASSED"); - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestMoreRes.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestMoreRes.java deleted file mode 100644 index cab35a0331..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestMoreRes.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; -import virtuoso.jdbc2.*; - -public class TestMoreRes -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("--------------------- Test of scrollable cursor -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = ((VirtuosoConnection)connection).createStatement(VirtuosoResultSet.TYPE_SCROLL_INSENSITIVE,VirtuosoResultSet.CONCUR_READ_ONLY); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try{ - stmt.executeUpdate("drop procedure ex..pdemo"); - }catch(Exception e) {} - - System.out.print("Execute CREATE PROCEDURE"); - if(stmt.executeUpdate("create procedure ex..pdemo () { result_names('a1'); result(1); end_result(); result_names('b1','b2'); result(2,3); end_result(); }") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - System.out.print("Execute procedure"); - stmt.executeQuery("{call ex..pdemo()}"); - System.out.println(" PASSED"); - - System.out.print("Get the result set"); - ResultSet rs = stmt.getResultSet(); - if(rs instanceof virtuoso.jdbc2.VirtuosoResultSet) - { - System.out.println(" PASSED"); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println("Get Data"); - System.out.print("Execute the resultset.next()"); - if(rs.next()) - { - if(rs.getInt(1) != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - }else{ - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - - System.out.print("Execute the getMoreResults()"); - if (!stmt.getMoreResults()) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - - System.out.print("Get the result set"); - rs = stmt.getResultSet(); - if(rs instanceof virtuoso.jdbc2.VirtuosoResultSet) - { - System.out.println(" PASSED"); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Get Data"); - System.out.print("Execute the resultset.next()"); - if(rs.next()){ - if(rs.getInt(1) != 2) - { - System.out.println(" FAILED"); - System.exit(-1); - } - if(rs.getInt(2) != 3) - { - System.out.println(" FAILED"); - System.exit(-1); - } - }else{ - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute the getMoreResults()"); - if (!stmt.getMoreResults()) - { - System.out.println(" FAILED"); - System.exit(-1); - } - if (stmt.getMoreResults()) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - - - stmt.close(); - stmt = connection.createStatement(); - System.out.print("Execute DROP PROCEDURE"); - if(stmt.executeUpdate("DROP PROCEDURE ex..pdemo") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestNumeric.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestNumeric.java deleted file mode 100644 index 50a4ccd9af..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestNumeric.java +++ /dev/null @@ -1,356 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import virtuoso.jdbc2.*; -import java.sql.*; - -public class TestNumeric -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("-------------------------- Test of Numeric ------------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - try { - stmt.executeUpdate ("drop procedure test_int"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,VAL numeric(9,0))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (1,1.0)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - ResultSet rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getFloat(2) == 1.0f) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT ID from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT VAL from EX..DEMO"); - rs.next(); - if(rs.getFloat(1) == 1.0f) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,VAL numeric(10,0))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (1,1.0)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getFloat(2) == 1.0f) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT ID from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT VAL from EX..DEMO"); - rs.next(); - if(rs.getFloat(1) == 1.0f) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,VAL numeric(15,3))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (1,1.23)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getFloat(2) == 1.23f) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (2,0)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); rs.next(); - if(rs.getInt(1) == 2 && rs.getFloat(2) == 0.0f) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO where ID=1"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getString(2).equals("1.23")) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,VAL numeric(15,3))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (1,887)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getFloat(2) == 887f && rs.getString(2).equals("887")) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,VAL numeric(15,3))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (1,893)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getFloat(2) == 893f && rs.getString(2).equals("893")) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,VAL numeric(15,3))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (1,73.872)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getFloat(2) == 73.872f && rs.getString(2).equals("73.872")) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareBatch.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareBatch.java deleted file mode 100644 index 6d7be3ae58..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareBatch.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestPrepareBatch -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("---------------- Test of batch in PreparedStatement ---------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a PStatement class attached to this connection"); - PreparedStatement pstmt = connection.prepareStatement("INSERT INTO EX..DEMO(ID,FILLER) VALUES (?,?)"); - System.out.println(" PASSED"); - System.out.print("Put batch INSERT"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - pstmt.setInt(2,i); - pstmt.addBatch(); - pstmt.clearParameters(); - } - System.out.println(" PASSED"); - System.out.print("Execute batch"); - int[] res = pstmt.executeBatch(); - pstmt.close(); - for(int i = 0;i < 100;i++) - if(res[i] != 1 && res[i]!=PreparedStatement.SUCCESS_NO_INFO) - { - System.out.println(i + " " + res[i]); - System.out.print(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.println("Execute SELECT"); - pstmt = connection.prepareStatement("SELECT * from EX..DEMO WHERE ID=?"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - ResultSet rs = pstmt.executeQuery(); - while(rs.next()) - for(int j = 1;j <= rs.getMetaData().getColumnCount();j++) - System.out.print(rs.getInt(j) + "\t"); - System.out.println(); - pstmt.clearParameters(); - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.print("Put batch DELETE"); - pstmt = connection.prepareStatement("DELETE FROM EX..DEMO WHERE ID=?"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - pstmt.addBatch(); - pstmt.clearParameters(); - } - System.out.println(" PASSED"); - System.out.print("Execute batch"); - res = pstmt.executeBatch(); - pstmt.close(); - for(int i = 0;i < 100;i++) - if(res[i] != 1 && res[i]!=PreparedStatement.SUCCESS_NO_INFO) - { - System.out.print(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareExecute.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareExecute.java deleted file mode 100644 index 354d11e2aa..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestPrepareExecute.java +++ /dev/null @@ -1,248 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestPrepareExecute -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("--------------------- Test of PreparedStatement -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a PStatement class attached to this connection"); - PreparedStatement pstmt = connection.prepareStatement("INSERT INTO EX..DEMO(ID,FILLER) VALUES (?,?)"); - System.out.print("Execute INSERT INTO"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - pstmt.setInt(2,i); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.println("Execute SELECT"); - pstmt = connection.prepareStatement("SELECT * from EX..DEMO WHERE ID=?"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - ResultSet rs = pstmt.executeQuery(); - while(rs.next()) - for(int j = 1;j <= rs.getMetaData().getColumnCount();j++) - System.out.print(rs.getInt(j) + "\t"); - System.out.println(); - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.print("Execute DELETE"); - pstmt = connection.prepareStatement("DELETE FROM EX..DEMO WHERE ID=?"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Create a Statement class attached to this connection"); - stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER varchar(255),ADATE DATETIME)") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a PStatement class attached to this connection"); - pstmt = connection.prepareStatement("INSERT INTO EX..DEMO(ID,FILLER,ADATE) VALUES (?,?,?)"); - System.out.print("Execute INSERT INTO"); - pstmt.setNull(1, Types.INTEGER); - pstmt.setNull(2, Types.VARCHAR); - pstmt.setNull(3, Types.TIMESTAMP); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.print("Create a Statement class attached to this connection"); - stmt = connection.createStatement(); - System.out.print("Execute SELECT"); - ResultSet rs = stmt.executeQuery("select * from EX..DEMO"); - while(rs.next()) - { - if(!(rs.getInt(1)==0 && rs.wasNull())) - { - System.out.println(" FAILED"); - System.exit(-1); - } - if(!(rs.getString(2)==null && rs.wasNull())) - { - System.out.println(" FAILED"); - System.exit(-1); - } - if(!(rs.getTimestamp(3)==null && rs.wasNull())) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); -// stmt.close(); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER varchar(255))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a PStatement class attached to this connection"); - pstmt = connection.prepareStatement("INSERT INTO EX..DEMO(ID,FILLER) VALUES (?,?)"); - System.out.print("Execute INSERT INTO"); - pstmt.setInt(1, 0); - pstmt.setString(2, ""); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.print("Create a Statement class attached to this connection"); - stmt = connection.createStatement(); - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("select * from EX..DEMO"); - while(rs.next()) - { - if(!(rs.getInt(1)==0 && !rs.wasNull())) - { - System.out.println(" FAILED"); - System.exit(-1); - } - if(!(rs.getString(2).equals("") && !rs.wasNull())) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); -// stmt.close(); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestScroll.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestScroll.java deleted file mode 100644 index be452e1a4d..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestScroll.java +++ /dev/null @@ -1,266 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestScroll -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("--------------------- Test of scrollable cursor -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,ResultSet.CONCUR_READ_ONLY); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a PStatement class attached to this connection"); - PreparedStatement pstmt = connection.prepareStatement("INSERT INTO EX..DEMO(ID,FILLER) VALUES (?,?)"); - System.out.println(" PASSED"); - System.out.print("Execute INSERT INTO"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - pstmt.setInt(2,i); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.print("Execute SELECT"); - stmt.setMaxRows(100); - stmt.setFetchSize(10); - stmt.execute("SELECT * from EX..DEMO"); - System.out.println(" PASSED"); - System.out.print("Get the result set"); - ResultSet rs = stmt.getResultSet(); - if(rs instanceof virtuoso.jdbc2.VirtuosoResultSet) - { - System.out.println(" PASSED"); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute the resultset.beforeFirst()"); - rs.beforeFirst(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.next()"); - for(int i = 0;i < 100;i++) - { - rs.next(); - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.afterLast()"); - rs.afterLast(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.previous()"); - for(int i = 99;i >= 0;i--) - { - rs.previous(); - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.first()"); - rs.first(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.next()"); - for(int i = 0;i < 100;i++) - { - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.next(); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.last()"); - rs.last(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.previous()"); - for(int i = 99;i >= 0;i--) - { - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.previous(); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(>0)"); - for(int i = 0;i != 100;i++) - { - rs.absolute(i + 1); - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(<0)"); - for(int i = -1, j = 99;i != -101;i--, j--) - { - rs.absolute(i); - if(rs.getInt(2) != j) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(50)"); - rs.absolute(50); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.relative(>0)"); - for(int i = 50;i != 90;i++) - { - if(rs.getInt(2) != i - 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.relative(1); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(50)"); - rs.absolute(50); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.relative(<0)"); - for(int i = 50;i != 10;i--) - { - if(rs.getInt(2) != i - 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.relative(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.first()"); - rs.first(); - System.out.println(" PASSED"); - System.out.print("Update rows in the table"); - for(int i = 0;i != 2;i++) - { - rs.updateInt("FILLER",i * 2); - rs.updateRow(); - rs.refreshRow(); - if(rs.getInt(2) != i * 2) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.next(); - } - System.out.println(" PASSED"); - System.out.print("Execute DELETE"); - pstmt = connection.prepareStatement("DELETE FROM EX..DEMO WHERE ID=?"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - pstmt.close(); - stmt.close(); - stmt = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,ResultSet.CONCUR_READ_ONLY); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollManual.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollManual.java deleted file mode 100644 index 83618e3d65..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollManual.java +++ /dev/null @@ -1,267 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestScrollManual -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("--------------------- Test of scrollable cursor in manual commit -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,ResultSet.CONCUR_READ_ONLY); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a PStatement class attached to this connection"); - PreparedStatement pstmt = connection.prepareStatement("INSERT INTO EX..DEMO(ID,FILLER) VALUES (?,?)"); - System.out.println(" PASSED"); - System.out.print("Execute INSERT INTO"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - pstmt.setInt(2,i); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - pstmt.close(); - connection.setAutoCommit (false); - System.out.print("Execute SELECT"); - stmt.setMaxRows(100); - stmt.setFetchSize(10); - stmt.execute("SELECT * from EX..DEMO"); - System.out.println(" PASSED"); - System.out.print("Get the result set"); - ResultSet rs = stmt.getResultSet(); - if(rs instanceof virtuoso.jdbc2.VirtuosoResultSet) - { - System.out.println(" PASSED"); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute the resultset.beforeFirst()"); - rs.beforeFirst(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.next()"); - for(int i = 0;i < 100;i++) - { - rs.next(); - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.afterLast()"); - rs.afterLast(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.previous()"); - for(int i = 99;i >= 0;i--) - { - rs.previous(); - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.first()"); - rs.first(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.next()"); - for(int i = 0;i < 100;i++) - { - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.next(); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.last()"); - rs.last(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.previous()"); - for(int i = 99;i >= 0;i--) - { - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.previous(); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(>0)"); - for(int i = 0;i != 100;i++) - { - rs.absolute(i + 1); - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(<0)"); - for(int i = -1, j = 99;i != -101;i--, j--) - { - rs.absolute(i); - if(rs.getInt(2) != j) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(50)"); - rs.absolute(50); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.relative(>0)"); - for(int i = 50;i != 90;i++) - { - if(rs.getInt(2) != i - 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.relative(1); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(50)"); - rs.absolute(50); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.relative(<0)"); - for(int i = 50;i != 10;i--) - { - if(rs.getInt(2) != i - 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.relative(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.first()"); - rs.first(); - System.out.println(" PASSED"); - System.out.print("Update rows in the table"); - for(int i = 0;i != 2;i++) - { - rs.updateInt("FILLER",i * 2); - rs.updateRow(); - rs.refreshRow(); - if(rs.getInt(2) != i * 2) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.next(); - } - System.out.println(" PASSED"); - System.out.print("Execute DELETE"); - pstmt = connection.prepareStatement("DELETE FROM EX..DEMO WHERE ID=?"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - pstmt.close(); - stmt.close(); - stmt = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,ResultSet.CONCUR_READ_ONLY); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollPrepare.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollPrepare.java deleted file mode 100644 index 52c1c1c373..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestScrollPrepare.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -// test for bug #2308 -import java.sql.*; -import java.io.*; -import java.util.Properties; -import java.sql.ResultSetMetaData; - -public class TestScrollPrepare { - - public static void main (String[] args) - { - - try - { - String driver = "virtuoso.jdbc2.Driver"; - Class.forName( driver ); - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - - System.out.println("--------------------- Test of scrollable prepareStatement -------------------"); - System.out.println ("URL - " + url); - Connection con = DriverManager.getConnection(url, "dba", "dba"); - System.out.println ("@JBDC connection established through " + driver); - - System.out.print("Create a preparedStatement scrollable class"); - // if I use the following prepared statement, the query executes, results - // are obtained, but virtuoso crashes when the "stmt.close()" executes. - PreparedStatement stmt = con.prepareStatement("select * from sys_users", - java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE, - java.sql.ResultSet.CONCUR_READ_ONLY); - - // if I use the following prepared statement, everything works fine - //PreparedStatement stmt = con.prepareStatement("select * from s_group"); - - ResultSet resultSet = stmt.executeQuery(); - - ResultSetMetaData rsmd = resultSet.getMetaData(); - int numCols = rsmd.getColumnCount() ; - - for (int i = 1 ; i <= numCols ; i++) - { - String colName = rsmd.getColumnName(i) ; - System.out.println(" .. colName = " + colName); - } - - while (resultSet.next()) - { - String primaryKey = resultSet.getString(1); - System.out.println ("primary key :"+primaryKey) ; - } - - resultSet.close(); - System.out.println("@ResultSet closed"); - stmt.close(); - System.out.println("@Statement closed"); - - con.close(); - System.out.println(" PASSED"); - } - catch (Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } -} diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecute.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecute.java deleted file mode 100644 index 2c49bb0935..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecute.java +++ /dev/null @@ -1,334 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestSimpleExecute -{ - public static void main(String args[]) - { - try - { - Connection connection; - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("----------------------- Test of basic queries ---------------------"); - System.out.print("Establish connection at " + url + " with UPPER passwd"); - try - { - connection = DriverManager.getConnection(url,"dba","DBA"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - catch(Exception e) - { - System.out.println(" PASSED"); - } - System.out.print("Establish connection at " + url); - connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Establish connection at " + url + "/UID=dba/PWD=DBA"); - try - { - connection = DriverManager.getConnection(url+"/UID=dba/PWD=DBA"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - catch(Exception e) - { - System.out.println(" PASSED"); - } - System.out.print("Establish connection at " + url); - connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - /* - System.out.print("Establish connection at " + url + " with UPPER usrname"); - try - { - connection = DriverManager.getConnection(url,"DBA","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - { - System.out.println(" PASSED"); - } - } - catch(Exception e) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Establish connection at " + url); - connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Establish connection at " + url + "/UID=DBA/PWD=dba"); - try - { - connection = DriverManager.getConnection(url+"/UID=DBA/PWD=dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - catch(Exception e) - { - System.out.println(" PASSED"); - } - System.out.print("Establish connection at " + url); - connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - */ - System.out.print("Establish connection at " + url + " with UPPER usrname+passwd"); - try - { - connection = DriverManager.getConnection(url,"DBA","DBA"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - catch(Exception e) - { - System.out.println(" PASSED"); - } - System.out.print("Establish connection at " + url); - connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Establish connection at " + url + "/UID=DBA/PWD=DBA"); - try - { - connection = DriverManager.getConnection(url+"/UID=DBA/PWD=DBA"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - catch(Exception e) - { - System.out.println(" PASSED"); - } - System.out.print("Establish connection at " + url); - connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,FILLER) VALUES (100,0)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - ResultSet rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - System.out.println(" PASSED"); - System.out.print("Execute getInt(1)"); - int id = rs.getInt(1); - if(id == 100) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute getInt(\"ID\")"); - id = rs.getInt("ID"); - if(id == 100) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute UPDATE"); - if(stmt.executeUpdate("UPDATE EX..DEMO SET FILLER=1000 WHERE ID=100") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DELETE"); - if(stmt.executeUpdate("DELETE FROM EX..DEMO WHERE ID=100") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,DUMMY integer)") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,FILLER,DUMMY) VALUES (100,0,0)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - System.out.println(" PASSED"); - System.out.print("Execute getInt(1)"); - id = rs.getInt(1); - if(id == 100) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute getInt(\"ID\")"); - id = rs.getInt("ID"); - if(id == 100) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Check if the connection is closed"); - if(connection.isClosed()) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.print("Check if the connection is closed"); - if(!connection.isClosed()) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecuteBatch.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecuteBatch.java deleted file mode 100644 index fec5f4babd..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestSimpleExecuteBatch.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestSimpleExecuteBatch -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("------------------------- Test batch update -----------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Put batch INSERT"); - for(int i = 0;i < 20;i++) - stmt.addBatch("INSERT INTO EX..DEMO(ID,FILLER) VALUES (" + i + ",100)"); - System.out.println(" PASSED"); - System.out.print("Execute batch"); - int[] res = stmt.executeBatch(); - for(int i = 0;i < 20;i++) - if(res[i] != 1) - { - System.out.println(i + " " + res[i]); - System.out.print(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Put batch DELETE"); - for(int i = 0;i < 20;i++) - stmt.addBatch("DELETE FROM EX..DEMO WHERE ID=" + i); - System.out.println(" PASSED"); - System.out.print("Execute batch"); - res = stmt.executeBatch(); - for(int i = 0;i < 20;i++) - if(res[i] != 1) - { - System.out.print(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestTagProc.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestTagProc.java deleted file mode 100644 index 5e14ad6afb..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestTagProc.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.util.*; -import java.io.*; -import java.sql.*; - -public class TestTagProc -{ - - // ************************************************************ - public static void main(String[] args) throws Exception - { - - // DriverManager.setLogStream(System.out); - System.err.println("driver"); - Connection conn = null; - if (args.length == 0) - { - System.err.println("Usage: TestTagProc ora | eds | edsj | ms7"); - System.exit(1); - } - System.err.println("connect"); - if (args[0].equals("eds")) - { - Class.forName("sun.jdbc.odbc.JdbcOdbcDriver"); - conn = DriverManager.getConnection("jdbc:odbc:Local ES","EWSYS","EWSYS"); - } - else if (args[0].equals("ora")) - { - System.err.println("connect"); - Class.forName("oracle.jdbc.driver.OracleDriver"); -// DriverManager.registerDriver(new oracle.jdbc.driver.OracleDriver()); - conn = DriverManager.getConnection ("jdbc:oracle:thin:@localhost:1521:ent70071","EWSYS","EWSYS"); - } - else if (args[0].equals("edsj")) - { - System.err.println("connect"); - Class.forName("virtuoso.jdbc2.Driver"); - // conn = DriverManager.getConnection ("jdbc:virtuoso://localhost:1111/timeout=60","EWSYS","EWSYS"); - conn = DriverManager.getConnection ("jdbc:virtuoso://localhost:1111/timeout=60","dba","dba"); - } - else if (args[0].equals("edso")) - { - System.err.println("connect"); - Class.forName("openlink.jdbc2.Driver"); - conn = DriverManager.getConnection ("jdbc:openlink://ODBC/DSN=Local ES","dba","dba"); - // jdbc:openlink://ODBC/DSN=/UID=/PWD= - } - else - { - Class.forName("sun.jdbc.odbc.JdbcOdbcDriver"); - conn = DriverManager.getConnection("jdbc:odbc:Local ES MS7","EWSYS","EWSYS"); - } - conn.setAutoCommit(false); - System.err.println("connected"); - int transactionIsolation = conn.getTransactionIsolation(); - System.err.println("connected: default isolation="+transactionIsolation+":"+Connection.TRANSACTION_NONE); - // DriverManager.setLogStream(System.out); - - boolean commitData = true; - if (args.length == 2) - commitData = args[1].equals("1"); - - try - { - - System.err.println( "DRIVER NAME:" + conn.getMetaData().getDriverName() ); - System.err.println( "DRIVER VER:" + conn.getMetaData().getDriverVersion() ); - - PreparedStatement ps = conn.prepareStatement("SELECT name, tag_proc() FROM tag_proc_table"); - ResultSet rs = ps.executeQuery(); - if ( rs == null ) - System.err.println ( "Result set is null!!!" ); - - System.err.println ( "Result set metadata " ); - ResultSetMetaData metaData = rs.getMetaData(); - for ( int colIndex = 0; colIndex < metaData.getColumnCount(); colIndex++ ) - { - System.err.println ( "Result set column metadata " + colIndex); - System.err.println ( "Result set column metadata: ...column name = " + metaData.getColumnName(colIndex+1) ); - System.err.println ( "Result set column metadata: ... display size = " + metaData.getColumnDisplaySize(colIndex+1) ); - System.err.println ( "Result set column metadata: ... scale = " + metaData.getPrecision(colIndex+1) ); - System.err.println ( "Result set column metadata: ... precision = " + metaData.getScale(colIndex+1) ); - // these cause a Tag 0 error - System.err.println ( "Result set column metadata: ...column type name = " + metaData.getColumnTypeName(colIndex+1) ); - System.err.println ( "Result set column metadata: ...sqlType = " + metaData.getColumnType(colIndex+1)); -/* - switch (colIndex) - { - case 0: if (metaData.getColumnType(colIndex+1)) != -*/ - - } - - int ct = 0; - while ( rs.next() ) - { - System.err.println("RS1"); - System.err.println ( "" + ct + ",ROW:" + rs.getString(1) + ":" + rs.getString(2)); - ct++; - /* - if ( ct > 3 ) - break; - */ - System.err.println("RS2"); - } - System.err.println ( "close result:"); - rs.close(); - - System.err.println ( "close prep:"); - ps.close(); - System.err.println ( "commit 3:"); - conn.commit(); - System.err.println ( "commit 4:"); - - /* - ps = conn.prepareStatement("SELECT u_name FROM sys_users"); - System.err.println("select execute"); - ResultSet rs2 = ps.executeQuery(); - while ( rs2.next() ) - { - System.err.println ( "select results: user=" + rs2.getString(1) ); - } - rs2.close(); - ps.close(); - */ - System.out.println ( "PASSED"); - - } - catch ( SQLException e ) - { - System.err.println ( "SQL EXP:" + e); - System.err.println ( "SQL EXP(error code):" + e.getErrorCode() ); - System.err.println ( "SQL EXP(sql state):" + e.getSQLState() ); - e.printStackTrace(); - } - catch ( Exception e ) - { - System.err.println ( "GEN EXP:" + e); - e.printStackTrace(); - } - conn.close(); - System.err.println("done"); - } - -} diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestTimeUpdate.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestTimeUpdate.java deleted file mode 100644 index 13ca82e6bd..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestTimeUpdate.java +++ /dev/null @@ -1,155 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; -import java.sql.*; -// for bug #3037 -public class TestTimeUpdate -{ - public static void main (String [] args) throws Exception - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("--------------------- Test of the update col with setTime -------------------"); - System.out.print("Establish connection at " + url); - Connection c = DriverManager.getConnection (url, "dba", "dba"); - System.out.println(" PASSED"); - - Statement stmt = c.createStatement(); - PreparedStatement ps; - ResultSet rs; - - try { - stmt.executeUpdate ("drop table EX..TSTTIME"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - stmt.executeUpdate("create table EX..TSTTIME (TSTTIME time)"); - System.out.println(" PASSED"); - - - System.out.print("Execute INSERT INTO"); - ps = c.prepareStatement ("insert into EX..TSTTIME (TSTTIME) values (?)"); - ps.setTime (1, Time.valueOf("08:48:40")); - ps.executeUpdate(); - System.out.println(" PASSED"); - - System.out.print("Execute DROP TABLE"); - stmt.executeUpdate("drop table EX..TSTTIME"); - System.out.println(" PASSED"); - - System.out.print("Receiving a date"); - rs = stmt.executeQuery("select aref (vector ({d '1972-07-29'}), 0)"); - rs.next(); - System.out.print(" as " + rs.getObject(1).getClass().getName()); - if (rs.getObject(1) instanceof java.sql.Date) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - System.out.print("Receiving a time"); - rs = stmt.executeQuery("select aref (vector ({t '15:30:20'}), 0)"); - rs.next(); - System.out.print(" as " + rs.getObject(1).getClass().getName()); - if (rs.getObject(1) instanceof java.sql.Time) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - System.out.print("Receiving a timestamp"); - rs = stmt.executeQuery("select aref (vector ({ts '1972-07-29 15:30:20'}), 0)"); - rs.next(); - System.out.print(" as " + rs.getObject(1).getClass().getName()); - if (rs.getObject(1) instanceof java.sql.Timestamp) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - - System.out.print("Sending a 1972-07-29 date"); - ps = c.prepareStatement ("select cast (? as varchar)"); - ps.setDate (1, new java.sql.Date(72, 6, 29)); - rs = ps.executeQuery(); - rs.next(); - System.out.print(" (recv as " + rs.getString(1) + ")"); - if (rs.getString(1).equals ("1972-07-29")) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - System.out.print("Sending a 15:30:45 time"); - ps = c.prepareStatement ("select cast (? as varchar)"); - ps.setTime (1, new java.sql.Time(15, 30, 45)); - rs = ps.executeQuery(); - rs.next(); - System.out.print(" (recv as " + rs.getString(1) + " trim=[" + rs.getString(1) + "])"); - if (rs.getString(1).equals ("15:30:45")) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - System.out.print("Sending a 1972-07-29 15:30:45.000012 timestamp"); - ps = c.prepareStatement ("select cast (? as varchar)"); - ps.setTimestamp (1, new java.sql.Timestamp(72, 6, 29, 15, 30, 45, 12000)); - rs = ps.executeQuery(); - rs.next(); - String q = rs.getString(1); - System.out.print(" (recv as " + rs.getString(1) + " trim=[" + rs.getString(1).substring(0, 26) + "])"); - if (rs.getString(1).substring(0, 26).equals ("1972-07-29 15:30:45.000012")) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - System.out.print("Sending a 1972-07-29 15:30:45.123456 timestamp"); - ps = c.prepareStatement ("select cast (? as varchar)"); - ps.setTimestamp (1, new java.sql.Timestamp(72, 6, 29, 15, 30, 45, 123456000)); - rs = ps.executeQuery(); - rs.next(); - q = rs.getString(1); - System.out.print(" (recv as " + rs.getString(1) + " trim=[" + rs.getString(1).substring(0, 26) + "])"); - if (rs.getString(1).substring(0, 26).equals ("1972-07-29 15:30:45.123456")) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - System.out.println("-------------------------------------------------------------------"); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } -} diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestURL.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestURL.java deleted file mode 100644 index c3df44dd9b..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestURL.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestURL -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("-------------------------- Test of JDBC URL ------------------------"); - System.out.print("JDBC url : " + url); - Driver driver = DriverManager.getDriver(url); - if(driver instanceof virtuoso.jdbc2.Driver) - System.out.println(" PASSED"); - System.out.print("JDBC url : " + url + "/UID=dba/PWD=dba"); - driver = DriverManager.getDriver(url + "/UID=dba/PWD=dba"); - if(driver instanceof virtuoso.jdbc2.Driver) - System.out.println(" PASSED"); - System.out.print("JDBC url : " + url + "/UID=dba/PWD=dba/DATABASE=db"); - driver = DriverManager.getDriver(url + "/UID=dba/PWD=dba/DATABASE=db"); - if(driver instanceof virtuoso.jdbc2.Driver) - System.out.println(" PASSED"); - System.out.print("JDBC url : jdbc:none://localhost:1111"); - try - { - driver = DriverManager.getDriver("jdbc:none://localhost:1111"); - if(!(driver instanceof virtuoso.jdbc2.Driver)) - System.out.println(" PASSED"); - } - catch(SQLException e) - { - if(e.toString().equals("java.sql.SQLException: No suitable driver")) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - e.printStackTrace(); - } - } - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/TestVarbinary.java b/libsrc/JDBCDriverType4/testsuite_2.0/TestVarbinary.java deleted file mode 100644 index 8f2924d71b..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/TestVarbinary.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestVarbinary -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc2.Driver"); - System.out.println("------------------------- Test of Varbinary -----------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc2.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc2.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (VAL varbinary)") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(VAL) VALUES (cast ('my value' as varbinary))") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - ResultSet resultset = stmt.executeQuery("SELECT * from EX..DEMO"); - System.out.println(" PASSED"); - System.out.print("Get metadata of the last result"); - ResultSetMetaData meta = resultset.getMetaData(); - if(meta instanceof virtuoso.jdbc2.VirtuosoResultSetMetaData) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Get the column type of the meta data"); - if(meta.getColumnType(1) == Types.VARBINARY) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - resultset = stmt.executeQuery("SELECT VAL from EX..DEMO"); - System.out.println(" PASSED"); - System.out.print("Get metadata of the last result"); - meta = resultset.getMetaData(); - if(meta instanceof virtuoso.jdbc2.VirtuosoResultSetMetaData) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Get the column type of the meta data"); - if(meta.getColumnType(1) == Types.VARBINARY) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/tagproc.sql b/libsrc/JDBCDriverType4/testsuite_2.0/tagproc.sql deleted file mode 100644 index 822e503f2f..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/tagproc.sql +++ /dev/null @@ -1,33 +0,0 @@ --- --- $Id$ --- --- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) --- project. --- --- Copyright (C) 1998-2018 OpenLink Software --- --- This project is free software; you can redistribute it and/or modify it --- under the terms of the GNU General Public License as published by the --- Free Software Foundation; only version 2 of the License, dated June 1991. --- --- This program is distributed in the hope that it will be useful, but --- WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --- General Public License for more details. --- --- You should have received a copy of the GNU General Public License along --- with this program; if not, write to the Free Software Foundation, Inc., --- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA --- --- -drop procedure tag_proc ; - --- create procedure tag_proc ( in p1 integer ) { return p1 + 27 ; } ; -create procedure tag_proc() { return 100 ; }; - -drop table tag_proc_table; - -create table tag_proc_table ( name varchar(10)); -insert into tag_proc_table values ( 'joe' ); -insert into tag_proc_table values ( 'tony' ); -insert into tag_proc_table values ( 'mary' ); diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/test2276.java b/libsrc/JDBCDriverType4/testsuite_2.0/test2276.java deleted file mode 100644 index e5df034734..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_2.0/test2276.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.lang.*; -import java.sql.*; -import java.util.*; - -public class test2276 -{ - - //2276 - public static void test2276(String [] args) throws Exception - { - try - { - int x; - Connection conn = null; - String driver = "virtuoso.jdbc2.Driver"; - Class.forName(driver); - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - System.out.println("--------------------- Test of Bug #2276 -------------------"); - System.out.println ("URL - " + url); - conn = DriverManager.getConnection - (url,"dba","dba"); - System.out.println ("@JBDC connection established through " + driver); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery ("select cast ({ts '2001-07-29 17:30:00'} as date) as xx date"); - rs.next(); - System.out.println (rs.getString(1)); - System.out.println (rs.getDate(1).toString()); - if (!rs.getString(1).equals (rs.getDate(1).toString())) - System.out.print ("*** FAILED"); - else - System.out.print ("PASSED"); - } - catch (Exception e) - { - e.printStackTrace(); - System.out.print ("*** FAILED"); - } - System.out.println (": Bug #2276 - dates with getString()"); - } - - public static void test4033(String [] args) throws Exception - { - try - { - int x; - // SSL testing - Connection conn = null; - String driver = "virtuoso.jdbc2.Driver"; - Class.forName(driver); - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - System.out.println("--------------------- Test of Bug #4033 -------------------"); - System.out.println ("URL - " + url); - conn = DriverManager.getConnection - (url,"dba","dba"); - System.out.println ("@JBDC connection established through " + driver); - - PreparedStatement stmt = null; - stmt = conn.prepareStatement ("select ?"); - - java.util.Date date; - java.util.Calendar c = java.util.Calendar.getInstance (); - c.set (2001, 5, 10, 1, 2, 3); - date = c.getTime (); - - Timestamp ts = new Timestamp (date.getTime ()); - ts.setNanos (0); - stmt.setTimestamp (1, ts); - - System.out.println ("insert time: " + ts); - ResultSet rs = stmt.executeQuery (); - - rs.next (); - Timestamp ts_ret = rs.getTimestamp (1); - System.out.println ("fetch date: " + ts_ret); - - if (!ts_ret.equals (ts)) - System.out.print ("*** FAILED"); - else - System.out.print ("PASSED"); - } - catch (Exception e) - { - e.printStackTrace(); - System.out.print ("*** FAILED"); - } - System.out.println (": Bug #4033 - compat for the dt subtypes"); - } - - public static void main(String [] args) throws Exception - { - test2276(args); - test4033(args); - } -} diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am b/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am deleted file mode 100644 index 120e0b52c2..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -# -# This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -# project. -# -# Copyright (C) 1998-2018 OpenLink Software -# -# This project is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License, dated June 1991. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# - -if WITH_JDK3 -TARGET = testsuite3.jar -JDK3 = @ac_jdk3_path@ -JAVA_FLAGS = -O -g:none -d . -JAVA_CLASS = -classpath .:../virtjdbc3.jar -endif - -all: $(TARGET) - - -testsuite3.jar: *.java - @echo ts3 javac $(JAVA_FLAGS) - @$(JDK3)/javac $(JAVA_FLAGS) $(JAVA_CLASS) *.java - @$(JDK3)/jar cf testsuite3.jar ./testsuite/*.class - @rm -f ../testsuite3.jar - @cp testsuite3.jar ../testsuite3.jar - @echo "............. Test suite jar package built" - - -CLEANFILES = testsuite3.jar - -clean-local: - -rm -rf testsuite - - -# ---------------------------------------------------------------------- -# -# Additional files to distribute -# -# ---------------------------------------------------------------------- -EXTRA_DIST = \ - *.java diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/SPRgetColumns.java b/libsrc/JDBCDriverType4/testsuite_3.0/SPRgetColumns.java deleted file mode 100644 index 9283abd706..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/SPRgetColumns.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; -import java.sql.*; - - -public class SPRgetColumns -{ - public static void main(String[] args) throws SQLException, ClassNotFoundException - { - try - { - String url; - System.out.print("bug 1743: metadata calls "); - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - Connection conn = DriverManager.getConnection(url, "dba", "dba"); - DatabaseMetaData dbmd = conn.getMetaData(); - ResultSet rs = dbmd.getColumns("", "", "", ""); - - // GET ALL RESULTS - StringBuffer buf = new StringBuffer(); - ResultSetMetaData rsmd = rs.getMetaData(); - int numCols = rsmd.getColumnCount(); - int i, rowcount = 0; - - // get column header info - for (i=1; i <= numCols; i++) { - if (i > 1) buf.append(","); - buf.append(rsmd.getColumnLabel(i)); - } - buf.append("\n"); - - // break it off at 100 rows max - while (rs.next() && rowcount < 100) { - // Loop through each column, getting the column - // data and displaying - - for (i=1; i <= numCols; i++) { - if (i > 1) buf.append(","); - buf.append(rs.getString(i)); - } - buf.append("\n"); - rowcount++; - } - - rs.close(); - conn.close(); - System.out.println(" PASSED"); - } - catch (Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } -} diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestBlob.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestBlob.java deleted file mode 100644 index f015a05bd9..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestBlob.java +++ /dev/null @@ -1,293 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.util.*; -import java.io.*; -import java.sql.*; - -public class TestBlob -{ - - // ************************************************************ - public static void main(String[] args) throws Exception - { - - - System.out.println("driver"); - Connection conn = null; - if (args.length == 0) - { - System.err.println("Usage: TestEmpty ora | eds | edsj | ms7 | tds"); - System.exit(1); - } - System.out.println("connect"); - if (args[0].equals("eds")) - { - Class.forName("sun.jdbc.odbc.JdbcOdbcDriver"); - conn = DriverManager.getConnection("jdbc:odbc:Local ES","EWSYS","EWSYS"); - } - - else if (args[0].equals("edsj")) - { - Class.forName("virtuoso.jdbc3.Driver"); - // conn = DriverManager.getConnection ("jdbc:virtuoso://localhost:1111","EWSYS","EWSYS"); - if (args.length < 2) - conn = DriverManager.getConnection ("jdbc:virtuoso://localhost:1111/timeout=60","dba","dba"); - else - conn = DriverManager.getConnection (args[1],"dba","dba"); - } - else if (args[0].equals("ora")) - { - Class.forName("oracle.jdbc.driver.OracleDriver"); - conn = DriverManager.getConnection ("jdbc:oracle:thin:@localhost:1521:ent70071","EWSYS","EWSYS"); - } - else if (args[0].equals("ms7")) - { - Class.forName("sun.jdbc.odbc.JdbcOdbcDriver"); - conn = DriverManager.getConnection("jdbc:odbc:Local ES MS7","EWSYS","EWSYS"); - } - else if (args[0].equals("tds")) - { - DriverManager.setLogStream(System.out); - Class.forName("com.thinweb.tds.Driver"); - conn = DriverManager.getConnection("jdbc:twtds:sqlserver://sgaetjen/EWSYS","EWSYS","EWSYS"); - } - else if (args[0].equals("spr")) - { - DriverManager.setLogStream(System.out); - Class.forName("com.inet.tds.TdsDriver"); - conn = DriverManager.getConnection("jdbc:inetdae7:sgaetjen","EWSYS","EWSYS"); - } - conn.setAutoCommit(false); - System.out.println( "DRIVER NAME:" + conn.getMetaData().getDriverName() ); - System.out.println( "DRIVER VER:" + conn.getMetaData().getDriverVersion() ); - - System.out.println("(TRANSACTION_READ_COMMITTED) :" + Connection.TRANSACTION_READ_COMMITTED); - System.out.println("(TRANSACTION_READ_UNCOMMITTED) :" + Connection.TRANSACTION_READ_UNCOMMITTED); - System.out.println("(TRANSACTION_REPEATABLE_READ) :" + Connection.TRANSACTION_REPEATABLE_READ); - System.out.println("(TRANSACTION_SERIALIZABLE) :" + Connection.TRANSACTION_SERIALIZABLE); - System.out.println("(TRANSACTION_NONE) :" + Connection.TRANSACTION_NONE); - - int transactionIsolation = conn.getTransactionIsolation(); - System.out.println("connected: default isolation="+transactionIsolation+":"+Connection.TRANSACTION_NONE); - - conn.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); - - - try - { - - Statement stmt = conn.createStatement(); - try { - stmt.executeUpdate ("drop table EX..TESTBLOB"); - } catch (Exception e) { } - - stmt.executeUpdate ("create table EX..TESTBLOB ( BLOB_COL LONG VARBINARY )"); - // create table EX..TESTBLOB ( BLOB_COL LONG VARBINARY ); - PreparedStatement ps = conn.prepareStatement("insert into EX..TESTBLOB (BLOB_COL) values(?)"); - - /* - String data = new String("113066"); - byte byteData[]; - byteData = data.getBytes(); - */ - - File file = new File ("bloor.pdf"); - BufferedInputStream bufferedInputStream = new BufferedInputStream(new FileInputStream(file)); - byte[] byteData = new byte [ (int) file.length() ]; - bufferedInputStream.read(byteData); - bufferedInputStream.close(); - - // ps.setBinaryStream(index,new ByteArrayInputStream(byteData),byteData.length); - ps.setBytes(1, byteData); - - System.out.println("insert execute update" ); - int ires = ps.executeUpdate(); - System.out.println("insert results:"+ires); - ps.close(); - System.out.println("insert commit"); - conn.commit(); - - - System.out.println("********* SELECT *****************************"); - ps = conn.prepareStatement("SELECT BLOB_COL FROM EX..TESTBLOB"); - System.out.println("select execute"); - ResultSet rs = ps.executeQuery(); - while ( rs.next() ) - { - System.out.println("result0"); - - // reads 12 bytes and returns - // byte[] x = rs.getBytes("BLOB_COL"); - - InputStream stream = rs.getBinaryStream("BLOB_COL"); - ByteArrayOutputStream ostream = new ByteArrayOutputStream(); - - - - // very slow processing - // throws read timeout periodically after a few hundred bytes - // or stops processing after 3600 bytes - /* - int c; - int index = 0; - while ((c = stream.read()) != -1) - { - ++index; - if (( index % 100 ) == 0 ) - System.err.println ( "bytes read: " + index ); - ostream.write(c); - } - */ - - - /* - java.io.IOException - at virtuoso.jdbc3.VirtuosoBlobStream.read(VirtuosoBlobStream.java:93) - at java.io.InputStream.read(InputStream.java:91) - at TestBlob.main(TestBlob.java:140) - */ - - int length; - // int index = 0; - System.out.println("result1"); - // while ((length = stream.read(buffer)) != -1) - while (true) - { - byte[] buffer = new byte[32767]; - System.out.println("result2"); - length = stream.read(buffer); - System.out.println("result3:" + length); - if ( length < 0 ) - break; - ostream.write(buffer, 0, length); - } - - byte[] x = ostream.toByteArray(); - - // String x = new String ( buffer ); - System.out.println ( "select results: len=" +x.length); - if (x.length != byteData.length) - throw new Exception ("different length orig=" + byteData.length + " returned=" + x.length); - for (int inx = 0; inx < x.length; inx++) - if (x[inx] != byteData[inx]) - throw new Exception ("different content orig=" + byteData[inx] + " returned=" + byteData[inx]); - - FileOutputStream os = new FileOutputStream ("out.pdf"); - os.write (x); - } - rs.close(); - ps.close(); - - try { - stmt.executeUpdate ("drop table EX..TESTBLOB"); - } catch (Exception e) { } - - - System.out.println("Testing long nvarchar:"); - - stmt.executeUpdate ("create table EX..TESTBLOB ( BLOB_COL LONG NVARCHAR )"); - ps = conn.prepareStatement("insert into EX..TESTBLOB (BLOB_COL) values(?)"); - String data = new String("12345678901234"); - byteData = data.getBytes(); - ps.setBytes(1, byteData); - System.out.println("insert execute update" ); - ires = ps.executeUpdate(); - System.out.println("insert results:"+ires); - ps.close(); - - System.out.println("insert commit"); - conn.commit(); - - System.out.println("********* SELECT *****************************"); - ps = conn.prepareStatement("SELECT BLOB_COL FROM EX..TESTBLOB"); - System.out.println("select execute"); - rs = ps.executeQuery(); - while ( rs.next() ) - { - System.out.println("result0"); - - InputStream stream = rs.getBinaryStream("BLOB_COL"); - ByteArrayOutputStream ostream = new ByteArrayOutputStream(); - - int length; - System.out.println("result1"); - while (true) - { - byte[] buffer = new byte[32767]; - System.out.println("result2"); - length = stream.read(buffer); - System.out.println("result3:" + length); - if ( length < 0 ) - break; - ostream.write(buffer, 0, length); - } - - byte[] x = ostream.toByteArray(); - - System.out.println ( "select results: len=" +x.length); - if (x.length != byteData.length) - throw new Exception ("different length orig=" + byteData.length + " returned=" + x.length); - for (int inx = 0; inx < x.length; inx++) - if (x[inx] != byteData[inx]) - throw new Exception ("different content orig=" + byteData[inx] + " returned=" + byteData[inx]); - - } - rs.close(); - ps.close(); - - try - { - stmt.executeUpdate ("drop table EX..TESTBLOB"); - } - catch (Exception e) - { - } - } - catch ( SQLException e ) - { - System.err.println ( "SQLEXP:" + e); - System.err.println ( "SQLEXP(error code):" + e.getErrorCode() ); - System.err.println ( "SQLEXP(sql state):" + e.getSQLState() ); - e.printStackTrace(); - } - catch ( Exception e ) - { - System.err.println ( "************* exception 1:" + e); - e.printStackTrace(); - } - - try - { - System.out.println("close"); - conn.commit(); - conn.close(); - System.out.println("done"); - } - catch ( Exception c2 ) - { - System.err.println ( "************* exception close:" + c2); - c2.printStackTrace(); - } - } -} diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestCallableExecute.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestCallableExecute.java deleted file mode 100644 index 26ce0cddac..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestCallableExecute.java +++ /dev/null @@ -1,179 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestCallableExecute -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("--------------------- Test of CallableStatement -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - try { - stmt.executeUpdate("DROP PROCEDURE VJDBC_BENCHMARK"); - } catch (Exception e) {} - try { - stmt.executeUpdate("DROP TABLE ex..history"); - } catch (Exception e) {} - try { - stmt.executeUpdate("DROP TABLE ex..accounts"); - } catch (Exception e) {} - try { - stmt.executeUpdate("DROP TABLE ex..tellers"); - } catch (Exception e) {} - try { - stmt.executeUpdate("DROP TABLE ex..branches"); - } catch (Exception e) {} - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("CREATE TABLE ex..branches (Bid integer,Bbalance integer,filler character(92),primary key (Bid))") == 0) - if(stmt.executeUpdate("CREATE TABLE ex..tellers (Tid integer,Bid integer,Tbalance integer,filler character(88),primary key (Tid),foreign key (Bid) references ex..branches)") == 0) - if(stmt.executeUpdate("CREATE TABLE ex..accounts (Aid integer,Bid integer,Abalance integer,filler character(88),primary key (Aid),foreign key (Bid) references ex..branches)") == 0) - if(stmt.executeUpdate("CREATE TABLE ex..history (Tid integer,Bid integer,Aid integer,delta integer,ti timestamp,filler character(24),foreign key (Tid) references ex..tellers,foreign key (Bid) references ex..branches,foreign key (Aid) references ex..accounts)") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - stmt.execute("create procedure VJDBC_BENCHMARK(IN br integer,IN delta integer,OUT Bbalance integer) { declare cr cursor for select Bbalance from ex..branches where Bid=br; update ex..branches set Bbalance = Bbalance + delta where Bid = br; open cr; fetch cr into Bbalance; close cr; }"); - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO ex..branches(Bid,Bbalance) VALUES (0,0)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a CallableStatement class attached to this connection"); - CallableStatement stmtc = connection.prepareCall("{fn VJDBC_BENCHMARK(?,?,?) }"); - if(stmtc instanceof virtuoso.jdbc3.VirtuosoCallableStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute procedure"); - stmtc.setInt(1,0); - stmtc.setInt(2,100); - stmtc.registerOutParameter(3,Types.INTEGER); - if(stmtc.executeUpdate() == 0) - if(stmtc.getInt(3) == 100) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute cleanup"); - stmt.executeUpdate("DROP PROCEDURE VJDBC_BENCHMARK"); - if(stmt.executeUpdate("DROP TABLE ex..history") == 0) - if(stmt.executeUpdate("DROP TABLE ex..accounts") == 0) - if(stmt.executeUpdate("DROP TABLE ex..tellers") == 0) - if(stmt.executeUpdate("DROP TABLE ex..branches") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestClean.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestClean.java deleted file mode 100644 index f207e0cb2d..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestClean.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestClean -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - Statement stmt = connection.createStatement(); - try - { - stmt.executeQuery("drop table EX..DEMO"); - } - catch(SQLException e) - { - } - try - { - stmt.executeQuery("drop table EX..EBLOB"); - } - catch(SQLException e) - { - } - try - { - stmt.executeQuery("drop table EX..ECLOB"); - } - catch(SQLException e) - { - } - stmt.close(); - connection.close(); - System.exit(0); - } - catch(Exception e) - { - System.exit(1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestDataSource.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestDataSource.java deleted file mode 100644 index 579eb321c6..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestDataSource.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; -import javax.sql.*; -import java.util.*; -import javax.naming.*; -import virtuoso.jdbc3.*; - -public class TestDataSource -{ - public static Context ctx; - public static DataSource registerConnection () throws Exception - { - VirtuosoDataSource ds = new VirtuosoDataSource (); - ds.setDescription ("test datasource"); - ds.setServerName ("localhost"); - ds.setPortNumber (1111); - ds.setUser ("dba"); - ds.setPassword ("dba"); - ds.setDatabaseName ("DS1"); - -// ctx.bind ("jdbc/virt_ds1", ds); - return ds; - } - - public static void main(String args[]) - { - VirtuosoDataSource ds; - try - { -/* - Hashtable env = new Hashtable(); - - env.put (Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.fscontext.RefFSContextFactory"); - env.put(Context.PROVIDER_URL, "file:///home/kgeorge/jndi"); - ctx = new InitialContext(env); -*/ - - System.out.println("----------------------- Test of datasource ---------------------"); - System.out.print("Register connection jdbc/virt_ds1"); -// registerConnection (); - ds = (VirtuosoDataSource) registerConnection (); - System.out.println(" PASSED"); - - - System.out.print("Establish connection through jdbc/virt_ds1 datasource"); -// VirtuosoDataSource ds = (VirtuosoDataSource) ctx.lookup ("jdbc/virt_ds1"); - Connection c = ds.getConnection (); - System.out.println(" PASSED"); - System.exit (0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestDatabaseMetaData.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestDatabaseMetaData.java deleted file mode 100644 index 10e57f857a..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestDatabaseMetaData.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestDatabaseMetaData -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("---------------------- Test of DatabaseMetaData -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - DatabaseMetaData metadata = connection.getMetaData(); - System.out.print("Get the DatabaseMetaData class"); - if(metadata instanceof virtuoso.jdbc3.VirtuosoDatabaseMetaData) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println("Get the JDBC driver name : " + metadata.getDriverName()); - System.out.println("Get the JDBC driver version : " + metadata.getDriverVersion()); - System.out.println("Get the database product name : " + metadata.getDatabaseProductName()); - System.out.println("Get the database product version : " + metadata.getDatabaseProductVersion()); - System.out.print("Check the JDBC URL returned and passed"); - if(metadata.getURL().equals(url)) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Check the user name returned and passed"); - if(metadata.getUserName().equals("dba")) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestDateTime.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestDateTime.java deleted file mode 100644 index 7a53695c46..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestDateTime.java +++ /dev/null @@ -1,534 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; -import java.sql.*; -import virtuoso.jdbc3.*; - -public class TestDateTime -{ - public static final String URL = "jdbc:virtuoso://localhost:1111"; - - static int g_PASSED = 0; - static int g_FAILED = 0; - static int g_testCounter = 0; - - static int PASSED = 0; - static int FAILED = 0; - static int testCounter = 0; - - public static void resetTests() - { - PASSED = 0; - FAILED = 0; - testCounter = 0; - } - - public static void startTest(String id) - { - testCounter++; - System.out.println("== TEST " + id + ": " + " : Start"); - } - - public static void endTest(String id, boolean OK) - { - System.out.println("== TEST " + id + ": " + " : End"); - System.out.println((OK ? "PASSED:" : "***FAILED:") + " TEST " + id + "\n"); - if (OK) PASSED++; - else FAILED++; - } - - public static void getTestTotal() - { - System.out.println("============================"); - System.out.println("PASSED:" + PASSED + " FAILED:" + FAILED); - g_PASSED += PASSED; - g_FAILED += FAILED; - g_testCounter += testCounter; - resetTests(); - } - - public static void getTotal() - { - System.out.println("\n=======TOTAL==================="); - System.out.println("PASSED:" + g_PASSED + " FAILED:" + g_FAILED); - if (g_FAILED > 0) - System.exit(-1); - } - - public static void log(String mess) - { - System.out.println(" " + mess); - } - - public static void assertEquals(Object v1, Object v2) throws Exception - { - if (!v1.equals(v2)) - throw new Exception("Equals failed: Received=["+v1+"] Expected=["+v2+"]"); - } - - public static void main(String[] args) - { - String url; - if(args.length == 0) - url = URL; - else - url = args[0]; - - Test_SQL(url); - Test_SPARQL_1(url); - Test_SPARQL_2(url); - - getTotal(); - } - - - public static void Test_SQL(String url) - { - log("\n TEST SQL"); - - - Connection c = null; - Statement stmt; - PreparedStatement ps; - ResultSet rs; - - - try - { - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("---------------------"); - System.out.print("Establish connection at " + url); - c = DriverManager.getConnection (url, "dba", "dba"); - System.out.println(" PASSED"); - - boolean ok = true; - String query = null; - - String s_d = "2010-07-29"; - String s_t = "15:30:20"; - String s_dt = "2010-07-29 15:30:20.0"; - String q_create = "create table EX..TSTDT(id integer, f_d date, f_t time, f_dt datetime)"; - String q_drop = "drop table EX..TSTDT"; - - - startTest("1"); ok = true; - try - { - log("Insert data via subst to query"); - - stmt = c.createStatement(); - - try { - stmt.executeUpdate(q_drop); - } catch(Exception e){} - - stmt.executeUpdate(q_create); - - stmt.executeUpdate("insert into EX..TSTDT values(1, {d '"+s_d+"'}, {t '"+s_t+"'}, {ts '"+s_dt+"'})"); - - rs = stmt.executeQuery("select * from EX..TSTDT where id=1"); - rs.next(); - assertEquals(rs.getDate(2).toString(), s_d); - assertEquals(rs.getTime(3).toString(), s_t); - assertEquals(rs.getTimestamp(4).toString(), s_dt); - rs.close(); - - stmt.executeUpdate(q_drop); - - } catch (Exception e) { - log("***FAILED Test " + e); - e.printStackTrace(); - ok = false; - } - endTest("1", ok); - - - startTest("2"); ok = true; - try - { - log("Insert data via parameter binding"); - stmt = c.createStatement(); - - try { - stmt.executeUpdate(q_drop); - } catch(Exception e){} - - stmt.executeUpdate(q_create); - - ps = c.prepareStatement("insert into EX..TSTDT values(1, ?, ?, ?)"); - ps.setDate(1, Date.valueOf(s_d)); - ps.setTime(2, Time.valueOf(s_t)); - ps.setTimestamp(3, Timestamp.valueOf(s_dt)); - ps.executeUpdate(); - ps.close(); - - rs = stmt.executeQuery("select * from EX..TSTDT where id=1"); - rs.next(); - assertEquals(rs.getDate(2).toString(), s_d); - assertEquals(rs.getTime(3).toString(), s_t); - assertEquals(rs.getTimestamp(4).toString(), s_dt); - rs.close(); - - stmt.executeUpdate(q_drop); - - } catch (Exception e) { - log("***FAILED Test " + e); - e.printStackTrace(); - ok = false; - } - endTest("2", ok); - - - getTestTotal(); - - }catch (Exception e){ - System.out.println("ERROR Test Failed."); - e.printStackTrace(); - } - finally { - try { - c.close(); - } - catch (Exception e) {} - } - } - - public static String createRdfType(String val, String v_type) - { - return "\""+val+"\"^^<"+v_type+">"; - } - - public static Object execSparqlSelect1(Statement stmt, String q) throws SQLException - { - ResultSet rs = stmt.executeQuery(q); - rs.next(); - Object o = rs.getObject(1); - rs.close(); - return o; - } - - - public static void Test_SPARQL_1(String url) - { - log("\n TEST SPARQL_1"); - - - Connection c = null; - Statement stmt; - PreparedStatement ps; - ResultSet rs; - - - try - { - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("---------------------"); - System.out.print("Establish connection at " + url); - c = DriverManager.getConnection (url, "dba", "dba"); - System.out.println(" PASSED"); - - boolean ok = true; - String query = null; - - String s_d1 = "1999-05-31"; - String s_d2 = "1938-01-01"; - String s_d3 = "2101-01-01"; - - String s_t1 = "13:24:00.000Z"; - String s_t2 = "13:21:00.000+04:30"; - String s_t3 = "13:22:00.000+04:00"; - String s_t4 = "13:23:00.000-05:00"; - - String s_dt1 = "1999-05-31T13:25:00-05:00"; - String s_dt2 = "1999-05-31T13:24:00Z"; - String s_dt3 = "1999-05-31T13:25:00.001-05:00"; - String s_dt4 = "1999-05-31T13:24:00.002Z"; - - String s_y1 = "2005"; - - String t_d = "http://www.w3.org/2001/XMLSchema#date"; - String t_t = "http://www.w3.org/2001/XMLSchema#time"; - String t_dt = "http://www.w3.org/2001/XMLSchema#dateTime"; - String t_y = "http://www.w3.org/2001/XMLSchema#gYear"; - - - startTest("1"); ok = true; - try - { - Object o; - - stmt = c.createStatement(); - - stmt.executeUpdate("sparql clear graph "); - - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_d1, t_d)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_d2, t_d)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_d3, t_d)+" }"); - - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_t1, t_t)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_t1, t_t)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_t1, t_t)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_t1, t_t)+" }"); - - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_dt1, t_dt)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_dt2, t_dt)+" }"); - - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_y1, t_y)+" }"); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoDate.class); - assertEquals(((VirtuosoDate)o).toXSD_String(), s_d1); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoDate.class); - assertEquals(((VirtuosoDate)o).toXSD_String(), s_d2); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoDate.class); - assertEquals(((VirtuosoDate)o).toXSD_String(), s_d3); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoTime.class); - assertEquals(((VirtuosoTime)o).toXSD_String(), s_t1); - - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoTimestamp.class); - assertEquals(((VirtuosoTimestamp)o).toXSD_String(), s_dt1); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoTimestamp.class); - assertEquals(((VirtuosoTimestamp)o).toXSD_String(), s_dt2); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_y1); - assertEquals(((VirtuosoRdfBox)o).getType(), t_y); - - } catch (Exception e) { - log("***FAILED Test " + e); - e.printStackTrace(); - ok = false; - } - endTest("1", ok); - - - - getTestTotal(); - - }catch (Exception e){ - System.out.println("ERROR Test Failed."); - e.printStackTrace(); - } - finally { - try { - c.close(); - } - catch (Exception e) {} - } - } - - public static void Test_SPARQL_2(String url) - { - log("\n TEST SPARQL_2"); - - - Connection c = null; - Statement stmt; - PreparedStatement ps; - ResultSet rs; - - - try - { - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("---------------------"); - System.out.print("Establish connection at " + url); - c = DriverManager.getConnection (url, "dba", "dba"); - System.out.println(" PASSED"); - - boolean ok = true; - String query = null; - - String s_y1 = "2005"; - String s_y2 = "1954"; - - String s_gm1 = "--12"; // --MM - String s_gm2 = "--02"; // --MM - - String s_gd1 = "---31"; // ---DD - String s_gd2 = "---01"; // ---DD - - String s_gym1 = "2005-12"; // CCYY-MM - String s_gym2 = "2005-01"; // CCYY-MM - - String s_gmd1 = "--12-31"; // --MM-DD - String s_gmd2 = "--01-01"; // --MM-DD - - String s_dts1 = "1999-05-31T13:25:00-05:00"; - String s_dts2 = "1999-05-31T13:24:00Z"; - String s_dts3 = "1999-05-31T13:25:00.001-05:00"; - String s_dts4 = "1999-05-31T13:24:00.002Z"; - - - String t_y = "http://www.w3.org/2001/XMLSchema#gYear"; - String t_gm = "http://www.w3.org/2001/XMLSchema#gMonth"; - String t_gd = "http://www.w3.org/2001/XMLSchema#gDay"; - String t_gym = "http://www.w3.org/2001/XMLSchema#gYearMonth"; - String t_gmd = "http://www.w3.org/2001/XMLSchema#gMonthDay"; - String t_dts = "http://www.w3.org/2001/XMLSchema#dateTimeStamp"; - -// String t_dtd = "http://www.w3.org/2001/XMLSchema#dateTimeDuration"; - - - startTest("1"); ok = true; - try - { - Object o; - - stmt = c.createStatement(); - - stmt.executeUpdate("sparql clear graph "); - - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_y1, t_y)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_y2, t_y)+" }"); - - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_gm1, t_gm)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_gm2, t_gm)+" }"); - - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_gd1, t_gd)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_gd2, t_gd)+" }"); - - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_gym1, t_gym)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_gym2, t_gym)+" }"); - - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_gmd1, t_gmd)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_gmd2, t_gmd)+" }"); - - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_dts1, t_dts)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_dts2, t_dts)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_dts3, t_dts)+" }"); - stmt.executeUpdate("sparql insert into graph { "+createRdfType(s_dts4, t_dts)+" }"); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_y1); - assertEquals(((VirtuosoRdfBox)o).getType(), t_y); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_y2); - assertEquals(((VirtuosoRdfBox)o).getType(), t_y); - - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_gm1); - assertEquals(((VirtuosoRdfBox)o).getType(), t_gm); - assertEquals((((VirtuosoRdfBox)o).rb_box).getClass(), String.class); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_gm2); - assertEquals(((VirtuosoRdfBox)o).getType(), t_gm); - - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_gd1); - assertEquals(((VirtuosoRdfBox)o).getType(), t_gd); - assertEquals((((VirtuosoRdfBox)o).rb_box).getClass(), String.class); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_gd2); - assertEquals(((VirtuosoRdfBox)o).getType(), t_gd); - - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_gym1); - assertEquals(((VirtuosoRdfBox)o).getType(), t_gym); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_gym2); - assertEquals(((VirtuosoRdfBox)o).getType(), t_gym); - - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_gmd1); - assertEquals(((VirtuosoRdfBox)o).getType(), t_gmd); - assertEquals((((VirtuosoRdfBox)o).rb_box).getClass(), String.class); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_gmd2); - assertEquals(((VirtuosoRdfBox)o).getType(), t_gmd); - - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_dts1); - assertEquals(((VirtuosoRdfBox)o).getType(), t_dts); - assertEquals((((VirtuosoRdfBox)o).rb_box).getClass(), String.class); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_dts2); - assertEquals(((VirtuosoRdfBox)o).getType(), t_dts); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_dts3); - assertEquals(((VirtuosoRdfBox)o).getType(), t_dts); - - o = execSparqlSelect1(stmt, "sparql select ?o from where { ?o}"); - assertEquals(o.getClass(), VirtuosoRdfBox.class); - assertEquals(((VirtuosoRdfBox)o).toString(), s_dts4); - assertEquals(((VirtuosoRdfBox)o).getType(), t_dts); - - } catch (Exception e) { - log("***FAILED Test " + e); - e.printStackTrace(); - ok = false; - } - endTest("1", ok); - - - - getTestTotal(); - - }catch (Exception e){ - System.out.println("ERROR Test Failed."); - e.printStackTrace(); - } - finally { - try { - c.close(); - } - catch (Exception e) {} - } - } - -} diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteBlob.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteBlob.java deleted file mode 100644 index 55c17d0f27..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteBlob.java +++ /dev/null @@ -1,225 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; -import java.io.*; - -public class TestExecuteBlob -{ - public static void main(String args[]) - { - try - { - String url, filename; - if(args.length != 2) - { - url = "jdbc:virtuoso://localhost:1111"; - filename = "termcap"; - } - else - { - url = args[1]; - filename = args[0]; - } - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("--------------------- Test of the blob features -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..EBLOB"); - } catch (Exception e) { } - try { - stmt.executeUpdate ("drop table EX..ECLOB"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..EBLOB (ID integer,FILLER long varbinary,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - java.io.FileInputStream fs = new java.io.FileInputStream(filename); - PreparedStatement pstmt = connection.prepareStatement("insert into EX..EBLOB(ID,FILLER) values(?,?)"); - pstmt.setLong(1,3000); - pstmt.setBinaryStream(2,fs,1024 * 20); - pstmt.execute(); - System.out.println(" PASSED"); - System.out.println("Execute SELECT"); - ResultSet rs = stmt.executeQuery("select * from EX..EBLOB"); - rs.next(); - Blob blob = rs.getBlob(2); - System.out.println(new String(blob.getBytes(4060,1024 * 2))); - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - stmt.executeUpdate("drop table EX..EBLOB"); - System.out.println(" PASSED"); - System.out.print("Close statement at " + url); - pstmt.close(); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Create a Statement class attached to this connection"); - stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..ECLOB (ID integer,FILLER long varchar,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - String value = " declare x integer; x := 5; return x; "; - pstmt = connection.prepareStatement("insert into EX..ECLOB(ID,FILLER) values(?,?)"); - pstmt.setLong(1,1); - pstmt.setAsciiStream(2,new ByteArrayInputStream(value.getBytes()),value.length()); - if(pstmt.executeUpdate()!=1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("select * from EX..ECLOB"); - rs.next(); - if(rs.getInt(1) != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - InputStream instream = rs.getAsciiStream(2); - StringBuffer buf = new StringBuffer(); - int ch; - while((ch = instream.read()) != -1) - buf.append((char)ch); - if(!buf.toString().equals(value)) - { - System.out.println(" FAILED"); - System.exit(-1); - } - byte []array = rs.getBytes(2); - if(!(new String(array).equals(value))) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - stmt.executeUpdate("drop table EX..ECLOB"); - System.out.println(" PASSED"); - System.out.print("Close statement at " + url); - pstmt.close(); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Create a Statement class attached to this connection"); - stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..ECLOB (ID integer,FILLER long varchar,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - value = " declare x integer; x := 5; return x; "; - pstmt = connection.prepareStatement("insert into EX..ECLOB(ID,FILLER) values(?,?)"); - pstmt.setLong(1,1); - pstmt.setBytes(2,value.getBytes()); - if(pstmt.executeUpdate()!=1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("select * from EX..ECLOB"); - rs.next(); - if(rs.getInt(1) != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - array = rs.getBytes(2); - if(!(new String(array).equals(value))) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - stmt.executeUpdate("drop table EX..ECLOB"); - System.out.println(" PASSED"); - System.out.print("Close statement at " + url); - pstmt.close(); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteClob.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteClob.java deleted file mode 100644 index d5b8f70af4..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteClob.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestExecuteClob -{ - public static void main(String args[]) - { - try - { - String url, filename; - if(args.length != 2) - { - url = "jdbc:virtuoso://localhost:1111"; - filename = "termcap"; - } - else - { - url = args[1]; - filename = args[0]; - } - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("--------------------- Test of the clob features (varchar) ------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..ECLOB"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..ECLOB (ID integer,FILLER long varchar,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - java.io.FileInputStream fs = new java.io.FileInputStream(filename); - PreparedStatement pstmt = connection.prepareStatement("insert into EX..ECLOB(id,FILLER) values(?,?)"); - pstmt.setLong(1,3000); - pstmt.setAsciiStream(2,fs,1024 * 20); - pstmt.execute(); - System.out.println(" PASSED"); - System.out.println("Execute SELECT"); - ResultSet rs = stmt.executeQuery("select * from EX..ECLOB"); - rs.next(); - Clob clob = rs.getClob(2); - System.out.println(new String(clob.getSubString(4060,1024 * 2))); - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - stmt.executeUpdate("drop table EX..ECLOB"); - System.out.println(" PASSED"); - - System.out.println("--------------------- Test of the clob features (nvarchar)-----------"); - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..ECLOB (ID integer,FILLER long nvarchar,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - fs = new java.io.FileInputStream(filename); - pstmt = connection.prepareStatement("insert into EX..ECLOB(id,FILLER) values(?,?)"); - pstmt.setLong(1,3000); - pstmt.setAsciiStream(2,fs,1024 * 20); - pstmt.execute(); - System.out.println(" PASSED"); - System.out.println("Execute SELECT"); - rs = stmt.executeQuery("select * from EX..ECLOB"); - rs.next(); - clob = rs.getClob(2); - System.out.println(new String(clob.getSubString(4060,1024 * 2))); - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - stmt.executeUpdate("drop table EX..ECLOB"); - System.out.println(" PASSED"); - System.out.print("Close statement at " + url); - pstmt.close(); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteFetch.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteFetch.java deleted file mode 100644 index c8ae348adb..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestExecuteFetch.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestExecuteFetch -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("--------------------- Test of the fetch execute -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Set fetch size attached to this statement"); - stmt.setMaxRows(10); - stmt.setFetchSize(10); - if(stmt.getMaxRows() == 10 && stmt.getFetchSize() == 10) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println("Execute select * from INFORMATION_SCHEMA.TABLES"); - boolean more = stmt.execute("select * from INFORMATION_SCHEMA.TABLES"); - ResultSetMetaData data = stmt.getResultSet().getMetaData(); - for(int i = 1;i <= data.getColumnCount();i++) - System.out.println(data.getColumnLabel(i) + "\t" + data.getColumnTypeName(i)); - while(more) - { - ResultSet rs = stmt.getResultSet(); - while(rs.next()) - for(int i = 1;i <= data.getColumnCount();i++) - { - if(i == 1 || i == 2) - { - String s = stmt.getResultSet().getString(i); - if(stmt.getResultSet().wasNull()) - System.out.print("NULL\t"); - else - System.out.print(s + "\t"); - } - } - System.out.println(); - more = stmt.getMoreResults(); - } - System.out.println(" PASSED"); - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestLongXml.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestLongXml.java deleted file mode 100644 index af51b9e1fd..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestLongXml.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; -import org.w3c.dom.*; - -public class TestLongXml -{ - static final int ntimes = 1500000; - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("------------------------- Test of LONG XML -----------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO_XML"); - } catch (Exception e) { } - try { - stmt.executeUpdate ("drop procedure EX..DEMO_XML_PROC"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO_XML (VAL int primary key, data varchar)") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE PROC"); - if(stmt.executeUpdate( - "create procedure EX..DEMO_XML_PROC (in x integer) {\n" + - " declare inx integer; \n" + - " delete from EX..DEMO_XML;\n" + - " for (inx := 0; inx < x; inx := inx + 1) { \n" + - " insert into EX..DEMO_XML (VAL, data) values (inx + 1, 'bcd'); \n" + - " }\n" + - "}") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - stmt.executeUpdate("EX..DEMO_XML_PROC (" + ntimes + ")"); - System.out.println(" PASSED"); - System.out.print("Execute SELECT"); - ResultSet resultset = stmt.executeQuery( - "SELECT \n" + - " XMLELEMENT (\"r\", XMLAGG (XMLELEMENT (\"a\", data))) from EX..DEMO_XML\n"); - System.out.println(" PASSED"); - System.out.print("Get metadata of the last result"); - ResultSetMetaData meta = resultset.getMetaData(); - if(meta instanceof virtuoso.jdbc3.VirtuosoResultSetMetaData) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Get the column type of the meta data"); - if(meta.getColumnType(1) == -10) - System.out.println("=-10 PASSED"); - else - { - System.out.println("=" + meta.getColumnType(1) + " FAILED"); - System.exit(-1); - } - - System.out.print("Check the returned value"); - resultset.next (); - Document doc = (Document) resultset.getObject (1); - Element elt = doc.getDocumentElement (); - String tagName = elt.getTagName (); - int childs = elt.getElementsByTagName ("a").getLength (); - if (tagName != "r" || childs != ntimes) - System.out.println(" tag=["+ tagName + "] childs=" + childs + " PASSED"); - else - { - System.out.println(" tag=["+ tagName + "] childs=" + childs + " FAILED"); - System.exit(-1); - } - - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestMoreRes.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestMoreRes.java deleted file mode 100644 index 8244b02501..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestMoreRes.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; -import virtuoso.jdbc3.*; - -public class TestMoreRes -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("--------------------- Test of scrollable cursor -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = ((VirtuosoConnection)connection).createStatement(VirtuosoResultSet.TYPE_SCROLL_INSENSITIVE,VirtuosoResultSet.CONCUR_READ_ONLY); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try{ - stmt.executeUpdate("drop procedure ex..pdemo"); - }catch(Exception e) {} - - System.out.print("Execute CREATE PROCEDURE"); - if(stmt.executeUpdate("create procedure ex..pdemo () { result_names('a1'); result(1); end_result(); result_names('b1','b2'); result(2,3); end_result(); }") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - System.out.print("Execute procedure"); - stmt.executeQuery("{call ex..pdemo()}"); - System.out.println(" PASSED"); - - System.out.print("Get the result set"); - ResultSet rs = stmt.getResultSet(); - if(rs instanceof virtuoso.jdbc3.VirtuosoResultSet) - { - System.out.println(" PASSED"); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println("Get Data"); - System.out.print("Execute the resultset.next()"); - if(rs.next()) - { - if(rs.getInt(1) != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - }else{ - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - - System.out.print("Execute the getMoreResults()"); - if (!stmt.getMoreResults()) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - - System.out.print("Get the result set"); - rs = stmt.getResultSet(); - if(rs instanceof virtuoso.jdbc3.VirtuosoResultSet) - { - System.out.println(" PASSED"); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Get Data"); - System.out.print("Execute the resultset.next()"); - if(rs.next()){ - if(rs.getInt(1) != 2) - { - System.out.println(" FAILED"); - System.exit(-1); - } - if(rs.getInt(2) != 3) - { - System.out.println(" FAILED"); - System.exit(-1); - } - }else{ - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute the getMoreResults()"); - if (!stmt.getMoreResults()) - { - System.out.println(" FAILED"); - System.exit(-1); - } - if (stmt.getMoreResults()) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - - - stmt.close(); - stmt = connection.createStatement(); - System.out.print("Execute DROP PROCEDURE"); - if(stmt.executeUpdate("DROP PROCEDURE ex..pdemo") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestNumeric.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestNumeric.java deleted file mode 100644 index 296b9243a7..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestNumeric.java +++ /dev/null @@ -1,391 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import virtuoso.jdbc3.*; -import java.sql.*; - -public class TestNumeric -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("-------------------------- Test of Numeric ------------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - try { - stmt.executeUpdate ("drop procedure test_int"); - } catch (Exception e) { } - - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,VAL numeric(9,0))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (1,1.0)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - ResultSet rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getFloat(2) == 1.0f) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT ID from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT VAL from EX..DEMO"); - rs.next(); - if(rs.getFloat(1) == 1.0f) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - System.out.print("Execute CREATE PROC"); - if(stmt.executeUpdate("create procedure test_int () { declare _new, _old, _it int; _new := 2; _old := 1; result_names (_it, _new, _old); while (_new > _old) { _old := _new; _new := _new + _new; _it := _it + 1; result (_new / _old, _old, _new); } end_result (); return; }") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - System.out.print("Execute INT64 TEST"); - rs = stmt.executeQuery("SELECT TEST_INT ()"); - - for(int inx = 1; inx < 63 ; inx=inx+1) - rs.next(); - - if(rs.getInt(1) == -2) - System.out.println(" PASSED"); - else - { - System.out.println(rs.getInt(1)); - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP PROCEDURE"); - if(stmt.executeUpdate("DROP PROCEDURE test_int") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,VAL numeric(10,0))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (1,1.0)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getFloat(2) == 1.0f) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT ID from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT VAL from EX..DEMO"); - rs.next(); - if(rs.getFloat(1) == 1.0f) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,VAL numeric(15,3))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (1,1.23)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getFloat(2) == 1.23f) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (2,0)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); rs.next(); - if(rs.getInt(1) == 2 && rs.getFloat(2) == 0.0f) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO where ID=1"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getString(2).equals("1.23")) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,VAL numeric(15,3))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (1,887)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getFloat(2) == 887f && rs.getString(2).equals("887")) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,VAL numeric(15,3))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (1,893)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getFloat(2) == 893f && rs.getString(2).equals("893")) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,VAL numeric(15,3))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,VAL) VALUES (1,73.872)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - if(rs.getInt(1) == 1 && rs.getFloat(2) == 73.872f && rs.getString(2).equals("73.872")) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareBatch.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareBatch.java deleted file mode 100644 index 6803e77f04..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareBatch.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestPrepareBatch -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("---------------- Test of batch in PreparedStatement ---------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a PStatement class attached to this connection"); - PreparedStatement pstmt = connection.prepareStatement("INSERT INTO EX..DEMO(ID,FILLER) VALUES (?,?)"); - System.out.println(" PASSED"); - System.out.print("Put batch INSERT"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - pstmt.setInt(2,i); - pstmt.addBatch(); - pstmt.clearParameters(); - } - System.out.println(" PASSED"); - System.out.print("Execute batch"); - int[] res = pstmt.executeBatch(); - pstmt.close(); - for(int i = 0;i < 100;i++) - if(res[i] != 1 && res[i]!=PreparedStatement.SUCCESS_NO_INFO) - { - System.out.println(i + " " + res[i]); - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.println("Execute SELECT"); - pstmt = connection.prepareStatement("SELECT * from EX..DEMO WHERE ID=?"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - ResultSet rs = pstmt.executeQuery(); - while(rs.next()) - for(int j = 1;j <= rs.getMetaData().getColumnCount();j++) - System.out.print(rs.getInt(j) + "\t"); - System.out.println(); - pstmt.clearParameters(); - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.print("Put batch DELETE"); - pstmt = connection.prepareStatement("DELETE FROM EX..DEMO WHERE ID=?"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - pstmt.addBatch(); - pstmt.clearParameters(); - } - System.out.println(" PASSED"); - System.out.print("Execute batch"); - res = pstmt.executeBatch(); - pstmt.close(); - for(int i = 0;i < 100;i++) - if(res[i] != 1 && res[i]!=PreparedStatement.SUCCESS_NO_INFO) - { - System.out.print(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareExecute.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareExecute.java deleted file mode 100644 index 04e3ebd5b3..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestPrepareExecute.java +++ /dev/null @@ -1,248 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestPrepareExecute -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("--------------------- Test of PreparedStatement -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a PStatement class attached to this connection"); - PreparedStatement pstmt = connection.prepareStatement("INSERT INTO EX..DEMO(ID,FILLER) VALUES (?,?)"); - System.out.print("Execute INSERT INTO"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - pstmt.setInt(2,i); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.println("Execute SELECT"); - pstmt = connection.prepareStatement("SELECT * from EX..DEMO WHERE ID=?"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - ResultSet rs = pstmt.executeQuery(); - while(rs.next()) - for(int j = 1;j <= rs.getMetaData().getColumnCount();j++) - System.out.print(rs.getInt(j) + "\t"); - System.out.println(); - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.print("Execute DELETE"); - pstmt = connection.prepareStatement("DELETE FROM EX..DEMO WHERE ID=?"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Create a Statement class attached to this connection"); - stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER varchar(255),ADATE DATETIME)") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a PStatement class attached to this connection"); - pstmt = connection.prepareStatement("INSERT INTO EX..DEMO(ID,FILLER,ADATE) VALUES (?,?,?)"); - System.out.print("Execute INSERT INTO"); - pstmt.setNull(1, Types.INTEGER); - pstmt.setNull(2, Types.VARCHAR); - pstmt.setNull(3, Types.TIMESTAMP); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.print("Create a Statement class attached to this connection"); - stmt = connection.createStatement(); - System.out.print("Execute SELECT"); - ResultSet rs = stmt.executeQuery("select * from EX..DEMO"); - while(rs.next()) - { - if(!(rs.getInt(1)==0 && rs.wasNull())) - { - System.out.println(" FAILED"); - System.exit(-1); - } - if(!(rs.getString(2)==null && rs.wasNull())) - { - System.out.println(" FAILED"); - System.exit(-1); - } - if(!(rs.getTimestamp(3)==null && rs.wasNull())) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); -// stmt.close(); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER varchar(255))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a PStatement class attached to this connection"); - pstmt = connection.prepareStatement("INSERT INTO EX..DEMO(ID,FILLER) VALUES (?,?)"); - System.out.print("Execute INSERT INTO"); - pstmt.setInt(1, 0); - pstmt.setString(2, ""); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.print("Create a Statement class attached to this connection"); - stmt = connection.createStatement(); - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("select * from EX..DEMO"); - while(rs.next()) - { - if(!(rs.getInt(1)==0 && !rs.wasNull())) - { - System.out.println(" FAILED"); - System.exit(-1); - } - if(!(rs.getString(2).equals("") && !rs.wasNull())) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); -// stmt.close(); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestScroll.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestScroll.java deleted file mode 100644 index 41576e7670..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestScroll.java +++ /dev/null @@ -1,266 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestScroll -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("--------------------- Test of scrollable cursor -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,ResultSet.CONCUR_READ_ONLY); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a PStatement class attached to this connection"); - PreparedStatement pstmt = connection.prepareStatement("INSERT INTO EX..DEMO(ID,FILLER) VALUES (?,?)"); - System.out.println(" PASSED"); - System.out.print("Execute INSERT INTO"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - pstmt.setInt(2,i); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - pstmt.close(); - System.out.print("Execute SELECT"); - stmt.setMaxRows(100); - stmt.setFetchSize(10); - stmt.execute("SELECT * from EX..DEMO"); - System.out.println(" PASSED"); - System.out.print("Get the result set"); - ResultSet rs = stmt.getResultSet(); - if(rs instanceof virtuoso.jdbc3.VirtuosoResultSet) - { - System.out.println(" PASSED"); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute the resultset.beforeFirst()"); - rs.beforeFirst(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.next()"); - for(int i = 0;i < 100;i++) - { - rs.next(); - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.afterLast()"); - rs.afterLast(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.previous()"); - for(int i = 99;i >= 0;i--) - { - rs.previous(); - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.first()"); - rs.first(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.next()"); - for(int i = 0;i < 100;i++) - { - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.next(); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.last()"); - rs.last(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.previous()"); - for(int i = 99;i >= 0;i--) - { - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.previous(); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(>0)"); - for(int i = 0;i != 100;i++) - { - rs.absolute(i + 1); - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(<0)"); - for(int i = -1, j = 99;i != -101;i--, j--) - { - rs.absolute(i); - if(rs.getInt(2) != j) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(50)"); - rs.absolute(50); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.relative(>0)"); - for(int i = 50;i != 90;i++) - { - if(rs.getInt(2) != i - 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.relative(1); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(50)"); - rs.absolute(50); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.relative(<0)"); - for(int i = 50;i != 10;i--) - { - if(rs.getInt(2) != i - 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.relative(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.first()"); - rs.first(); - System.out.println(" PASSED"); - System.out.print("Update rows in the table"); - for(int i = 0;i != 2;i++) - { - rs.updateInt("FILLER",i * 2); - rs.updateRow(); - rs.refreshRow(); - if(rs.getInt(2) != i * 2) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.next(); - } - System.out.println(" PASSED"); - System.out.print("Execute DELETE"); - pstmt = connection.prepareStatement("DELETE FROM EX..DEMO WHERE ID=?"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - pstmt.close(); - stmt.close(); - stmt = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,ResultSet.CONCUR_READ_ONLY); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollManual.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollManual.java deleted file mode 100644 index 3a0f2e725c..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollManual.java +++ /dev/null @@ -1,267 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestScrollManual -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("--------------------- Test of scrollable cursor in manual commit -------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,ResultSet.CONCUR_READ_ONLY); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a PStatement class attached to this connection"); - PreparedStatement pstmt = connection.prepareStatement("INSERT INTO EX..DEMO(ID,FILLER) VALUES (?,?)"); - System.out.println(" PASSED"); - System.out.print("Execute INSERT INTO"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - pstmt.setInt(2,i); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - pstmt.close(); - connection.setAutoCommit (false); - System.out.print("Execute SELECT"); - stmt.setMaxRows(100); - stmt.setFetchSize(10); - stmt.execute("SELECT * from EX..DEMO"); - System.out.println(" PASSED"); - System.out.print("Get the result set"); - ResultSet rs = stmt.getResultSet(); - if(rs instanceof virtuoso.jdbc3.VirtuosoResultSet) - { - System.out.println(" PASSED"); - } - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute the resultset.beforeFirst()"); - rs.beforeFirst(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.next()"); - for(int i = 0;i < 100;i++) - { - rs.next(); - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.afterLast()"); - rs.afterLast(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.previous()"); - for(int i = 99;i >= 0;i--) - { - rs.previous(); - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.first()"); - rs.first(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.next()"); - for(int i = 0;i < 100;i++) - { - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.next(); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.last()"); - rs.last(); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.previous()"); - for(int i = 99;i >= 0;i--) - { - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.previous(); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(>0)"); - for(int i = 0;i != 100;i++) - { - rs.absolute(i + 1); - if(rs.getInt(2) != i) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(<0)"); - for(int i = -1, j = 99;i != -101;i--, j--) - { - rs.absolute(i); - if(rs.getInt(2) != j) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(50)"); - rs.absolute(50); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.relative(>0)"); - for(int i = 50;i != 90;i++) - { - if(rs.getInt(2) != i - 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.relative(1); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.absolute(50)"); - rs.absolute(50); - System.out.println(" PASSED"); - System.out.print("Execute the resultset.relative(<0)"); - for(int i = 50;i != 10;i--) - { - if(rs.getInt(2) != i - 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.relative(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute the resultset.first()"); - rs.first(); - System.out.println(" PASSED"); - System.out.print("Update rows in the table"); - for(int i = 0;i != 2;i++) - { - rs.updateInt("FILLER",i * 2); - rs.updateRow(); - rs.refreshRow(); - if(rs.getInt(2) != i * 2) - { - System.out.println(" FAILED"); - System.exit(-1); - } - rs.next(); - } - System.out.println(" PASSED"); - System.out.print("Execute DELETE"); - pstmt = connection.prepareStatement("DELETE FROM EX..DEMO WHERE ID=?"); - for(int i = 0;i < 100;i++) - { - pstmt.setInt(1,i); - if(pstmt.executeUpdate() != 1) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - System.out.println(" PASSED"); - pstmt.close(); - stmt.close(); - stmt = connection.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,ResultSet.CONCUR_READ_ONLY); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollPrepare.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollPrepare.java deleted file mode 100644 index dce2bef183..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestScrollPrepare.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -// test for bug #2308 -import java.sql.*; -import java.io.*; -import java.util.Properties; -import java.sql.ResultSetMetaData; - -public class TestScrollPrepare { - - public static void main (String[] args) - { - - try - { - String driver = "virtuoso.jdbc3.Driver"; - Class.forName( driver ); - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - - System.out.println("--------------------- Test of scrollable prepareStatement -------------------"); - System.out.println ("URL - " + url); - Connection con = DriverManager.getConnection(url, "dba", "dba"); - System.out.println ("@JBDC connection established through " + driver); - - System.out.print("Create a preparedStatement scrollable class"); - // if I use the following prepared statement, the query executes, results - // are obtained, but virtuoso crashes when the "stmt.close()" executes. - PreparedStatement stmt = con.prepareStatement("select * from sys_users", - java.sql.ResultSet.TYPE_SCROLL_INSENSITIVE, - java.sql.ResultSet.CONCUR_READ_ONLY); - - // if I use the following prepared statement, everything works fine - //PreparedStatement stmt = con.prepareStatement("select * from s_group"); - - ResultSet resultSet = stmt.executeQuery(); - - ResultSetMetaData rsmd = resultSet.getMetaData(); - int numCols = rsmd.getColumnCount() ; - - for (int i = 1 ; i <= numCols ; i++) - { - String colName = rsmd.getColumnName(i) ; - System.out.println(" .. colName = " + colName); - } - - while (resultSet.next()) - { - String primaryKey = resultSet.getString(1); - System.out.println ("primary key :"+primaryKey) ; - } - - resultSet.close(); - System.out.println("@ResultSet closed"); - stmt.close(); - System.out.println("@Statement closed"); - - con.close(); - System.out.println(" PASSED"); - } - catch (Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } -} diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecute.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecute.java deleted file mode 100644 index 5c424a5304..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecute.java +++ /dev/null @@ -1,334 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestSimpleExecute -{ - public static void main(String args[]) - { - try - { - Connection connection; - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("----------------------- Test of basic queries ---------------------"); - System.out.print("Establish connection at " + url + " with UPPER passwd"); - try - { - connection = DriverManager.getConnection(url,"dba","DBA"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - catch(Exception e) - { - System.out.println(" PASSED"); - } - System.out.print("Establish connection at " + url); - connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Establish connection at " + url + "/UID=dba/PWD=DBA"); - try - { - connection = DriverManager.getConnection(url+"/UID=dba/PWD=DBA"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - catch(Exception e) - { - System.out.println(" PASSED"); - } - System.out.print("Establish connection at " + url); - connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - /* - System.out.print("Establish connection at " + url + " with UPPER usrname"); - try - { - connection = DriverManager.getConnection(url,"DBA","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - { - System.out.println(" PASSED"); - } - } - catch(Exception e) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Establish connection at " + url); - connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Establish connection at " + url + "/UID=DBA/PWD=dba"); - try - { - connection = DriverManager.getConnection(url+"/UID=DBA/PWD=dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - catch(Exception e) - { - System.out.println(" PASSED"); - } - System.out.print("Establish connection at " + url); - connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - */ - System.out.print("Establish connection at " + url + " with UPPER usrname+passwd"); - try - { - connection = DriverManager.getConnection(url,"DBA","DBA"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - catch(Exception e) - { - System.out.println(" PASSED"); - } - System.out.print("Establish connection at " + url); - connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Establish connection at " + url + "/UID=DBA/PWD=DBA"); - try - { - connection = DriverManager.getConnection(url+"/UID=DBA/PWD=DBA"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - { - System.out.println(" FAILED"); - System.exit(-1); - } - } - catch(Exception e) - { - System.out.println(" PASSED"); - } - System.out.print("Establish connection at " + url); - connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,FILLER) VALUES (100,0)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - ResultSet rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - System.out.println(" PASSED"); - System.out.print("Execute getInt(1)"); - int id = rs.getInt(1); - if(id == 100) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute getInt(\"ID\")"); - id = rs.getInt("ID"); - if(id == 100) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute UPDATE"); - if(stmt.executeUpdate("UPDATE EX..DEMO SET FILLER=1000 WHERE ID=100") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DELETE"); - if(stmt.executeUpdate("DELETE FROM EX..DEMO WHERE ID=100") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,DUMMY integer)") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(ID,FILLER,DUMMY) VALUES (100,0,0)") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - rs = stmt.executeQuery("SELECT * from EX..DEMO"); - rs.next(); - System.out.println(" PASSED"); - System.out.print("Execute getInt(1)"); - id = rs.getInt(1); - if(id == 100) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute getInt(\"ID\")"); - id = rs.getInt("ID"); - if(id == 100) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Check if the connection is closed"); - if(connection.isClosed()) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.print("Check if the connection is closed"); - if(!connection.isClosed()) - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecuteBatch.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecuteBatch.java deleted file mode 100644 index 8942a4fec1..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestSimpleExecuteBatch.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestSimpleExecuteBatch -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("------------------------- Test batch update -----------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (ID integer,FILLER integer,primary key(ID))") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Put batch INSERT"); - for(int i = 0;i < 20;i++) - stmt.addBatch("INSERT INTO EX..DEMO(ID,FILLER) VALUES (" + i + ",100)"); - System.out.println(" PASSED"); - System.out.print("Execute batch"); - int[] res = stmt.executeBatch(); - for(int i = 0;i < 20;i++) - if(res[i] != 1) - { - System.out.println(i + " " + res[i]); - System.out.print(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Put batch DELETE"); - for(int i = 0;i < 20;i++) - stmt.addBatch("DELETE FROM EX..DEMO WHERE ID=" + i); - System.out.println(" PASSED"); - System.out.print("Execute batch"); - res = stmt.executeBatch(); - for(int i = 0;i < 20;i++) - if(res[i] != 1) - { - System.out.print(" FAILED"); - System.exit(-1); - } - System.out.println(" PASSED"); - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestTagProc.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestTagProc.java deleted file mode 100644 index ad5ee5d42f..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestTagProc.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.util.*; -import java.io.*; -import java.sql.*; - -public class TestTagProc -{ - - // ************************************************************ - public static void main(String[] args) throws Exception - { - - // DriverManager.setLogStream(System.out); - System.err.println("driver"); - Connection conn = null; - if (args.length == 0) - { - System.err.println("Usage: TestTagProc ora | eds | edsj | ms7"); - System.exit(1); - } - System.err.println("connect"); - if (args[0].equals("eds")) - { - Class.forName("sun.jdbc.odbc.JdbcOdbcDriver"); - conn = DriverManager.getConnection("jdbc:odbc:Local ES","EWSYS","EWSYS"); - } - else if (args[0].equals("ora")) - { - System.err.println("connect"); - Class.forName("oracle.jdbc.driver.OracleDriver"); -// DriverManager.registerDriver(new oracle.jdbc.driver.OracleDriver()); - conn = DriverManager.getConnection ("jdbc:oracle:thin:@localhost:1521:ent70071","EWSYS","EWSYS"); - } - else if (args[0].equals("edsj")) - { - System.err.println("connect"); - Class.forName("virtuoso.jdbc3.Driver"); - // conn = DriverManager.getConnection ("jdbc:virtuoso://localhost:1111/timeout=60","EWSYS","EWSYS"); - conn = DriverManager.getConnection ("jdbc:virtuoso://localhost:1111/timeout=60","dba","dba"); - } - else if (args[0].equals("edso")) - { - System.err.println("connect"); - Class.forName("openlink.jdbc3.Driver"); - conn = DriverManager.getConnection ("jdbc:openlink://ODBC/DSN=Local ES","dba","dba"); - // jdbc:openlink://ODBC/DSN=/UID=/PWD= - } - else - { - Class.forName("sun.jdbc.odbc.JdbcOdbcDriver"); - conn = DriverManager.getConnection("jdbc:odbc:Local ES MS7","EWSYS","EWSYS"); - } - conn.setAutoCommit(false); - System.err.println("connected"); - int transactionIsolation = conn.getTransactionIsolation(); - System.err.println("connected: default isolation="+transactionIsolation+":"+Connection.TRANSACTION_NONE); - // DriverManager.setLogStream(System.out); - - boolean commitData = true; - if (args.length == 2) - commitData = args[1].equals("1"); - - try - { - - System.err.println( "DRIVER NAME:" + conn.getMetaData().getDriverName() ); - System.err.println( "DRIVER VER:" + conn.getMetaData().getDriverVersion() ); - - PreparedStatement ps = conn.prepareStatement("SELECT name, tag_proc() FROM tag_proc_table"); - ResultSet rs = ps.executeQuery(); - if ( rs == null ) - System.err.println ( "Result set is null!!!" ); - - System.err.println ( "Result set metadata " ); - ResultSetMetaData metaData = rs.getMetaData(); - for ( int colIndex = 0; colIndex < metaData.getColumnCount(); colIndex++ ) - { - System.err.println ( "Result set column metadata " + colIndex); - System.err.println ( "Result set column metadata: ...column name = " + metaData.getColumnName(colIndex+1) ); - System.err.println ( "Result set column metadata: ... display size = " + metaData.getColumnDisplaySize(colIndex+1) ); - System.err.println ( "Result set column metadata: ... scale = " + metaData.getPrecision(colIndex+1) ); - System.err.println ( "Result set column metadata: ... precision = " + metaData.getScale(colIndex+1) ); - // these cause a Tag 0 error - System.err.println ( "Result set column metadata: ...column type name = " + metaData.getColumnTypeName(colIndex+1) ); - System.err.println ( "Result set column metadata: ...sqlType = " + metaData.getColumnType(colIndex+1)); -/* - switch (colIndex) - { - case 0: if (metaData.getColumnType(colIndex+1)) != -*/ - - } - - int ct = 0; - while ( rs.next() ) - { - System.err.println("RS1"); - System.err.println ( "" + ct + ",ROW:" + rs.getString(1) + ":" + rs.getString(2)); - ct++; - /* - if ( ct > 3 ) - break; - */ - System.err.println("RS2"); - } - System.err.println ( "close result:"); - rs.close(); - - System.err.println ( "close prep:"); - ps.close(); - System.err.println ( "commit 3:"); - conn.commit(); - System.err.println ( "commit 4:"); - - /* - ps = conn.prepareStatement("SELECT u_name FROM sys_users"); - System.err.println("select execute"); - ResultSet rs2 = ps.executeQuery(); - while ( rs2.next() ) - { - System.err.println ( "select results: user=" + rs2.getString(1) ); - } - rs2.close(); - ps.close(); - */ - System.out.println ( "PASSED"); - - } - catch ( SQLException e ) - { - System.err.println ( "SQL EXP:" + e); - System.err.println ( "SQL EXP(error code):" + e.getErrorCode() ); - System.err.println ( "SQL EXP(sql state):" + e.getSQLState() ); - e.printStackTrace(); - } - catch ( Exception e ) - { - System.err.println ( "GEN EXP:" + e); - e.printStackTrace(); - } - conn.close(); - System.err.println("done"); - } - -} diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestTimeUpdate.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestTimeUpdate.java deleted file mode 100644 index 70d70a2a0b..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestTimeUpdate.java +++ /dev/null @@ -1,155 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; -import java.sql.*; -// for bug #3037 -public class TestTimeUpdate -{ - public static void main (String [] args) throws Exception - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("--------------------- Test of the update col with setTime -------------------"); - System.out.print("Establish connection at " + url); - Connection c = DriverManager.getConnection (url, "dba", "dba"); - System.out.println(" PASSED"); - - Statement stmt = c.createStatement(); - PreparedStatement ps; - ResultSet rs; - - try { - stmt.executeUpdate ("drop table EX..TSTTIME"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - stmt.executeUpdate("create table EX..TSTTIME (TSTTIME time)"); - System.out.println(" PASSED"); - - - System.out.print("Execute INSERT INTO"); - ps = c.prepareStatement ("insert into EX..TSTTIME (TSTTIME) values (?)"); - ps.setTime (1, Time.valueOf("08:48:40")); - ps.executeUpdate(); - System.out.println(" PASSED"); - - System.out.print("Execute DROP TABLE"); - stmt.executeUpdate("drop table EX..TSTTIME"); - System.out.println(" PASSED"); - - System.out.print("Receiving a date"); - rs = stmt.executeQuery("select aref (vector ({d '1972-07-29'}), 0)"); - rs.next(); - System.out.print(" as " + rs.getObject(1).getClass().getName()); - if (rs.getObject(1) instanceof java.sql.Date) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - System.out.print("Receiving a time"); - rs = stmt.executeQuery("select aref (vector ({t '15:30:20'}), 0)"); - rs.next(); - System.out.print(" as " + rs.getObject(1).getClass().getName()); - if (rs.getObject(1) instanceof java.sql.Time) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - System.out.print("Receiving a timestamp"); - rs = stmt.executeQuery("select aref (vector ({ts '1972-07-29 15:30:20'}), 0)"); - rs.next(); - System.out.print(" as " + rs.getObject(1).getClass().getName()); - if (rs.getObject(1) instanceof java.sql.Timestamp) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - - System.out.print("Sending a 1972-07-29 date"); - ps = c.prepareStatement ("select cast (? as varchar)"); - ps.setDate (1, new java.sql.Date(72, 6, 29)); - rs = ps.executeQuery(); - rs.next(); - System.out.print(" (recv as " + rs.getString(1) + " trim=[" + rs.getString(1).substring(0, 10) + "])"); - if (rs.getString(1).substring(0, 10).equals ("1972-07-29")) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - System.out.print("Sending a 15:30:45 time"); - ps = c.prepareStatement ("select cast (? as varchar)"); - ps.setTime (1, new java.sql.Time(15, 30, 45)); - rs = ps.executeQuery(); - rs.next(); - System.out.print(" (recv as " + rs.getString(1) + " trim=[" + rs.getString(1).substring(0, 8) + "])"); - if (rs.getString(1).substring(0, 8).equals ("15:30:45")) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - System.out.print("Sending a 1972-07-29 15:30:45.000012 timestamp"); - ps = c.prepareStatement ("select cast (? as varchar)"); - ps.setTimestamp (1, new java.sql.Timestamp(72, 6, 29, 15, 30, 45, 12000)); - rs = ps.executeQuery(); - rs.next(); - String q = rs.getString(1); - System.out.print(" (recv as " + rs.getString(1) + " trim=[" + rs.getString(1).substring(0, 26) + "])"); - if (rs.getString(1).substring(0, 26).equals ("1972-07-29 15:30:45.000012")) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - System.out.print("Sending a 1972-07-29 15:30:45.123456 timestamp"); - ps = c.prepareStatement ("select cast (? as varchar)"); - ps.setTimestamp (1, new java.sql.Timestamp(72, 6, 29, 15, 30, 45, 123456000)); - rs = ps.executeQuery(); - rs.next(); - q = rs.getString(1); - System.out.print(" (recv as " + rs.getString(1) + " trim=[" + rs.getString(1).substring(0, 26) + "])"); - if (rs.getString(1).substring(0, 26).equals ("1972-07-29 15:30:45.123456")) - System.out.println(" PASSED"); - else - System.out.println(" FAILED"); - rs.close(); - - System.out.println("-------------------------------------------------------------------"); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } -} diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestURL.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestURL.java deleted file mode 100644 index b48a1ff25e..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestURL.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestURL -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("-------------------------- Test of JDBC URL ------------------------"); - System.out.print("JDBC url : " + url); - Driver driver = DriverManager.getDriver(url); - if(driver instanceof virtuoso.jdbc3.Driver) - System.out.println(" PASSED"); - System.out.print("JDBC url : " + url + "/UID=dba/PWD=dba"); - driver = DriverManager.getDriver(url + "/UID=dba/PWD=dba"); - if(driver instanceof virtuoso.jdbc3.Driver) - System.out.println(" PASSED"); - System.out.print("JDBC url : " + url + "/UID=dba/PWD=dba/DATABASE=db"); - driver = DriverManager.getDriver(url + "/UID=dba/PWD=dba/DATABASE=db"); - if(driver instanceof virtuoso.jdbc3.Driver) - System.out.println(" PASSED"); - System.out.print("JDBC url : jdbc:none://localhost:1111"); - try - { - driver = DriverManager.getDriver("jdbc:none://localhost:1111"); - if(!(driver instanceof virtuoso.jdbc3.Driver)) - System.out.println(" PASSED"); - } - catch(SQLException e) - { - if(e.toString().equals("java.sql.SQLException: No suitable driver")) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - e.printStackTrace(); - } - } - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/TestVarbinary.java b/libsrc/JDBCDriverType4/testsuite_3.0/TestVarbinary.java deleted file mode 100644 index 32a32bf8a8..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/TestVarbinary.java +++ /dev/null @@ -1,144 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.sql.*; - -public class TestVarbinary -{ - public static void main(String args[]) - { - try - { - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - Class.forName("virtuoso.jdbc3.Driver"); - System.out.println("------------------------- Test of Varbinary -----------------------"); - System.out.print("Establish connection at " + url); - Connection connection = DriverManager.getConnection(url,"dba","dba"); - if(connection instanceof virtuoso.jdbc3.VirtuosoConnection) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Create a Statement class attached to this connection"); - Statement stmt = connection.createStatement(); - if(stmt instanceof virtuoso.jdbc3.VirtuosoStatement) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - - try { - stmt.executeUpdate ("drop table EX..DEMO"); - } catch (Exception e) { } - - System.out.print("Execute CREATE TABLE"); - if(stmt.executeUpdate("create table EX..DEMO (VAL varbinary)") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute INSERT INTO"); - if(stmt.executeUpdate("INSERT INTO EX..DEMO(VAL) VALUES (cast ('my value' as varbinary))") == 1) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - ResultSet resultset = stmt.executeQuery("SELECT * from EX..DEMO"); - System.out.println(" PASSED"); - System.out.print("Get metadata of the last result"); - ResultSetMetaData meta = resultset.getMetaData(); - if(meta instanceof virtuoso.jdbc3.VirtuosoResultSetMetaData) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Get the column type of the meta data"); - if(meta.getColumnType(1) == Types.VARBINARY) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute SELECT"); - resultset = stmt.executeQuery("SELECT VAL from EX..DEMO"); - System.out.println(" PASSED"); - System.out.print("Get metadata of the last result"); - meta = resultset.getMetaData(); - if(meta instanceof virtuoso.jdbc3.VirtuosoResultSetMetaData) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Get the column type of the meta data"); - if(meta.getColumnType(1) == Types.VARBINARY) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Execute DROP TABLE"); - if(stmt.executeUpdate("DROP TABLE EX..DEMO") == 0) - System.out.println(" PASSED"); - else - { - System.out.println(" FAILED"); - System.exit(-1); - } - System.out.print("Close statement at " + url); - stmt.close(); - System.out.println(" PASSED"); - System.out.print("Close connection at " + url); - connection.close(); - System.out.println(" PASSED"); - System.out.println("-------------------------------------------------------------------"); - System.exit(0); - } - catch(Exception e) - { - System.out.println(" FAILED"); - e.printStackTrace(); - System.exit(-1); - } - } - -} - diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/test2276.java b/libsrc/JDBCDriverType4/testsuite_3.0/test2276.java deleted file mode 100644 index a37b2e3b12..0000000000 --- a/libsrc/JDBCDriverType4/testsuite_3.0/test2276.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * - * This project is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License, dated June 1991. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -package testsuite; - -import java.lang.*; -import java.sql.*; -import java.util.*; - -public class test2276 -{ - - //2276 - public static void test2276(String [] args) throws Exception - { - try - { - int x; - Connection conn = null; - String driver = "virtuoso.jdbc3.Driver"; - Class.forName(driver); - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - System.out.println("--------------------- Test of Bug #2276 -------------------"); - System.out.println ("URL - " + url); - conn = DriverManager.getConnection - (url,"dba","dba"); - System.out.println ("@JBDC connection established through " + driver); - Statement stmt = conn.createStatement(); - ResultSet rs = stmt.executeQuery ("select cast ({ts '2001-07-29 17:30:00'} as date) as xx date"); - rs.next(); - System.out.println (rs.getString(1)); - System.out.println (rs.getDate(1).toString()); - if (!rs.getString(1).equals (rs.getDate(1).toString())) - System.out.print ("*** FAILED"); - else - System.out.print ("PASSED"); - } - catch (Exception e) - { - e.printStackTrace(); - System.out.print ("*** FAILED"); - } - System.out.println (": Bug #2276 - dates with getString()"); - } - - public static void test4033(String [] args) throws Exception - { - try - { - int x; - // SSL testing - Connection conn = null; - String driver = "virtuoso.jdbc3.Driver"; - Class.forName(driver); - String url; - if(args.length == 0) - url = "jdbc:virtuoso://localhost:1111"; - else - url = args[0]; - System.out.println("--------------------- Test of Bug #4033 -------------------"); - System.out.println ("URL - " + url); - conn = DriverManager.getConnection - (url,"dba","dba"); - System.out.println ("@JBDC connection established through " + driver); - - PreparedStatement stmt = null; - stmt = conn.prepareStatement ("select ?"); - - java.util.Date date; - java.util.Calendar c = java.util.Calendar.getInstance (); - c.set (2001, 5, 10, 1, 2, 3); - date = c.getTime (); - - Timestamp ts = new Timestamp (date.getTime ()); - ts.setNanos (0); - stmt.setTimestamp (1, ts); - - System.out.println ("insert time: " + ts); - ResultSet rs = stmt.executeQuery (); - - rs.next (); - Timestamp ts_ret = rs.getTimestamp (1); - System.out.println ("fetch date: " + ts_ret); - - if (!ts_ret.equals (ts)) - System.out.print ("*** FAILED"); - else - System.out.print ("PASSED"); - } - catch (Exception e) - { - e.printStackTrace(); - System.out.print ("*** FAILED"); - } - System.out.println (": Bug #4033 - compat for the dt subtypes"); - } - - public static void main(String [] args) throws Exception - { - test2276(args); - test4033(args); - } -} diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am b/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am index 880a32dd6d..d596e01076 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am +++ b/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/SPRgetColumns.java b/libsrc/JDBCDriverType4/testsuite_4.0/SPRgetColumns.java index 65580c43f6..bcb5a6f0ac 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/SPRgetColumns.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/SPRgetColumns.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestBlob.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestBlob.java index 14246db219..092515aefe 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestBlob.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestBlob.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestCallableExecute.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestCallableExecute.java index 80119b8aa5..400169556f 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestCallableExecute.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestCallableExecute.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestClean.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestClean.java index 66a229dd5f..dcdfaef074 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestClean.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestClean.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestDataSource.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestDataSource.java index cc87304f75..55de49a342 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestDataSource.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestDataSource.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestDatabaseMetaData.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestDatabaseMetaData.java index 34797746b1..86efbb182d 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestDatabaseMetaData.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestDatabaseMetaData.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestDateTime.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestDateTime.java index 8c1b562545..b72bfa5569 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestDateTime.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestDateTime.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteBlob.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteBlob.java index 42d9814533..70e45d1e96 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteBlob.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteBlob.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteClob.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteClob.java index 2f7d0c0048..9c7491796b 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteClob.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteClob.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteFetch.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteFetch.java index 74fccbc851..093450c5f4 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteFetch.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestExecuteFetch.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestLongXml.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestLongXml.java index f1cdaa9cbf..fb52b9e33f 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestLongXml.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestLongXml.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestMoreRes.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestMoreRes.java index fbc76855e7..4d9f7763fa 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestMoreRes.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestMoreRes.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestNumeric.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestNumeric.java index e076ab8388..a23aa60a51 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestNumeric.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestNumeric.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareBatch.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareBatch.java index bda7b6bc25..5900731089 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareBatch.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareBatch.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareExecute.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareExecute.java index 67bfc4bd1e..84313ac6b1 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareExecute.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestPrepareExecute.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestScroll.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestScroll.java index e1d200bc93..110a9557bc 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestScroll.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestScroll.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollManual.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollManual.java index 70bcfff86d..91178811aa 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollManual.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollManual.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollPrepare.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollPrepare.java index e15031ada9..93ef3579bb 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollPrepare.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestScrollPrepare.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecute.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecute.java index 19a5fe732f..657f0cd456 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecute.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecute.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecuteBatch.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecuteBatch.java index e518663491..d2d2ffe043 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecuteBatch.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestSimpleExecuteBatch.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestTagProc.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestTagProc.java index 1ad296afe3..e6d7c31e32 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestTagProc.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestTagProc.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestTimeUpdate.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestTimeUpdate.java index c56d182f8b..a20f4a5957 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestTimeUpdate.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestTimeUpdate.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestURL.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestURL.java index 52fa40704d..4362740896 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestURL.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestURL.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/TestVarbinary.java b/libsrc/JDBCDriverType4/testsuite_4.0/TestVarbinary.java index d43a8edc14..73db2fc7d5 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/TestVarbinary.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/TestVarbinary.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/test2276.java b/libsrc/JDBCDriverType4/testsuite_4.0/test2276.java index 3c9bf09f0c..1ac555e8be 100644 --- a/libsrc/JDBCDriverType4/testsuite_4.0/test2276.java +++ b/libsrc/JDBCDriverType4/testsuite_4.0/test2276.java @@ -2,7 +2,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/virtjdbc2.jar b/libsrc/JDBCDriverType4/virtjdbc2.jar deleted file mode 100644 index 7dad9676dc..0000000000 Binary files a/libsrc/JDBCDriverType4/virtjdbc2.jar and /dev/null differ diff --git a/libsrc/JDBCDriverType4/virtjdbc3.jar b/libsrc/JDBCDriverType4/virtjdbc3.jar deleted file mode 100644 index 02b5000adf..0000000000 Binary files a/libsrc/JDBCDriverType4/virtjdbc3.jar and /dev/null differ diff --git a/libsrc/JDBCDriverType4/virtjdbc3ssl.jar b/libsrc/JDBCDriverType4/virtjdbc3ssl.jar deleted file mode 100644 index d14e48ee29..0000000000 Binary files a/libsrc/JDBCDriverType4/virtjdbc3ssl.jar and /dev/null differ diff --git a/libsrc/JDBCDriverType4/virtjdbc4.jar b/libsrc/JDBCDriverType4/virtjdbc4.jar index 4d211522b9..d324ca2172 100644 Binary files a/libsrc/JDBCDriverType4/virtjdbc4.jar and b/libsrc/JDBCDriverType4/virtjdbc4.jar differ diff --git a/libsrc/JDBCDriverType4/virtjdbc4_1.jar b/libsrc/JDBCDriverType4/virtjdbc4_1.jar index eab421c490..500069eaff 100644 Binary files a/libsrc/JDBCDriverType4/virtjdbc4_1.jar and b/libsrc/JDBCDriverType4/virtjdbc4_1.jar differ diff --git a/libsrc/JDBCDriverType4/virtjdbc4_1ssl.jar b/libsrc/JDBCDriverType4/virtjdbc4_1ssl.jar deleted file mode 100644 index 96701c2430..0000000000 Binary files a/libsrc/JDBCDriverType4/virtjdbc4_1ssl.jar and /dev/null differ diff --git a/libsrc/JDBCDriverType4/virtjdbc4_2.jar b/libsrc/JDBCDriverType4/virtjdbc4_2.jar index 2a591db2c7..82f5576b86 100644 Binary files a/libsrc/JDBCDriverType4/virtjdbc4_2.jar and b/libsrc/JDBCDriverType4/virtjdbc4_2.jar differ diff --git a/libsrc/JDBCDriverType4/virtjdbc4_2ssl.jar b/libsrc/JDBCDriverType4/virtjdbc4_2ssl.jar deleted file mode 100644 index 8f997f396f..0000000000 Binary files a/libsrc/JDBCDriverType4/virtjdbc4_2ssl.jar and /dev/null differ diff --git a/libsrc/JDBCDriverType4/virtjdbc4ssl.jar b/libsrc/JDBCDriverType4/virtjdbc4ssl.jar deleted file mode 100644 index 971300b918..0000000000 Binary files a/libsrc/JDBCDriverType4/virtjdbc4ssl.jar and /dev/null differ diff --git a/libsrc/JDBCDriverType4/virtuoso/Makefile.am b/libsrc/JDBCDriverType4/virtuoso/Makefile.am index 411694f515..07834cdd30 100644 --- a/libsrc/JDBCDriverType4/virtuoso/Makefile.am +++ b/libsrc/JDBCDriverType4/virtuoso/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -19,7 +19,7 @@ # # -SUBDIRS = jdbc2 +SUBDIRS = jdbc # ---------------------------------------------------------------------- # @@ -29,4 +29,4 @@ SUBDIRS = jdbc2 EXTRA_DIST= \ javax/*.java \ sql/*.java \ - jdbc2/*.java + jdbc/*.java diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/BaseRowSet.java b/libsrc/JDBCDriverType4/virtuoso/javax/BaseRowSet.java index d75bbe6d6d..89bd7265a1 100644 --- a/libsrc/JDBCDriverType4/virtuoso/javax/BaseRowSet.java +++ b/libsrc/JDBCDriverType4/virtuoso/javax/BaseRowSet.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -61,25 +61,14 @@ public abstract class BaseRowSet implements RowSet, Serializable { private int fetchDir = ResultSet.FETCH_FORWARD; private int fetchSize = 0; -#if JDK_VER >= 16 protected java.util.Map> map = null; private LinkedList listeners; private ArrayList params; -#else - private Map map = null; - private LinkedList listeners; - private ArrayList params; -#endif public BaseRowSet() { -#if JDK_VER >= 16 listeners = new LinkedList(); params = new ArrayList(); -#else - listeners = new LinkedList(); - params = new ArrayList(); -#endif } @@ -273,11 +262,7 @@ public int getType() throws SQLException { * @return a map object * @exception SQLException if a database-access error occurs. */ -#if JDK_VER >= 16 public Map> getTypeMap() throws SQLException{ -#else - public Map getTypeMap() throws SQLException{ -#endif return map; } @@ -412,7 +397,6 @@ public synchronized void setBlob(int parameterIndex, Blob x) param.jType = Parameter.jObject; } -#if JDK_VER >= 16 /** * Sets the designated parameter to a InputStream object. The inputstream must contain the number * of characters specified by length otherwise a SQLException will be @@ -1000,7 +984,6 @@ public void setNClob(int parameterIndex, Reader reader) throws SQLException throw OPLMessage_x.makeFExceptionV(OPLMessage_x.errx_Method_XX_not_yet_implemented, "setNClob(parameterIndex, reader)"); } -#endif /** * Set a parameter to a Java boolean value. @@ -1075,7 +1058,6 @@ public synchronized void setCharacterStream(int parameterIndex, Reader x, int le param.length = length; } -#if JDK_VER >= 16 /** * Sets the designated parameter in this RowSet object's command @@ -1278,7 +1260,6 @@ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLExce throw OPLMessage_x.makeFExceptionV(OPLMessage_x.errx_Method_XX_not_yet_implemented, "setNCharacterStream(parameterIndex, value)"); } -#endif /** * Set a CLOB parameter. @@ -1710,7 +1691,6 @@ public synchronized void setObject(int parameterIndex, Object x, int targetSqlTy } -#if JDK_VER >= 16 /** * Sets the designated parameter to SQL NULL. * @@ -2295,13 +2275,12 @@ public void setTimestamp(String parameterName, java.sql.Timestamp x, Calendar ca throw OPLMessage_x.makeFExceptionV(OPLMessage_x.errx_Method_XX_not_yet_implemented, "setTimestamp(parameterName, x, cal)"); } -#endif /** * Set the rowset's command property. * * This property is optional. The command property may not be needed - * when a rowset is produced by a data source that doesn't support + * when a rowset is produced by a data source that does not support * commands, such as a spreadsheet. * * @param cmd a command string, may be null @@ -2474,11 +2453,7 @@ public void setType(int value) throws SQLException * @param map a map object * @exception SQLException if a database-access error occurs. */ -#if JDK_VER >= 16 public void setTypeMap(Map> value) throws SQLException -#else - public void setTypeMap(Map value) throws SQLException -#endif { map = value; } diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/OPLCachedRowSet.java b/libsrc/JDBCDriverType4/virtuoso/javax/OPLCachedRowSet.java index 02314cfa69..538c663853 100644 --- a/libsrc/JDBCDriverType4/virtuoso/javax/OPLCachedRowSet.java +++ b/libsrc/JDBCDriverType4/virtuoso/javax/OPLCachedRowSet.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -39,9 +39,7 @@ import javax.naming.*; import openlink.util.OPLHeapBlob; import openlink.util.OPLHeapClob; -#if JDK_VER >= 16 import openlink.util.OPLHeapNClob; -#endif /** * @@ -53,8 +51,8 @@ * an Enterprise JavaBeans component running in a server environment over * a network to a client running in a web browser. A second use for * OPLCachedRowSets is to provide scrolling and updating for ResultSets that - * don't provide these capabilities themselves. A OPLCachedRowSet can be - * used to augment the capabilities of a JDBC driver that doesn't have + * do not provide these capabilities themselves. A OPLCachedRowSet can be + * used to augment the capabilities of a JDBC driver that does not have * full support for scrolling and updating. Finally, a OPLCachedRowSet can * be used to provide Java applications with access to tabular data in an * environment such as a thin client or PDA, where it would be @@ -73,7 +71,7 @@ * a JDBC connection briefly while data is being read from the database * and used to populate it with rows, and again while updated rows are being * propagated back to the underlying database. During the remainder of - * its lifetime, a OPLCachedRowSet object isn't associated with an + * its lifetime, a OPLCachedRowSet object is not associated with an * underlying database connection. A OPLCachedRowSet object can simply be * thought of as a disconnected set of rows that are being cached outside * of a data source. Since all data is cached in memory, OPLCachedRowSets are @@ -105,11 +103,7 @@ public class OPLCachedRowSet extends BaseRowSet private RowSetMetaData rowSMD; private int keyCols[]; private String tableName; -#if JDK_VER >= 16 private ArrayList rowsData; -#else - private ArrayList rowsData; -#endif private int curState = NOROWS; private int curRow; private int absolutePos; @@ -130,11 +124,7 @@ public class OPLCachedRowSet extends BaseRowSet public OPLCachedRowSet() throws SQLException { rowSetReader = new RowSetReader(); rowSetWriter = new RowSetWriter(); -#if JDK_VER >= 16 rowsData = new ArrayList(); -#else - rowsData = new ArrayList(); -#endif onInsertRow = false; updateRow = null; setType(ResultSet.TYPE_SCROLL_INSENSITIVE); @@ -191,7 +181,7 @@ public synchronized void setConcurrency(int concurrency) throws SQLException { * is set to the first "updated" row that resulted in an exception, in * the case that an exception is thrown. With one exception, if the row * that caused the exception is a "deleted" row, then in the usual case, - * when deleted rows are not shown, the current row isn't affected. + * when deleted rows are not shown, the current row is not affected. * * When successful, calling acceptChanges() replaces the original value * of the rowset with the current value. Note: Both the original and @@ -236,7 +226,7 @@ public synchronized void acceptChanges() throws SQLException { /** * Like acceptChanges() above, but takes a Connection argument. The * Connection is used internally when doing the updates. This form - * isn't used unless the underlying data source is a JDBC data source. + * is not used unless the underlying data source is a JDBC data source. * * @param _conn a database connection * @@ -278,7 +268,7 @@ public synchronized void execute() throws java.sql.SQLException { /** * Populates the rowset with data. The first form uses the properties: * url/data source name, user, and password to create a database - * connection. If these properties haven't been set, an exception is + * connection. If these properties have not been set, an exception is * thrown. The second form uses an existing JDBC connection object * instead. The values of the url/data source name, user, and password * properties are ignored when the second form is used. Execute() closes @@ -302,7 +292,7 @@ public void execute(Connection _conn) throws SQLException { /** * Populate the OPLCachedRowSet object with data from a ResultSet. This * method is an alternative to execute() for filling the rowset with - * data. Populate() doesn't require that the properties needed by + * data. Populate() does not require that the properties needed by * execute(), such as the command property, be set. A RowSetChangedEvent * is sent to all registered listeners prior to returning. * @@ -316,11 +306,7 @@ public synchronized void populate(ResultSet rs) throws SQLException { tableName = null; keyCols = null; -#if JDK_VER >= 16 Map> map = getTypeMap(); -#else - Map map = getTypeMap(); -#endif ResultSetMetaData rsmd = rs.getMetaData(); int colCount = rsmd.getColumnCount(); int i; @@ -339,11 +325,9 @@ public synchronized void populate(ResultSet rs) throws SQLException { else if (x instanceof Clob) x = new OPLHeapClob(((Clob)x).getSubString(0L, (int)((Clob)x).length())); -#if JDK_VER >= 16 else if (x instanceof NClob) x = new OPLHeapNClob(((NClob)x).getSubString(0L, (int)((NClob)x).length())); -#endif row.setOrigColData(j, x); } rowsData.add(row); @@ -436,7 +420,7 @@ public String getTableName() throws SQLException { * Sets the identifier for the table from which this rowset was derived * to the given table name. * - * Note: You don't usually need to set a table name, because the OPLCachedRowSet tries + * Note: You do not usually need to set a table name, because the OPLCachedRowSet tries * to determine the table name from your SQL query command. * * @param _tabName - a String object that identifies the table from which @@ -462,7 +446,7 @@ public int[] getKeyCols() throws SQLException { * Sets this OPLCachedRowSet object's keyCols field with the given array of column numbers, * which forms a key for uniquely identifying a row in this rowset. * - * Note: If you don't set the keyCols, the OPLCachedRowSet will set automatically + * Note: If you do not set the keyCols, the OPLCachedRowSet will set automatically * based on RowSetMetaData * * @param keys - an array of int indicating the columns that form a key for @@ -491,7 +475,7 @@ public void setKeyColumns(int[] keys) throws SQLException { * has changed. After calling cancelRowDelete() * the current row is no longer marked for deletion. An exception is * thrown if there is no current row. Note: This method can be - * ignored if deleted rows aren't being shown (the normal case). + * ignored if deleted rows are not being shown (the normal case). * * @exception SQLException if an error occurs. */ @@ -513,7 +497,7 @@ public synchronized void cancelRowDelete() throws SQLException { /** * Cancels insertion of the current row and notifies listeners that a row * has changed. An exception is thrown if - * the row isn't an inserted row. The current row is immediately removed + * the row is not an inserted row. The current row is immediately removed * from the rowset. This operation cannot be undone. * * @exception SQLException if an error occurs. @@ -703,20 +687,12 @@ public synchronized Collection toCollection() throws SQLException { int count = countRows - countDeleted; if (count == 0) return null; -#if JDK_VER >= 16 ArrayList tmpRowset = new ArrayList(count); -#else - ArrayList tmpRowset = new ArrayList(count); -#endif int colCount = rowSMD.getColumnCount(); for(Iterator i = rowsData.iterator(); i.hasNext(); ) { Row row = (Row)i.next(); if (!row.isDeleted) { -#if JDK_VER >= 16 ArrayList tmpCol = new ArrayList(colCount); -#else - ArrayList tmpCol = new ArrayList(colCount); -#endif for(int j = 1; j <= colCount; j++) tmpCol.add(row.getColData(j)); tmpRowset.add(tmpCol); @@ -727,7 +703,7 @@ public synchronized Collection toCollection() throws SQLException { /** * Return a column of the rowset as a collection. Makes a copy of the - * column's data. + * column data. * * @return a collection object * @@ -737,11 +713,7 @@ public synchronized Collection toCollection(int col) throws SQLException { int count = countRows - countDeleted; if (count == 0) return null; -#if JDK_VER >= 16 ArrayList tmpRowset = new ArrayList(count); -#else - ArrayList tmpRowset = new ArrayList(count); -#endif checkColumnIndex(col); for(Iterator i = rowsData.iterator(); i.hasNext(); ) { Row row = (Row)i.next(); @@ -782,7 +754,7 @@ public synchronized void release() throws SQLException { * a copy of a rowset is completely independent from the original. * Making a copy saves the cost of creating an identical rowset from * first principles, which can be quite expensive. - * For example, it doesn't do the query to a remote database server. + * For example, it does not do the query to a remote database server. * * @return a copy of the rowset * @exception SQLException if an error occurs. @@ -1550,10 +1522,8 @@ else if (x instanceof Blob) return Bin2Hex(((Blob)x).getBytes(0L, (int)((Blob)x).length())); else if (x instanceof Clob) return ((Clob)x).getSubString(0L, (int)((Clob)x).length()); -#if JDK_VER >= 16 else if (x instanceof NClob) return ((NClob)x).getSubString(0L, (int)((NClob)x).length()); -#endif else return x.toString(); } @@ -1585,11 +1555,9 @@ else if (x instanceof Blob) else if (x instanceof Clob) { c =((Clob)x).getSubString(0L, 1).charAt(0); return (c == 'T' || c == 't' || c == '1'); -#if JDK_VER >= 16 }else if (x instanceof NClob) { c =((NClob)x).getSubString(0L, 1).charAt(0); return (c == 'T' || c == 't' || c == '1'); -#endif }else if (x instanceof Number) return ((Number)x).intValue() != 0; else @@ -1806,10 +1774,8 @@ else if (x instanceof Blob) return ((Blob)x).getBytes(0L, (int)((Blob)x).length()); else if (x instanceof Clob) return ((Clob)x).getSubString(0L, (int)((Clob)x).length()).getBytes(); -#if JDK_VER >= 16 else if (x instanceof NClob) return ((NClob)x).getSubString(0L, (int)((NClob)x).length()).getBytes(); -#endif else if (x instanceof String) return ((String)x).getBytes(); else @@ -1844,13 +1810,11 @@ public synchronized Date getDate(int columnIndex) throws SQLException { if (dt == null) throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'Date'"); return dt; -#if JDK_VER >= 16 } else if (x instanceof NClob) { Date dt = _getDate(((NClob)x).getSubString(0L, (int)((NClob)x).length())); if (dt == null) throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'Date'"); return dt; -#endif } else throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'Date'"); } @@ -1883,13 +1847,11 @@ public synchronized Time getTime(int columnIndex) throws SQLException { if (dt == null) throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'Time'"); return dt; -#if JDK_VER >= 16 } else if (x instanceof NClob) { Time dt = _getTime(((NClob)x).getSubString(0L, (int)((NClob)x).length())); if (dt == null) throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'Time'"); return dt; -#endif } else throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'Time'"); } @@ -1924,13 +1886,11 @@ public synchronized Timestamp getTimestamp(int columnIndex) throws SQLException if (dt == null) throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'Timestamp'"); return dt; -#if JDK_VER >= 16 } else if (x instanceof NClob) { Timestamp dt = _getTimestamp(((NClob)x).getSubString(0L, (int)((NClob)x).length())); if (dt == null) throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'Timestamp'"); return dt; -#endif } else throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'Timestamp'"); } @@ -1965,10 +1925,8 @@ public synchronized InputStream getAsciiStream(int columnIndex) throws SQLExcept return objInputStream = new ByteArrayInputStream(((String)x).getBytes()); else if (x instanceof Clob) return objInputStream = ((Clob)x).getAsciiStream(); -#if JDK_VER >= 16 else if (x instanceof NClob) return objInputStream = ((NClob)x).getAsciiStream(); -#endif else throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'AsciiStream'"); } @@ -2004,10 +1962,8 @@ public synchronized InputStream getUnicodeStream(int columnIndex) throws SQLExce return objInputStream = new ByteArrayInputStream(((String)x).getBytes()); else if (x instanceof Clob) return objInputStream = ((Clob)x).getAsciiStream(); -#if JDK_VER >= 16 else if (x instanceof NClob) return objInputStream = ((NClob)x).getAsciiStream(); -#endif else throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'UnicodeStream'"); } @@ -2045,10 +2001,8 @@ else if (x instanceof Blob) return objInputStream = ((Blob)x).getBinaryStream(); else if (x instanceof Clob) return objInputStream = ((Clob)x).getAsciiStream(); -#if JDK_VER >= 16 else if (x instanceof NClob) return objInputStream = ((NClob)x).getAsciiStream(); -#endif else throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'BinaryStream'"); } @@ -2059,7 +2013,7 @@ else if (x instanceof NClob) * *

    This method will return the value of the given column as a * Java object. The type of the Java object will be the default - * Java object type corresponding to the column's SQL type, + * Java object type corresponding to the column SQL type, * following the mapping for built-in types specified in the JDBC * spec. * @@ -2302,7 +2256,7 @@ public InputStream getBinaryStream(String columnName) throws SQLException { * *

    This method will return the value of the given column as a * Java object. The type of the Java object will be the default - * Java object type corresponding to the column's SQL type, + * Java object type corresponding to the column SQL type, * following the mapping for built-in types specified in the JDBC * spec. * @@ -2340,10 +2294,8 @@ public synchronized Reader getCharacterStream(int columnIndex) throws SQLExcepti return objReader = new StringReader((String)x); else if (x instanceof Clob) return objReader = ((Clob)x).getCharacterStream(); -#if JDK_VER >= 16 else if (x instanceof NClob) return objReader = ((NClob)x).getCharacterStream(); -#endif else throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Could_not_convert_parameter_to_XX, "'CharacterStream'"); } @@ -2396,11 +2348,9 @@ public synchronized void updateNull(int columnIndex) throws SQLException { public synchronized void updateBoolean(int columnIndex, boolean x) throws SQLException { Row r = this.getRowForUpdate(columnIndex, "'updateBoolean(...)'"); switch(rowSMD.getColumnType(columnIndex)) { -#if JDK_VER >= 14 case Types.BOOLEAN: r.setColData(columnIndex, new Boolean(x)); break; -#endif case Types.BIT: case Types.TINYINT: case Types.SMALLINT: @@ -2416,11 +2366,9 @@ public synchronized void updateBoolean(int columnIndex, boolean x) throws SQLExc case Types.CHAR: case Types.VARCHAR: case Types.LONGVARCHAR: -#if JDK_VER >= 16 case Types.NCHAR: case Types.NVARCHAR: case Types.LONGNVARCHAR: -#endif r.setColData(columnIndex, String.valueOf(x)); break; default: @@ -2561,11 +2509,9 @@ public synchronized void updateString(int columnIndex, String x) throws SQLExcep updateNull(columnIndex); else switch(rowSMD.getColumnType(columnIndex)) { -#if JDK_VER >= 14 case Types.BOOLEAN: r.setColData(columnIndex, new Boolean(x)); break; -#endif case Types.BIT: case Types.TINYINT: case Types.SMALLINT: @@ -2579,15 +2525,11 @@ public synchronized void updateString(int columnIndex, String x) throws SQLExcep case Types.CHAR: case Types.VARCHAR: case Types.LONGVARCHAR: -#if JDK_VER >= 14 case Types.DATALINK: -#endif -#if JDK_VER >= 16 case Types.NCHAR: case Types.NVARCHAR: case Types.LONGNVARCHAR: case Types.NCLOB: -#endif case Types.BLOB: case Types.CLOB: r.setColData(columnIndex, x); @@ -2648,12 +2590,10 @@ public synchronized void updateBytes(int columnIndex, byte[] x) throws SQLExcept case Types.VARCHAR: case Types.LONGVARCHAR: case Types.CLOB: -#if JDK_VER >= 16 case Types.NCLOB: case Types.NCHAR: case Types.NVARCHAR: case Types.LONGNVARCHAR: -#endif r.setColData(columnIndex, Bin2Hex(x)); break; case Types.BLOB: @@ -2691,12 +2631,10 @@ public synchronized void updateDate(int columnIndex, Date x) throws SQLException case Types.VARCHAR: case Types.LONGVARCHAR: case Types.CLOB: -#if JDK_VER >= 16 case Types.NCLOB: case Types.NCHAR: case Types.NVARCHAR: case Types.LONGNVARCHAR: -#endif r.setColData(columnIndex, x.toString()); break; case Types.DATE: @@ -2732,12 +2670,10 @@ public synchronized void updateTime(int columnIndex, Time x) throws SQLException case Types.VARCHAR: case Types.LONGVARCHAR: case Types.CLOB: -#if JDK_VER >= 16 case Types.NCLOB: case Types.NCHAR: case Types.NVARCHAR: case Types.LONGNVARCHAR: -#endif r.setColData(columnIndex, x.toString()); break; case Types.TIME: @@ -2773,12 +2709,10 @@ public synchronized void updateTimestamp(int columnIndex, Timestamp x) throws SQ case Types.VARCHAR: case Types.LONGVARCHAR: case Types.CLOB: -#if JDK_VER >= 16 case Types.NCLOB: case Types.NCHAR: case Types.NVARCHAR: case Types.LONGNVARCHAR: -#endif r.setColData(columnIndex, x.toString()); break; case Types.TIMESTAMP: @@ -3410,7 +3344,7 @@ public Array getArray(String colName) throws SQLException { /** * Get the value of a column in the current row as a java.sql.Date * object. Use the calendar to construct an appropriate millisecond - * value for the Date, if the underlying database doesn't store + * value for the Date, if the underlying database does not store * timezone information. * * @param columnIndex the first column is 1, the second is 2, ... @@ -3434,7 +3368,7 @@ public Date getDate(int columnIndex, Calendar cal) throws SQLException { /** * Get the value of a column in the current row as a java.sql.Date * object. Use the calendar to construct an appropriate millisecond - * value for the Date, if the underlying database doesn't store + * value for the Date, if the underlying database does not store * timezone information. * * @param columnName is the SQL name of the column @@ -3449,7 +3383,7 @@ public Date getDate(String columnName, Calendar cal) throws SQLException { /** * Get the value of a column in the current row as a java.sql.Time * object. Use the calendar to construct an appropriate millisecond - * value for the Time, if the underlying database doesn't store + * value for the Time, if the underlying database does not store * timezone information. * * @param columnIndex the first column is 1, the second is 2, ... @@ -3473,7 +3407,7 @@ public Time getTime(int columnIndex, Calendar cal) throws SQLException { /** * Get the value of a column in the current row as a java.sql.Time * object. Use the calendar to construct an appropriate millisecond - * value for the Time, if the underlying database doesn't store + * value for the Time, if the underlying database does not store * timezone information. * * @param columnName is the SQL name of the column @@ -3488,7 +3422,7 @@ public Time getTime(String columnName, Calendar cal) throws SQLException { /** * Get the value of a column in the current row as a java.sql.Timestamp * object. Use the calendar to construct an appropriate millisecond - * value for the Timestamp, if the underlying database doesn't store + * value for the Timestamp, if the underlying database does not store * timezone information. * * @param columnIndex the first column is 1, the second is 2, ... @@ -3517,7 +3451,7 @@ public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException /** * Get the value of a column in the current row as a java.sql.Timestamp * object. Use the calendar to construct an appropriate millisecond - * value for the Timestamp, if the underlying database doesn't store + * value for the Timestamp, if the underlying database does not store * timezone information. * * @param columnName is the SQL name of the column @@ -3529,7 +3463,6 @@ public Timestamp getTimestamp(String columnName, Calendar cal) throws SQLExcepti return getTimestamp(findColumn (columnName), cal); } -#if JDK_VER >= 14 //-------------------------- JDBC 3.0 ---------------------------------------- /** * Retrieves the value of the designated column in the current row @@ -3740,7 +3673,6 @@ public void updateArray(String columnName, java.sql.Array x) throws SQLException updateArray (findColumn (columnName), x); } -#if JDK_VER >= 16 //------------------------- JDBC 4.0 ----------------------------------- /** @@ -5102,7 +5034,7 @@ public void updateNClob(String columnLabel, Reader reader) throws SQLException public T unwrap(java.lang.Class iface) throws java.sql.SQLException { try { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.cast(this); } catch (ClassCastException cce) { throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Unable_to_unwrap_to_XX, iface.toString()); @@ -5126,7 +5058,7 @@ public T unwrap(java.lang.Class iface) throws java.sql.SQLException */ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.isInstance(this); } @@ -5163,9 +5095,9 @@ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLExcepti public T getObject(int columnIndex, Class type) throws SQLException { if (type == null) { - throw new SQLException("Type parameter can not be null", "S1009"); + throw new SQLException("Type parameter cannot be null", "S1009"); } - + if (type.equals(String.class)) { return (T) getString(columnIndex); } else if (type.equals(BigDecimal.class)) { @@ -5199,19 +5131,19 @@ public T getObject(int columnIndex, Class type) throws SQLException } else if (type.equals(java.net.URL.class)) { return (T) getURL(columnIndex); // } else if (type.equals(Struct.class)) { -// -// } +// +// } // } else if (type.equals(RowId.class)) { -// +// // } else if (type.equals(NClob.class)) { -// +// // } else if (type.equals(SQLXML.class)) { - + } else { try { return (T) getObject(columnIndex); } catch (ClassCastException cce) { - throw new SQLException ("Conversion not supported for type " + type.getName(), + throw new SQLException ("Conversion not supported for type " + type.getName(), "S1009"); } } @@ -5251,8 +5183,6 @@ public T getObject(String columnLabel, Class type) throws SQLException } #endif -#endif -#endif ///////////////////////////////////////////////////////////////////////////// @@ -5342,11 +5272,9 @@ private synchronized void updateNumber(int columnIndex, Number val, String typeN { Row r = this.getRowForUpdate(columnIndex, funcName); switch(rowSMD.getColumnType(columnIndex)) { -#if JDK_VER >= 14 case Types.BOOLEAN: r.setColData(columnIndex, new Boolean((val.intValue()!=0? true:false))); break; -#endif case Types.BIT: case Types.TINYINT: case Types.SMALLINT: @@ -5362,11 +5290,9 @@ private synchronized void updateNumber(int columnIndex, Number val, String typeN case Types.CHAR: case Types.VARCHAR: case Types.LONGVARCHAR: -#if JDK_VER >= 16 case Types.NCHAR: case Types.NVARCHAR: case Types.LONGNVARCHAR: -#endif r.setColData(columnIndex, val.toString()); break; default: @@ -5754,11 +5680,7 @@ private class Scanner { char[] query; final static String blankChars = " \t\n\r\f"; final static String symb = "_-$#"; -#if JDK_VER >= 16 HashMap keywords = new HashMap(); -#else - HashMap keywords = new HashMap(); -#endif Token tok = null; private Scanner(String sql) { @@ -6263,11 +6185,7 @@ private class RowSetWriter implements Serializable, Cloneable { private int[] keyCols; private ResultSetMetaData rsmd; private int colCount; -#if JDK_VER >= 16 private LinkedList params = new LinkedList(); -#else - private LinkedList params = new LinkedList(); -#endif private boolean writeData(RowSetInternal x) throws java.sql.SQLException { OPLCachedRowSet crs = (OPLCachedRowSet)x; @@ -6338,14 +6256,10 @@ private boolean writeData(RowSetInternal x) throws java.sql.SQLException { private boolean doUpdate(OPLCachedRowSet crs) throws SQLException { ResultSet rs_orig = crs.getOriginalRow(); if (!rs_orig.next()) - return true; //ERROR , data isn't found + return true; //ERROR , data is not found StringBuffer tmpSQL = new StringBuffer(updateSQL); -#if JDK_VER >= 16 LinkedList setData = new LinkedList(); -#else - LinkedList setData = new LinkedList(); -#endif boolean comma = false; for (int i = 1; i <= colCount; i++) if (crs.columnUpdated(i)) { @@ -6384,7 +6298,7 @@ private boolean doUpdate(OPLCachedRowSet crs) throws SQLException { pstmt.setObject(++par, i.next()); if (pstmt.executeUpdate() != 1) - return true; //ERROR , data wasn't updated + return true; //ERROR , data was not updated pstmt.close(); return false; @@ -6402,7 +6316,7 @@ private boolean doInsert(PreparedStatement insertPStmt, OPLCachedRowSet crs) } if (insertPStmt.executeUpdate() != 1) - return true; //ERROR , data wasn't inserted + return true; //ERROR , data was not inserted return false; } @@ -6410,7 +6324,7 @@ private boolean doInsert(PreparedStatement insertPStmt, OPLCachedRowSet crs) private boolean doDelete(OPLCachedRowSet crs) throws SQLException { ResultSet rs = crs.getOriginalRow(); if (!rs.next()) - return true; //ERROR , data isn't found + return true; //ERROR , data is not found String delWhere = createWhere(keyCols, rs); PreparedStatement pstmt = conn.prepareStatement(deleteSQL + delWhere); @@ -6425,7 +6339,7 @@ private boolean doDelete(OPLCachedRowSet crs) throws SQLException { pstmt.setObject(++par, i.next()); if (pstmt.executeUpdate() != 1) - return true; //ERROR , data wasn't deleted + return true; //ERROR , data was not deleted pstmt.close(); return false; @@ -6523,9 +6437,7 @@ private void setKeyCols(OPLCachedRowSet crs) throws SQLException { case Types.DECIMAL: case Types.NUMERIC: case Types.BIT: -#if JDK_VER >= 14 case Types.BOOLEAN: -#endif case Types.CHAR: case Types.VARCHAR: case Types.BINARY: @@ -6533,14 +6445,10 @@ private void setKeyCols(OPLCachedRowSet crs) throws SQLException { case Types.DATE: case Types.TIME: case Types.TIMESTAMP: -#if JDK_VER >= 14 case Types.DATALINK: -#endif -#if JDK_VER >= 16 case Types.NCHAR: case Types.ROWID: case Types.NVARCHAR: -#endif case Types.DISTINCT: tmpCols[count++] = i; break; diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/OPLJdbcRowSet.java b/libsrc/JDBCDriverType4/virtuoso/javax/OPLJdbcRowSet.java index 68544f3f4c..6bf51e0edc 100644 --- a/libsrc/JDBCDriverType4/virtuoso/javax/OPLJdbcRowSet.java +++ b/libsrc/JDBCDriverType4/virtuoso/javax/OPLJdbcRowSet.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -918,7 +918,7 @@ public synchronized InputStream getBinaryStream(int columnIndex) throws SQLExcep * *

    This method will return the value of the given column as a * Java object. The type of the Java object will be the default - * Java object type corresponding to the column's SQL type, + * Java object type corresponding to the column SQL type, * following the mapping for built-in types specified in the JDBC * spec. * @@ -1171,7 +1171,7 @@ public synchronized InputStream getBinaryStream(String columnName) throws SQLExc * *

    This method will return the value of the given column as a * Java object. The type of the Java object will be the default - * Java object type corresponding to the column's SQL type, + * Java object type corresponding to the column SQL type, * following the mapping for built-in types specified in the JDBC * spec. * @@ -1900,11 +1900,7 @@ public synchronized Statement getStatement() throws SQLException { * @param map the mapping from SQL type names to Java classes * @return an object representing the SQL value */ -#if JDK_VER >= 16 public synchronized Object getObject(int colIndex, Map> map) -#else - public synchronized Object getObject(int colIndex, Map map) -#endif throws SQLException { check_close(); @@ -1964,11 +1960,7 @@ public synchronized Array getArray(int colIndex) throws SQLException { * @param map the mapping from SQL type names to Java classes * @return an object representing the SQL value */ -#if JDK_VER >= 16 public synchronized Object getObject(String colName, Map> map) -#else - public synchronized Object getObject(String colName, Map map) -#endif throws SQLException { check_close(); @@ -2022,7 +2014,7 @@ public synchronized Array getArray(String colName) throws SQLException { /** * Get the value of a column in the current row as a java.sql.Date * object. Use the calendar to construct an appropriate millisecond - * value for the Date, if the underlying database doesn't store + * value for the Date, if the underlying database does not store * timezone information. * * @param columnIndex the first column is 1, the second is 2, ... @@ -2038,7 +2030,7 @@ public synchronized Date getDate(int columnIndex, Calendar cal) throws SQLExcept /** * Get the value of a column in the current row as a java.sql.Date * object. Use the calendar to construct an appropriate millisecond - * value for the Date, if the underlying database doesn't store + * value for the Date, if the underlying database does not store * timezone information. * * @param columnName is the SQL name of the column @@ -2054,7 +2046,7 @@ public synchronized Date getDate(String columnName, Calendar cal) throws SQLExce /** * Get the value of a column in the current row as a java.sql.Time * object. Use the calendar to construct an appropriate millisecond - * value for the Time, if the underlying database doesn't store + * value for the Time, if the underlying database does not store * timezone information. * * @param columnIndex the first column is 1, the second is 2, ... @@ -2070,7 +2062,7 @@ public synchronized Time getTime(int columnIndex, Calendar cal) throws SQLExcept /** * Get the value of a column in the current row as a java.sql.Time * object. Use the calendar to construct an appropriate millisecond - * value for the Time, if the underlying database doesn't store + * value for the Time, if the underlying database does not store * timezone information. * * @param columnName is the SQL name of the column @@ -2086,7 +2078,7 @@ public synchronized Time getTime(String columnName, Calendar cal) throws SQLExce /** * Get the value of a column in the current row as a java.sql.Timestamp * object. Use the calendar to construct an appropriate millisecond - * value for the Timestamp, if the underlying database doesn't store + * value for the Timestamp, if the underlying database does not store * timezone information. * * @param columnIndex the first column is 1, the second is 2, ... @@ -2102,7 +2094,7 @@ public synchronized Timestamp getTimestamp(int columnIndex, Calendar cal) throws /** * Get the value of a column in the current row as a java.sql.Timestamp * object. Use the calendar to construct an appropriate millisecond - * value for the Timestamp, if the underlying database doesn't store + * value for the Timestamp, if the underlying database does not store * timezone information. * * @param columnName is the SQL name of the column @@ -2115,7 +2107,6 @@ public synchronized Timestamp getTimestamp(String columnName, Calendar cal) thro return rs.getTimestamp(columnName, cal); } -#if JDK_VER >= 14 //-------------------------- JDBC 3.0 ---------------------------------------- /** * Retrieves the value of the designated column in the current row @@ -2293,7 +2284,6 @@ public synchronized void updateArray(String columnName, java.sql.Array x) throws rs.updateArray(columnName, x); } -#if JDK_VER >= 16 //------------------------- JDBC 4.0 ----------------------------------- /** @@ -3693,9 +3683,9 @@ public synchronized boolean isWrapperFor(java.lang.Class iface) throws java.s public T getObject(int columnIndex, Class type) throws SQLException { if (type == null) { - throw new SQLException("Type parameter can not be null", "S1009"); + throw new SQLException("Type parameter cannot be null", "S1009"); } - + if (type.equals(String.class)) { return (T) getString(columnIndex); } else if (type.equals(BigDecimal.class)) { @@ -3729,19 +3719,19 @@ public T getObject(int columnIndex, Class type) throws SQLException } else if (type.equals(java.net.URL.class)) { return (T) getURL(columnIndex); // } else if (type.equals(Struct.class)) { -// -// } +// +// } // } else if (type.equals(RowId.class)) { -// +// // } else if (type.equals(NClob.class)) { -// +// // } else if (type.equals(SQLXML.class)) { - + } else { try { return (T) getObject(columnIndex); } catch (ClassCastException cce) { - throw new SQLException ("Conversion not supported for type " + type.getName(), + throw new SQLException ("Conversion not supported for type " + type.getName(), "S1009"); } } @@ -3782,8 +3772,6 @@ public T getObject(String columnLabel, Class type) throws SQLException #endif -#endif -#endif private void check_close() throws SQLException { diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/OPLMessage_x.java b/libsrc/JDBCDriverType4/virtuoso/javax/OPLMessage_x.java index 41cd17c77d..a7f57c8516 100644 --- a/libsrc/JDBCDriverType4/virtuoso/javax/OPLMessage_x.java +++ b/libsrc/JDBCDriverType4/virtuoso/javax/OPLMessage_x.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -25,9 +25,7 @@ import java.text.MessageFormat; import java.sql.SQLException; -#if JDK_VER >= 16 import java.sql.SQLFeatureNotSupportedException; -#endif class OPLMessage_x extends openlink.util.BaseMessage { protected static final int errx_Physical_Connection_is_closed = 1; @@ -94,13 +92,11 @@ protected static SQLException makeException (int err_id) return new SQLException (err_Prefix + getMessage(err_id), S_GENERAL_ERR); } -#if JDK_VER >= 16 protected static SQLFeatureNotSupportedException makeFExceptionV (int err_id, String p0) { Object params[] = { p0 }; return new SQLFeatureNotSupportedException (err_Prefix + getMessage(err_id, params), S_GENERAL_ERR); } -#endif protected static SQLException makeExceptionV (int err_id, String p0) { diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/OPLRowSetMetaData.java b/libsrc/JDBCDriverType4/virtuoso/javax/OPLRowSetMetaData.java index aa2a031220..03c30153d5 100644 --- a/libsrc/JDBCDriverType4/virtuoso/javax/OPLRowSetMetaData.java +++ b/libsrc/JDBCDriverType4/virtuoso/javax/OPLRowSetMetaData.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -95,10 +95,10 @@ public void setCaseSensitive(int column, boolean property) throws java.sql.SQLEx } /** - * Specify the column's table's catalog name, if any. + * Specify the column table's catalog name, if any. * * @param column the first column is 1, the second is 2, ... - * @param catalogName column's catalog name. + * @param catalogName column catalog name. * * @exception SQLException if a database-access error occurs. */ @@ -124,7 +124,7 @@ public void setColumnCount(int columnCount) throws SQLException { } /** - * Specify the column's normal max width in chars. + * Specify the column normal max width in chars. * * @param column the first column is 1, the second is 2, ... * @param size size of the column @@ -159,10 +159,10 @@ public void setColumnName(int column, String columnName) throws java.sql.SQLExce } /** - * Specify the column's SQL type. + * Specify the column SQL type. * * @param column the first column is 1, the second is 2, ... - * @param SQLType column's SQL type. + * @param SQLType column SQL type. * @exception SQLException if a database-access error occurs. * @see Types */ @@ -171,7 +171,7 @@ public void setColumnType(int column, int SQLType) throws java.sql.SQLException } /** - * Specify the column's data source specific type name, if any. + * Specify the column data source specific type name, if any. * * @param column the first column is 1, the second is 2, ... * @param typeName data source specific type name. @@ -194,7 +194,7 @@ public void setCurrency(int column, boolean property) throws java.sql.SQLExcepti } /** - * Specify whether the column's value can be set to NULL. + * Specify whether the column value can be set to NULL. * * @param column the first column is 1, the second is 2, ... * @param property is either one of columnNoNulls, columnNullable @@ -207,7 +207,7 @@ public void setNullable(int column, int property) throws java.sql.SQLException { } /** - * Specify the column's number of decimal digits. + * Specify the column number of decimal digits. * * @param column the first column is 1, the second is 2, ... * @param precision number of decimal digits. @@ -218,7 +218,7 @@ public void setPrecision(int column, int precision) throws java.sql.SQLException } /** - * Specify the column's number of digits to right of the decimal point. + * Specify the column number of digits to right of the decimal point. * * @param column the first column is 1, the second is 2, ... * @param scale number of digits to right of decimal point. @@ -229,7 +229,7 @@ public void setScale(int column, int scale) throws java.sql.SQLException { } /** - * Specify the column's table's schema, if any. + * Specify the column table's schema, if any. * * @param column the first column is 1, the second is 2, ... * @param schemaName the schema name @@ -267,10 +267,10 @@ public void setSigned(int column, boolean property) throws java.sql.SQLException } /** - * Specify the column's table name, if any. + * Specify the column table name, if any. * * @param column the first column is 1, the second is 2, ... - * @param tableName column's table name. + * @param tableName column table name. * @exception SQLException if a database-access error occurs. */ public void setTableName(int column, String tableName) throws java.sql.SQLException { @@ -302,7 +302,7 @@ public boolean isAutoIncrement(int column) throws SQLException { } /** - * Indicates whether a column's case matters. + * Indicates whether a column case matters. * * @param column the first column is 1, the second is 2, ... * @return true if so; false otherwise @@ -358,7 +358,7 @@ public boolean isSigned(int column) throws SQLException { } /** - * Indicates the designated column's normal maximum width in characters. + * Indicates the designated column normal maximum width in characters. * * @param column the first column is 1, the second is 2, ... * @return the normal maximum number of characters allowed as the width @@ -370,7 +370,7 @@ public int getColumnDisplaySize(int column) throws SQLException { } /** - * Gets the designated column's suggested title for use in printouts and + * Gets the designated column suggested title for use in printouts and * displays. * * @param column the first column is 1, the second is 2, ... @@ -382,7 +382,7 @@ public String getColumnLabel(int column) throws SQLException { } /** - * Get the designated column's name. + * Get the designated column name. * * @param column the first column is 1, the second is 2, ... * @return column name @@ -393,7 +393,7 @@ public String getColumnName(int column) throws SQLException { } /** - * Get the designated column's table's schema. + * Get the designated column table's schema. * * @param column the first column is 1, the second is 2, ... * @return schema name or "" if not applicable @@ -404,7 +404,7 @@ public String getSchemaName(int column) throws SQLException { } /** - * Get the designated column's number of decimal digits. + * Get the designated column number of decimal digits. * * @param column the first column is 1, the second is 2, ... * @return precision @@ -415,7 +415,7 @@ public int getPrecision(int column) throws SQLException { } /** - * Gets the designated column's number of digits to right of the decimal point. + * Gets the designated column number of digits to right of the decimal point. * * @param column the first column is 1, the second is 2, ... * @return scale @@ -426,7 +426,7 @@ public int getScale(int column) throws SQLException { } /** - * Gets the designated column's table name. + * Gets the designated column table name. * * @param column the first column is 1, the second is 2, ... * @return table name or "" if not applicable @@ -437,7 +437,7 @@ public String getTableName(int column) throws SQLException { } /** - * Gets the designated column's table's catalog name. + * Gets the designated column table's catalog name. * * @param column the first column is 1, the second is 2, ... * @return column name or "" if not applicable @@ -448,7 +448,7 @@ public String getCatalogName(int column) throws SQLException { } /** - * Retrieves the designated column's SQL type. + * Retrieves the designated column SQL type. * * @param column the first column is 1, the second is 2, ... * @return SQL type from java.sql.Types @@ -460,7 +460,7 @@ public int getColumnType(int column) throws SQLException { } /** - * Retrieves the designated column's database-specific type name. + * Retrieves the designated column database-specific type name. * * @param column the first column is 1, the second is 2, ... * @return type name used by the database. If the column type is @@ -525,7 +525,6 @@ public String getColumnClassName(int column) throws SQLException { } -#if JDK_VER >= 16 /** * Returns an object that implements the given interface to allow access to * non-standard methods, or standard methods not exposed by the proxy. @@ -546,7 +545,7 @@ public String getColumnClassName(int column) throws SQLException { public T unwrap(java.lang.Class iface) throws java.sql.SQLException { try { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.cast(this); } catch (ClassCastException cce) { throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Unable_to_unwrap_to_XX, iface.toString()); @@ -570,11 +569,10 @@ public T unwrap(java.lang.Class iface) throws java.sql.SQLException */ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.isInstance(this); } -#endif private Coldesc check_index(int column) throws SQLException { diff --git a/libsrc/JDBCDriverType4/virtuoso/javax/messages_x.java b/libsrc/JDBCDriverType4/virtuoso/javax/messages_x.java index f88c962e0c..5ccc23fcbb 100644 --- a/libsrc/JDBCDriverType4/virtuoso/javax/messages_x.java +++ b/libsrc/JDBCDriverType4/virtuoso/javax/messages_x.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -38,7 +38,7 @@ public messages_x() { //## { "jdbcx.err.1", "Physical Connection is closed"}, { "jdbcx.err.2", "Connection is closed"}, - { "jdbcx.err.3", "Unexpected state of cache... cache_unit hasn't found"}, + { "jdbcx.err.3", "Unexpected state of cache... cache_unit was not found"}, { "jdbcx.err.4", "Connection failed : loginTimeout has expired"}, { "jdbcx.err.5", "ConnectionPoolDataSource is closed"}, { "jdbcx.err.6", "Statement is closed"}, @@ -71,8 +71,8 @@ public messages_x() { { "jdbcx.err.30", "Invalid cursor position"}, { "jdbcx.err.31", "Unable to get Connection"}, { "jdbcx.err.32", "RowSetMetaData is not defined"}, - { "jdbcx.err.33", "{0} can not determine the table name."}, - { "jdbcx.err.34", "{0} can not determine the keyCols."}, + { "jdbcx.err.33", "{0} cannot determine the table name."}, + { "jdbcx.err.34", "{0} cannot determine the keyCols."}, { "jdbcx.err.35", "Method {0} not yet implemented."}, { "jdbcx.err.36", "Unable to unwrap to: {0}"}, diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/.gitignore b/libsrc/JDBCDriverType4/virtuoso/jdbc/.gitignore similarity index 100% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/.gitignore rename to libsrc/JDBCDriverType4/virtuoso/jdbc/.gitignore diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/BatchUpdateException.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/BatchUpdateException.java similarity index 97% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/BatchUpdateException.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/BatchUpdateException.java index ca20616781..d1847a83c3 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/BatchUpdateException.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/BatchUpdateException.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/CallableStatementWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/CallableStatementWrapper.java similarity index 98% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/CallableStatementWrapper.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/CallableStatementWrapper.java index 60005e533a..42576b33d8 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/CallableStatementWrapper.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/CallableStatementWrapper.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.CallableStatement; import java.math.BigDecimal; @@ -46,11 +46,9 @@ import java.sql.SQLException; import java.sql.Connection; -#if JDK_VER >= 16 import java.sql.RowId; import java.sql.SQLXML; import java.sql.NClob; -#endif public class CallableStatementWrapper extends PreparedStatementWrapper implements CallableStatement{ @@ -247,11 +245,7 @@ public BigDecimal getBigDecimal(int parameterIndex) throws SQLException { } -#if JDK_VER >= 16 public Object getObject(int i, Map> map) throws SQLException { -#else - public Object getObject(int i, Map map) throws SQLException { -#endif check_close(); try { return ((CallableStatement)stmt).getObject(i, map); @@ -341,7 +335,6 @@ public void registerOutParameter(int paramIndex, int sqlType, String typeName) t } } -#if JDK_VER >= 14 //--------------------------JDBC 3.0----------------------------- public void registerOutParameter(String parameterName, int sqlType) @@ -812,11 +805,7 @@ public BigDecimal getBigDecimal(String parameterName) throws SQLException { } } -#if JDK_VER >= 16 public Object getObject (String parameterName, Map> map) -#else - public Object getObject (String parameterName, Map map) -#endif throws SQLException { check_close(); @@ -916,7 +905,6 @@ public java.net.URL getURL(String parameterName) } } -#if JDK_VER >= 16 //------------------------- JDBC 4.0 ----------------------------------- public RowId getRowId(int parameterIndex) throws SQLException @@ -1309,7 +1297,5 @@ public T getObject(String parameterName, Class type) throws SQLException #endif -#endif -#endif } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Closeable.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/Closeable.java similarity index 92% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/Closeable.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/Closeable.java index 8498b748ac..e4ad0f05d6 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Closeable.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/Closeable.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; public interface Closeable { diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/ConnectionWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/ConnectionWrapper.java similarity index 96% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/ConnectionWrapper.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/ConnectionWrapper.java index 28128ea698..7b5d870fda 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/ConnectionWrapper.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/ConnectionWrapper.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.Connection; import java.sql.Statement; @@ -36,9 +36,7 @@ import java.util.ListIterator; import java.util.LinkedList; import java.util.Properties; -#if JDK_VER >= 14 import java.sql.Savepoint; -#if JDK_VER >= 16 /*DROP_FOR_JDBC3*/ import java.sql.RowId; import java.sql.SQLXML; @@ -48,8 +46,6 @@ import java.sql.SQLClientInfoException; import java.sql.Array; import java.sql.Struct; -#endif -#endif import javax.transaction.xa.Xid; @@ -63,11 +59,7 @@ public class ConnectionWrapper implements java.sql.Connection { private Integer r_TxnIsolation; private Integer r_Holdability; -#if JDK_VER >= 16 private HashMap objsToClose; -#else - private HashMap objsToClose; -#endif //-- protected StmtCache pStmtPool; //-- private int maxStatements; @@ -81,16 +73,12 @@ public ConnectionWrapper(Connection rConn, { rconn = rConn; pconn = pConn; -#if JDK_VER >= 16 objsToClose = new HashMap(100); -#else - objsToClose = new HashMap(100); -#endif } public void finalize () throws Throwable { VirtuosoPooledConnection pc = pconn; - if (pc!=null) + if (pc!=null) pc.sendCloseEvent(); pconn = null; } @@ -107,7 +95,7 @@ public void close() throws java.sql.SQLException { } } - // close the physical connection & clear the statement's cache + // close the physical connection & clear the statement cache protected synchronized void closeAll() throws SQLException{ close_objs(); pconn = null; @@ -347,11 +335,7 @@ public CallableStatement prepareCall(String sql, } } -#if JDK_VER >= 16 public Map> getTypeMap() throws SQLException { -#else - public Map getTypeMap() throws SQLException { -#endif try { check_conn(); return rconn.getTypeMap(); @@ -361,16 +345,11 @@ public Map getTypeMap() throws SQLException { } } -#if JDK_VER >= 16 public void setTypeMap(Map> map) throws SQLException { -#else - public void setTypeMap(Map map) throws SQLException { -#endif check_conn(); rconn.setTypeMap(map); } -#if JDK_VER >= 14 //-------------------------- JDBC 3.0 ---------------------------------------- public int getHoldability() throws SQLException @@ -538,7 +517,6 @@ public PreparedStatement prepareStatement(String sql, } } -#if JDK_VER >= 16 //------------------------- JDBC 4.0 ----------------------------------- public Clob createClob() throws SQLException { @@ -682,7 +660,7 @@ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLExcepti { try { check_conn(); - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return rconn.isWrapperFor(iface); } catch (SQLException ex) { exceptionOccurred(ex); @@ -693,7 +671,7 @@ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLExcepti #if JDK_VER >= 17 //--------------------------JDBC 4.1 ----------------------------- - public void setSchema(String schema) throws java.sql.SQLException + public void setSchema(String schema) throws java.sql.SQLException { try { check_conn(); @@ -726,7 +704,7 @@ public void abort(java.util.concurrent.Executor executor) throws java.sql.SQLExc } } - public void setNetworkTimeout(java.util.concurrent.Executor executor, + public void setNetworkTimeout(java.util.concurrent.Executor executor, final int milliseconds) throws java.sql.SQLException { try { @@ -750,8 +728,6 @@ public int getNetworkTimeout() throws java.sql.SQLException } #endif -#endif -#endif protected void setXAResource(VirtuosoXAResource val) @@ -829,11 +805,7 @@ protected void exceptionOccurred(SQLException ex) { private void close_objs() { -#if JDK_VER >= 16 HashMap copy = (HashMap) objsToClose.clone(); -#else - HashMap copy = (HashMap) objsToClose.clone(); -#endif synchronized(objsToClose) { for (Iterator i = copy.keySet().iterator(); i.hasNext(); ) try { diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/DateObject.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/DateObject.java similarity index 97% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/DateObject.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/DateObject.java index 3c480bc4a9..a342eb44cd 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/DateObject.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/DateObject.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,14 +21,14 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; import java.sql.*; -class DateObject +class DateObject { java.util.Calendar cal_dat = new java.util.GregorianCalendar (); int day; @@ -40,7 +40,7 @@ class DateObject int type; protected DateObject(int _day, int _hour, int _minute, int _second, - int _fraction, int _tz, int _type) + int _fraction, int _tz, int _type) { this.day = _day; this.hour = _hour; @@ -188,7 +188,7 @@ else if (1722884 == midhignt_jdn) - + static final int GREG_JDAYS = 577737; static final int GREG_LAST_DAY = 14; static final int GREG_FIRST_DAY = 5; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Driver.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/Driver.java similarity index 94% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/Driver.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/Driver.java index a61a157066..98b7a99650 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Driver.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/Driver.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; import java.util.*; @@ -30,19 +30,19 @@ * The Virtuoso DBMS Driver class is an implementation of the Driver interface * in the JDBC API. It can be loaded in an application by : * 

    - *   Class.forName("virtuoso.jdbc2.Driver")
+ *   Class.forName("virtuoso.jdbc4.Driver")
  *
    - * , or statically with the -Djdbc.drivers=virtuoso.jdbc2.Driver on the java + * , or statically with the -Djdbc.drivers=virtuoso.jdbc4.Driver on the java * interpreter command line, or in the java properties files with an entry like * before. * Hints :
      You can see the version of the current Virtuoso DBMS JDBC driver accessible in - * the CLASSPATH with the java virtuoso.jdbc2.Driver + * the CLASSPATH with the java virtuoso.jdbc4.Driver *
    * * @version 1.0 (JDBC API 2.0 implementation) * @see java.sql.Driver * @see java.sql.DriverManager - * @see virtuoso.jdbc2.VirtuosoConnection + * @see virtuoso.jdbc4.VirtuosoConnection */ public class Driver implements java.sql.Driver { @@ -62,17 +62,15 @@ public class Driver implements java.sql.Driver // The major and minor version number protected static final int major = 3; - protected static final int minor = 108; + protected static final int minor = 115; // Some variables private String host = "localhost"; private String port = "1111"; private String user, password, database, charset, pwdclear; private Integer timeout, log_enable; -#ifdef SSL private String keystore_cert, keystore_pass, keystore_path; private String ssl_provider; -#endif private Integer fbs, sendbs, recvbs; private final String VirtPrefix = "jdbc:virtuoso://"; @@ -82,7 +80,7 @@ public class Driver implements java.sql.Driver * directly, this function is called only during the DriverManager registration * done with : * 
    -    *   Class.forName("virtuoso.jdbc2.Driver")
+    *   Class.forName("virtuoso.jdbc4.Driver")
     *
    * * @exception java.sql.SQLException an error occurred in registering @@ -92,15 +90,7 @@ public Driver() throws SQLException try { String log_file = System.getProperty( -#if JDK_VER < 12 - "JDBC_LOG" -#elif JDK_VER < 14 - "JDBC2_LOG" -#elif JDK_VER < 16 - "JDBC3_LOG" -#else "JDBC4_LOG" -#endif ); //log_file="/home/O12/logs/log." + System.currentTimeMillis () + "." + new java.util.Random ().nextInt() + ".log"; if (log_file != null) @@ -145,7 +135,7 @@ public Driver() throws SQLException * "password" property should be included. * @return a Connection object that represents a * connection to the URL - * @exception virtuoso.jdbc2.VirtuosoException it is the right + * @exception virtuoso.jdbc4.VirtuosoException it is the right * driver to connect to the given URL, but has trouble connecting to * the database. * @see java.sql.Connection#connect @@ -172,7 +162,7 @@ public Connection connect(String url, Properties info) throws VirtuosoException * Returns true if the driver thinks that it can open a connection * to the given URL. Typically drivers will return true if they * understand the subprotocol specified in the URL and false if - * they don't. + * they do not. * * @param url the URL of the database * @return true if this driver can connect to the given URL @@ -344,7 +334,7 @@ else if (inQuote == '\0') * @return an array of DriverPropertyInfo objects describing possible * properties. This array may be an empty array if no properties * are required. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.Connection#getPropertyInfo */ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws VirtuosoException @@ -372,7 +362,6 @@ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws pr.required = false; pinfo.add(pr); } -#ifdef SSL if(info.get("cert") == null) { pr = new DriverPropertyInfo("cert",null); @@ -409,7 +398,6 @@ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws pr.required = false; pinfo.add(pr); } -#endif DriverPropertyInfo drv_info[] = new DriverPropertyInfo[pinfo.size()]; pinfo.copyInto(drv_info); return drv_info; @@ -460,7 +448,6 @@ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws pr.required = false; pinfo.add(pr); } -#ifdef SSL if(info.get("cert") == null) { pr = new DriverPropertyInfo("cert",null); @@ -497,9 +484,7 @@ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws pr.required = false; pinfo.add(pr); } -#endif -#if JDK_VER >= 16 if(info.get("usepstmtpool") == null) { pr = new DriverPropertyInfo("usepstmtpool",null); @@ -512,7 +497,6 @@ public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws pr.required = false; pinfo.add(pr); } -#endif DriverPropertyInfo drv_info[] = new DriverPropertyInfo[pinfo.size()]; pinfo.copyInto(drv_info); return drv_info; @@ -551,11 +535,7 @@ public boolean jdbcCompliant() public static void main(String args[]) { -#ifdef SSL System.out.println("OpenLink Virtuoso(TM) Driver with SSL support for JDBC(TM) Version " + VIRT_JDBC_VER + " [Build " + major + "." + minor + "]"); -#else - System.out.println("OpenLink Virtuoso(TM) Driver for JDBC(TM) Version " + VIRT_JDBC_VER + " [Build " + major + "." + minor + "]"); -#endif } #if JDK_VER >= 17 diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/LRUCache.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/LRUCache.java similarity index 93% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/LRUCache.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/LRUCache.java index 1819b7a7d3..8efbba7686 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/LRUCache.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/LRUCache.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.util.*; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc/Makefile.am b/libsrc/JDBCDriverType4/virtuoso/jdbc/Makefile.am new file mode 100644 index 0000000000..843ab22551 --- /dev/null +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/Makefile.am @@ -0,0 +1,325 @@ +# +# This file is part of the OpenLink Software Virtuoso Open-Source (VOS) +# project. +# +# Copyright (C) 1998-2019 OpenLink Software +# +# This project is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; only version 2 of the License, dated June 1991. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# +# + + +########################################### +# Prevent issues with make -jX +########################################### +.NOTPARALLEL: + + +########################################### +# Settings +########################################### + +if WITH_JDK4 +CLASSPATH4=$(CLASSPATH4) +JDK4=@ac_jdk4_path@ +JDK4_FLAGS=-g #-Xlint:deprecation -Xlint:unchecked +endif + +if WITH_JDK4_1 +CLASSPATH4=$(CLASSPATH4) +JDK4_1=@ac_jdk4_1_path@ +JDK4_1_FLAGS=-g #-Xlint:deprecation -Xlint:unchecked +endif + +if WITH_JDK4_2 +CLASSPATH4=$(CLASSPATH4) +JDK4_2=@ac_jdk4_2_path@ +JDK4_2_FLAGS=-g #-Xlint:deprecation -Xlint:unchecked +endif + + +jdbc4_defs = -DJDK_VER=16 -DVIRT_JDBC_VER="4.0" +jdbc4_1_defs = -DJDK_VER=17 -DVIRT_JDBC_VER="4.1" +jdbc4_2_defs = -DJDK_VER=18 -DVIRT_JDBC_VER="4.2" + + +########################################### +# Sources +########################################### +infiles = \ + DateObject.java \ + Driver.java \ + VirtuosoAsciiInputStream.java \ + VirtuosoBlob.java \ + VirtuosoBlobStream.java \ + VirtuosoCallableStatement.java \ + VirtuosoClobStream.java \ + VirtuosoColumn.java \ + VirtuosoConnection.java \ + VirtuosoDatabaseMetaData.java \ + VirtuosoException.java \ + VirtuosoExplicitString.java \ + VirtuosoExtendedString.java \ + VirtuosoFuture.java \ + VirtuosoInputStream.java \ + VirtuosoNullParameter.java \ + VirtuosoOutputStream.java \ + VirtuosoPreparedStatement.java \ + VirtuosoRdfBox.java \ + VirtuosoPoint.java \ + VirtuosoResultSet.java \ + VirtuosoResultSetMetaData.java \ + VirtuosoRow.java \ + VirtuosoStatement.java \ + VirtuosoTypes.java \ + VirtuosoDate.java \ + VirtuosoTime.java \ + VirtuosoTimestamp.java + +in1files = \ + BatchUpdateException.java \ + Types.java \ + VirtuosoClob.java + +in3files = \ + CallableStatementWrapper.java \ + Closeable.java \ + ConnectionWrapper.java \ + PreparedStatementWrapper.java \ + ResultSetWrapper.java \ + StatementWrapper.java \ + VirtuosoArray.java \ + VirtuosoConnectionPoolDataSource.java \ + VirtuosoDataSource.java \ + VirtuosoDataSourceFactory.java \ + VirtuosoParameterMetaData.java \ + VirtuosoPooledConnection.java \ + VirtuosoPoolManager.java \ + VirtuosoPoolStatistic.java \ + VirtuosoXAConnection.java \ + VirtuosoXADataSource.java \ + VirtuosoXAResource.java \ + VirtuosoXid.java \ + XAResourceManager.java \ + XATransaction.java + +in4files = \ + LRUCache.java \ + VirtuosoFNSException.java + +utilfiles = \ + MD5.java \ + Vector.java \ + VectorOfDouble.java \ + VectorOfFloat.java \ + VectorOfLong.java + +util3files = \ + BaseMessage.java \ + OPLHeapBlob.java \ + OPLHeapClob.java \ + OPLMessage_u.java \ + messages_u.java + +util4files = \ + OPLHeapNClob.java + + +javaxfiles = \ + BaseRowSet.java \ + OPLCachedRowSet.java \ + OPLJdbcRowSet.java \ + OPLMessage_x.java \ + OPLRowSetMetaData.java \ + messages_x.java + +sqlfiles = \ + ExtendedString.java \ + RdfBox.java + + +########################################### +# JDBC 4.x +########################################### +std4javafiles = \ + $(utilfiles:%.java=outstd4/openlink/util/%.java) \ + $(sqlfiles:%.java=outstd4/virtuoso/sql/%.java) \ + $(util3files:%.java=outstd4/openlink/util/%.java) \ + $(util4files:%.java=outstd4/openlink/util/%.java) \ + $(in3files:%.java=outstd4/virtuoso/jdbc4/%.java) \ + $(in4files:%.java=outstd4/virtuoso/jdbc4/%.java) \ + $(infiles:%.java=outstd4/virtuoso/jdbc4/%.java) \ + $(javaxfiles:%.java=outstd4/virtuoso/javax/%.java) + + +.PHONY: doc4 +doc4: ../../virtjdbc4.jar + @cd outstd4 ; $(JDK4)/javadoc -d ../../../doc/virtjdbc4 -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java + + + +.PHONY: std4 +std4: ../../virtjdbc4.jar + +../../virtjdbc4.jar: outstd4 $(std4javafiles) + @echo jdbc4 javac $(JDK4_FLAGS) + @cd outstd4 ; $(JDK4)/javac $(JDK4_FLAGS) -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java + @cd outstd4 ; $(JDK4)/jar cfm ../../../virtjdbc4.jar ../../../manifest4.main virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class META-INF + @echo "............. Virtuoso pure Java 4.0 built" + +outstd4: + @mkdir outstd4 + @mkdir outstd4/virtuoso + @mkdir outstd4/virtuoso/jdbc4 + @mkdir outstd4/virtuoso/sql + @mkdir outstd4/openlink + @mkdir outstd4/openlink/util + @mkdir outstd4/virtuoso/javax + @mkdir outstd4/META-INF + @mkdir outstd4/META-INF/services + @cp ../../java.sql.Driver4 outstd4/META-INF/services/java.sql.Driver + +outstd4/virtuoso/jdbc4/%.java: %.java + $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_defs) $< >$@ + +outstd4/openlink/util/%.java: ../../openlink/util/%.java + $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_defs) $< >$@ + +outstd4/virtuoso/sql/%.java: ../../virtuoso/sql/%.java + cd outstd4/virtuoso/sql; cp ../../../$< . + +outstd4/virtuoso/javax/%.java: ../javax/%.java + $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_defs) $< >$@ + + +########################################### +# JDBC 4.1 +########################################### +std4_1javafiles = \ + $(utilfiles:%.java=outstd4_1/openlink/util/%.java) \ + $(sqlfiles:%.java=outstd4_1/virtuoso/sql/%.java) \ + $(util3files:%.java=outstd4_1/openlink/util/%.java) \ + $(util4files:%.java=outstd4_1/openlink/util/%.java) \ + $(in3files:%.java=outstd4_1/virtuoso/jdbc4/%.java) \ + $(in4files:%.java=outstd4_1/virtuoso/jdbc4/%.java) \ + $(infiles:%.java=outstd4_1/virtuoso/jdbc4/%.java) \ + $(javaxfiles:%.java=outstd4_1/virtuoso/javax/%.java) + + +.PHONY: doc4_1 +doc4_1: ../../virtjdbc4_1.jar + @cd outstd4_1 ; $(JDK4_1)/javadoc -d ../../../doc/virtjdbc4_1 -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java + + + +.PHONY: std4_1 +std4_1: ../../virtjdbc4_1.jar + +../../virtjdbc4_1.jar: outstd4_1 $(std4_1javafiles) + @echo jdbc4_1 javac $(JDK4_1_FLAGS) + @cd outstd4_1 ; $(JDK4_1)/javac $(JDK4_1_FLAGS) -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java + @cd outstd4_1 ; $(JDK4_1)/jar cfm ../../../virtjdbc4_1.jar ../../../manifest4.main virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class META-INF + @echo "............. Virtuoso pure Java 4.1 built" + +outstd4_1: + @mkdir outstd4_1 + @mkdir outstd4_1/virtuoso + @mkdir outstd4_1/virtuoso/jdbc4 + @mkdir outstd4_1/virtuoso/sql + @mkdir outstd4_1/openlink + @mkdir outstd4_1/openlink/util + @mkdir outstd4_1/virtuoso/javax + @mkdir outstd4_1/META-INF + @mkdir outstd4_1/META-INF/services + @cp ../../java.sql.Driver4 outstd4_1/META-INF/services/java.sql.Driver + +outstd4_1/virtuoso/jdbc4/%.java: %.java + $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_1_defs) $< >$@ + +outstd4_1/openlink/util/%.java: ../../openlink/util/%.java + $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_1_defs) $< >$@ + +outstd4_1/virtuoso/sql/%.java: ../../virtuoso/sql/%.java + cd outstd4_1/virtuoso/sql; cp ../../../$< . + +outstd4_1/virtuoso/javax/%.java: ../javax/%.java + $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_1_defs) $< >$@ + + +########################################### +# JDBC 4.2 +########################################### +std4_2javafiles = \ + $(utilfiles:%.java=outstd4_2/openlink/util/%.java) \ + $(sqlfiles:%.java=outstd4_2/virtuoso/sql/%.java) \ + $(util3files:%.java=outstd4_2/openlink/util/%.java) \ + $(util4files:%.java=outstd4_2/openlink/util/%.java) \ + $(in3files:%.java=outstd4_2/virtuoso/jdbc4/%.java) \ + $(in4files:%.java=outstd4_2/virtuoso/jdbc4/%.java) \ + $(infiles:%.java=outstd4_2/virtuoso/jdbc4/%.java) \ + $(javaxfiles:%.java=outstd4_2/virtuoso/javax/%.java) + + +.PHONY: doc4_2 +doc4_2: ../../virtjdbc4_2.jar + @cd outstd4_2 ; $(JDK4_2)/javadoc -d ../../../doc/virtjdbc4_2 -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java + + + +.PHONY: std4_2 +std4_2: ../../virtjdbc4_2.jar + +../../virtjdbc4_2.jar: outstd4_2 $(std4_2javafiles) + @echo jdbc4_2 javac $(JDK4_2_FLAGS) + @cd outstd4_2 ; $(JDK4_2)/javac $(JDK4_2_FLAGS) -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java + @cd outstd4_2 ; $(JDK4_2)/jar cfm ../../../virtjdbc4_2.jar ../../../manifest4.main virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class META-INF + @echo "............. Virtuoso pure Java 4.2 built" + +outstd4_2: + @mkdir outstd4_2 + @mkdir outstd4_2/virtuoso + @mkdir outstd4_2/virtuoso/jdbc4 + @mkdir outstd4_2/virtuoso/sql + @mkdir outstd4_2/openlink + @mkdir outstd4_2/openlink/util + @mkdir outstd4_2/virtuoso/javax + @mkdir outstd4_2/META-INF + @mkdir outstd4_2/META-INF/services + @cp ../../java.sql.Driver4 outstd4_2/META-INF/services/java.sql.Driver + +outstd4_2/virtuoso/jdbc4/%.java: %.java + $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_2_defs) $< >$@ + +outstd4_2/openlink/util/%.java: ../../openlink/util/%.java + $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_2_defs) $< >$@ + +outstd4_2/virtuoso/sql/%.java: ../../virtuoso/sql/%.java + cd outstd4_2/virtuoso/sql; cp ../../../$< . + +outstd4_2/virtuoso/javax/%.java: ../javax/%.java + $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_2_defs) $< >$@ + + +########################################### +# Cleanup +########################################### +clean-local: + rm -f *.class version.h + rm -rf outstd outssl + rm -rf outstd1 outssl1 + rm -rf outstd2 outssl2 + rm -rf outstd3 outssl3 + rm -rf outstd4 outssl4 + rm -rf outstd4_1 outssl4_1 + rm -rf outstd4_2 outssl4_2 diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/PreparedStatementWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/PreparedStatementWrapper.java similarity index 99% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/PreparedStatementWrapper.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/PreparedStatementWrapper.java index d09e8f8bb0..809a606a52 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/PreparedStatementWrapper.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/PreparedStatementWrapper.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -44,11 +44,9 @@ import java.sql.Connection; import java.sql.Types; -#if JDK_VER >= 16 import java.sql.RowId; import java.sql.SQLXML; import java.sql.NClob; -#endif public class PreparedStatementWrapper extends StatementWrapper implements PreparedStatement { @@ -427,7 +425,6 @@ public void setNull(int paramIndex, int sqlType, String typeName) throws SQLExce } } -#if JDK_VER >= 14 //------------------------- JDBC 3.0 ----------------------------------- public void setURL(int parameterIndex, java.net.URL x) throws SQLException { @@ -451,7 +448,6 @@ public java.sql.ParameterMetaData getParameterMetaData() throws SQLException { } -#if JDK_VER >= 16 //------------------------- JDBC 4.0 ----------------------------------- public void setRowId(int parameterIndex, RowId x) throws SQLException { @@ -657,7 +653,5 @@ public void setNClob(int parameterIndex, Reader reader) throws SQLException } } -#endif -#endif } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/ResultSetWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/ResultSetWrapper.java similarity index 99% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/ResultSetWrapper.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/ResultSetWrapper.java index e893091c4e..b7f343e362 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/ResultSetWrapper.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/ResultSetWrapper.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.io.InputStream; import java.io.Reader; @@ -42,11 +42,9 @@ import java.util.Calendar; import java.net.URL; -#if JDK_VER >= 16 import java.sql.RowId; import java.sql.SQLXML; import java.sql.NClob; -#endif public class ResultSetWrapper implements ResultSet, Closeable { private ConnectionWrapper wconn; @@ -1213,11 +1211,7 @@ public Statement getStatement() throws SQLException { return wstmt; } -#if JDK_VER >= 16 public Object getObject(int i, Map> map) -#else - public Object getObject(int i, Map map) -#endif throws SQLException { check_close(); @@ -1269,11 +1263,7 @@ public Array getArray(int i) throws SQLException { } } -#if JDK_VER >= 16 public Object getObject(String colName, Map> map) -#else - public Object getObject(String colName, Map map) -#endif throws SQLException { check_close(); @@ -1385,7 +1375,6 @@ public Timestamp getTimestamp(String columnName, Calendar cal) throws SQLExcepti } } -#if JDK_VER >= 14 //-------------------------- JDBC 3.0 ---------------------------------------- public java.net.URL getURL(int columnIndex) throws SQLException { @@ -1490,7 +1479,6 @@ public void updateArray(String columnName, java.sql.Array x) throws SQLException } -#if JDK_VER >= 16 //------------------------- JDBC 4.0 ----------------------------------- @@ -2073,8 +2061,6 @@ public T getObject(String columnLabel, Class type) throws SQLException -#endif -#endif private void check_close() throws SQLException { diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/StatementWrapper.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/StatementWrapper.java similarity index 98% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/StatementWrapper.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/StatementWrapper.java index 9f3a63145b..e7cd28cf2c 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/StatementWrapper.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/StatementWrapper.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.Statement; import java.sql.ResultSet; @@ -34,11 +34,7 @@ public class StatementWrapper implements Statement, Closeable { protected Statement stmt; protected ConnectionWrapper wconn; -#if JDK_VER >= 16 protected HashMap objsToClose = new HashMap(); -#else - protected HashMap objsToClose = new HashMap(); -#endif protected volatile boolean isClosed = false; @@ -363,7 +359,6 @@ public Connection getConnection() throws SQLException { } -#if JDK_VER >= 14 //-------------------------- JDBC 3.0 ---------------------------------------- public boolean getMoreResults(int current) throws SQLException { @@ -462,7 +457,6 @@ public int getResultSetHoldability() throws SQLException { } } -#if JDK_VER >= 16 //------------------------- JDBC 4.0 ----------------------------------- public boolean isClosed() throws SQLException { @@ -544,8 +538,6 @@ public boolean isCloseOnCompletion() throws SQLException } #endif -#endif -#endif protected synchronized void check_close() throws SQLException diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Types.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/Types.java similarity index 96% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/Types.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/Types.java index 4ce35c168d..2e37e145ff 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Types.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/Types.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; /** diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoArray.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoArray.java similarity index 97% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoArray.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoArray.java index 976b69a347..ba186152f7 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoArray.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoArray.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.Array; import java.sql.ResultSet; @@ -81,14 +81,12 @@ public VirtuosoArray(VirtuosoConnection conn, String typeName, Object[] arr_data case Types.OTHER: this.data.add(new VirtuosoExplicitString((String)x, VirtuosoTypes.DV_ANY,conn)); break; -#if JDK_VER >= 16 case Types.NCHAR: case Types.NVARCHAR: case Types.LONGNVARCHAR: case Types.NCLOB: this.data.add(new VirtuosoExplicitString((String)x, VirtuosoTypes.DV_WIDE,conn)); break; -#endif default: this.data.add(x); break; @@ -291,11 +289,7 @@ public Object getArray(long index, int count, Map> map) throws * @since 1.2 */ public ResultSet getResultSet() throws SQLException { -#if JDK_VER >= 16 throw new VirtuosoFNSException ("getResultSet not supported", VirtuosoException.NOTIMPLEMENTED); -#else - throw new VirtuosoException ("getResultSet not supported", VirtuosoException.NOTIMPLEMENTED); -#endif } /** @@ -361,11 +355,7 @@ public ResultSet getResultSet(Map> map) throws SQLException { * @since 1.2 */ public ResultSet getResultSet(long index, int count) throws SQLException { -#if JDK_VER >= 16 throw new VirtuosoFNSException ("getResultSet not supported", VirtuosoException.NOTIMPLEMENTED); -#else - throw new VirtuosoException ("getResultSet not supported", VirtuosoException.NOTIMPLEMENTED); -#endif } /** @@ -407,7 +397,6 @@ public ResultSet getResultSet(long index, int count, Map> map) return getResultSet(index, count); } -#if JDK_VER >= 16 /** * This method frees the Array object and releases the resources that * it holds. The object is invalid once the free @@ -429,6 +418,5 @@ public ResultSet getResultSet(long index, int count, Map> map) public void free() throws SQLException { data = null; } -#endif } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoAsciiInputStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoAsciiInputStream.java similarity index 94% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoAsciiInputStream.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoAsciiInputStream.java index f11445ce1c..c79d934367 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoAsciiInputStream.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoAsciiInputStream.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.io.*; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlob.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoBlob.java similarity index 96% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlob.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoBlob.java index 47ae67fd3b..c317e5058c 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlob.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoBlob.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; import java.io.*; @@ -34,12 +34,8 @@ * @see java.sql.Blob */ public class VirtuosoBlob -#if JDK_VER >= 12 implements Blob, Clob -#if JDK_VER >= 16 ,NClob -#endif -#endif { // A flag to say if it may do some requests private boolean request = true; @@ -74,7 +70,7 @@ public class VirtuosoBlob * @param is The input stream. * @param length The length of the blob to construct from. * @param index The unique Blob number - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ VirtuosoBlob(InputStream is, long length, long index) throws VirtuosoException { @@ -100,7 +96,7 @@ private long bh_offset() * Constructs a new VirtuosoBlob object from a array. * * @param array The byte array. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ VirtuosoBlob(byte[] array) throws VirtuosoException { @@ -118,7 +114,7 @@ private long bh_offset() * * @param obj The object. * @param index The unique Blob number - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ VirtuosoBlob(Object obj, long index) throws VirtuosoException { @@ -131,7 +127,7 @@ private long bh_offset() * @param rd The Reader class. * @param length The length of the clob to construct from. * @param index The unique Clob number - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ VirtuosoBlob(Reader rd, long length, long index) throws VirtuosoException { @@ -148,7 +144,7 @@ private long bh_offset() * @param ask The ask from client flag. * @param index The unique Blob number * @param length The length of the blob to construct from. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ VirtuosoBlob(VirtuosoConnection connection, long ask, long index, long length) throws VirtuosoException { @@ -235,7 +231,7 @@ protected void setObject(Object obj) * consecutive bytes from the BLOB value designated * by this Blob object, starting with the * byte at position pos. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ private void checkBlobError (openlink.util.Vector curr) throws VirtuosoException { @@ -300,7 +296,7 @@ else if (pos - 1 > bh_offset ()) //System.out.println ("vb: rewind pos:" + pos + " ofs:" + bh_offset()); rewind(); } - + if (pos - 1 > bh_offset ()) init_read_len = new Long (pos - bh_offset() - 1); @@ -454,7 +450,7 @@ else if (val instanceof String) * @param length the number of consecutive characters to be copied * @return a String that is the specified substring in * the CLOB value designated by this Clob object - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ public String getSubString(long pos, int length) throws VirtuosoException { @@ -509,7 +505,7 @@ else if (connection.charset != null) * designated by this Blob object. * * @return long The length of the BLOB in bytes. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ public long length() throws VirtuosoException { @@ -521,7 +517,7 @@ public long length() throws VirtuosoException * Blob instance as a stream. * * @return a stream containing the BLOB data - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ public InputStream getBinaryStream() throws VirtuosoException { @@ -536,7 +532,7 @@ public InputStream getBinaryStream() throws VirtuosoException * Gets the Clob contents as a Unicode stream. * * @return a Unicode stream containing the CLOB data - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ public Reader getCharacterStream() throws VirtuosoException { @@ -569,7 +565,7 @@ public Reader getCharacterStream() throws VirtuosoException * object as a stream of Ascii bytes. * * @return an ascii stream containing the CLOB data - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ public InputStream getAsciiStream() throws VirtuosoException { @@ -591,7 +587,7 @@ public InputStream getAsciiStream() throws VirtuosoException * @param start the position at which to begin searching; the * first position is 1 * @return the position at which the pattern appears, else -1. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ public long position(byte pattern[], long start) throws VirtuosoException { @@ -631,7 +627,6 @@ public long position(byte pattern[], long start) throws VirtuosoException } } -#if JDK_VER >= 12 /** * Determines the byte position in the BLOB value * designated by this Blob object at which @@ -643,7 +638,7 @@ public long position(byte pattern[], long start) throws VirtuosoException * @param start the position in the BLOB value * at which to begin searching; the first position is 1 * @return the position at which the pattern begins, else -1 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ public long position(Blob pattern, long start) throws VirtuosoException { @@ -672,7 +667,6 @@ public long position(Blob pattern, long start) throws VirtuosoException throw new VirtuosoException("SQL error occurred : " + e.getMessage(),VirtuosoException.SQLERROR); } } -#endif /** * Determines the character position at which the specified substring @@ -684,7 +678,7 @@ public long position(Blob pattern, long start) throws VirtuosoException * is 1 * @return the position at which the substring appears, else -1; the first * position is 1 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ public long position(String searchstr, long start) throws VirtuosoException { @@ -709,7 +703,6 @@ public long position(String searchstr, long start) throws VirtuosoException } } -#if JDK_VER >= 12 /** * Determines the character position at which the specified * Clob object searchstr appears in this @@ -721,7 +714,7 @@ public long position(String searchstr, long start) throws VirtuosoException * position is 1 * @return the position at which the Clob object appears, * else -1; the first position is 1 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ public long position(Clob searchstr, long start) throws VirtuosoException { @@ -750,7 +743,6 @@ public long position(Clob searchstr, long start) throws VirtuosoException throw new VirtuosoException("SQL error occurred : " + e.getMessage(),VirtuosoException.SQLERROR); } } -#endif // --------------------------- Object ------------------------------ /** @@ -788,7 +780,6 @@ public String toString() */ } -#if JDK_VER >= 14 /* JDK 1.4 functions */ public int setString(long pos, String str, int offset, int len) throws SQLException @@ -831,7 +822,6 @@ public OutputStream setBinaryStream(long pos) throws SQLException throw new VirtuosoException ("Not implemented function", VirtuosoException.NOTIMPLEMENTED); } -#endif /** diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlobStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoBlobStream.java similarity index 97% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlobStream.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoBlobStream.java index 83e0149686..0db21dfb70 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoBlobStream.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoBlobStream.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.io.*; @@ -67,7 +67,7 @@ public int read() throws IOException { try { - // Check if it's the end of the stream + // Check if it is the end of the stream return (pos > blob.length()) ? -1 : (blob.getBytes(pos++,1))[0]; } catch(Exception e) @@ -100,7 +100,7 @@ public int read(byte b[], int off, int len) throws IOException // Check parameters if(len <= 0) return 0; - // Check if it's the end of the stream + // Check if it is the end of the stream if((pos + len) > blob.length()) { int to_read = (int)(blob.length() - pos + 1); diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoCallableStatement.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoCallableStatement.java similarity index 99% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoCallableStatement.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoCallableStatement.java index 95c8dcbb55..6c92da0310 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoCallableStatement.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoCallableStatement.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; import java.util.*; @@ -38,7 +38,7 @@ * * * @version 1.0 (JDBC API 2.0 implementation) - * @see virtuoso.jdbc2.VirtuosoConnection#prepareCall + * @see virtuoso.jdbc4.VirtuosoConnection#prepareCall */ public class VirtuosoCallableStatement extends VirtuosoPreparedStatement implements CallableStatement { @@ -54,7 +54,7 @@ public class VirtuosoCallableStatement extends VirtuosoPreparedStatement impleme * * @param connection The VirtuosoConnection which owns it. * @param sql The sql string with ?. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ VirtuosoCallableStatement(VirtuosoConnection connection, String sql) throws VirtuosoException { @@ -68,7 +68,7 @@ public class VirtuosoCallableStatement extends VirtuosoPreparedStatement impleme * @param sql The sql string with ?. * @param type The result set type. * @param concurrency The result set concurrency. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet */ VirtuosoCallableStatement(VirtuosoConnection connection, String sql, int type, int concurrency) throws VirtuosoException @@ -546,7 +546,7 @@ public java.sql.Time getTime(int parameterIndex) throws VirtuosoException param_scale[parameterIndex - 1]); if (_wasNull = (obj == null)) return null; - else + else return (java.sql.Time)obj; } @@ -627,7 +627,6 @@ public BigDecimal getBigDecimal(int parameterIndex) throws VirtuosoException return ((BigDecimal) obj); } -#if JDK_VER >= 12 /** * Returns an object representing the value of OUT parameter * i and uses map for the custom mapping of the parameter value. @@ -659,7 +658,6 @@ public Ref getRef(int parameterIndex) throws VirtuosoException { throw new VirtuosoException ("REF not supported", VirtuosoException.NOTIMPLEMENTED); } -#endif /** * Gets the value of a JDBC BLOB parameter as a @@ -673,11 +671,7 @@ public Ref getRef(int parameterIndex) throws VirtuosoException * @see java.sql.CallableStatement#getBlob */ public -#if JDK_VER >= 12 Blob -#else - VirtuosoBlob -#endif getBlob(int parameterIndex) throws VirtuosoException { // Check parameters @@ -688,11 +682,7 @@ public Ref getRef(int parameterIndex) throws VirtuosoException return null; else return -#if JDK_VER >= 12 (Blob) -#else - (VirtuosoBlob) -#endif objparams.elementAt(parameterIndex - 1); } @@ -709,11 +699,7 @@ public Ref getRef(int parameterIndex) throws VirtuosoException * @see java.sql.CallableStatement#getClob */ public -#if JDK_VER >= 12 Clob -#else - VirtuosoClob -#endif getClob(int parameterIndex) throws VirtuosoException { // Check parameters @@ -724,15 +710,10 @@ public Ref getRef(int parameterIndex) throws VirtuosoException return null; else return -#if JDK_VER >= 12 (Clob) -#else - (VirtuosoClob) -#endif objparams.elementAt(parameterIndex - 1); } -#if JDK_VER >= 12 /** * Gets the value of a JDBC ARRAY parameter as an * {@link Array} object in the Java programming language. @@ -747,7 +728,6 @@ public Array getArray(int parameterIndex) throws VirtuosoException { throw new VirtuosoException ("ARRAY not supported", VirtuosoException.NOTIMPLEMENTED); } -#endif /** * Gets the value of a JDBC DATE parameter as a java.sql.Date object, using @@ -809,7 +789,7 @@ public java.sql.Time getTime(int parameterIndex, Calendar cal) throws VirtuosoEx public java.sql.Timestamp getTimestamp(int parameterIndex, Calendar cal) throws SQLException { java.sql.Timestamp _ts, val; - + _ts = val = this.getTimestamp(parameterIndex); if(cal != null && _ts != null) @@ -839,7 +819,6 @@ public void registerOutParameter(int parameterIndex, int sqlType, String typeNam } -#if JDK_VER >= 14 /* JDK 1.4 functions */ public void registerOutParameter(String parameterName, @@ -1109,7 +1088,6 @@ public java.net.URL getURL(String parameterName) throws SQLException throw new VirtuosoException ("DATALINK type not supported", VirtuosoException.NOTIMPLEMENTED); } -#if JDK_VER >= 16 private int findParam (String paramName) throws SQLException { throw new VirtuosoException ("Named parameters not supported", VirtuosoException.NOTIMPLEMENTED); } @@ -1923,10 +1901,10 @@ public void setNClob(String parameterName, Reader reader) public T getObject(int parameterIndex, Class type) throws SQLException { if (type == null) { - throw new VirtuosoException ("Type parameter can not be null", + throw new VirtuosoException ("Type parameter cannot be null", "S1009", VirtuosoException.BADPARAM); } - + if (type.equals(String.class)) { return (T) getString(parameterIndex); } else if (type.equals(BigDecimal.class)) { @@ -1960,19 +1938,19 @@ public T getObject(int parameterIndex, Class type) throws SQLException } else if (type.equals(java.net.URL.class)) { return (T) getURL(parameterIndex); // } else if (type.equals(Struct.class)) { -// -// } +// +// } // } else if (type.equals(RowId.class)) { -// +// // } else if (type.equals(NClob.class)) { -// +// // } else if (type.equals(SQLXML.class)) { - + } else { try { return (T) getObject(parameterIndex); } catch (ClassCastException cce) { - throw new VirtuosoException ("Conversion not supported for type " + type.getName(), + throw new VirtuosoException ("Conversion not supported for type " + type.getName(), "S1009", VirtuosoException.BADPARAM); } } @@ -2013,6 +1991,4 @@ public T getObject(String parameterName, Class type) throws SQLException #endif -#endif -#endif } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClob.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoClob.java similarity index 95% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClob.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoClob.java index 50307ee199..9dd7310681 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClob.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoClob.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; import java.io.*; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobCharStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoClobCharStream.java similarity index 97% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobCharStream.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoClobCharStream.java index 4039e783fb..47c5a75b15 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobCharStream.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoClobCharStream.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.io.*; @@ -78,7 +78,7 @@ public int read() throws IOException try { //System.err.print ("(conn " + hashCode() + ") IN "); - // Check if it's the end of the stream + // Check if it is the end of the stream return (pos > clob.length()) ? -1 : clob.getSubString(pos++,1).length(); } catch(Exception e) @@ -114,7 +114,7 @@ public int read(char c[], int off, int len) throws IOException // Check parameters if(len <= 0) return 0; - // Check if it's the end of the stream + // Check if it is the end of the stream if((pos + len) > clob.length()) { int to_read = (int)(clob.length() - pos + 1); diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoClobStream.java similarity index 97% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobStream.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoClobStream.java index c4354d7c35..9fbd8755e6 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoClobStream.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoClobStream.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.io.*; @@ -76,7 +76,7 @@ public int read() throws IOException try { //System.err.print ("(conn " + hashCode() + ") IN "); - // Check if it's the end of the stream + // Check if it is the end of the stream return (pos > clob.length()) ? -1 : ((clob.getSubString(pos++,1)).getBytes("ASCII"))[0]; } catch(Exception e) @@ -111,7 +111,7 @@ public int read(byte b[], int off, int len) throws IOException // Check parameters if(len <= 0) return 0; - // Check if it's the end of the stream + // Check if it is the end of the stream if((pos + len) > clob.length()) { int to_read = (int)(clob.length() - pos + 1); diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoColumn.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoColumn.java similarity index 93% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoColumn.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoColumn.java index 4f42321355..b795d6d227 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoColumn.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoColumn.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; import java.util.*; @@ -38,40 +38,40 @@ class VirtuosoColumn // The type of object stored by this column private int typeObject; - // The column's name + // The column name private String name; // The SQL type corresponding to this column private int typeSQL; - // The column's normal max width in chars + // The column normal max width in chars private int length; - // The column's scale + // The column scale private int scale; - // The column's precision + // The column precision private int precision; - // The column's auto increment flag + // The column auto increment flag private boolean isAutoIncrement = false; - // The column's case sensitive flag + // The column case sensitive flag private boolean isCaseSensitive = false; - // The column's currency flag + // The column currency flag private boolean isCurrency = false; - // The column's nullable flag + // The column nullable flag private int isNullable = ResultSetMetaData.columnNullable; - // The column's searchable flag + // The column searchable flag private boolean isSearchable = false; - // The column's updateable flag + // The column updateable flag private boolean isUpdateable = false; - // The column's signed flag + // The column signed flag private boolean isSigned = false; // The case mode @@ -81,14 +81,14 @@ class VirtuosoColumn private boolean _isXml = false; /** - * Construct a new VirtuosoColumn class which stores only the column's name. + * Construct a new VirtuosoColumn class which stores only the column name. * (Useful to use equals and hashCode without others parameters). * - * @param String The column's name. + * @param String The column name. */ VirtuosoColumn(String name, int dtp, VirtuosoConnection connection) { - // Set column's name + // Set column name this.name = name; this._case = connection.getCase(); this.typeObject = dtp; @@ -238,7 +238,7 @@ protected void setColumnName(String s) } /** - * Indicates the column's normal max width in chars. + * Indicates the column normal max width in chars. * * @return int The max length of the column. * @see java.sql.ResultSetMetaData#getColumnDisplaySize @@ -287,11 +287,7 @@ protected static int getColumnType (int _typeObject) throws VirtuosoException return Types.LONGVARBINARY; case VirtuosoTypes.DV_BLOB_WIDE: -#if JDK_VER >= 16 return Types.LONGNVARCHAR; -#else - return -16; /* SQL_WLONGVARCHAR */ -#endif case VirtuosoTypes.DV_DATE: return Types.DATE; @@ -310,11 +306,7 @@ protected static int getColumnType (int _typeObject) throws VirtuosoException case VirtuosoTypes.DV_WIDE: case VirtuosoTypes.DV_LONG_WIDE: -#if JDK_VER >= 16 return Types.NVARCHAR; -#else - return -9; /* SQL_NVARCHAR */ -#endif /* custom cases follow */ case VirtuosoTypes.DV_DB_NULL: @@ -355,9 +347,9 @@ protected static int getColumnType (int _typeObject) throws VirtuosoException } /** - * Returns the column's number of decimal digits. + * Returns the column number of decimal digits. * - * @return int The column's precision. + * @return int The column precision. * @see java.sql.ResultSetMetaData#getPrecision */ protected int getPrecision() @@ -366,9 +358,9 @@ protected int getPrecision() } /** - * Returns the column's number of digits to right of the decimal point. + * Returns the column number of digits to right of the decimal point. * - * @return int The column's scale. + * @return int The column scale. * @see java.sql.ResultSetMetaData#getScale */ protected int getScale() @@ -388,7 +380,7 @@ protected boolean isAutoIncrement() } /** - * Indicates whether a column's case matters. + * Indicates whether a column case matters. * * @return boolean The case sensitive flag. * @see java.sql.ResultSetMetaData#isCaseSensitive diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnection.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoConnection.java similarity index 94% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnection.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoConnection.java index c6db75a087..e6a1db188f 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnection.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoConnection.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,29 +21,22 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; import java.net.*; import java.io.*; import java.util.*; -#ifdef SSL #undef sun import java.security.*; import java.security.cert.*; import javax.net.ssl.*; -#if JDK_VER < 14 -import com.sun.net.ssl.*; -#endif -#endif import openlink.util.*; import java.util.Vector; -#if JDK_VER >= 16 import openlink.util.OPLHeapNClob; import java.util.Map; import java.util.HashMap; import java.util.Iterator; -#endif /** * The VirtuosoConnection class is an implementation of the Connection interface @@ -62,10 +55,10 @@ * @version 1.0 (JDBC API 2.0 implementation) * @see java.sql.Connection * @see java.sql.DriverManager#getConnection - * @see virtuoso.jdbc2.VirtuosoStatement - * @see virtuoso.jdbc2.VirtuosoPreparedStatement - * @see virtuoso.jdbc2.VirtuosoCallableStatement - * @see virtuoso.jdbc2.VirtuosoDatabaseMetaData + * @see virtuoso.jdbc4.VirtuosoStatement + * @see virtuoso.jdbc4.VirtuosoPreparedStatement + * @see virtuoso.jdbc4.VirtuosoCallableStatement + * @see virtuoso.jdbc4.VirtuosoDatabaseMetaData */ public class VirtuosoConnection implements Connection { @@ -77,11 +70,7 @@ public class VirtuosoConnection implements Connection private VirtuosoOutputStream out; // Hash table from future id to the VirtuosoFuture instance -#if JDK_VER >= 16 private Hashtable futures; -#else - private Hashtable futures; -#endif // Serial number of last issued future, 0 is first private int req_no, con_no; @@ -93,11 +82,7 @@ public class VirtuosoConnection implements Connection private int _case; protected openlink.util.Vector client_defaults; protected openlink.util.Vector client_charset; -#if JDK_VER >= 16 protected Hashtable client_charset_hash; -#else - protected Hashtable client_charset_hash; -#endif protected SQLWarning warning = null; // String sent by server as answer to "caller_identification" RPC @@ -115,14 +100,12 @@ public class VirtuosoConnection implements Connection // The login used to connect to the database. private String user, password, pwdclear; -#ifdef SSL // The SSL parameters private String cert_alias; private String keystore_path, keystore_pass; private String truststore_path, truststore_pass; private String ssl_provider; private boolean use_ssl; -#endif private String con_delegate; // The transaction isolation @@ -143,19 +126,16 @@ public class VirtuosoConnection implements Connection // timezoneless datetimes setting protected int timezoneless_datetimes = 0; - + // set if the connection is managed through VirtuosoPooledConnection; -#if JDK_VER >= 14 protected VirtuosoPooledConnection pooled_connection = null; protected VirtuosoXAConnection xa_connection = null; -#endif protected String charset; protected boolean charset_utf8 = false; - -#if JDK_VER >= 16 + protected Hashtable rdf_type_hash = null; protected Hashtable rdf_lang_hash = null; protected Hashtable rdf_type_rev = null; @@ -164,14 +144,6 @@ public class VirtuosoConnection implements Connection private LRUCache pStatementCache; private boolean useCachePrepStatements = false; private Vector hostList = new Vector(); -#else - protected Hashtable rdf_type_hash = null; - protected Hashtable rdf_lang_hash = null; - protected Hashtable rdf_type_rev = null; - protected Hashtable rdf_lang_rev = null; - - private Vector hostList = new Vector(); -#endif protected boolean rdf_type_loaded = false; protected boolean rdf_lang_loaded = false; @@ -181,8 +153,6 @@ public class VirtuosoConnection implements Connection #endif private boolean useRoundRobin; - // The pingStatement to know if the connection is still available - private Statement pingStatement = null; protected class VhostRec @@ -208,15 +178,9 @@ protected VhostRec(String _host, int _port) throws VirtuosoException } -#if JDK_VER >= 16 protected Vector parse_vhost(String vhost, String _host, int _port) throws VirtuosoException { Vector hostlist = new Vector(); -#else - protected Vector parse_vhost(String vhost, String _host, int _port) throws VirtuosoException - { - Vector hostlist = new Vector(); -#endif String port = Integer.toString(_port); String attr = null; @@ -278,7 +242,7 @@ private synchronized int getNextRoundRobinHostIndex() * @param host The name of the host on which the database resides. * @param port The port number on which Virtuoso is listening. * @param prop The properties to use for making the connection (user, password). - * @exception virtuoso.jdbc2.VirtuosoException An error occurred during the + * @exception virtuoso.jdbc4.VirtuosoException An error occurred during the * connection. */ VirtuosoConnection(String url, String host, int port, Properties prop) throws VirtuosoException @@ -326,7 +290,6 @@ private synchronized int getNextRoundRobinHostIndex() if (fbs <= 0) fbs = VirtuosoTypes.DEFAULTPREFETCH;; //System.err.println ("3PwdClear is " + pwdclear); -#ifdef SSL truststore_path = (String)prop.get("truststorepath"); truststore_pass = (String)prop.get("truststorepass"); keystore_pass = (String)prop.get("keystorepass"); @@ -334,33 +297,21 @@ private synchronized int getNextRoundRobinHostIndex() ssl_provider = (String)prop.get("provider"); cert_alias = (String)prop.get("cert"); use_ssl = getBoolAttr(prop, "ssl", false); -#endif con_delegate = (String)prop.get("delegate"); if(pwdclear == null) pwdclear = "0"; //System.err.println ("4PwdClear is " + pwdclear); // Create the hash table -#if JDK_VER >= 16 futures = new Hashtable(); // RDF box type & lang rdf_type_hash = new Hashtable (); rdf_lang_hash = new Hashtable (); rdf_type_rev = new Hashtable (); rdf_lang_rev = new Hashtable (); -#else - futures = new Hashtable(); - // RDF box type & lang - rdf_type_hash = new Hashtable (); - rdf_lang_hash = new Hashtable (); - rdf_type_rev = new Hashtable (); - rdf_lang_rev = new Hashtable (); -#endif -#if JDK_VER >= 16 useCachePrepStatements = getBoolAttr(prop, "usepstmtpool", false); int poolSize = getIntAttr(prop, "pstmtpoolsize", 25); createCaches(poolSize); -#endif useRoundRobin = getBoolAttr(prop, "roundrobin", false); if (hostList.size() <= 1) @@ -368,16 +319,16 @@ private synchronized int getNextRoundRobinHostIndex() // Connect to the database connect(host,port,(String)prop.get("database"), sendbs, recvbs, (prop.get("log_enable") != null ? (Integer.parseInt(prop.getProperty("log_enable"))) : -1)); - - pingStatement = createStatement(); } - public synchronized boolean isConnectionLost(int timeout_sec) + public synchronized boolean isConnectionLost(int timeout_sec) { ResultSet rs = null; + Statement st = null; try{ - pingStatement.setQueryTimeout(timeout_sec); - rs = pingStatement.executeQuery("select 1"); + st = createStatement(); + st.setQueryTimeout(timeout_sec); + rs = st.executeQuery("select 1"); return false; } catch (Exception e ) { return true; @@ -386,6 +337,10 @@ public synchronized boolean isConnectionLost(int timeout_sec) try{ rs.close(); } catch(Exception e){} + if (st!=null) + try{ + st.close(); + } catch(Exception e){} } } @@ -422,7 +377,7 @@ protected boolean getBoolAttr(java.util.Properties info, String key, boolean def * @param host The name of the host on which the database resides. * @param port The port number on which Virtuoso is listening. * @param database The database to connect to. - * @exception virtuoso.jdbc2.VirtuosoException An error occurred during the + * @exception virtuoso.jdbc4.VirtuosoException An error occurred during the * connection. */ private void connect(String host, int port,String db, int sendbs, int recvbs, int log_enable) throws VirtuosoException @@ -466,7 +421,7 @@ else if (hostList.size() == hostIndex) { /* Failover mode last rec*/ } // Set database with statement - if(db!=null) + if(db!=null) try { new VirtuosoStatement(this).executeQuery("use "+db); } catch (VirtuosoException ve) { @@ -513,7 +468,6 @@ private Object[] fill_login_info_array () } -#ifdef SSL private Collection getCertificates(InputStream fis) throws CertificateException { @@ -521,14 +475,13 @@ private Collection getCertificates(InputStream fis) cf = CertificateFactory.getInstance("X.509"); return cf.generateCertificates(fis); } -#endif /** * Connect to the Virtuoso database and set streams. * * @param host The name of the host on which the database resides. * @param port The port number on which Virtuoso is listening. - * @exception virtuoso.jdbc2.VirtuosoException An error occurred during the + * @exception virtuoso.jdbc4.VirtuosoException An error occurred during the * connection. */ private void connect(String host, int port, int sendbs, int recvbs) throws VirtuosoException @@ -537,7 +490,6 @@ private void connect(String host, int port, int sendbs, int recvbs) throws Virtu try { // Establish the connection -#ifdef SSL if(use_ssl || truststore_path != null || keystore_path != null) { //System.out.println ("Will do SSL"); @@ -586,7 +538,7 @@ private void connect(String host, int port, int sendbs, int recvbs) throws Virtu fis.close(); } - + tmf.init(tks); tma = tmf.getTrustManagers(); } else { @@ -608,16 +560,13 @@ private void connect(String host, int port, int sendbs, int recvbs) throws Virtu } else -#endif socket = new Socket(host,port); if (timeout > 0) socket.setSoTimeout(timeout); socket.setTcpNoDelay(true); -#if JDK_VER >= 12 socket.setReceiveBufferSize(recvbs); socket.setSendBufferSize(sendbs); -#endif // Get streams corresponding to the socket in = new VirtuosoInputStream(this,socket, recvbs); @@ -700,11 +649,7 @@ else if (pwdclear != null && pwdclear.equals ("encrypt")) { client_charset = (openlink.util.Vector)obj; String table = (String)client_charset.elementAt (1); -#if JDK_VER >= 16 client_charset_hash = new Hashtable (256); -#else - client_charset_hash = new Hashtable (256); -#endif for (int i = 0; i < 255; i++) { if (i < table.length()) @@ -802,7 +747,6 @@ else if (pwdclear != null && pwdclear.equals ("encrypt")) { throw new VirtuosoException("Connection failed: ["+(fname!=null?fname:"")+"] "+e.getMessage(),VirtuosoException.IOERROR); } -#ifdef SSL catch(ClassNotFoundException e) { throw new VirtuosoException("Class not found: " + e.getMessage(),VirtuosoException.MISCERROR); @@ -835,14 +779,13 @@ else if (pwdclear != null && pwdclear.equals ("encrypt")) { throw new VirtuosoException("Encryption failed: ["+(fname!=null?fname:"") +"]" + e.getMessage(),VirtuosoException.MISCERROR); } -#endif } /** * Send an object to be sent on the output stream. * * @param obj The object to send. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ protected void write_object(Object obj) throws IOException, VirtuosoException { @@ -851,7 +794,6 @@ protected void write_object(Object obj) throws IOException, VirtuosoException VirtuosoFuture.rpc_log.print (" >> (conn " + hashCode() + ") OUT "); VirtuosoFuture.rpc_log.println (obj != null ? obj.toString() : ""); } -#if JDK_VER >= 14 try { out.write_object(obj); out.flush(); @@ -876,15 +818,10 @@ protected void write_object(Object obj) throws IOException, VirtuosoException } throw ex; } -#else - out.write_object(obj); - out.flush(); -#endif } protected void write_bytes(byte [] bytes) throws IOException, VirtuosoException { -#if JDK_VER >= 14 try { for (int k = 0; k < bytes.length; k++) out.write(bytes[k]); @@ -901,11 +838,6 @@ protected void write_bytes(byte [] bytes) throws IOException, VirtuosoException throw ex; } } -#else - for (int k = 0; k < bytes.length; k++) - out.write(bytes[k]); - out.flush(); -#endif } /** @@ -915,7 +847,7 @@ protected void write_bytes(byte [] bytes) throws IOException, VirtuosoException * @param args The array of arguments. * @return VirtuosoFuture The future instance. * @exception java.io.IOException An IO error occurred. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ protected VirtuosoFuture getFuture(String rpcname, Object[] args, int timeout) throws IOException, VirtuosoException @@ -936,9 +868,9 @@ protected VirtuosoFuture getFuture(String rpcname, Object[] args, int timeout) return fut; } - protected void clearFutures() + protected void clearFutures() { - if (futures != null) + if (futures != null) synchronized (futures) { futures.clear(); @@ -961,7 +893,7 @@ protected void removeFuture(VirtuosoFuture fut) * * @return boolean True if a message was dispatching. * @exception java.io.IOException A stream error occurred. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ protected boolean read_request() throws IOException, VirtuosoException { @@ -969,7 +901,6 @@ protected boolean read_request() throws IOException, VirtuosoException throw new VirtuosoException ("Activity on a closed connection", "IM001", VirtuosoException.SQLERROR); //System.out.println ("req start"); Object _result; -#if JDK_VER >= 14 try { _result = in.read_object(); } catch (IOException ex) { @@ -993,9 +924,6 @@ protected boolean read_request() throws IOException, VirtuosoException } throw ex; } -#else - _result = in.read_object(); -#endif //System.out.println ("req end"); if (VirtuosoFuture.rpc_log != null) { @@ -1109,10 +1037,10 @@ protected int getTimeout() // --------------------------- JDBC 1.0 ------------------------------ /** * Clears all the warnings reported on this Connection object. - * Virtuoso doesn't generate warnings, so this function does nothing, but we + * Virtuoso does not generate warnings, so this function does nothing, but we * must declare it to be compliant with the JDBC API. * - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Connection#clearWarnings */ public void clearWarnings() throws VirtuosoException @@ -1123,7 +1051,7 @@ public void clearWarnings() throws VirtuosoException /** * Close the current connection previously established with Virtuoso DBMS. * - * @exception virtuoso.jdbc2.VirtuosoException An error occurred during the connection. + * @exception virtuoso.jdbc4.VirtuosoException An error occurred during the connection. * @see java.sql.Connection#close */ public void close() throws VirtuosoException @@ -1150,16 +1078,12 @@ public void close() throws VirtuosoException socket.close(); socket = null; } -#if JDK_VER >= 16 pStatementCache.clear(); -#endif // Clear some variables user = url = password = null; futures = null; -#if JDK_VER >= 14 pooled_connection = null; xa_connection = null; -#endif } } catch(IOException e) @@ -1173,7 +1097,7 @@ public void close() throws VirtuosoException * currently held by the Connection. This method should be * used only when auto-commit mode has been disabled. * - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.Connection#commit */ public synchronized void commit() throws VirtuosoException @@ -1216,7 +1140,7 @@ public synchronized void commit() throws VirtuosoException * @return Statement A new Statement object. * @exception VirtuosoException A database access error occurred. * @see java.sql.Connection#createStatement - * @see virtuoso.jdbc2.VirtuosoStatement + * @see virtuoso.jdbc4.VirtuosoStatement */ public Statement createStatement() throws VirtuosoException { @@ -1227,7 +1151,7 @@ public Statement createStatement() throws VirtuosoException * Returns the current auto-commit state. * * @return boolean The current state of auto-commit mode. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Connection#setAutoCommit */ public boolean getAutoCommit() throws VirtuosoException @@ -1244,9 +1168,9 @@ public boolean getAutoCommit() throws VirtuosoException * object. * * @return a DatabaseMetaData object for this Connection - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Connection#getMetaData - * @see virtuoso.jdbc2.VirtuosoDatabaseMetaData + * @see virtuoso.jdbc4.VirtuosoDatabaseMetaData */ public DatabaseMetaData getMetaData() throws VirtuosoException { @@ -1256,11 +1180,11 @@ public DatabaseMetaData getMetaData() throws VirtuosoException /** * Retrieves the first warning reported by calls on this Connection. * Subsequent Connection warnings will be chained to this - * SQLWarning. Virtuoso doesn't generate warnings, so this function + * SQLWarning. Virtuoso does not generate warnings, so this function * returns always null. * * @return SQLWarning The first SQLWarning or null (must be null for the moment) - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just implementation). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just implementation). * @see java.sql.Connection#getWarnings */ public SQLWarning getWarnings() throws VirtuosoException @@ -1276,7 +1200,7 @@ public SQLWarning getWarnings() throws VirtuosoException * @param level one of the TRANSACTION_* isolation values with the * exception of TRANSACTION_NONE; some databases may not support * other values - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.Connection#setTransactionIsolation */ public void setTransactionIsolation(int level) throws VirtuosoException @@ -1292,7 +1216,7 @@ public void setTransactionIsolation(int level) throws VirtuosoException * Gets this Connection's current transaction isolation level. * * @return the current TRANSACTION_* mode value - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Connection#getTransactionIsolation */ public int getTransactionIsolation() throws VirtuosoException @@ -1303,7 +1227,7 @@ public int getTransactionIsolation() throws VirtuosoException /** * Checks if the connection is closed. * - * @return boolean True if the connection is closed, false if it's still open. + * @return boolean True if the connection is closed, false if it is still open. */ public boolean isClosed() { @@ -1324,9 +1248,9 @@ public boolean isClosed() * function call escape string. * @return a new CallableStatement object containing the * pre-compiled SQL statement - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.Connection#prepareCall - * @see virtuoso.jdbc2.VirtuosoCallableStatement + * @see virtuoso.jdbc4.VirtuosoCallableStatement */ public CallableStatement prepareCall(String sql) throws VirtuosoException { @@ -1342,7 +1266,7 @@ public CallableStatement prepareCall(String sql) throws VirtuosoException * @return PreparedStatement A new PreparedStatement object. * @exception VirtuosoException A database access error occurs. * @see java.sql.Connection#prepareStatement - * @see virtuoso.jdbc2.VirtuosoPreparedStatement + * @see virtuoso.jdbc4.VirtuosoPreparedStatement */ public PreparedStatement prepareStatement(String sql) throws VirtuosoException { @@ -1354,7 +1278,7 @@ public PreparedStatement prepareStatement(String sql) throws VirtuosoException * any database locks currently held by this Connection. * This method should be used only when auto-commit has been disabled. * - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.Connection#rollback */ public synchronized void rollback() throws VirtuosoException @@ -1391,7 +1315,7 @@ public synchronized void rollback() throws VirtuosoException * By default, new connections are in auto-commit mode. * * @param autoCommit True enables auto-commit; false disables it. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Connection#setAutoCommit */ public void setAutoCommit(boolean autoCommit) throws VirtuosoException @@ -1414,7 +1338,7 @@ public void setAutoCommit(boolean autoCommit) throws VirtuosoException * @return Statement A new Statement object. * @exception VirtuosoException A database access error occurs. * @see java.Connection#createStatement - * @see virtuoso.jdbc2.VirtuosoStatement + * @see virtuoso.jdbc4.VirtuosoStatement */ public Statement createStatement(int resultSetType, int resultSetConcurrency) throws VirtuosoException { @@ -1434,7 +1358,7 @@ public Statement createStatement(int resultSetType, int resultSetConcurrency) th * pre-compiled SQL statement * @exception VirtuosoException A database access error occurs. * @see java.sql.Connection#prepareCall - * @see virtuoso.jdbc2.VirtuosoCallableStatement + * @see virtuoso.jdbc4.VirtuosoCallableStatement */ public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency) throws VirtuosoException { @@ -1456,11 +1380,10 @@ public CallableStatement prepareCall(String sql, int resultSetType, int resultSe * pre-compiled SQL statement * @exception VirtuosoException A database access error occurs. * @see java.sql.Connection#prepareCall - * @see virtuoso.jdbc2.VirtuosoPreparedStatement + * @see virtuoso.jdbc4.VirtuosoPreparedStatement */ public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency) throws VirtuosoException { -#if JDK_VER >= 16 if (useCachePrepStatements) { VirtuosoPreparedStatement ps = null; synchronized(pStatementCache) { @@ -1480,7 +1403,6 @@ public PreparedStatement prepareStatement(String sql, int resultSetType, int res } else -#endif { return new VirtuosoPreparedStatement(this,sql,resultSetType,resultSetConcurrency); } @@ -1510,7 +1432,7 @@ public void finalize() throws Throwable * Check if the connection is in read-only mode. * * @return boolean True if connection is read-only and false otherwise. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Connection#isReadOnly */ public boolean isReadOnly() throws VirtuosoException @@ -1522,7 +1444,7 @@ public boolean isReadOnly() throws VirtuosoException * Puts this connection in read-only mode. * * @param readOnly True enables read-only mode; false disables it. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.Connection#setReadOnly */ public void setReadOnly(boolean readOnly) throws VirtuosoException @@ -1539,7 +1461,7 @@ public void setReadOnly(boolean readOnly) throws VirtuosoException * @param sql a SQL statement that may contain one or more '?' * parameter placeholders * @return the native form of this statement - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Connection#nativeSQL */ public String nativeSQL(String sql) throws VirtuosoException @@ -1553,7 +1475,7 @@ public String nativeSQL(String sql) throws VirtuosoException * If the driver does not support catalogs, it will * silently ignore this request. * - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Connection#setCatalog */ public void setCatalog(String catalog) throws VirtuosoException @@ -1578,7 +1500,7 @@ public void setCatalog(String catalog) throws VirtuosoException * Returns the Connection's current catalog name. * * @return the current catalog name or null - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Connection#getCatalog */ public String getCatalog() throws VirtuosoException @@ -1586,7 +1508,6 @@ public String getCatalog() throws VirtuosoException return qualifier; } -#if JDK_VER >= 12 /** * Gets the type map object associated with this connection. * Unless the application has added an entry to the type map, @@ -1594,14 +1515,10 @@ public String getCatalog() throws VirtuosoException * * @return the java.util.Map object associated * with this Connection object - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just implementation). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just implementation). * @see java.sql.Connection#getTypeMap */ -#if JDK_VER >= 16 public java.util.Map> getTypeMap() throws VirtuosoException -#else - public Map getTypeMap() throws VirtuosoException -#endif { return null; } @@ -1614,17 +1531,12 @@ public Map getTypeMap() throws VirtuosoException * @param the java.util.Map object to install * as the replacement for this Connection * object's default type map - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just implementation). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just implementation). * @see java.sql.Connection#setTypeMap */ -#if JDK_VER >= 16 public void setTypeMap(java.util.Map> map) throws VirtuosoException -#else - public void setTypeMap(Map map) throws VirtuosoException -#endif { } -#endif protected void setSocketTimeout (int timeout) throws VirtuosoException { @@ -1781,12 +1693,11 @@ protected String uncharsetBytes(String source) throws VirtuosoException } } -#if JDK_VER >= 14 /* JDK 1.4 functions */ /** * supports only ResultSet.HOLD_CURSORS_OVER_COMMIT for now - * @exception virtuoso.jdbc2.VirtuosoException if the holdability is not the supported one + * @exception virtuoso.jdbc4.VirtuosoException if the holdability is not the supported one */ protected void checkHoldability (int holdability) throws SQLException { @@ -1813,7 +1724,7 @@ public int getHoldability() throws SQLException } /** - * @exception virtuoso.jdbc2.VirtuosoException allways thrown : savepoints not supported + * @exception virtuoso.jdbc4.VirtuosoException allways thrown : savepoints not supported */ public Savepoint setSavepoint() throws SQLException { @@ -1822,7 +1733,7 @@ public Savepoint setSavepoint() throws SQLException } /** - * @exception virtuoso.jdbc2.VirtuosoException allways thrown : savepoints not supported + * @exception virtuoso.jdbc4.VirtuosoException allways thrown : savepoints not supported */ public Savepoint setSavepoint(String name) throws SQLException { @@ -1831,7 +1742,7 @@ public Savepoint setSavepoint(String name) throws SQLException } /** - * @exception virtuoso.jdbc2.VirtuosoException allways thrown : savepoints not supported + * @exception virtuoso.jdbc4.VirtuosoException allways thrown : savepoints not supported */ public void rollback(Savepoint savepoint) throws SQLException { @@ -1840,7 +1751,7 @@ public void rollback(Savepoint savepoint) throws SQLException } /** - * @exception virtuoso.jdbc2.VirtuosoException allways thrown : savepoints not supported + * @exception virtuoso.jdbc4.VirtuosoException allways thrown : savepoints not supported */ public void releaseSavepoint(Savepoint savepoint) throws SQLException { @@ -1919,7 +1830,6 @@ synchronized void checkClosed() throws SQLException throw new VirtuosoException("The connection is already closed.",VirtuosoException.DISCONNECTED); } -#if JDK_VER >= 16 //------------------------- JDBC 4.0 ----------------------------------- /** * Constructs an object that implements the Clob interface. The object @@ -1928,7 +1838,7 @@ synchronized void checkClosed() throws SQLException * the Clob interface may be used to add data to the Clob. * @return An object that implements the Clob interface * @throws SQLException if an object that implements the - * Clob interface can not be constructed, this method is + * Clob interface cannot be constructed, this method is * called on a closed connection or a database access error occurs. * @exception SQLFeatureNotSupportedException if the JDBC driver does not support * this data type @@ -1947,7 +1857,7 @@ public Clob createClob() throws SQLException * the Blob. * @return An object that implements the Blob interface * @throws SQLException if an object that implements the - * Blob interface can not be constructed, this method is + * Blob interface cannot be constructed, this method is * called on a closed connection or a database access error occurs. * @exception SQLFeatureNotSupportedException if the JDBC driver does not support * this data type @@ -1966,7 +1876,7 @@ public Blob createBlob() throws SQLException * be used to add data to the NClob. * @return An object that implements the NClob interface * @throws SQLException if an object that implements the - * NClob interface can not be constructed, this method is + * NClob interface cannot be constructed, this method is * called on a closed connection or a database access error occurs. * @exception SQLFeatureNotSupportedException if the JDBC driver does not support * this data type @@ -1984,7 +1894,7 @@ public NClob createNClob() throws SQLException * setString method of the SQLXML interface may be used to add data to the SQLXML * object. * @return An object that implements the SQLXML interface - * @throws SQLException if an object that implements the SQLXML interface can not + * @throws SQLException if an object that implements the SQLXML interface cannot * be constructed, this method is * called on a closed connection or a database access error occurs. * @exception SQLFeatureNotSupportedException if the JDBC driver does not support @@ -2024,7 +1934,7 @@ public boolean isValid(int _timeout) throws SQLException if (isClosed()) return false; - boolean isLost = true; + boolean isLost = true; try { try { isLost = isConnectionLost(_timeout); @@ -2032,7 +1942,7 @@ public boolean isValid(int _timeout) throws SQLException try { abortInternal(); } catch (Throwable ignoreThrown) { - // we're dead now anyway + // we are dead now anyway } return false; @@ -2040,7 +1950,7 @@ public boolean isValid(int _timeout) throws SQLException } catch (Throwable t) { return false; } - + return !isLost; } @@ -2272,7 +2182,7 @@ public Struct createStruct(String typeName, Object[] attributes) throws SQLExcep public T unwrap(java.lang.Class iface) throws java.sql.SQLException { try { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.cast(this); } catch (ClassCastException cce) { throw new VirtuosoException ("Unable to unwrap to "+iface.toString(), "22023", VirtuosoException.BADPARAM); @@ -2299,7 +2209,7 @@ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLExcepti if(isClosed()) throw new VirtuosoException("The connection is closed.",VirtuosoException.DISCONNECTED); - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.isInstance(this); } @@ -2326,7 +2236,7 @@ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLExcepti * @see #getSchema * @since 1.7 */ - public void setSchema(String schema) throws java.sql.SQLException + public void setSchema(String schema) throws java.sql.SQLException { if(isClosed()) throw new VirtuosoException("The connection is closed.",VirtuosoException.DISCONNECTED); @@ -2387,15 +2297,15 @@ public String getSchema() throws java.sql.SQLException public void abort(java.util.concurrent.Executor executor) throws java.sql.SQLException { SecurityManager sec = System.getSecurityManager(); - + if (sec != null) sec.checkPermission(ABORT_PERM); - + if (executor == null) - throw new VirtuosoException ("Executor can not be null", + throw new VirtuosoException ("Executor cannot be null", VirtuosoException.BADPARAM); - - executor.execute(new Runnable() + + executor.execute(new Runnable() { public void run() { try { @@ -2431,7 +2341,7 @@ public void run() { * JDBC connection is accessible to the administrator thread. * The setNetworkTimeout method will cover cases where * there is no administrator thread, or it has no access to the - * connection. This method is severe in it's effects, and should be + * connection. This method is severe in it is effects, and should be * given a high enough value so it is never triggered before any more * normal timeouts, such as transaction timeouts. *

    @@ -2499,22 +2409,22 @@ public void run() { * @see Executor * @since 1.7 */ - public void setNetworkTimeout(java.util.concurrent.Executor executor, + public void setNetworkTimeout(java.util.concurrent.Executor executor, final int milliseconds) throws java.sql.SQLException { SecurityManager sec = System.getSecurityManager(); - + if (sec != null) sec.checkPermission(SET_NETWORK_TIMEOUT_PERM); - + if (executor == null) - throw new VirtuosoException ("Executor can not be null", + throw new VirtuosoException ("Executor cannot be null", VirtuosoException.BADPARAM); - + if(isClosed()) throw new VirtuosoException("The connection is closed.",VirtuosoException.DISCONNECTED); - executor.execute(new Runnable() + executor.execute(new Runnable() { public void run() { try { @@ -2553,7 +2463,7 @@ public int getNetworkTimeout() throws java.sql.SQLException #endif - private void abortInternal() throws java.sql.SQLException + private void abortInternal() throws java.sql.SQLException { if (isClosed()) return; @@ -2565,7 +2475,7 @@ private void abortInternal() throws java.sql.SQLException } - + private void createCaches(int cacheSize) { pStatementCache = new LRUCache(cacheSize) { @@ -2605,8 +2515,6 @@ protected void recacheStmt(VirtuosoPreparedStatement ps) throws SQLException } } -#endif -#endif /* Global XA transaction support */ @@ -2639,17 +2547,13 @@ protected VirtuosoException notify_error (Throwable e) if (!(e instanceof VirtuosoException)) { vex = new VirtuosoException(e.getMessage(), VirtuosoException.IOERROR); -#if JDK_VER >= 14 vex.initCause (e); -#endif } else vex = (VirtuosoException) e; -#if JDK_VER >= 14 if (pooled_connection != null && isCriticalError(vex)) { pooled_connection.sendErrorEvent(vex); } -#endif return vex; } @@ -2658,9 +2562,9 @@ public static boolean isCriticalError(SQLException ex) if (ex == null) return false; String SQLstate = ex.getSQLState(); - if (SQLstate != null && SQLstate.startsWith("08") - && SQLstate != "08C04" - && SQLstate != "08C03" + if (SQLstate != null && SQLstate.startsWith("08") + && SQLstate != "08C04" + && SQLstate != "08C03" && SQLstate != "08001" && SQLstate != "08003" && SQLstate != "08006" @@ -2684,7 +2588,6 @@ public static boolean isCriticalError(SQLException ex) } -#ifdef SSL class VirtX509TrustManager implements X509TrustManager { @@ -2698,14 +2601,7 @@ public boolean isServerTrusted(java.security.cert.X509Certificate[] chain) return true; } -#if JDK_VER < 14 - public java.security.cert.X509Certificate[] getAcceptedIssuers() - { - return null; - } -#endif -#if JDK_VER >= 14 /* JDK 1.4 fucntions */ /** * note - ALLWAYS true - means no effective certificate check @@ -2727,7 +2623,6 @@ public X509Certificate[] getAcceptedIssuers() { return null; } -#endif } @@ -2838,4 +2733,3 @@ public PrivateKey getPrivateKey(String s) { } -#endif diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnectionPoolDataSource.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoConnectionPoolDataSource.java similarity index 97% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnectionPoolDataSource.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoConnectionPoolDataSource.java index b50e4ec9a4..da4614ef2e 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoConnectionPoolDataSource.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoConnectionPoolDataSource.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.lang.reflect.*; import java.io.PrintWriter; @@ -67,11 +67,7 @@ public class VirtuosoConnectionPoolDataSource private volatile boolean isClosed = false; private VirtuosoPoolStatistic stat; private Object initLock ; -#if JDK_VER >= 16 private TreeSet propQueue; -#else - private TreeSet propQueue; -#endif private long propEnforceTime = 0; @@ -81,11 +77,7 @@ public VirtuosoConnectionPoolDataSource() { initLock = new Object(); stat = new VirtuosoPoolStatistic(); connPool = new ConnCache(this); -#if JDK_VER >= 16 propQueue = new TreeSet( new Comparator() { -#else - propQueue = new TreeSet( new Comparator() { -#endif public int compare(Object a, Object b) { long a_time = ((NewProperty)a).enforceTime; long b_time = ((NewProperty)b).enforceTime; @@ -228,13 +220,7 @@ protected void addProperties(Reference ref) { public Reference getReference() throws NamingException { -#if JDK_VER < 14 - Reference ref = new Reference(getClass().getName(), "virtuoso.jdbc2.VirtuosoDataSourceFactory", null); -#elif JDK_VER < 16 - Reference ref = new Reference(getClass().getName(), "virtuoso.jdbc3.VirtuosoDataSourceFactory", null); -#else Reference ref = new Reference(getClass().getName(), "virtuoso.jdbc4.VirtuosoDataSourceFactory", null); -#endif addProperties(ref); return ref; } @@ -640,7 +626,7 @@ public void run() { for(ListIterator i = connList.listIterator(); i.hasNext(); ) { try { ((VirtuosoPooledConnection)i.next()).close(); - } catch (Exception e) { + } catch (Exception e) { } finally { connPool.cacheSize.decrementAndGet(); } @@ -794,7 +780,7 @@ private void closePooledConnection(VirtuosoPooledConnection pconn) pconn.close(); } finally { cacheSize.decrementAndGet(); - } + } } @@ -836,7 +822,7 @@ private VirtuosoPooledConnection lookup(String _Key) private boolean checkForNewConn() { - synchronized(lck_new) + synchronized(lck_new) { if (maxPoolSize == 0 || cacheSize.get() < maxPoolSize) { cacheSize.incrementAndGet(); @@ -866,7 +852,7 @@ private PooledConnection getPooledConnection(Properties info, return pconn; } - // if couldn't found an unused Connection + // if could not found an unused Connection if (checkForNewConn()) { // establish a new Connection try { diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSource.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoDataSource.java similarity index 96% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSource.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoDataSource.java index 03bd676ce6..bacdb5b0a5 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSource.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoDataSource.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import javax.sql.DataSource; import java.sql.*; @@ -49,24 +49,20 @@ public class VirtuosoDataSource implements DataSource, Referenceable, Serializab protected String pwdclear; protected int log_enable = -1; -#ifdef SSL protected String certificate; protected String keystorepass; protected String keystorepath; protected String provider; protected String truststorepass; protected String truststorepath; -#endif protected boolean ssl = false; protected int fbs = 0; protected int sendbs = 0; protected int recvbs = 0; protected boolean roundrobin = false; -#if JDK_VER >= 16 protected boolean usepstmtpool = false; protected int pstmtpoolsize = 0; -#endif protected transient java.io.PrintWriter logWriter; @@ -88,7 +84,6 @@ public class VirtuosoDataSource implements DataSource, Referenceable, Serializab final static String n_pwdclear = "pwdclear"; final static String n_log_enable = "log_enable"; -#ifdef SSL final static String n_certificate = "certificate"; final static String n_keystorepass = "keystorepass"; final static String n_keystorepath = "keystorepath"; @@ -96,17 +91,14 @@ public class VirtuosoDataSource implements DataSource, Referenceable, Serializab final static String n_truststorepass = "truststorepass"; final static String n_truststorepath = "truststorepath"; final static String n_ssl = "ssl"; -#endif final static String n_fbs = "fbs"; final static String n_sendbs = "sendbs"; final static String n_recvbs = "recvbs"; final static String n_roundrobin = "roundrobin"; -#if JDK_VER >= 16 final static String n_usepstmtpool = "usepstmtpool"; final static String n_pstmtpoolsize = "pstmtpoolsize"; -#endif public VirtuosoDataSource () @@ -148,7 +140,6 @@ protected void addProperties(Reference ref) { if (log_enable != 1) ref.add(new StringRefAddr(VirtuosoDataSource.n_log_enable, String.valueOf(log_enable))); -#ifdef SSL if (certificate != null) ref.add(new StringRefAddr(VirtuosoDataSource.n_certificate, certificate)); @@ -168,7 +159,6 @@ protected void addProperties(Reference ref) { ref.add(new StringRefAddr(VirtuosoDataSource.n_truststorepath, truststorepath)); ref.add(new StringRefAddr(VirtuosoDataSource.n_ssl, String.valueOf(ssl))); -#endif if (fbs != 0) ref.add(new StringRefAddr(VirtuosoDataSource.n_fbs, String.valueOf(fbs))); @@ -181,25 +171,17 @@ protected void addProperties(Reference ref) { ref.add(new StringRefAddr(VirtuosoDataSource.n_roundrobin, String.valueOf(roundrobin))); -#if JDK_VER >= 16 ref.add(new StringRefAddr(VirtuosoDataSource.n_usepstmtpool, String.valueOf(usepstmtpool))); if (pstmtpoolsize != 0) ref.add(new StringRefAddr(VirtuosoDataSource.n_pstmtpoolsize, String.valueOf(pstmtpoolsize))); -#endif } // Referenceable members public Reference getReference() throws NamingException { -#if JDK_VER < 14 - Reference ref = new Reference(getClass().getName(), "virtuoso.jdbc2.VirtuosoDataSourceFactory", null); -#elif JDK_VER < 16 - Reference ref = new Reference(getClass().getName(), "virtuoso.jdbc3.VirtuosoDataSourceFactory", null); -#else Reference ref = new Reference(getClass().getName(), "virtuoso.jdbc4.VirtuosoDataSourceFactory", null); -#endif addProperties(ref); return ref; } @@ -229,7 +211,6 @@ protected Properties createConnProperties() { if (log_enable != -1) prop.setProperty("log_enable", String.valueOf(log_enable)); -#ifdef SSL if (certificate!=null) prop.setProperty("certificate", certificate); if (keystorepass!=null) prop.setProperty("keystorepass", keystorepass); if (keystorepath!=null) prop.setProperty("keystorepath", keystorepath); @@ -237,17 +218,14 @@ protected Properties createConnProperties() { if (truststorepass!=null) prop.setProperty("truststorepass", truststorepass); if (truststorepath!=null) prop.setProperty("truststorepath", truststorepath); if (ssl) prop.setProperty("ssl", "1"); -#endif if (fbs != 0) prop.setProperty("fbs", String.valueOf(fbs)); if (sendbs != 0) prop.setProperty("sendbs", String.valueOf(sendbs)); if (recvbs != 0) prop.setProperty("recvbs", String.valueOf(recvbs)); if (roundrobin) prop.setProperty("roundrobin", "1"); -#if JDK_VER >= 16 if (usepstmtpool) prop.setProperty("usepstmtpool", "1"); if (pstmtpoolsize != 0) prop.setProperty("pstmtpoolsize", String.valueOf(pstmtpoolsize)); -#endif return prop; } @@ -476,7 +454,6 @@ public int getLog_Enable() return log_enable; } -#ifdef SSL public void setCertificate (String value) { this.certificate = value; @@ -540,7 +517,6 @@ public boolean getSsl () return this.ssl; } -#endif public void setFbs (int value) { @@ -578,7 +554,6 @@ public boolean getRoundrobin () return this.roundrobin; } -#if JDK_VER >= 16 public void setUsepstmtpool (boolean value) { this.usepstmtpool = value; @@ -618,7 +593,7 @@ public int getPstmtpoolsize () public T unwrap(java.lang.Class iface) throws java.sql.SQLException { try { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.cast(this); } catch (ClassCastException cce) { throw new VirtuosoException("Unable to unwrap to "+iface.toString(), VirtuosoException.OK); @@ -642,7 +617,7 @@ public T unwrap(java.lang.Class iface) throws java.sql.SQLException */ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.isInstance(this); } @@ -665,7 +640,6 @@ public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedE throw new VirtuosoFNSException ("getParentLogger() not supported", VirtuosoException.NOTIMPLEMENTED); } #endif -#endif } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSourceFactory.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoDataSourceFactory.java similarity index 88% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSourceFactory.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoDataSourceFactory.java index 8e52ea68c7..deef58fb80 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDataSourceFactory.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoDataSourceFactory.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import javax.naming.spi.ObjectFactory; import javax.naming.Name; @@ -42,25 +42,6 @@ public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtabl Reference ref = (Reference)obj; DataSource ds; String className = ref.getClassName(); -#if JDK_VER < 14 - if (className.equals("virtuoso.jdbc2.VirtuosoDataSource")) - ds = new VirtuosoDataSource(); - else if (className.equals("virtuoso.jdbc2.VirtuosoConnectionPoolDataSource")) - ds = new VirtuosoConnectionPoolDataSource(); - else if (className.equals("virtuoso.jdbc2.VirtuosoXADataSource")) - ds = new VirtuosoXADataSource(); - else - return null; -#elif JDK_VER < 16 - if (className.equals("virtuoso.jdbc3.VirtuosoDataSource")) - ds = new VirtuosoDataSource(); - else if (className.equals("virtuoso.jdbc3.VirtuosoConnectionPoolDataSource")) - ds = new VirtuosoConnectionPoolDataSource(); - else if (className.equals("virtuoso.jdbc3.VirtuosoXADataSource")) - ds = new VirtuosoXADataSource(); - else - return null; -#else if (className.equals("virtuoso.jdbc4.VirtuosoDataSource")) ds = new VirtuosoDataSource(); else if (className.equals("virtuoso.jdbc4.VirtuosoConnectionPoolDataSource")) @@ -69,7 +50,6 @@ else if (className.equals("virtuoso.jdbc4.VirtuosoXADataSource")) ds = new VirtuosoXADataSource(); else return null; -#endif if (ds != null) { StringRefAddr refS; @@ -115,7 +95,6 @@ else if ((refS = (StringRefAddr)ref.get(VirtuosoDataSource.n_charSet)) != null) if ((refS = (StringRefAddr)ref.get(VirtuosoDataSource.n_log_enable)) != null) ((VirtuosoDataSource) ds).setLog_Enable(Integer.parseInt((String)refS.getContent())); -#ifdef SSL if ((refS = (StringRefAddr)ref.get(VirtuosoDataSource.n_certificate)) != null) ((VirtuosoDataSource) ds).setCertificate((String)refS.getContent()); @@ -136,7 +115,6 @@ else if ((refS = (StringRefAddr)ref.get(VirtuosoDataSource.n_charSet)) != null) if ((refS = (StringRefAddr)ref.get(VirtuosoDataSource.n_ssl)) != null) ((VirtuosoDataSource) ds).setSsl(Boolean.getBoolean((String)refS.getContent())); -#endif if ((refS = (StringRefAddr)ref.get(VirtuosoDataSource.n_fbs)) != null) ((VirtuosoDataSource) ds).setFbs(Integer.parseInt((String)refS.getContent())); @@ -150,15 +128,13 @@ else if ((refS = (StringRefAddr)ref.get(VirtuosoDataSource.n_charSet)) != null) if ((refS = (StringRefAddr)ref.get(VirtuosoDataSource.n_roundrobin)) != null) ((VirtuosoDataSource) ds).setRoundrobin(Boolean.getBoolean((String)refS.getContent())); -#if JDK_VER >= 16 if ((refS = (StringRefAddr)ref.get(VirtuosoDataSource.n_usepstmtpool)) != null) ((VirtuosoDataSource) ds).setUsepstmtpool(Boolean.getBoolean((String)refS.getContent())); if ((refS = (StringRefAddr)ref.get(VirtuosoDataSource.n_pstmtpoolsize)) != null) ((VirtuosoDataSource) ds).setPstmtpoolsize(Integer.parseInt((String)refS.getContent())); -#endif - if (ds instanceof virtuoso.jdbc2.VirtuosoConnectionPoolDataSource) { + if (ds instanceof virtuoso.jdbc4.VirtuosoConnectionPoolDataSource) { if ((refS = (StringRefAddr)ref.get(VirtuosoConnectionPoolDataSource.n_maxStatements)) != null) ((VirtuosoConnectionPoolDataSource) ds).setMaxStatements(Integer.parseInt((String)refS.getContent())); diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDatabaseMetaData.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoDatabaseMetaData.java similarity index 94% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDatabaseMetaData.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoDatabaseMetaData.java index 4d03cc6188..3f4e511a62 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDatabaseMetaData.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoDatabaseMetaData.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,12 +21,10 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; -#if JDK_VER >= 16 import java.sql.RowIdLifetime; -#endif /** * The DatabaseMetaData class is an implementation of the DatabaseMetaData interface @@ -38,7 +36,7 @@ * @version 1.0 (JDBC API 2.0 implementation) * @see java.sql.DatabaseMetaData * @see java.sql.Connection#getDatabaseMetaData - * @see virtuoso.jdbc2.VirtuosoResultSet + * @see virtuoso.jdbc4.VirtuosoResultSet */ public class VirtuosoDatabaseMetaData implements DatabaseMetaData { @@ -78,7 +76,7 @@ public class VirtuosoDatabaseMetaData implements DatabaseMetaData * Returns the URL which permits to access the database. * * @return the url or null if it cannot be generated. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getURL() throws VirtuosoException { @@ -89,7 +87,7 @@ public String getURL() throws VirtuosoException * Returns the user name as known to the database. * * @return the database user name used. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getUserName() throws VirtuosoException { @@ -100,7 +98,7 @@ public String getUserName() throws VirtuosoException * Is the database in read-only mode? * * @return true if so; false otherwise. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean isReadOnly() throws VirtuosoException { @@ -111,7 +109,7 @@ public boolean isReadOnly() throws VirtuosoException * Are NULL values sorted high? * * @return true if so; false otherwise. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean nullsAreSortedHigh() throws VirtuosoException { @@ -122,7 +120,7 @@ public boolean nullsAreSortedHigh() throws VirtuosoException * Are NULL values sorted low? * * @return true if so; false otherwise. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean nullsAreSortedLow() throws VirtuosoException { @@ -133,7 +131,7 @@ public boolean nullsAreSortedLow() throws VirtuosoException * Are NULL values sorted at the start regardless of sort order? * * @return true if so; false otherwise. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean nullsAreSortedAtStart() throws VirtuosoException { @@ -144,7 +142,7 @@ public boolean nullsAreSortedAtStart() throws VirtuosoException * Are NULL values sorted at the end regardless of sort order? * * @return true if so; false otherwise. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean nullsAreSortedAtEnd() throws VirtuosoException { @@ -152,10 +150,10 @@ public boolean nullsAreSortedAtEnd() throws VirtuosoException } /** - * Returns the name of this database product. In our case it's OpenLink Virtuoso DBMS. + * Returns the name of this database product. In our case it is OpenLink Virtuoso DBMS. * * @return the database product name. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getDatabaseProductName() throws VirtuosoException { @@ -166,7 +164,7 @@ public String getDatabaseProductName() throws VirtuosoException * Returns the version of this database product. * * @return the database version. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getDatabaseProductVersion() throws VirtuosoException { @@ -174,10 +172,10 @@ public String getDatabaseProductVersion() throws VirtuosoException } /** - * Returns the name of this JDBC driver. In our case it's OpenLink Virtuoso JDBC pure Java. + * Returns the name of this JDBC driver. In our case it is OpenLink Virtuoso JDBC pure Java. * * @return the JDBC driver name. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getDriverName() throws VirtuosoException { @@ -188,11 +186,11 @@ public String getDriverName() throws VirtuosoException * Returns the version of this JDBC driver. * * @return the JDBC driver version. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getDriverVersion() throws VirtuosoException { - return new String(virtuoso.jdbc2.Driver.major + "." + virtuoso.jdbc2.Driver.minor + " (for Java 2 platform)"); + return new String(virtuoso.jdbc4.Driver.major + "." + virtuoso.jdbc4.Driver.minor + " (for Java 2 platform)"); } /** @@ -202,7 +200,7 @@ public String getDriverVersion() throws VirtuosoException */ public int getDriverMajorVersion() { - return virtuoso.jdbc2.Driver.major; + return virtuoso.jdbc4.Driver.major; } /** @@ -212,14 +210,14 @@ public int getDriverMajorVersion() */ public int getDriverMinorVersion() { - return virtuoso.jdbc2.Driver.minor; + return virtuoso.jdbc4.Driver.minor; } /** * Does the database store tables in a local file? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean usesLocalFiles() throws VirtuosoException { @@ -230,7 +228,7 @@ public boolean usesLocalFiles() throws VirtuosoException * Does the database use a file for each table? * * @return true if the database uses a local file for each table. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean usesLocalFilePerTable() throws VirtuosoException { @@ -244,7 +242,7 @@ public boolean usesLocalFilePerTable() throws VirtuosoException * A JDBC CompliantTM driver will always return false. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsMixedCaseIdentifiers() throws VirtuosoException { @@ -256,7 +254,7 @@ public boolean supportsMixedCaseIdentifiers() throws VirtuosoException * case insensitive and store them in upper case? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean storesUpperCaseIdentifiers() throws VirtuosoException { @@ -268,7 +266,7 @@ public boolean storesUpperCaseIdentifiers() throws VirtuosoException * case insensitive and store them in lower case? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean storesLowerCaseIdentifiers() throws VirtuosoException { @@ -280,7 +278,7 @@ public boolean storesLowerCaseIdentifiers() throws VirtuosoException * case insensitive and store them in mixed case? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean storesMixedCaseIdentifiers() throws VirtuosoException { @@ -294,7 +292,7 @@ public boolean storesMixedCaseIdentifiers() throws VirtuosoException * A JDBC CompliantTM driver will always return true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsMixedCaseQuotedIdentifiers() throws VirtuosoException { @@ -306,7 +304,7 @@ public boolean supportsMixedCaseQuotedIdentifiers() throws VirtuosoException * case insensitive and store them in upper case? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean storesUpperCaseQuotedIdentifiers() throws VirtuosoException { @@ -318,7 +316,7 @@ public boolean storesUpperCaseQuotedIdentifiers() throws VirtuosoException * case insensitive and store them in lower case? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean storesLowerCaseQuotedIdentifiers() throws VirtuosoException { @@ -330,7 +328,7 @@ public boolean storesLowerCaseQuotedIdentifiers() throws VirtuosoException * case insensitive and store them in mixed case? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean storesMixedCaseQuotedIdentifiers() throws VirtuosoException { @@ -339,13 +337,13 @@ public boolean storesMixedCaseQuotedIdentifiers() throws VirtuosoException /** * What's the string used to quote SQL identifiers? - * This returns a space " " if identifier quoting isn't supported. + * This returns a space " " if identifier quoting is not supported. * * A JDBC CompliantTM * driver always uses a double quote character. * * @return the quoting string - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getIdentifierQuoteString() throws VirtuosoException { @@ -357,7 +355,7 @@ public String getIdentifierQuoteString() throws VirtuosoException * that are NOT also SQL92 keywords. * * @return the list - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getSQLKeywords() throws VirtuosoException { @@ -370,7 +368,7 @@ public String getSQLKeywords() throws VirtuosoException * clause. * * @return the list - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getNumericFunctions() throws VirtuosoException { @@ -383,7 +381,7 @@ public String getNumericFunctions() throws VirtuosoException * clause. * * @return the list - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getStringFunctions() throws VirtuosoException { @@ -396,7 +394,7 @@ public String getStringFunctions() throws VirtuosoException * clause. * * @return the list - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getSystemFunctions() throws VirtuosoException { @@ -407,7 +405,7 @@ public String getSystemFunctions() throws VirtuosoException * Gets a comma-separated list of time and date functions. * * @return the list - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getTimeDateFunctions() throws VirtuosoException { @@ -424,7 +422,7 @@ public String getTimeDateFunctions() throws VirtuosoException * more characters. * * @return the string used to escape wildcard characters - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getSearchStringEscape() throws VirtuosoException { @@ -436,7 +434,7 @@ public String getSearchStringEscape() throws VirtuosoException * identifier names (those beyond a-z, A-Z, 0-9 and _). * * @return the string containing the extra characters - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getExtraNameCharacters() throws VirtuosoException { @@ -447,7 +445,7 @@ public String getExtraNameCharacters() throws VirtuosoException * Is "ALTER TABLE" with add column supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsAlterTableWithAddColumn() throws VirtuosoException { @@ -458,7 +456,7 @@ public boolean supportsAlterTableWithAddColumn() throws VirtuosoException * Is "ALTER TABLE" with drop column supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsAlterTableWithDropColumn() throws VirtuosoException { @@ -474,7 +472,7 @@ public boolean supportsAlterTableWithDropColumn() throws VirtuosoException * A JDBC CompliantTM driver always returns true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsColumnAliasing() throws VirtuosoException { @@ -487,7 +485,7 @@ public boolean supportsColumnAliasing() throws VirtuosoException * A JDBC CompliantTM driver always returns true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean nullPlusNonNullIsNull() throws VirtuosoException { @@ -498,7 +496,7 @@ public boolean nullPlusNonNullIsNull() throws VirtuosoException * Is the CONVERT function between SQL types supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsConvert() throws VirtuosoException { @@ -511,8 +509,8 @@ public boolean supportsConvert() throws VirtuosoException * @param fromType the type to convert from * @param toType the type to convert to * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). - * @see virtuoso.jdbc2.Types + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). + * @see virtuoso.jdbc4.Types */ public boolean supportsConvert(int fromType, int toType) throws VirtuosoException { @@ -583,7 +581,7 @@ public boolean supportsConvert(int fromType, int toType) throws VirtuosoExceptio * A JDBC CompliantTM driver always returns true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsTableCorrelationNames() throws VirtuosoException { @@ -595,7 +593,7 @@ public boolean supportsTableCorrelationNames() throws VirtuosoException * to be different from the names of the tables? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsDifferentTableCorrelationNames() throws VirtuosoException { @@ -606,7 +604,7 @@ public boolean supportsDifferentTableCorrelationNames() throws VirtuosoException * Are expressions in "ORDER BY" lists supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsExpressionsInOrderBy() throws VirtuosoException { @@ -617,7 +615,7 @@ public boolean supportsExpressionsInOrderBy() throws VirtuosoException * Can an "ORDER BY" clause use columns not in the SELECT statement? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsOrderByUnrelated() throws VirtuosoException { @@ -628,7 +626,7 @@ public boolean supportsOrderByUnrelated() throws VirtuosoException * Is some form of "GROUP BY" clause supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsGroupBy() throws VirtuosoException { @@ -639,7 +637,7 @@ public boolean supportsGroupBy() throws VirtuosoException * Can a "GROUP BY" clause use columns not in the SELECT? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsGroupByUnrelated() throws VirtuosoException { @@ -651,7 +649,7 @@ public boolean supportsGroupByUnrelated() throws VirtuosoException * provided it specifies all the columns in the SELECT? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsGroupByBeyondSelect() throws VirtuosoException { @@ -664,7 +662,7 @@ public boolean supportsGroupByBeyondSelect() throws VirtuosoException * A JDBC CompliantTM driver always returns true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsLikeEscapeClause() throws VirtuosoException { @@ -675,7 +673,7 @@ public boolean supportsLikeEscapeClause() throws VirtuosoException * Are multiple ResultSets from a single execute supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsMultipleResultSets() throws VirtuosoException { @@ -687,7 +685,7 @@ public boolean supportsMultipleResultSets() throws VirtuosoException * connections)? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsMultipleTransactions() throws VirtuosoException { @@ -700,7 +698,7 @@ public boolean supportsMultipleTransactions() throws VirtuosoException * A JDBC CompliantTM driver always returns true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsNonNullableColumns() throws VirtuosoException { @@ -713,7 +711,7 @@ public boolean supportsNonNullableColumns() throws VirtuosoException * All JDBC CompliantTM drivers must return true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsMinimumSQLGrammar() throws VirtuosoException { @@ -724,7 +722,7 @@ public boolean supportsMinimumSQLGrammar() throws VirtuosoException * Is the ODBC Core SQL grammar supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsCoreSQLGrammar() throws VirtuosoException { @@ -735,7 +733,7 @@ public boolean supportsCoreSQLGrammar() throws VirtuosoException * Is the ODBC Extended SQL grammar supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsExtendedSQLGrammar() throws VirtuosoException { @@ -748,7 +746,7 @@ public boolean supportsExtendedSQLGrammar() throws VirtuosoException * All JDBC CompliantTM drivers must return true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsANSI92EntryLevelSQL() throws VirtuosoException { @@ -759,7 +757,7 @@ public boolean supportsANSI92EntryLevelSQL() throws VirtuosoException * Is the ANSI92 intermediate SQL grammar supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsANSI92IntermediateSQL() throws VirtuosoException { @@ -770,7 +768,7 @@ public boolean supportsANSI92IntermediateSQL() throws VirtuosoException * Is the ANSI92 full SQL grammar supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsANSI92FullSQL() throws VirtuosoException { @@ -781,7 +779,7 @@ public boolean supportsANSI92FullSQL() throws VirtuosoException * Is the SQL Integrity Enhancement Facility supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsIntegrityEnhancementFacility() throws SQLException { @@ -792,7 +790,7 @@ public boolean supportsIntegrityEnhancementFacility() throws SQLException * Is some form of outer join supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsOuterJoins() throws VirtuosoException { @@ -803,7 +801,7 @@ public boolean supportsOuterJoins() throws VirtuosoException * Are full nested outer joins supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsFullOuterJoins() throws VirtuosoException { @@ -815,7 +813,7 @@ public boolean supportsFullOuterJoins() throws VirtuosoException * if supportFullOuterJoins is true.) * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsLimitedOuterJoins() throws VirtuosoException { @@ -826,7 +824,7 @@ public boolean supportsLimitedOuterJoins() throws VirtuosoException * What's the database vendor's preferred term for "schema"? * * @return the vendor term - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getSchemaTerm() throws VirtuosoException { @@ -837,7 +835,7 @@ public String getSchemaTerm() throws VirtuosoException * What's the database vendor's preferred term for "procedure"? * * @return the vendor term - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getProcedureTerm() throws VirtuosoException { @@ -848,7 +846,7 @@ public String getProcedureTerm() throws VirtuosoException * What's the database vendor's preferred term for "catalog"? * * @return the vendor term - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getCatalogTerm() throws VirtuosoException { @@ -860,7 +858,7 @@ public String getCatalogTerm() throws VirtuosoException * (Otherwise it appears at the end) * * @return true if it appears at the start - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean isCatalogAtStart() throws VirtuosoException { @@ -871,7 +869,7 @@ public boolean isCatalogAtStart() throws VirtuosoException * What's the separator between catalog and table name? * * @return the separator string - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public String getCatalogSeparator() throws VirtuosoException { @@ -882,7 +880,7 @@ public String getCatalogSeparator() throws VirtuosoException * Can a schema name be used in a data manipulation statement? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsSchemasInDataManipulation() throws VirtuosoException { @@ -893,7 +891,7 @@ public boolean supportsSchemasInDataManipulation() throws VirtuosoException * Can a schema name be used in a procedure call statement? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsSchemasInProcedureCalls() throws VirtuosoException { @@ -904,7 +902,7 @@ public boolean supportsSchemasInProcedureCalls() throws VirtuosoException * Can a schema name be used in a table definition statement? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsSchemasInTableDefinitions() throws VirtuosoException { @@ -915,7 +913,7 @@ public boolean supportsSchemasInTableDefinitions() throws VirtuosoException * Can a schema name be used in an index definition statement? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsSchemasInIndexDefinitions() throws VirtuosoException { @@ -926,7 +924,7 @@ public boolean supportsSchemasInIndexDefinitions() throws VirtuosoException * Can a schema name be used in a privilege definition statement? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsSchemasInPrivilegeDefinitions() throws VirtuosoException { @@ -937,7 +935,7 @@ public boolean supportsSchemasInPrivilegeDefinitions() throws VirtuosoException * Can a catalog name be used in a data manipulation statement? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsCatalogsInDataManipulation() throws VirtuosoException { @@ -948,7 +946,7 @@ public boolean supportsCatalogsInDataManipulation() throws VirtuosoException * Can a catalog name be used in a procedure call statement? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsCatalogsInProcedureCalls() throws VirtuosoException { @@ -959,7 +957,7 @@ public boolean supportsCatalogsInProcedureCalls() throws VirtuosoException * Can a catalog name be used in a table definition statement? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsCatalogsInTableDefinitions() throws VirtuosoException { @@ -970,7 +968,7 @@ public boolean supportsCatalogsInTableDefinitions() throws VirtuosoException * Can a catalog name be used in an index definition statement? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsCatalogsInIndexDefinitions() throws VirtuosoException { @@ -981,7 +979,7 @@ public boolean supportsCatalogsInIndexDefinitions() throws VirtuosoException * Can a catalog name be used in a privilege definition statement? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsCatalogsInPrivilegeDefinitions() throws VirtuosoException { @@ -992,7 +990,7 @@ public boolean supportsCatalogsInPrivilegeDefinitions() throws VirtuosoException * Is positioned DELETE supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsPositionedDelete() throws VirtuosoException { @@ -1003,7 +1001,7 @@ public boolean supportsPositionedDelete() throws VirtuosoException * Is positioned UPDATE supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsPositionedUpdate() throws VirtuosoException { @@ -1014,7 +1012,7 @@ public boolean supportsPositionedUpdate() throws VirtuosoException * Is SELECT for UPDATE supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsSelectForUpdate() throws VirtuosoException { @@ -1026,7 +1024,7 @@ public boolean supportsSelectForUpdate() throws VirtuosoException * syntax supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsStoredProcedures() throws VirtuosoException { @@ -1039,7 +1037,7 @@ public boolean supportsStoredProcedures() throws VirtuosoException * A JDBC CompliantTM driver always returns true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsSubqueriesInComparisons() throws VirtuosoException { @@ -1052,7 +1050,7 @@ public boolean supportsSubqueriesInComparisons() throws VirtuosoException * A JDBC CompliantTM driver always returns true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsSubqueriesInExists() throws VirtuosoException { @@ -1065,7 +1063,7 @@ public boolean supportsSubqueriesInExists() throws VirtuosoException * A JDBC CompliantTM driver always returns true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsSubqueriesInIns() throws VirtuosoException { @@ -1078,7 +1076,7 @@ public boolean supportsSubqueriesInIns() throws VirtuosoException * A JDBC CompliantTM driver always returns true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsSubqueriesInQuantifieds() throws VirtuosoException { @@ -1091,7 +1089,7 @@ public boolean supportsSubqueriesInQuantifieds() throws VirtuosoException * A JDBC CompliantTM driver always returns true. * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsCorrelatedSubqueries() throws VirtuosoException { @@ -1102,7 +1100,7 @@ public boolean supportsCorrelatedSubqueries() throws VirtuosoException * Is SQL UNION supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsUnion() throws VirtuosoException { @@ -1113,7 +1111,7 @@ public boolean supportsUnion() throws VirtuosoException * Is SQL UNION ALL supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsUnionAll() throws VirtuosoException { @@ -1125,7 +1123,7 @@ public boolean supportsUnionAll() throws VirtuosoException * * @return true if cursors always remain open; * false if they might not remain open - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsOpenCursorsAcrossCommit() throws VirtuosoException { @@ -1137,7 +1135,7 @@ public boolean supportsOpenCursorsAcrossCommit() throws VirtuosoException * * @return true if cursors always remain open; * false if they might not remain open - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsOpenCursorsAcrossRollback() throws VirtuosoException { @@ -1149,7 +1147,7 @@ public boolean supportsOpenCursorsAcrossRollback() throws VirtuosoException * * @return true if statements always remain open; * false if they might not remain open - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsOpenStatementsAcrossCommit() throws VirtuosoException { @@ -1161,7 +1159,7 @@ public boolean supportsOpenStatementsAcrossCommit() throws VirtuosoException * * @return true if statements always remain open; * false if they might not remain open - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsOpenStatementsAcrossRollback() throws VirtuosoException { @@ -1173,7 +1171,7 @@ public boolean supportsOpenStatementsAcrossRollback() throws VirtuosoException * * @return max binary literal length in hex characters; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxBinaryLiteralLength() throws VirtuosoException { @@ -1185,7 +1183,7 @@ public int getMaxBinaryLiteralLength() throws VirtuosoException * * @return max literal length; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxCharLiteralLength() throws VirtuosoException { @@ -1197,7 +1195,7 @@ public int getMaxCharLiteralLength() throws VirtuosoException * * @return max column name length; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxColumnNameLength() throws VirtuosoException { @@ -1209,7 +1207,7 @@ public int getMaxColumnNameLength() throws VirtuosoException * * @return max number of columns; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxColumnsInGroupBy() throws VirtuosoException { @@ -1221,7 +1219,7 @@ public int getMaxColumnsInGroupBy() throws VirtuosoException * * @return max number of columns; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxColumnsInIndex() throws VirtuosoException { @@ -1233,7 +1231,7 @@ public int getMaxColumnsInIndex() throws VirtuosoException * * @return max number of columns; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxColumnsInOrderBy() throws VirtuosoException { @@ -1245,7 +1243,7 @@ public int getMaxColumnsInOrderBy() throws VirtuosoException * * @return max number of columns; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxColumnsInSelect() throws VirtuosoException { @@ -1257,7 +1255,7 @@ public int getMaxColumnsInSelect() throws VirtuosoException * * @return max number of columns; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxColumnsInTable() throws VirtuosoException { @@ -1269,7 +1267,7 @@ public int getMaxColumnsInTable() throws VirtuosoException * * @return max number of active connections; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxConnections() throws VirtuosoException { @@ -1281,7 +1279,7 @@ public int getMaxConnections() throws VirtuosoException * * @return max cursor name length in bytes; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxCursorNameLength() throws VirtuosoException { @@ -1293,7 +1291,7 @@ public int getMaxCursorNameLength() throws VirtuosoException * * @return max index length in bytes; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxIndexLength() throws VirtuosoException { @@ -1305,7 +1303,7 @@ public int getMaxIndexLength() throws VirtuosoException * * @return max name length in bytes; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxSchemaNameLength() throws VirtuosoException { @@ -1317,7 +1315,7 @@ public int getMaxSchemaNameLength() throws VirtuosoException * * @return max name length in bytes; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxProcedureNameLength() throws VirtuosoException { @@ -1329,7 +1327,7 @@ public int getMaxProcedureNameLength() throws VirtuosoException * * @return max name length in bytes; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxCatalogNameLength() throws VirtuosoException { @@ -1341,7 +1339,7 @@ public int getMaxCatalogNameLength() throws VirtuosoException * * @return max row size in bytes; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxRowSize() throws VirtuosoException { @@ -1353,7 +1351,7 @@ public int getMaxRowSize() throws VirtuosoException * blobs? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean doesMaxRowSizeIncludeBlobs() throws VirtuosoException { @@ -1365,7 +1363,7 @@ public boolean doesMaxRowSizeIncludeBlobs() throws VirtuosoException * * @return max length in bytes; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxStatementLength() throws VirtuosoException { @@ -1378,7 +1376,7 @@ public int getMaxStatementLength() throws VirtuosoException * * @return the maximum number of statements that can be open at one time; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxStatements() throws VirtuosoException { @@ -1390,7 +1388,7 @@ public int getMaxStatements() throws VirtuosoException * * @return max name length in bytes; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxTableNameLength() throws VirtuosoException { @@ -1402,7 +1400,7 @@ public int getMaxTableNameLength() throws VirtuosoException * * @return the maximum number of tables allowed in a SELECT statement; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxTablesInSelect() throws VirtuosoException { @@ -1414,7 +1412,7 @@ public int getMaxTablesInSelect() throws VirtuosoException * * @return max user name length in bytes; * a result of zero means that there is no limit or the limit is not known - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public int getMaxUserNameLength() throws VirtuosoException { @@ -1426,7 +1424,7 @@ public int getMaxUserNameLength() throws VirtuosoException * values are defined in java.sql.Connection. * * @return the default isolation level - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Connection */ public int getDefaultTransactionIsolation() throws VirtuosoException @@ -1440,7 +1438,7 @@ public int getDefaultTransactionIsolation() throws VirtuosoException * isolation level is TRANSACTION_NONE. * * @return true if transactions are supported; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsTransactions() throws VirtuosoException { @@ -1452,7 +1450,7 @@ public boolean supportsTransactions() throws VirtuosoException * * @param level the values are defined in java.sql.Connection * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Connection */ public boolean supportsTransactionIsolationLevel(int level) throws VirtuosoException @@ -1470,7 +1468,7 @@ public boolean supportsTransactionIsolationLevel(int level) throws VirtuosoExcep * within a transaction supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsDataDefinitionAndDataManipulationTransactions() throws VirtuosoException { @@ -1482,7 +1480,7 @@ public boolean supportsDataDefinitionAndDataManipulationTransactions() throws Vi * supported? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean supportsDataManipulationTransactionsOnly() throws VirtuosoException { @@ -1494,7 +1492,7 @@ public boolean supportsDataManipulationTransactionsOnly() throws VirtuosoExcepti * transaction to commit? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean dataDefinitionCausesTransactionCommit() throws VirtuosoException { @@ -1505,7 +1503,7 @@ public boolean dataDefinitionCausesTransactionCommit() throws VirtuosoException * Is a data definition statement within a transaction ignored? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean dataDefinitionIgnoredInTransactions() throws VirtuosoException { @@ -1517,7 +1515,7 @@ public boolean dataDefinitionIgnoredInTransactions() throws VirtuosoException * current user? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean allProceduresAreCallable() throws VirtuosoException { @@ -1529,7 +1527,7 @@ public boolean allProceduresAreCallable() throws VirtuosoException * current user? * * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ public boolean allTablesAreSelectable() throws VirtuosoException { @@ -1642,7 +1640,7 @@ public boolean allTablesAreSelectable() throws VirtuosoException * without a schema * @param procedureNamePattern a procedure name pattern * @return ResultSet - each row is a procedure description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see #getSearchStringEscape */ public ResultSet getProcedures(String catalog, String schemaPattern, @@ -1726,7 +1724,7 @@ public ResultSet getProcedures(String catalog, String schemaPattern, * @param columnNamePattern a column name pattern * @return ResultSet - each row describes a stored procedure parameter or * column - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see #getSearchStringEscape */ public ResultSet getProcedureColumns(String catalog, String schemaPattern, @@ -1770,13 +1768,11 @@ public ResultSet getProcedureColumns(String catalog, String schemaPattern, "charset_recode (name_part(\\KEY_TABLE,2), 'UTF-8', '_WIDE_') AS \\TABLE_NAME NVARCHAR(128)," + "table_type(\\KEY_TABLE) AS \\TABLE_TYPE VARCHAR(128)," + "NULL AS \\REMARKS VARCHAR(254) " + -#if JDK_VER >= 14 ",NULL AS \\TYPE_CAT VARCHAR(128) " + ",NULL AS \\TYPE_SCHEM VARCHAR(128) " + ",NULL AS \\TYPE_NAME VARCHAR(128) " + ",NULL AS \\SELF_REFERENCING_COL_NAME VARCHAR(128) " + ",NULL AS \\REF_GENERATION VARCHAR(128) " + -#endif "FROM DB.DBA.SYS_KEYS " + "WHERE " + "__any_grants(\\KEY_TABLE) AND " + @@ -1794,13 +1790,11 @@ public ResultSet getProcedureColumns(String catalog, String schemaPattern, "charset_recode (name_part(\\KEY_TABLE,2), 'UTF-8', '_WIDE_') AS \\TABLE_NAME NVARCHAR(128)," + "table_type(\\KEY_TABLE) AS \\TABLE_TYPE VARCHAR(128)," + "NULL AS \\REMARKS VARCHAR(254) " + -#if JDK_VER >= 14 ",NULL AS \\TYPE_CAT VARCHAR(128) " + ",NULL AS \\TYPE_SCHEM VARCHAR(128) " + ",NULL AS \\TYPE_NAME VARCHAR(128) " + ",NULL AS \\SELF_REFERENCING_COL_NAME VARCHAR(128) " + ",NULL AS \\REF_GENERATION VARCHAR(128) " + -#endif "FROM DB.DBA.SYS_KEYS " + "WHERE " + "__any_grants(\\KEY_TABLE) AND " + @@ -1821,13 +1815,11 @@ public ResultSet getProcedureColumns(String catalog, String schemaPattern, "name_part(\\KEY_TABLE,2) AS \\TABLE_NAME VARCHAR(128)," + "table_type(\\KEY_TABLE) AS \\TABLE_TYPE VARCHAR(128)," + "NULL AS \\REMARKS VARCHAR(254) " + -#if JDK_VER >= 14 ",NULL AS \\TYPE_CAT VARCHAR(128) " + ",NULL AS \\TYPE_SCHEM VARCHAR(128) " + ",NULL AS \\TYPE_NAME VARCHAR(128) " + ",NULL AS \\SELF_REFERENCING_COL_NAME VARCHAR(128) " + ",NULL AS \\REF_GENERATION VARCHAR(128) " + -#endif "FROM DB.DBA.SYS_KEYS " + "WHERE " + "__any_grants(\\KEY_TABLE) AND " + @@ -1845,13 +1837,11 @@ public ResultSet getProcedureColumns(String catalog, String schemaPattern, "name_part(\\KEY_TABLE,2) AS \\TABLE_NAME VARCHAR(128)," + "table_type(\\KEY_TABLE) AS \\TABLE_TYPE VARCHAR(128)," + "NULL AS \\REMARKS VARCHAR(254) " + -#if JDK_VER >= 14 ",NULL AS \\TYPE_CAT VARCHAR(128) " + ",NULL AS \\TYPE_SCHEM VARCHAR(128) " + ",NULL AS \\TYPE_NAME VARCHAR(128) " + ",NULL AS \\SELF_REFERENCING_COL_NAME VARCHAR(128) " + ",NULL AS \\REF_GENERATION VARCHAR(128) " + -#endif "FROM DB.DBA.SYS_KEYS " + "WHERE " + "__any_grants(\\KEY_TABLE) AND " + @@ -1892,7 +1882,7 @@ public ResultSet getProcedureColumns(String catalog, String schemaPattern, * @param tableNamePattern a table name pattern * @param types a list of table types to include; null returns all types * @return ResultSet - each row is a table description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see #getSearchStringEscape */ public ResultSet getTables(String catalog, String schemaPattern, @@ -1946,35 +1936,27 @@ else if (types[i].equals("SYSTEM TABLE")) return rs; } -/****** create problem for DbVisualizer, bug in DbVisualizer, it doesn't support new JDBC specification +/****** create problem for DbVisualizer, bug in DbVisualizer, it does not support new JDBC specification private static final String getSchemasText = "select distinct" + " name_part(KEY_TABLE, 1) AS \\TABLE_SCHEM VARCHAR(128)" + -#if JDK_VER >= 14 ", name_part(KEY_TABLE, 0) AS \\TABLE_CAT VARCHAR(128)" + -#endif "from DB.DBA.SYS_KEYS"; private static final String getWideSchemasText = "select distinct" + " charset_recode (name_part(KEY_TABLE, 1), 'UTF-8', '_WIDE_') AS \\TABLE_SCHEM NVARCHAR(128)" + -#if JDK_VER >= 14 ", charset_recode (name_part(KEY_TABLE, 0), 'UTF-8', '_WIDE_') AS \\TABLE_CAT NVARCHAR(128)" + -#endif "from DB.DBA.SYS_KEYS"; ***********/ private static final String getSchemasText = "select distinct" + " name_part(KEY_TABLE, 1) AS \\TABLE_SCHEM VARCHAR(128)" + -#if JDK_VER >= 14 ", null AS \\TABLE_CAT VARCHAR(128)" + -#endif "from DB.DBA.SYS_KEYS"; private static final String getWideSchemasText = "select distinct" + " charset_recode (name_part(KEY_TABLE, 1), 'UTF-8', '_WIDE_') AS \\TABLE_SCHEM NVARCHAR(128)" + -#if JDK_VER >= 14 ", null AS \\TABLE_CAT NVARCHAR(128)" + -#endif "from DB.DBA.SYS_KEYS"; /** * Gets the schema names available in this database. The results @@ -1987,7 +1969,7 @@ else if (types[i].equals("SYSTEM TABLE")) * * @return ResultSet - each row has a single String column that is a * schema name - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public ResultSet getSchemas() throws SQLException { @@ -2017,7 +1999,7 @@ public ResultSet getSchemas() throws SQLException * * @return ResultSet - each row has a single String column that is a * catalog name - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public ResultSet getCatalogs() throws SQLException { @@ -2046,7 +2028,7 @@ public ResultSet getCatalogs() throws SQLException * * @return ResultSet - each row has a single String column that is a * table type - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public ResultSet getTableTypes() throws SQLException { @@ -2073,12 +2055,10 @@ public ResultSet getTableTypes() throws SQLException "NULL AS \\CHAR_OCTET_LENGTH INTEGER, " + "NULL AS \\ORDINAL_POSITION INTEGER, " + "NULL AS \\IS_NULLABLE VARCHAR(10) " + -#if JDK_VER >= 14 ",NULL AS \\SCOPE_CATLOG VARCHAR(128) " + ",NULL AS \\SCOPE_SCHEMA VARCHAR(128) " + ",NULL AS \\SCOPE_TABLE VARCHAR(128) " + ",NULL AS \\SOURCE_DATA_TYPE SMALLINT " + -#endif "FROM " + "DB.DBA.SYS_KEYS k, " + "DB.DBA.SYS_KEY_PARTS kp, " + @@ -2114,12 +2094,10 @@ public ResultSet getTableTypes() throws SQLException "NULL AS \\CHAR_OCTET_LENGTH INTEGER, " + "NULL AS \\ORDINAL_POSITION INTEGER, " + "NULL AS \\IS_NULLABLE VARCHAR(10) " + -#if JDK_VER >= 14 ",NULL AS \\SCOPE_CATLOG VARCHAR(128) " + ",NULL AS \\SCOPE_SCHEMA VARCHAR(128) " + ",NULL AS \\SCOPE_TABLE VARCHAR(128) " + ",NULL AS \\SOURCE_DATA_TYPE SMALLINT " + -#endif "FROM " + "DB.DBA.SYS_KEYS k, " + "DB.DBA.SYS_KEY_PARTS kp, " + @@ -2156,12 +2134,10 @@ public ResultSet getTableTypes() throws SQLException "NULL AS \\CHAR_OCTET_LENGTH INTEGER, " + "NULL AS \\ORDINAL_POSITION INTEGER, " + "NULL AS \\IS_NULLABLE VARCHAR(10) " + -#if JDK_VER >= 14 ",NULL AS \\SCOPE_CATLOG VARCHAR(128) " + ",NULL AS \\SCOPE_SCHEMA VARCHAR(128) " + ",NULL AS \\SCOPE_TABLE VARCHAR(128) " + ",NULL AS \\SOURCE_DATA_TYPE SMALLINT " + -#endif "FROM " + "DB.DBA.SYS_KEYS k, " + "DB.DBA.SYS_KEY_PARTS kp, " + @@ -2197,12 +2173,10 @@ public ResultSet getTableTypes() throws SQLException "NULL AS \\CHAR_OCTET_LENGTH INTEGER, " + "NULL AS \\ORDINAL_POSITION INTEGER, " + "NULL AS \\IS_NULLABLE VARCHAR(10) " + -#if JDK_VER >= 14 ",NULL AS \\SCOPE_CATLOG VARCHAR(128) " + ",NULL AS \\SCOPE_SCHEMA VARCHAR(128) " + ",NULL AS \\SCOPE_TABLE VARCHAR(128) " + ",NULL AS \\SOURCE_DATA_TYPE SMALLINT " + -#endif "FROM " + "DB.DBA.SYS_KEYS k, " + "DB.DBA.SYS_KEY_PARTS kp, " + @@ -2272,7 +2246,7 @@ public ResultSet getTableTypes() throws SQLException * @param tableNamePattern a table name pattern * @param columnNamePattern a column name pattern * @return ResultSet - each row is a column description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see #getSearchStringEscape */ public ResultSet getColumns(String catalog, String schemaPattern, @@ -2332,7 +2306,7 @@ public ResultSet getColumns(String catalog, String schemaPattern, * @param table a table name * @param columnNamePattern a column name pattern * @return ResultSet - each row is a column privilege description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see #getSearchStringEscape */ public ResultSet getColumnPrivileges(String catalog, String schema, String table, String columnNamePattern) throws SQLException @@ -2389,7 +2363,7 @@ public ResultSet getColumnPrivileges(String catalog, String schema, String table * without a schema * @param tableNamePattern a table name pattern * @return ResultSet - each row is a table privilege description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see #getSearchStringEscape */ public ResultSet getTablePrivileges(String catalog, String schemaPattern, @@ -2543,7 +2517,7 @@ public ResultSet getTablePrivileges(String catalog, String schemaPattern, * @param scope the scope of interest; use same values as SCOPE * @param nullable include columns that are nullable? * @return ResultSet - each row is a column description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public ResultSet getBestRowIdentifier(String catalog, String schema, String table, int scope, boolean nullable) throws VirtuosoException { @@ -2668,7 +2642,7 @@ public ResultSet getBestRowIdentifier(String catalog, String schema, String tabl * @param schema a schema name; "" retrieves those without a schema * @param table a table name * @return ResultSet - each row is a column description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public ResultSet getVersionColumns(String catalog, String schema, String table) throws VirtuosoException { @@ -2827,7 +2801,7 @@ public ResultSet getVersionColumns(String catalog, String schema, String table) * without a schema * @param table a table name * @return ResultSet - each row is a primary key column description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public ResultSet getPrimaryKeys(String catalog, String schema, String table) throws SQLException { @@ -3015,7 +2989,7 @@ public ResultSet getPrimaryKeys(String catalog, String schema, String table) thr * without a schema * @param table a table name * @return ResultSet - each row is a primary key column description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see #getExportedKeys */ public ResultSet getImportedKeys(String catalog, String schema, String table) throws SQLException @@ -3198,7 +3172,7 @@ public ResultSet getImportedKeys(String catalog, String schema, String table) th * without a schema * @param table a table name * @return ResultSet - each row is a foreign key column description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see #getImportedKeys */ public ResultSet getExportedKeys(String catalog, String schema, String table) throws SQLException @@ -3330,7 +3304,7 @@ public ResultSet getExportedKeys(String catalog, String schema, String table) th /** * Gets a description of the foreign key columns in the foreign key * table that reference the primary key columns of the primary key - * table (describe how one table imports another's key.) This + * table (describe how one table imports anothere is key.) This * should normally return a single foreign key/primary key pair * (most tables only import a foreign key from a table once.) They * are ordered by FKTABLE_CAT, FKTABLE_SCHEM, FKTABLE_NAME, and @@ -3400,7 +3374,7 @@ public ResultSet getExportedKeys(String catalog, String schema, String table) th * without a schema * @param foreignTable the table name that imports the key * @return ResultSet - each row is a foreign key column description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see #getImportedKeys */ public ResultSet getCrossReference(String primaryCatalog, String primarySchema, String primaryTable, String foreignCatalog, String foreignSchema, String foreignTable) throws VirtuosoException @@ -3486,7 +3460,7 @@ public ResultSet getCrossReference(String primaryCatalog, String primarySchema, * * * @return ResultSet - each row is a SQL type description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public ResultSet getTypeInfo() throws SQLException { @@ -3667,7 +3641,7 @@ public ResultSet getTypeInfo() throws SQLException * or out of data values; when false, results are requested to be * accurate * @return ResultSet - each row is an index column description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate) throws VirtuosoException { @@ -3701,7 +3675,7 @@ public ResultSet getIndexInfo(String catalog, String schema, String table, boole * Retrieves the connection that produced this metadata object. * * @return the connection that produced this metadata object - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public Connection getConnection() throws VirtuosoException { return connection; @@ -3712,7 +3686,7 @@ public Connection getConnection() throws VirtuosoException { * * @param type defined in java.sql.ResultSet * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public boolean supportsResultSetType(int type) throws VirtuosoException { @@ -3736,7 +3710,7 @@ public boolean supportsResultSetType(int type) throws VirtuosoException * @param type defined in java.sql.ResultSet * @param concurrency type defined in java.sql.ResultSet * @return true if so; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.Connection */ public boolean supportsResultSetConcurrency(int type, int concurrency) throws VirtuosoException @@ -3750,7 +3724,7 @@ public boolean supportsResultSetConcurrency(int type, int concurrency) throws Vi * @param result set type, i.e. ResultSet.TYPE_XXX * @return true if updates are visible for the result set type; * false otherwise - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public boolean ownUpdatesAreVisible(int type) throws VirtuosoException { @@ -3763,7 +3737,7 @@ public boolean ownUpdatesAreVisible(int type) throws VirtuosoException * @param result set type, i.e. ResultSet.TYPE_XXX * @return true if deletes are visible for the result set type; * false otherwise - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public boolean ownDeletesAreVisible(int type) throws VirtuosoException { @@ -3776,7 +3750,7 @@ public boolean ownDeletesAreVisible(int type) throws VirtuosoException * @param result set type, i.e. ResultSet.TYPE_XXX * @return true if inserts are visible for the result set type; * false otherwise - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public boolean ownInsertsAreVisible(int type) throws VirtuosoException { @@ -3790,7 +3764,7 @@ public boolean ownInsertsAreVisible(int type) throws VirtuosoException * @return true if updates made by others * are visible for the result set type; * false otherwise - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public boolean othersUpdatesAreVisible(int type) throws VirtuosoException { @@ -3804,7 +3778,7 @@ public boolean othersUpdatesAreVisible(int type) throws VirtuosoException * @return true if deletes made by others * are visible for the result set type; * false otherwise - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public boolean othersDeletesAreVisible(int type) throws VirtuosoException { @@ -3819,7 +3793,7 @@ public boolean othersDeletesAreVisible(int type) throws VirtuosoException * @return true if inserts made by others * are visible for the result set type; * false otherwise - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public boolean othersInsertsAreVisible(int type) throws VirtuosoException { @@ -3833,7 +3807,7 @@ public boolean othersInsertsAreVisible(int type) throws VirtuosoException * @param result set type, i.e. ResultSet.TYPE_XXX * @return true if changes are detected by the result set type; * false otherwise - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public boolean updatesAreDetected(int type) throws VirtuosoException { @@ -3847,7 +3821,7 @@ public boolean updatesAreDetected(int type) throws VirtuosoException * * @param result set type, i.e. ResultSet.TYPE_XXX * @return true if changes are detected by the resultset type - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public boolean deletesAreDetected(int type) throws VirtuosoException { @@ -3860,7 +3834,7 @@ public boolean deletesAreDetected(int type) throws VirtuosoException * * @param result set type, i.e. ResultSet.TYPE_XXX * @return true if changes are detected by the resultset type - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public boolean insertsAreDetected(int type) throws VirtuosoException { @@ -3871,7 +3845,7 @@ public boolean insertsAreDetected(int type) throws VirtuosoException * Indicates whether the driver supports batch updates. * * @return true if the driver supports batch updates; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public boolean supportsBatchUpdates() throws VirtuosoException { @@ -3912,7 +3886,7 @@ public boolean supportsBatchUpdates() throws VirtuosoException * @param types a list of user-named types to include (JAVA_OBJECT, * STRUCT, or DISTINCT); null returns all types * @return ResultSet - each row is a type description - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePattern, int[] types) throws VirtuosoException { @@ -3936,7 +3910,6 @@ public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePa return new VirtuosoResultSet (connection, col_names, col_dtps); } -#if JDK_VER >= 14 /* JDK 1.4 functions */ // ------------------- JDBC 3.0 ------------------------- @@ -4157,14 +4130,14 @@ public ResultSet getSuperTables(String catalog, String schemaPattern, * does not allow NULL values; "YES" means the column might * allow NULL values. An empty string means unknown. *
  • SCOPE_CATALOG String => catalog of table that is the - * scope of a reference attribute (null if DATA_TYPE isn't REF) + * scope of a reference attribute (null if DATA_TYPE is not REF) *
  • SCOPE_SCHEMA String => schema of table that is the - * scope of a reference attribute (null if DATA_TYPE isn't REF) + * scope of a reference attribute (null if DATA_TYPE is not REF) *
  • SCOPE_TABLE String => table name that is the scope of a - * reference attribute (null if the DATA_TYPE isn't REF) + * reference attribute (null if the DATA_TYPE is not REF) *
  • SOURCE_DATA_TYPE short => source type of a distinct type or user-generated * Ref type,SQL type from java.sql.Types (null if DATA_TYPE - * isn't DISTINCT or user-generated REF) + * is not DISTINCT or user-generated REF) * * @param catalog a catalog name; must match the catalog name as it * is stored in the database; "" retrieves those without a catalog; @@ -4358,7 +4331,6 @@ public boolean supportsStatementPooling() throws SQLException } -#if JDK_VER >= 16 //------------------------- JDBC 4.0 ----------------------------------- /** @@ -4779,7 +4751,7 @@ public ResultSet getFunctionColumns(String catalog, public T unwrap(java.lang.Class iface) throws java.sql.SQLException { try { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.cast(this); } catch (ClassCastException cce) { throw new VirtuosoException ("Unable to unwrap to "+iface.toString(), "22023", VirtuosoException.BADPARAM); @@ -4803,7 +4775,7 @@ public T unwrap(java.lang.Class iface) throws java.sql.SQLException */ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.isInstance(this); } @@ -4930,7 +4902,5 @@ public boolean generatedKeyAlwaysReturned() throws SQLException #endif -#endif -#endif } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDate.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoDate.java similarity index 95% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDate.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoDate.java index 167957f798..4ff30f8855 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoDate.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoDate.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,14 +21,14 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; import java.sql.*; -public class VirtuosoDate extends java.sql.Date +public class VirtuosoDate extends java.sql.Date { int timezone = 0; boolean with_timezone = false; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoException.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoException.java similarity index 93% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoException.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoException.java index 529f43b690..17337f2ddf 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoException.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoException.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; @@ -88,13 +88,13 @@ public class VirtuosoException extends SQLException public static final int SQLERROR = -8; /** - * Error occurred on a DV tag. A such error doesn't occur. It's only returned if the Virtuoso + * Error occurred on a DV tag. A such error does not occur. It's only returned if the Virtuoso * DBMS used with the currently driver is too recent. It's reserved for futures cases. */ public static final int BADTAG = -9; /** - * Cast error occurred on an object. A such error doesn't occur. It's only returned if the Virtuoso + * Cast error occurred on an object. A such error does not occur. It's only returned if the Virtuoso * DBMS used with the currently driver is too recent. It's reserved for futures cases. */ public static final int CASTERROR = -10; @@ -151,9 +151,7 @@ public VirtuosoException(String data, int vendor) public VirtuosoException(Exception e, String data, int vendor) { super(data,"42000",vendor); -#if JDK_VER >= 14 initCause (e); -#endif } @@ -178,12 +176,8 @@ public VirtuosoException(String data, String sqlstate, int vendor) */ public VirtuosoException(Exception e, int vendor) { -#if JDK_VER >= 14 super("General error","42000",vendor); initCause (e); -#else - super(e.getMessage(),"42000",vendor); -#endif } } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExplicitString.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoExplicitString.java similarity index 96% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExplicitString.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoExplicitString.java index 7d001bb2cf..d683158d90 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExplicitString.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoExplicitString.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; import java.util.*; @@ -64,7 +64,7 @@ protected VirtuosoExplicitString (String str, int dtp, VirtuosoConnection con) t dtp == VirtuosoTypes.DV_LONG_WIDE || dtp == VirtuosoTypes.DV_BLOB_WIDE) { - // If it's an wide parameter + // If it is an wide parameter bytes = str.getBytes ("UTF8"); if (bytes.length < 256) this.dtp = VirtuosoTypes.DV_WIDE; @@ -72,13 +72,13 @@ protected VirtuosoExplicitString (String str, int dtp, VirtuosoConnection con) t this.dtp = VirtuosoTypes.DV_LONG_WIDE; this.str = str; } - else if (dtp == VirtuosoTypes.DV_STRING || + else if (dtp == VirtuosoTypes.DV_STRING || dtp == VirtuosoTypes.DV_SHORT_STRING_SERIAL || - dtp == VirtuosoTypes.DV_STRICT_STRING || + dtp == VirtuosoTypes.DV_STRICT_STRING || dtp == VirtuosoTypes.DV_C_STRING || dtp == VirtuosoTypes.DV_BLOB) { - // If it's an narrow parameter + // If it is an narrow parameter if (con != null && con.charset_utf8) bytes = str.getBytes ("UTF8"); else if (con != null && con.charset != null) @@ -108,7 +108,7 @@ else if (dtp == VirtuosoTypes.DV_ANY) bytes = str.getBytes ("UTF8"); this.dtp = (bytes.length < 256) ? VirtuosoTypes.DV_WIDE : VirtuosoTypes.DV_LONG_WIDE; this.str = str; - } + } else { cli_wide_to_narrow (str, con != null ? con.client_charset_hash : null); this.dtp = (bytes.length < 256) ? VirtuosoTypes.DV_SHORT_STRING_SERIAL : VirtuosoTypes.DV_STRING; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExtendedString.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoExtendedString.java similarity index 96% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExtendedString.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoExtendedString.java index 1f17339b52..c858663da0 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoExtendedString.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoExtendedString.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.lang.*; import java.io.*; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFNSException.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoFNSException.java similarity index 93% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFNSException.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoFNSException.java index 1c6e103ddb..42e6e93cb7 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFNSException.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoFNSException.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; @@ -67,12 +67,8 @@ public VirtuosoFNSException(String data, String sqlstate, int vendor) */ public VirtuosoFNSException(Exception e, int vendor) { -#if JDK_VER >= 14 super("General error","42000",vendor); initCause (e); -#else - super(e.getMessage(),"42000",vendor); -#endif } } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFuture.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoFuture.java similarity index 96% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFuture.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoFuture.java index b849351a8b..091b3a2283 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoFuture.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoFuture.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.io.*; import openlink.util.*; @@ -81,7 +81,7 @@ class VirtuosoFuture * @param args The array of arguments. * @param req_no The request serial number. * @exception java.io.IOException An error occurred. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred; + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred; */ VirtuosoFuture(VirtuosoConnection connection, String rpcname, Object[] args, int req_no, int timeout) throws IOException, VirtuosoException @@ -102,7 +102,7 @@ class VirtuosoFuture * @param rpcname The name of the RPC function. * @param args The array of arguments. * @exception java.io.IOException An error occurred. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred; + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred; */ protected void send_message(String rpcname, Object[] args) throws IOException, VirtuosoException { @@ -139,7 +139,7 @@ protected void putResult(Object res) * Returns the next result of the answer queue messages. * * @return Object A Vector object or a base class. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ protected openlink.util.Vector nextResult() throws VirtuosoException { diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoInputStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoInputStream.java similarity index 97% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoInputStream.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoInputStream.java index 01a5c83199..0454a52a13 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoInputStream.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoInputStream.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.io.*; import java.net.*; @@ -134,7 +134,7 @@ public int read(byte[] b, int off, int len) throws IOException /** * Check if the input stream is closed. * - * @return true if the connection is closed, false if it's still open. + * @return true if the connection is closed, false if it is still open. */ protected boolean isClosed() { @@ -148,7 +148,7 @@ protected boolean isClosed() * @exception java.io.IOException An IO error occurred on the stream. * @exception java.io.EOFException An end of stream is occurred * (read incomplete). - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ protected Object read_object() throws IOException, EOFException, VirtuosoException { @@ -719,7 +719,7 @@ private BigDecimal readNumeric() throws IOException, VirtuosoException return bd; } - + private VirtuosoRdfBox readRdfBox () throws IOException, VirtuosoException { int flags = read (); @@ -732,7 +732,7 @@ private VirtuosoRdfBox readRdfBox () throws IOException, VirtuosoException VirtuosoRdfBox rb; //System.out.println ("flags:" + flags); - if (0 != (flags & VirtuosoRdfBox.RBS_EXT_TYPE)) + if (0 != (flags & VirtuosoRdfBox.RBS_EXT_TYPE)) { int ID_ONLY = VirtuosoRdfBox.RBS_HAS_LANG | VirtuosoRdfBox.RBS_HAS_TYPE; if ((flags & ID_ONLY) == ID_ONLY) { @@ -751,16 +751,6 @@ private VirtuosoRdfBox readRdfBox () throws IOException, VirtuosoException if (0 != (flags & VirtuosoRdfBox.RBS_COMPLETE)){ is_complete = true; box = read_object (); - if (type == VirtuosoRdfBox.RDF_BOX_GEO_TYPE) { - if (box instanceof String && ((String)box).length()>5 && ((String)box).substring(0,5).equalsIgnoreCase("point")) { - String data = ((String)box).substring(6); - try { - box = new VirtuosoPoint(data.substring(0, data.length()-1)); - } catch (Exception e){ - throw new VirtuosoException(e, VirtuosoException.IOERROR); - } - } - } } } else { @@ -783,7 +773,7 @@ private VirtuosoRdfBox readRdfBox () throws IOException, VirtuosoException } else box = read_object (); - + if (0 != (flags & VirtuosoRdfBox.RBS_OUTLINED)) { if (0 != (flags & VirtuosoRdfBox.RBS_64)) diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoNullParameter.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoNullParameter.java similarity index 97% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoNullParameter.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoNullParameter.java index 874ee09d48..292f8650ed 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoNullParameter.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoNullParameter.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoOutputStream.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoOutputStream.java similarity index 98% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoOutputStream.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoOutputStream.java index 4b8d8c847b..b7d46f4d13 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoOutputStream.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoOutputStream.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.io.*; import java.net.*; @@ -116,7 +116,7 @@ class VirtuosoOutputStream extends BufferedOutputStream /** * Check if the output stream is closed. * - * @return true if the connection is closed, false if it's still open. + * @return true if the connection is closed, false if it is still open. */ protected boolean isClosed() { @@ -128,7 +128,7 @@ protected boolean isClosed() * * @param Object Object to serialize. * @exception java.io.IOException An error occurred on the stream. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ protected void write_object(Object obj) throws IOException, VirtuosoException { @@ -137,7 +137,6 @@ protected void write_object(Object obj) throws IOException, VirtuosoException switch(tag = whatIs(obj)) { case VirtuosoTypes.DV_LIST_OF_POINTER: -#if JDK_VER >= 12 { //System.out.println("DV_ARRAY_OF_POINTER"); List o = (List)obj; @@ -150,7 +149,6 @@ protected void write_object(Object obj) throws IOException, VirtuosoException } return; } -#endif case VirtuosoTypes.DV_ARRAY_OF_POINTER: { //System.out.println("DV_ARRAY_OF_POINTER"); @@ -538,7 +536,7 @@ private void writenumeric(BigDecimal bd) throws IOException, VirtuosoException write(VirtuosoTypes.DV_NULL); return; } - // Here, it's a pure Big Decimal .... + // Here, it is a pure Big Decimal .... int flags = ((bd.signum() == -1) ? 1 : 0); if(bd.signum() == -1) bd = bd.negate(); @@ -759,7 +757,7 @@ private void writeDate(Object obj, int tag) throws IOException write(((_minute << 2) & 0xfc) | ((yday >> 4) & 0x3)); temp = _frac / 1000; write((yday << 4) | ((temp >> 16) & 0xf)); - // Send the fraction if it's a time stamp + // Send the fraction if it is a time stamp write(temp >> 8); write(temp); // Send the time zone @@ -850,12 +848,10 @@ private int whatIs(Object obj) return VirtuosoTypes.DV_ARRAY_OF_DOUBLE; if(obj instanceof VectorOfFloat) return VirtuosoTypes.DV_ARRAY_OF_FLOAT; -#if JDK_VER >= 12 if(obj instanceof LinkedList) return VirtuosoTypes.DV_LIST_OF_POINTER; if(obj instanceof ArrayList) return VirtuosoTypes.DV_LIST_OF_POINTER; -#endif if(obj instanceof openlink.util.Vector) return VirtuosoTypes.DV_ARRAY_OF_POINTER; // Treat Short object @@ -912,17 +908,9 @@ else if (o.longValue () >= (long) Integer.MIN_VALUE && o.longValue() <= (long) I if(obj instanceof java.util.Date) return VirtuosoTypes.DV_DATETIME; // Treat blob objects -#if JDK_VER >= 12 if(obj instanceof Clob) -#else - if(obj instanceof VirtuosoClob) -#endif return VirtuosoTypes.DV_BLOB; -#if JDK_VER >= 12 if(obj instanceof Blob) -#else - if(obj instanceof VirtuosoBlob) -#endif return VirtuosoTypes.DV_BLOB_BIN; if (obj instanceof VirtuosoExplicitString) { diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoParameterMetaData.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoParameterMetaData.java similarity index 95% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoParameterMetaData.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoParameterMetaData.java index d235a76c5f..a9c8ae359e 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoParameterMetaData.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoParameterMetaData.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; import java.util.*; @@ -38,7 +38,7 @@ * @author George Kodinov (gkodinov@openlinksw.co.uk) * @version 1.0 (JDBC API 3.0 implementation) * @see java.sql.PreparedStatement - * @see virtuoso.jdbc2.VirtuosoPreparedStatement#getParameterMetaData + * @see virtuoso.jdbc4.VirtuosoPreparedStatement#getParameterMetaData */ public class VirtuosoParameterMetaData implements ParameterMetaData { @@ -47,7 +47,7 @@ public class VirtuosoParameterMetaData implements ParameterMetaData * Constructs a new VirtuosoParameterMetaData. * * @param args The column description in the DV format. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ VirtuosoParameterMetaData(openlink.util.Vector args, VirtuosoConnection conn) throws VirtuosoException { @@ -157,7 +157,6 @@ public int getParameterMode(int param) throws VirtuosoException } } -#if JDK_VER >= 16 /** * Returns an object that implements the given interface to allow access to * non-standard methods, or standard methods not exposed by the proxy. @@ -178,7 +177,7 @@ public int getParameterMode(int param) throws VirtuosoException public T unwrap(java.lang.Class iface) throws java.sql.SQLException { try { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.cast(this); } catch (ClassCastException cce) { throw new VirtuosoException ("Unable to unwrap to "+iface.toString(), "22023", VirtuosoException.BADPARAM); @@ -202,8 +201,7 @@ public T unwrap(java.lang.Class iface) throws java.sql.SQLException */ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.isInstance(this); } -#endif } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoint.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPoint.java similarity index 94% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoint.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPoint.java index ff18f7e62f..cd709089da 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoint.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPoint.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,14 +21,14 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.lang.*; import java.io.*; import java.util.*; import java.sql.*; -public class VirtuosoPoint +public class VirtuosoPoint { public double x; public double y; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoolManager.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPoolManager.java similarity index 95% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoolManager.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPoolManager.java index 434c3b598f..d74f31f25d 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoolManager.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPoolManager.java @@ -3,35 +3,31 @@ * * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * + * + * Copyright (C) 1998-2019 OpenLink Software + * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation; only version 2 of the License, dated June 1991. - * + * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * + * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.util.*; class VirtuosoPoolManager { -#if JDK_VER >= 16 private static WeakHashMap connPools = new WeakHashMap(50); -#else - private static WeakHashMap connPools = new WeakHashMap(50); -#endif private static VirtuosoPoolManager poolMgr = null; private static Object lock = new Object(); private static ThreadGroup thrGroup = null; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoolStatistic.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPoolStatistic.java similarity index 90% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoolStatistic.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPoolStatistic.java index 8b4300517c..273d483d6d 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPoolStatistic.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPoolStatistic.java @@ -3,32 +3,31 @@ * * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. - * - * Copyright (C) 1998-2018 OpenLink Software - * + * + * Copyright (C) 1998-2019 OpenLink Software + * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation; only version 2 of the License, dated June 1991. - * + * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - * + * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * + * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.util.*; public class VirtuosoPoolStatistic implements Cloneable { protected String name; -#if JDK_VER >= 16 protected volatile int conn_unUsed; protected volatile int connIn_Use; protected volatile int cacheSize = 0; @@ -37,16 +36,6 @@ public class VirtuosoPoolStatistic implements Cloneable { protected volatile long _max_wtime = 0L; protected volatile long _min_wtime = 0L; protected volatile long _cum_wtime = 0L; -#else - protected int conn_unUsed; - protected int connIn_Use; - protected int cacheSize = 0; - protected int _hits = 0; - protected int _misses = 0; - protected long _max_wtime = 0L; - protected long _min_wtime = 0L; - protected long _cum_wtime = 0L; -#endif protected VirtuosoPoolStatistic() { } @@ -77,7 +66,7 @@ protected synchronized Object clone() { v._cum_wtime = _cum_wtime; return v; } catch (CloneNotSupportedException e) { - // this shouldn't happen, since we are Cloneable + // this should not happen, since we are Cloneable throw new InternalError(); } } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPooledConnection.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPooledConnection.java similarity index 98% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPooledConnection.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPooledConnection.java index 8cd116b334..833cddf0fd 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPooledConnection.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPooledConnection.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.Connection; import java.sql.Statement; @@ -34,9 +34,7 @@ import javax.sql.PooledConnection; import javax.sql.ConnectionEventListener; import javax.sql.ConnectionEvent; -#if JDK_VER >= 16 import javax.sql.StatementEventListener; -#endif /** * A PooledConnection object is a connection object that provides hooks @@ -92,7 +90,7 @@ protected synchronized Object clone() { v.tmClosed = tmClosed; return v; } catch (CloneNotSupportedException e) { - // this shouldn't happen, since we are Cloneable + // this should not happen, since we are Cloneable throw new InternalError(); } } @@ -247,7 +245,6 @@ public boolean isConnectionLost(int timeout_sec) return conn.isClosed() || conn.isConnectionLost(timeout_sec); } -#if JDK_VER >= 16 /** * Registers a StatementEventListener with this PooledConnection object. Components that * wish to be notified when PreparedStatements created by the @@ -279,7 +276,6 @@ public void removeStatementEventListener(StatementEventListener listener) { //??TODO errx_Method_XX_not_yet_implemented, "removeStatementEventListener(listener)"); } -#endif protected boolean isClosed() { diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPreparedStatement.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPreparedStatement.java similarity index 93% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPreparedStatement.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPreparedStatement.java index 08b80afcfc..62592a4335 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoPreparedStatement.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoPreparedStatement.java @@ -3,7 +3,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -20,7 +20,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; import java.util.*; @@ -28,11 +28,9 @@ import java.math.*; import openlink.util.*; -#if JDK_VER >= 16 import java.sql.RowId; import java.sql.SQLXML; import java.sql.NClob; -#endif /** * The VirtuosoPreparedStatement class is an implementation of the PreparedStatement interface @@ -43,24 +41,21 @@ * * * @version 1.0 (JDBC API 2.0 implementation) - * @see virtuoso.jdbc2.VirtuosoConnection#prepareStatement + * @see virtuoso.jdbc4.VirtuosoConnection#prepareStatement */ public class VirtuosoPreparedStatement extends VirtuosoStatement implements PreparedStatement { // The sql string with ? protected String sql; -#if JDK_VER <= 14 - private static final int _EXECUTE_FAILED = -3; -#else private static final int _EXECUTE_FAILED = Statement.EXECUTE_FAILED; -#endif + protected VirtuosoResultSet ps_vresultSet; /** * Constructs a new VirtuosoPreparedStatement that is forward-only and read-only. * * @param connection The VirtuosoConnection which owns it. * @param sql The sql string with ?. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ VirtuosoPreparedStatement(VirtuosoConnection connection, String sql) throws VirtuosoException { @@ -74,7 +69,7 @@ public class VirtuosoPreparedStatement extends VirtuosoStatement implements Prep * @param sql The sql string with ?. * @param type The result set type. * @param concurrency The result set concurrency. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet */ VirtuosoPreparedStatement(VirtuosoConnection connection, String sql, int type, int concurrency) throws VirtuosoException @@ -90,15 +85,14 @@ public class VirtuosoPreparedStatement extends VirtuosoStatement implements Prep parse_sql(); // Send RPC call Object[] args = new Object[4]; - args[0] = (statid == null) ? statid = new String("s" + connection.hashCode() + (req_no++)) : statid; - //args[0] = statid = new String("s" + connection.hashCode() + (req_no++)); + args[0] = (statid == null) ? statid = new String("ps" + connection.hashCode() + (req_no++)) : statid; args[1] = connection.escapeSQL(sql); args[2] = new Long(0); args[3] = getStmtOpts(); // Create a future future = connection.getFuture(VirtuosoFuture.prepare,args, this.rpc_timeout); // Process result to get information about results meta data - vresultSet = new VirtuosoResultSet(this,metaData, true); + ps_vresultSet = vresultSet = new VirtuosoResultSet(this,metaData, true); result_opened = true; clearParameters(); } @@ -140,7 +134,7 @@ private void parse_sql() * @param sql the SQL request. * @return ResultSet A ResultSet that contains the data produced by * the query; never null. - * @exception virtuoso.jdbc2.VirtuosoException If a database access error occurs. + * @exception virtuoso.jdbc4.VirtuosoException If a database access error occurs. */ private void sendQuery() throws VirtuosoException { @@ -166,9 +160,10 @@ private void sendQuery() throws VirtuosoException // Put the options array in the args array args[5] = getStmtOpts(); future = connection.getFuture(VirtuosoFuture.exec,args, this.rpc_timeout); - vresultSet.isLastResult = false; - vresultSet.getMoreResults(false); - vresultSet.stmt_n_rows_to_get = this.prefetch; + ps_vresultSet.isLastResult = false; + ps_vresultSet.getMoreResults(false); + ps_vresultSet.stmt_n_rows_to_get = this.prefetch; + vresultSet = ps_vresultSet; result_opened = true; } catch(IOException e) @@ -183,7 +178,7 @@ private void sendQuery() throws VirtuosoException * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ protected void setVector(int parameterIndex, openlink.util.Vector x) throws VirtuosoException { @@ -198,7 +193,7 @@ protected void setVector(int parameterIndex, openlink.util.Vector x) throws Virt /** * Clears the current parameter values immediately. * - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#clearParameters */ public void clearParameters() throws VirtuosoException @@ -215,10 +210,10 @@ public void clearParameters() throws VirtuosoException * method handles these complex statements as well as the simpler * form of statements handled by executeQuery and executeUpdate. * - * @exception virtuoso.jdbc2.VirtuosoException If a database access error occurs. - * @see virtuoso.jdbc2.VirtuosoStatement#getResultSet - * @see virtuoso.jdbc2.VirtuosoStatement#getUpdateCount - * @see virtuoso.jdbc2.VirtuosoStatement#getMoreResults + * @exception virtuoso.jdbc4.VirtuosoException If a database access error occurs. + * @see virtuoso.jdbc4.VirtuosoStatement#getResultSet + * @see virtuoso.jdbc4.VirtuosoStatement#getUpdateCount + * @see virtuoso.jdbc4.VirtuosoStatement#getMoreResults * @see java.sql.PreparedStatement#execute */ public boolean execute() throws VirtuosoException @@ -238,7 +233,7 @@ public boolean execute() throws VirtuosoException * * @return either the row count for INSERT, UPDATE or DELETE statements; * or 0 for SQL statements that return nothing - * @exception virtuoso.jdbc2.VirtuosoException If a database access error occurs. + * @exception virtuoso.jdbc4.VirtuosoException If a database access error occurs. * @see java.sql.PreparedStatement#executeUpdate */ public int executeUpdate() throws VirtuosoException @@ -298,7 +293,7 @@ public int[] executeBatchUpdate() throws BatchUpdateException * * @return ResultSet A ResultSet that contains the data produced by * the query; never null. - * @exception virtuoso.jdbc2.VirtuosoException If a database access error occurs. + * @exception virtuoso.jdbc4.VirtuosoException If a database access error occurs. * @see java.sql.PreparedStatement#executeQuery */ public ResultSet executeQuery() throws VirtuosoException @@ -312,7 +307,7 @@ public ResultSet executeQuery() throws VirtuosoException * Gets the number, types and properties of a ResultSet's columns. * * @return the description of a ResultSet's columns - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#getMetaData */ public ResultSetMetaData getMetaData() throws VirtuosoException @@ -336,12 +331,11 @@ public void finalize() throws Throwable * and JDBC resources immediately instead of new wait for * this to happen when it is automatically closed. * - * @exception virtuoso.jdbc2.VirtuosoException If a database access error occurs. + * @exception virtuoso.jdbc4.VirtuosoException If a database access error occurs. * @see java.sql.Statement#close */ public void close() throws VirtuosoException { -#if JDK_VER >= 16 if (isCached) { close_flag = true; try { @@ -351,7 +345,6 @@ public void close() throws VirtuosoException } return; } -#endif if(close_flag) return; @@ -369,7 +362,6 @@ public void close() throws VirtuosoException // Build the args array Object[] args = new Object[2]; args[0] = statid; -// args[1] = new Long(VirtuosoTypes.STAT_CLOSE); args[1] = new Long(VirtuosoTypes.STAT_DROP); // Create and get a future for this future = connection.getFuture(VirtuosoFuture.close,args, this.rpc_timeout); @@ -394,7 +386,7 @@ public void close() throws VirtuosoException * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the Java input stream that contains the ASCII parameter value * @param length the number of bytes in the stream - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setAsciiStream */ public void setAsciiStream(int parameterIndex, InputStream x, int length) throws VirtuosoException @@ -418,7 +410,7 @@ public void setAsciiStream(int parameterIndex, InputStream x, int length) throws "IM001", VirtuosoException.NOTIMPLEMENTED); } - // Check now if it's a Blob + // Check now if it is a Blob if(_obj instanceof VirtuosoBlob) { ((VirtuosoBlob)_obj).setInputStream(x,length); @@ -461,7 +453,7 @@ public void setAsciiStream(int parameterIndex, InputStream x, int length) throws * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setBigDecimal */ public void setBigDecimal(int parameterIndex, BigDecimal x) throws VirtuosoException @@ -480,7 +472,7 @@ public void setBigDecimal(int parameterIndex, BigDecimal x) throws VirtuosoExcep * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the java input stream which contains the binary parameter value * @param length the number of bytes in the stream - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setBinaryStream */ public void setBinaryStream(int parameterIndex, InputStream x, int length) throws VirtuosoException @@ -504,7 +496,7 @@ public void setBinaryStream(int parameterIndex, InputStream x, int length) throw "IM001", VirtuosoException.NOTIMPLEMENTED); } - // Check now if it's a Blob + // Check now if it is a Blob if(_obj instanceof VirtuosoBlob) { ((VirtuosoBlob)_obj).setInputStream(x,length); @@ -547,7 +539,7 @@ public void setBinaryStream(int parameterIndex, InputStream x, int length) throw * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the java input stream which contains the binary parameter value * @param length the number of bytes in the stream - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setBinaryStream */ public void setUnicodeStream(int parameterIndex, InputStream x, int length) throws VirtuosoException @@ -570,7 +562,7 @@ public void setUnicodeStream(int parameterIndex, InputStream x, int length) thro "IM001", VirtuosoException.NOTIMPLEMENTED); } - // Check now if it's a Blob + // Check now if it is a Blob if(_obj instanceof VirtuosoBlob) { ((VirtuosoBlob)_obj).setInputStream(x,length); @@ -612,7 +604,7 @@ public void setUnicodeStream(int parameterIndex, InputStream x, int length) thro * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setBoolean */ public void setBoolean(int parameterIndex, boolean x) throws VirtuosoException @@ -629,7 +621,7 @@ public void setBoolean(int parameterIndex, boolean x) throws VirtuosoException * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setByte */ public void setByte(int parameterIndex, byte x) throws VirtuosoException @@ -648,7 +640,7 @@ public void setByte(int parameterIndex, byte x) throws VirtuosoException * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setBytes */ public void setBytes(int parameterIndex, byte x[]) throws VirtuosoException @@ -672,7 +664,7 @@ public void setBytes(int parameterIndex, byte x[]) throws VirtuosoException * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setDate */ public void setDate(int parameterIndex, java.sql.Date x) throws VirtuosoException @@ -686,7 +678,7 @@ public void setDate(int parameterIndex, java.sql.Date x) throws VirtuosoExceptio * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setDouble */ public void setDouble(int parameterIndex, double x) throws VirtuosoException @@ -703,7 +695,7 @@ public void setDouble(int parameterIndex, double x) throws VirtuosoException * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setFloat */ public void setFloat(int parameterIndex, float x) throws VirtuosoException @@ -720,7 +712,7 @@ public void setFloat(int parameterIndex, float x) throws VirtuosoException * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setInt */ public void setInt(int parameterIndex, int x) throws VirtuosoException @@ -737,7 +729,7 @@ public void setInt(int parameterIndex, int x) throws VirtuosoException * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setLong */ public void setLong(int parameterIndex, long x) throws VirtuosoException @@ -755,7 +747,7 @@ public void setLong(int parameterIndex, long x) throws VirtuosoException * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param sqlType the SQL type code defined in java.sql.Types - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setNull */ public void setNull(int parameterIndex, int sqlType) throws VirtuosoException @@ -772,7 +764,7 @@ public void setNull(int parameterIndex, int sqlType) throws VirtuosoException * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the object containing the input parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setObject */ public void setObject(int parameterIndex, Object x) throws VirtuosoException @@ -788,7 +780,7 @@ public void setObject(int parameterIndex, Object x) throws VirtuosoException * @param x the object containing the input parameter value * @param targetSqlType the SQL type (as defined in java.sql.Types) to be * sent to the database - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setObject */ public void setObject(int parameterIndex, Object x, int targetSqlType) throws VirtuosoException @@ -809,13 +801,13 @@ public void setObject(int parameterIndex, Object x, int targetSqlType) throws Vi * @param scale for java.sql.Types.DECIMAL or java.sql.Types.NUMERIC types, * this is the number of digits after the decimal point. For all other * types, this value will be ignored. - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setObject * @see java.sql.Types */ public void setObject(int parameterIndex, Object x, int targetSqlType, int scale) throws VirtuosoException { - if(x == null) { + if(x == null) { this.setNull(parameterIndex, Types.OTHER); return; } @@ -832,7 +824,7 @@ public void setObject(int parameterIndex, Object x, int targetSqlType, int scale } // After check, check if a Blob object is already associated or not Object _obj = objparams.elementAt(parameterIndex - 1); - // Check now if it's a Blob + // Check now if it is a Blob if(_obj instanceof VirtuosoBlob) { ((VirtuosoBlob)_obj).setObject(x); @@ -842,7 +834,7 @@ public void setObject(int parameterIndex, Object x, int targetSqlType, int scale x = VirtuosoTypes.mapJavaTypeToSqlType (x, targetSqlType, scale); if (x instanceof java.io.Serializable) { - if (x instanceof String && parameters != null + if (x instanceof String && parameters != null && parameters.elementAt(parameterIndex - 1) instanceof openlink.util.Vector) { openlink.util.Vector pd = (openlink.util.Vector)parameters.elementAt(parameterIndex - 1); @@ -865,7 +857,7 @@ public void setObject(int parameterIndex, Object x, int targetSqlType, int scale * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setShort */ public void setShort(int parameterIndex, short x) throws VirtuosoException @@ -884,7 +876,7 @@ public void setShort(int parameterIndex, short x) throws VirtuosoException * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setString */ public void setString(int parameterIndex, String x) throws VirtuosoException @@ -928,7 +920,7 @@ protected void setString(int parameterIndex, VirtuosoExplicitString x) throws Vi * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setTime */ public void setTime(int parameterIndex, java.sql.Time x) throws VirtuosoException @@ -943,7 +935,7 @@ public void setTime(int parameterIndex, java.sql.Time x) throws VirtuosoExceptio * * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the parameter value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setTimeStamp */ public void setTimestamp(int parameterIndex, java.sql.Timestamp x) throws VirtuosoException @@ -955,7 +947,7 @@ public void setTimestamp(int parameterIndex, java.sql.Timestamp x) throws Virtuo /** * Adds a set of parameters to the batch. * - * @exception virtuoso.jdbc2.VirtuosoException If a database access error occurs. + * @exception virtuoso.jdbc4.VirtuosoException If a database access error occurs. * @see java.sql.PreparedStatement#addBatch */ public void addBatch() throws VirtuosoException @@ -964,19 +956,9 @@ public void addBatch() throws VirtuosoException if(parameters == null) return; if(batch == null) -#if JDK_VER >= 16 batch = new LinkedList(); -#elif JDK_VER >= 12 - batch = new LinkedList(); -#else - batch = new openlink.util.Vector(10,10); -#endif // Add the sql request at the end -#if JDK_VER >= 12 batch.add(objparams.clone()); -#else - batch.addElement(objparams.clone()); -#endif } /** @@ -1012,11 +994,11 @@ public int[] executeBatch() throws BatchUpdateException return new int[0]; // Else execute one by one SQL request int[] result = new int[batch.size()]; - // Flag to say if there's a problem + // Flag to say if there is a problem boolean error = false; if (this instanceof VirtuosoCallableStatement && ((VirtuosoCallableStatement)this).hasOut()) - throwBatchUpdateException (result, "Batch can't execute calls with out params", 0); + throwBatchUpdateException (result, "Batch cannot execute calls with out params", 0); try { @@ -1031,24 +1013,19 @@ public int[] executeBatch() throws BatchUpdateException } finally { -#if JDK_VER >= 12 batch.clear(); -#else - batch.removeAllElements(); -#endif } return result; } -#if JDK_VER >= 12 /** * Sets an Array parameter. * * @param i the first parameter is 1, the second is 2, ... * @param x an object representing an SQL array - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setArray */ public void setArray(int i, Array x) throws VirtuosoException @@ -1064,21 +1041,16 @@ public void setArray(int i, Array x) throws VirtuosoException objparams.setElementAt(x,i - 1); } } -#endif /** * Sets a BLOB parameter. * * @param i the first parameter is 1, the second is 2, ... * @param x an object representing a BLOB - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setBlob */ -#if JDK_VER >= 12 public void setBlob(int i, Blob x) throws VirtuosoException -#else - public void setBlob(int i, VirtuosoBlob x) throws VirtuosoException -#endif { // Check parameters if(i < 1 || i > parameters.capacity()) @@ -1094,7 +1066,7 @@ public void setBlob(int i, VirtuosoBlob x) throws VirtuosoException * @param parameterIndex the first parameter is 1, the second is 2, ... * @param x the java reader which contains the UNICODE data * @param length the number of characters in the stream - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setCharacterStream */ public void setCharacterStream(int parameterIndex, Reader x, int length) throws VirtuosoException @@ -1160,7 +1132,7 @@ public void setCharacterStream(int parameterIndex, Reader x, int length) throws // After check, check if a Blob object is already associated or not //System.err.println ("after check"); Object _obj = objparams.elementAt(parameterIndex - 1); - // Check now if it's a Blob + // Check now if it is a Blob if(_obj instanceof VirtuosoBlob) { ((VirtuosoBlob)_obj).setReader(x,length); @@ -1176,14 +1148,10 @@ public void setCharacterStream(int parameterIndex, Reader x, int length) throws * * @param i the first parameter is 1, the second is 2, ... * @param x an object representing a CLOB - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setClob */ -#if JDK_VER >= 12 public void setClob(int i, Clob x) throws VirtuosoException -#else - public void setClob(int i, VirtuosoClob x) throws VirtuosoException -#endif { // Check parameters if(i < 1 || i > parameters.capacity()) @@ -1202,7 +1170,7 @@ public void setClob(int i, VirtuosoClob x) throws VirtuosoException * @param sqlType a value from java.sql.Types * @param typeName the fully-qualified name of an SQL user-named type, * ignored if the parameter is not a user-named type or REF - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setNull */ public void setNull(int paramIndex, int sqlType, String typeName) throws VirtuosoException @@ -1210,13 +1178,12 @@ public void setNull(int paramIndex, int sqlType, String typeName) throws Virtuos setNull(paramIndex,sqlType); } -#if JDK_VER >= 12 /** * Sets a REF(<structured-type>) parameter. * * @param i the first parameter is 1, the second is 2, ... * @param x an object representing data of an SQL REF Type - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setRef */ public void setRef(int i, Ref x) throws VirtuosoException @@ -1227,7 +1194,6 @@ public void setRef(int i, Ref x) throws VirtuosoException if(x == null) this.setNull(i, Types.REF); else objparams.setElementAt(x,i - 1); } -#endif /** * Sets the designated parameter to a java.sql.Date value, @@ -1237,7 +1203,7 @@ public void setRef(int i, Ref x) throws VirtuosoException * @param x the parameter value * @param cal the Calendar object the driver will use * to construct the date - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setDate */ public void setDate(int parameterIndex, java.sql.Date x, Calendar cal) throws VirtuosoException @@ -1265,7 +1231,7 @@ public void setDate(int parameterIndex, java.sql.Date x, Calendar cal) throws Vi * @param x the parameter value * @param cal the Calendar object the driver will use * to construct the time - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setTime */ public void setTime(int parameterIndex, java.sql.Time x, Calendar cal) throws VirtuosoException @@ -1293,7 +1259,7 @@ public void setTime(int parameterIndex, java.sql.Time x, Calendar cal) throws Vi * @param x the parameter value * @param cal the Calendar object the driver will use * to construct the timestamp - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.PreparedStatement#setTimestamp */ public void setTimestamp(int parameterIndex, java.sql.Timestamp x, Calendar cal) throws VirtuosoException @@ -1314,7 +1280,6 @@ public void setTimestamp(int parameterIndex, java.sql.Timestamp x, Calendar cal) objparams.setElementAt(x,parameterIndex - 1); } } -#if JDK_VER >= 14 /* JDK 1.4 functions */ /** @@ -1348,7 +1313,6 @@ public ParameterMetaData getParameterMetaData() throws SQLException return paramsMetaData == null ? new VirtuosoParameterMetaData(null, connection) : paramsMetaData; } -#if JDK_VER >= 16 //------------------------- JDBC 4.0 ----------------------------------- /** @@ -1367,7 +1331,7 @@ public ParameterMetaData getParameterMetaData() throws SQLException */ public void setRowId(int parameterIndex, RowId x) throws SQLException { - throw new VirtuosoFNSException ("Method setRowId(parameterIndex, x) isn't supported", VirtuosoException.NOTIMPLEMENTED); + throw new VirtuosoFNSException ("Method setRowId(parameterIndex, x) is not supported", VirtuosoException.NOTIMPLEMENTED); } @@ -1544,7 +1508,7 @@ public synchronized void setNClob(int parameterIndex, Reader reader, long length */ public synchronized void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException { - throw new VirtuosoFNSException ("Method setSQLXML(parameterIndex, xmlObject) isn't supported", VirtuosoException.NOTIMPLEMENTED); + throw new VirtuosoFNSException ("Method setSQLXML(parameterIndex, xmlObject) is not supported", VirtuosoException.NOTIMPLEMENTED); /********* //??TODO *******/ @@ -1658,7 +1622,7 @@ public void setCharacterStream(int parameterIndex, java.io.Reader reader, public void setAsciiStream(int parameterIndex, java.io.InputStream x) throws SQLException { - throw new VirtuosoFNSException ("Method setAsciiStream(parameterIndex, x) isn't supported", VirtuosoException.NOTIMPLEMENTED); + throw new VirtuosoFNSException ("Method setAsciiStream(parameterIndex, x) is not supported", VirtuosoException.NOTIMPLEMENTED); } /** @@ -1686,7 +1650,7 @@ public void setAsciiStream(int parameterIndex, java.io.InputStream x) public void setBinaryStream(int parameterIndex, java.io.InputStream x) throws SQLException { - throw new VirtuosoFNSException ("Method setAsciiStream(parameterIndex, x) isn't supported", VirtuosoException.NOTIMPLEMENTED); + throw new VirtuosoFNSException ("Method setAsciiStream(parameterIndex, x) is not supported", VirtuosoException.NOTIMPLEMENTED); } /** @@ -1717,7 +1681,7 @@ public void setBinaryStream(int parameterIndex, java.io.InputStream x) public void setCharacterStream(int parameterIndex, java.io.Reader reader) throws SQLException { - throw new VirtuosoFNSException ("Method setCharacterStream(parameterIndex, reader) isn't supported", VirtuosoException.NOTIMPLEMENTED); + throw new VirtuosoFNSException ("Method setCharacterStream(parameterIndex, reader) is not supported", VirtuosoException.NOTIMPLEMENTED); } /** @@ -1745,7 +1709,7 @@ public void setCharacterStream(int parameterIndex, */ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException { - throw new VirtuosoFNSException ("Method setNCharacterStream(parameterIndex, value) isn't supported", VirtuosoException.NOTIMPLEMENTED); + throw new VirtuosoFNSException ("Method setNCharacterStream(parameterIndex, value) is not supported", VirtuosoException.NOTIMPLEMENTED); } /** @@ -1773,7 +1737,7 @@ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLExce public void setClob(int parameterIndex, Reader reader) throws SQLException { - throw new VirtuosoFNSException ("Method setClob(parameterIndex, reader) isn't supported", VirtuosoException.NOTIMPLEMENTED); + throw new VirtuosoFNSException ("Method setClob(parameterIndex, reader) is not supported", VirtuosoException.NOTIMPLEMENTED); } /** @@ -1804,7 +1768,7 @@ public void setClob(int parameterIndex, Reader reader) public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException { - throw new VirtuosoFNSException ("Method setBlob(parameterIndex, inputStream) isn't supported", VirtuosoException.NOTIMPLEMENTED); + throw new VirtuosoFNSException ("Method setBlob(parameterIndex, inputStream) is not supported", VirtuosoException.NOTIMPLEMENTED); } /** @@ -1833,10 +1797,8 @@ public void setBlob(int parameterIndex, InputStream inputStream) public void setNClob(int parameterIndex, Reader reader) throws SQLException { - throw new VirtuosoFNSException ("Method setNClob(parameterIndex, reader) isn't supported", VirtuosoException.NOTIMPLEMENTED); + throw new VirtuosoFNSException ("Method setNClob(parameterIndex, reader) is not supported", VirtuosoException.NOTIMPLEMENTED); } -#endif -#endif protected synchronized void setClosed(boolean flag) { diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRdfBox.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoRdfBox.java similarity index 94% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRdfBox.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoRdfBox.java index a61be9f0e2..63b9fd3843 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRdfBox.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoRdfBox.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.lang.*; import java.io.*; @@ -159,11 +159,7 @@ public short getTypeKey (String type) return (k != null ? k.shortValue () : (short) RDF_BOX_DEFAULT_TYPE); } -#if JDK_VER >= 16 - private void fillHashFromSQL (Hashtable ht, Hashtable rev, String sql) -#else - private void fillHashFromSQL (Hashtable ht, Hashtable rev, String sql) -#endif + private void fillHashFromSQL (Hashtable ht, Hashtable rev, String sql) { try { @@ -258,18 +254,18 @@ public String toString () if (this.rb_box != null) { String o_type = getType(); - if (o_type!=null && o_type.equals(gYear)) + if (o_type!=null && o_type.equals(gYear)) { - if (rb_box instanceof VirtuosoDate) + if (rb_box instanceof VirtuosoDate) retVal = ((VirtuosoDate) rb_box).toXSD_String().substring(0,4); else if (rb_box instanceof VirtuosoTimestamp) retVal = ((VirtuosoTimestamp) rb_box).toXSD_String().substring(0,4); else retVal = this.rb_box.toString (); - } - else if (o_type!=null && o_type.equals(gYearMonth)) + } + else if (o_type!=null && o_type.equals(gYearMonth)) { - if (rb_box instanceof VirtuosoDate) + if (rb_box instanceof VirtuosoDate) retVal = ((VirtuosoDate) rb_box).toXSD_String().substring(0,7); else if (rb_box instanceof VirtuosoTimestamp) retVal = ((VirtuosoTimestamp) rb_box).toXSD_String().substring(0,7); diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSet.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoResultSet.java similarity index 94% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSet.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoResultSet.java index 50859aa998..28faf9f4ef 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSet.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoResultSet.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.util.*; import java.sql.*; @@ -39,9 +39,9 @@ * * @version 1.0 (JDBC API 2.0 implementation) * @see java.sql.ResultSet - * @see virtuoso.jdbc2.VirtuosoStatement - * @see virtuoso.jdbc2.VirtuosoPreparedStatement - * @see virtuoso.jdbc2.VirtuosoCallableStatement + * @see virtuoso.jdbc4.VirtuosoStatement + * @see virtuoso.jdbc4.VirtuosoPreparedStatement + * @see virtuoso.jdbc4.VirtuosoCallableStatement */ public class VirtuosoResultSet implements ResultSet { @@ -184,7 +184,7 @@ public class VirtuosoResultSet implements ResultSet * * @param connection The VirtuosoConnection which owns it. * @param metaData The metadata of the result. (It can be null) - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ VirtuosoResultSet(VirtuosoStatement statement, VirtuosoResultSetMetaData metaData, boolean isPrepare) throws VirtuosoException { @@ -212,7 +212,7 @@ public class VirtuosoResultSet implements ResultSet /** * Constructs a new empty VirtuosoResultSet. * - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ VirtuosoResultSet(VirtuosoConnection vc) throws VirtuosoException { @@ -233,7 +233,7 @@ protected VirtuosoResultSet(VirtuosoConnection vc, String [] col_names, int [] c /** * Method uses to get next rows of this result set. * - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred */ protected void getMoreResults(boolean isPrepare) throws VirtuosoException { @@ -277,7 +277,7 @@ protected void setUpdateCount(int n) * @param op The kind of operation (SQL_FETCH_xxx) * @param firstline The beginning line * @param nbline Number og lines to get - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred; + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred; */ private void fetch_rpc() throws VirtuosoException { @@ -308,7 +308,7 @@ private void fetch_rpc() throws VirtuosoException * @param op The kind of operation (SQL_FETCH_xxx) * @param firstline The beginning line * @param nbline Number og lines to get - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred; + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred; */ private void extended_fetch(int op, long firstline, long nbline) throws VirtuosoException { @@ -350,7 +350,7 @@ private void extended_fetch(int op, long firstline, long nbline) throws Virtuoso * @param op Operation of the SetPos (SQL_xxx ...) * @param args Vector of vectors * @param num Line number to affect - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred; + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred; */ private void set_pos(int op, openlink.util.Vector args, long num) throws VirtuosoException { @@ -440,7 +440,7 @@ private void set_pos(int op, openlink.util.Vector args, long num) throws Virtuos /** * Method processes the result queue to format rows and metadata. * - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred; + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred; */ private void process_result(boolean isPrepare) throws VirtuosoException { @@ -516,7 +516,7 @@ else if (i >= ((prefetch == 0) ? VirtuosoTypes.DEFAULTPREFETCH : prefetch)) if (statement != null) { if (statement.getExecType() == VirtuosoTypes.QT_SELECT) - throw new VirtuosoException("executeUpdate can't execute update/insert/delete queries",VirtuosoException.BADPARAM); + throw new VirtuosoException("executeUpdate cannot execute update/insert/delete queries",VirtuosoException.BADPARAM); } if(!(statement instanceof VirtuosoPreparedStatement)) { @@ -525,7 +525,7 @@ else if (i >= ((prefetch == 0) ? VirtuosoTypes.DEFAULTPREFETCH : prefetch)) new VirtuosoResultSetMetaData(null,statement.connection); break; } - // An error will occur or it's a null query + // An error will occur or it is a null query } else { @@ -535,7 +535,7 @@ else if (i >= ((prefetch == 0) ? VirtuosoTypes.DEFAULTPREFETCH : prefetch)) if (statement.getExecType() == VirtuosoTypes.QT_UPDATE && kindop == VirtuosoTypes.QT_SELECT) throw new VirtuosoException("executeUpdate can execute only update/insert/delete queries",VirtuosoException.BADPARAM); if (statement.getExecType() == VirtuosoTypes.QT_SELECT && kindop == VirtuosoTypes.QT_UPDATE) - throw new VirtuosoException("executeUpdate can't execute update/insert/delete queries",VirtuosoException.BADPARAM); + throw new VirtuosoException("executeUpdate cannot execute update/insert/delete queries",VirtuosoException.BADPARAM); } } //mutexKindOp.freeSem(); @@ -546,14 +546,12 @@ else if (i >= ((prefetch == 0) ? VirtuosoTypes.DEFAULTPREFETCH : prefetch)) new VirtuosoResultSetMetaData(v,statement.connection); //more_result = true; //mutexMetaData.freeSem(); - // Check if it's a prepared statement + // Check if it is a prepared statement if(statement instanceof PreparedStatement && isPrepare) { Object obj = v.elementAt(3); statement.objparams = null; -#if JDK_VER >= 14 statement.paramsMetaData = null; -#endif if(obj!=null && obj instanceof openlink.util.Vector) { fixReturnedData((openlink.util.Vector)obj); @@ -573,10 +571,8 @@ else if (i >= ((prefetch == 0) ? VirtuosoTypes.DEFAULTPREFETCH : prefetch)) } is_complete = true; -#if JDK_VER >= 14 statement.paramsMetaData = new VirtuosoParameterMetaData ((openlink.util.Vector)obj, statement.connection); -#endif } else { @@ -716,11 +712,11 @@ void fixReturnedData(openlink.util.Vector data) /** * Retrieves the first warning reported by calls on this ResultSet. * Subsequent ResultSet warnings will be chained to this - * SQLWarning. Virtuoso doesn't generate warnings, so this function + * SQLWarning. Virtuoso does not generate warnings, so this function * will return always null. * * @return SQLWarning The first SQLWarning or null (must be null for the moment) - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.ResultSet#getWarnings */ public SQLWarning getWarnings() throws VirtuosoException @@ -730,9 +726,9 @@ public SQLWarning getWarnings() throws VirtuosoException /** * Clears all the warnings reported on this ResultSet object. - * Virtuoso doesn't generate warnings, so this function does nothing. + * Virtuoso does not generate warnings, so this function does nothing. * - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.ResultSet#clearWarnings */ public void clearWarnings() throws VirtuosoException @@ -750,7 +746,7 @@ public void clearWarnings() throws VirtuosoException * * * @return int The result set type. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.ResultSet#getType */ public int getType() throws VirtuosoException @@ -769,7 +765,7 @@ public int getType() throws VirtuosoException * * * @return int The concurrency type. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.ResultSet#getConcurrency */ public int getConcurrency() throws VirtuosoException @@ -788,7 +784,7 @@ public int getConcurrency() throws VirtuosoException * * * @param direction The initial direction for processing rows - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#setFetchDirection */ public void setFetchDirection(int direction) throws VirtuosoException @@ -811,7 +807,7 @@ public void setFetchDirection(int direction) throws VirtuosoException * * * @return int The default fetch direction for this result set. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.ResultSet#getFetchDirection */ public int getFetchDirection() throws VirtuosoException @@ -831,7 +827,7 @@ public int getFetchDirection() throws VirtuosoException * * * @param rows the number of rows to fetch - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#setFetchSize */ public void setFetchSize(int rows) throws VirtuosoException @@ -853,7 +849,7 @@ public void setFetchSize(int rows) throws VirtuosoException * * * @return int The default fetch size for result sets generated. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.ResultSet#getFetchSize */ public int getFetchSize() throws VirtuosoException @@ -873,7 +869,7 @@ public int getFetchSize() throws VirtuosoException * * * @return VirtuosoStatement The connection that produced this statement - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.ResultSet#getStatement */ public Statement getStatement() throws VirtuosoException @@ -885,7 +881,7 @@ public Statement getStatement() throws VirtuosoException * Retrieves the number, types and properties of a ResultSet's columns. * * @return VirtuosoResultSetMetaData The description of a ResultSet's columns. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.ResultSet#getMetaData */ public ResultSetMetaData getMetaData() throws VirtuosoException @@ -896,7 +892,7 @@ public ResultSetMetaData getMetaData() throws VirtuosoException /** * Retrieves the kind of operation of this Result set. * - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ protected int kindop() throws VirtuosoException { @@ -906,7 +902,7 @@ protected int kindop() throws VirtuosoException /** * Retrieves if it exist more result after this set. * - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). */ protected boolean more_result() throws VirtuosoException { @@ -916,9 +912,9 @@ protected boolean more_result() throws VirtuosoException /** * Returns the column number corresponding to the name. * - * @param name The column's name. - * @return int The column's number corresponding to the name. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @param name The column name. + * @return int The column number corresponding to the name. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSet#findColumn */ public int findColumn(String name) throws VirtuosoException @@ -931,9 +927,9 @@ public int findColumn(String name) throws VirtuosoException new VirtuosoColumn(name, VirtuosoTypes.DV_STRING, statement.connection))); if (i == null) - throw new VirtuosoException("findColumn() can't found column with name '"+name+"' in resultSet", "S0022", VirtuosoException.MISCERROR); - - // Return column's number + throw new VirtuosoException("findColumn() cannot found column with name '"+name+"' in resultSet", "S0022", VirtuosoException.MISCERROR); + + // Return column number return i.intValue() + 1; } @@ -944,7 +940,7 @@ public int findColumn(String name) throws VirtuosoException * SQL NULL. * * @return boolean True if last column read was SQL NULL and false otherwise. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.ResultSet#wasNull */ public boolean wasNull() throws VirtuosoException @@ -957,7 +953,7 @@ public boolean wasNull() throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getString */ public String getString(int columnIndex) throws VirtuosoException @@ -974,7 +970,7 @@ public String getString(int columnIndex) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return the column value; if the value is SQL NULL, the result is false - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBoolean */ public boolean getBoolean(int columnIndex) throws VirtuosoException @@ -991,7 +987,7 @@ public boolean getBoolean(int columnIndex) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return the column value; if the value is SQL NULL, the result is 0 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getByte */ public byte getByte(int columnIndex) throws VirtuosoException @@ -1008,7 +1004,7 @@ public byte getByte(int columnIndex) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return the column value; if the value is SQL NULL, the result is 0 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getShort */ public short getShort(int columnIndex) throws VirtuosoException @@ -1025,7 +1021,7 @@ public short getShort(int columnIndex) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return the column value; if the value is SQL NULL, the result is 0 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getInt */ public int getInt(int columnIndex) throws VirtuosoException @@ -1042,7 +1038,7 @@ public int getInt(int columnIndex) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return the column value; if the value is SQL NULL, the result is 0 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getLong */ public long getLong(int columnIndex) throws VirtuosoException @@ -1059,7 +1055,7 @@ public long getLong(int columnIndex) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return the column value; if the value is SQL NULL, the result is 0 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getFloat */ public float getFloat(int columnIndex) throws VirtuosoException @@ -1076,7 +1072,7 @@ public float getFloat(int columnIndex) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return the column value; if the value is SQL NULL, the result is 0 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getDouble */ public double getDouble(int columnIndex) throws VirtuosoException @@ -1094,7 +1090,7 @@ public double getDouble(int columnIndex) throws VirtuosoException * @param columnIndex the first column is 1, the second is 2, ... * @param scale the number of digits to the right of the decimal * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBigDecimal * @deprecated */ @@ -1110,7 +1106,7 @@ public BigDecimal getBigDecimal(int columnIndex, int scale) throws VirtuosoExcep * * @param columnIndex the first column is 1, the second is 2, ... * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBytes */ public byte[] getBytes(int columnIndex) throws VirtuosoException @@ -1129,7 +1125,7 @@ public byte[] getBytes(int columnIndex) throws VirtuosoException * @param columnIndex the first column is 1, the second is 2, ... * @return the column value (full precision); if the value is SQL NULL, * the result is null - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBigDecimal */ public BigDecimal getBigDecimal(int columnIndex) throws VirtuosoException @@ -1155,7 +1151,7 @@ public BigDecimal getBigDecimal(int columnIndex) throws VirtuosoException * @return a Java input stream that delivers the database column value * as a stream of one byte ASCII characters. If the value is SQL NULL * then the result is null. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getAsciiStream */ public InputStream getAsciiStream(int columnIndex) throws VirtuosoException @@ -1183,7 +1179,7 @@ public InputStream getAsciiStream(int columnIndex) throws VirtuosoException * @return a Java input stream that delivers the database column value * as a stream of two-byte Unicode characters. If the value is SQL NULL * then the result is null. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getUnicodeStream * @deprecated */ @@ -1205,7 +1201,7 @@ public InputStream getUnicodeStream(int columnIndex) throws VirtuosoException * @return a Java input stream that delivers the database column value * as a stream of uninterpreted bytes. If the value is SQL NULL * then the result is null. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBinaryStream */ public InputStream getBinaryStream(int columnIndex) throws VirtuosoException @@ -1225,7 +1221,7 @@ public InputStream getBinaryStream(int columnIndex) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return the Reader - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getCharacterStream */ public Reader getCharacterStream(int columnIndex) throws VirtuosoException @@ -1242,7 +1238,7 @@ public Reader getCharacterStream(int columnIndex) throws VirtuosoException * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getString */ public String getString(String columnName) throws VirtuosoException @@ -1256,7 +1252,7 @@ public String getString(String columnName) throws VirtuosoException * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is false - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBoolean */ public boolean getBoolean(String columnName) throws VirtuosoException @@ -1270,7 +1266,7 @@ public boolean getBoolean(String columnName) throws VirtuosoException * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is 0 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getByte */ public byte getByte(String columnName) throws VirtuosoException @@ -1284,7 +1280,7 @@ public byte getByte(String columnName) throws VirtuosoException * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is 0 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getShort */ public short getShort(String columnName) throws VirtuosoException @@ -1298,7 +1294,7 @@ public short getShort(String columnName) throws VirtuosoException * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is 0 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getInt */ public int getInt(String columnName) throws VirtuosoException @@ -1312,7 +1308,7 @@ public int getInt(String columnName) throws VirtuosoException * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is 0 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getLong */ public long getLong(String columnName) throws VirtuosoException @@ -1326,7 +1322,7 @@ public long getLong(String columnName) throws VirtuosoException * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is 0 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getFloat */ public float getFloat(String columnName) throws VirtuosoException @@ -1340,7 +1336,7 @@ public float getFloat(String columnName) throws VirtuosoException * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is 0 - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getDouble */ public double getDouble(String columnName) throws VirtuosoException @@ -1356,7 +1352,7 @@ public double getDouble(String columnName) throws VirtuosoException * @param columnName the SQL name of the column * @param scale the number of digits to the right of the decimal * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBigDecimal * @deprecated */ @@ -1372,7 +1368,7 @@ public BigDecimal getBigDecimal(String columnName, int scale) throws VirtuosoExc * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBytes */ public byte[] getBytes(String columnName) throws VirtuosoException @@ -1389,7 +1385,7 @@ public byte[] getBytes(String columnName) throws VirtuosoException * * @param columnName the name of the column * @return the Reader - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getCharacterStream */ public Reader getCharacterStream(String columnName) throws VirtuosoException @@ -1404,7 +1400,7 @@ public Reader getCharacterStream(String columnName) throws VirtuosoException * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBigDecimal */ public BigDecimal getBigDecimal(String columnName) throws VirtuosoException @@ -1427,7 +1423,7 @@ public BigDecimal getBigDecimal(String columnName) throws VirtuosoException * @return a Java input stream that delivers the database column value * as a stream of one byte ASCII characters. If the value is SQL NULL * then the result is null. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getAsciiStream */ public InputStream getAsciiStream(String columnName) throws VirtuosoException @@ -1452,7 +1448,7 @@ public InputStream getAsciiStream(String columnName) throws VirtuosoException * @return a Java input stream that delivers the database column value * as a stream of two-byte Unicode characters. If the value is SQL NULL * then the result is null. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getUnicodeStream * @deprecated */ @@ -1475,7 +1471,7 @@ public InputStream getUnicodeStream(String columnName) throws VirtuosoException * @return a Java input stream that delivers the database column value * as a stream of uninterpreted bytes. If the value is SQL NULL * then the result is null. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBinaryStream */ public InputStream getBinaryStream(String columnName) throws VirtuosoException @@ -1489,7 +1485,7 @@ public InputStream getBinaryStream(String columnName) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return a java.lang.Object holding the column value - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getObject */ public Object getObject(int columnIndex) throws VirtuosoException @@ -1506,7 +1502,7 @@ public Object getObject(int columnIndex) throws VirtuosoException * * @param columnName the SQL name of the column * @return a java.lang.Object holding the column value - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getObject */ public Object getObject(String columnName) throws VirtuosoException @@ -1520,7 +1516,7 @@ public Object getObject(String columnName) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public java.sql.Date getDate(int columnIndex) throws VirtuosoException { @@ -1532,7 +1528,7 @@ public java.sql.Date getDate(int columnIndex) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public java.sql.Time getTime(int columnIndex) throws VirtuosoException { @@ -1544,7 +1540,7 @@ public java.sql.Time getTime(int columnIndex) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public java.sql.Timestamp getTimestamp(int columnIndex) throws VirtuosoException { @@ -1560,7 +1556,7 @@ public java.sql.Timestamp getTimestamp(int columnIndex) throws VirtuosoException * @param columnIndex the first column is 1, the second is 2, ... * @param cal the calendar to use in constructing the date * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public java.sql.Date getDate(int columnIndex, Calendar cal) throws VirtuosoException { @@ -1586,7 +1582,7 @@ public java.sql.Date getDate(int columnIndex, Calendar cal) throws VirtuosoExcep * @param columnIndex the first column is 1, the second is 2, ... * @param cal the calendar to use in constructing the time * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public java.sql.Time getTime(int columnIndex, Calendar cal) throws VirtuosoException { @@ -1612,7 +1608,7 @@ public java.sql.Time getTime(int columnIndex, Calendar cal) throws VirtuosoExcep * @param columnIndex the first column is 1, the second is 2, ... * @param cal the calendar to use in constructing the timestamp * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public java.sql.Timestamp getTimestamp(int columnIndex, Calendar cal) throws VirtuosoException { @@ -1637,7 +1633,7 @@ public java.sql.Timestamp getTimestamp(int columnIndex, Calendar cal) throws Vir * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public java.sql.Date getDate(String columnName) throws VirtuosoException { @@ -1650,7 +1646,7 @@ public java.sql.Date getDate(String columnName) throws VirtuosoException * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public java.sql.Time getTime(String columnName) throws VirtuosoException { @@ -1663,7 +1659,7 @@ public java.sql.Time getTime(String columnName) throws VirtuosoException * * @param columnName the SQL name of the column * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public java.sql.Timestamp getTimestamp(String columnName) throws VirtuosoException { @@ -1680,7 +1676,7 @@ public java.sql.Timestamp getTimestamp(String columnName) throws VirtuosoExcepti * methods are called to update the database. * * @param columnName the name of the column - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateNull(String columnName) throws VirtuosoException { @@ -1698,7 +1694,7 @@ public void updateNull(String columnName) throws VirtuosoException * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateBoolean(String columnName, boolean x) throws VirtuosoException { @@ -1716,7 +1712,7 @@ public void updateBoolean(String columnName, boolean x) throws VirtuosoException * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateByte(String columnName, byte x) throws VirtuosoException { @@ -1734,7 +1730,7 @@ public void updateByte(String columnName, byte x) throws VirtuosoException * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateShort(String columnName, short x) throws VirtuosoException { @@ -1752,7 +1748,7 @@ public void updateShort(String columnName, short x) throws VirtuosoException * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateInt(String columnName, int x) throws VirtuosoException { @@ -1770,7 +1766,7 @@ public void updateInt(String columnName, int x) throws VirtuosoException * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateLong(String columnName, long x) throws VirtuosoException { @@ -1788,7 +1784,7 @@ public void updateLong(String columnName, long x) throws VirtuosoException * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateFloat(String columnName, float x) throws VirtuosoException { @@ -1806,7 +1802,7 @@ public void updateFloat(String columnName, float x) throws VirtuosoException * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateDouble(String columnName, double x) throws VirtuosoException { @@ -1824,7 +1820,7 @@ public void updateDouble(String columnName, double x) throws VirtuosoException * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateBigDecimal(String columnName, BigDecimal x) throws VirtuosoException { @@ -1842,7 +1838,7 @@ public void updateBigDecimal(String columnName, BigDecimal x) throws VirtuosoExc * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateString(String columnName, String x) throws VirtuosoException { @@ -1860,7 +1856,7 @@ public void updateString(String columnName, String x) throws VirtuosoException * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateBytes(String columnName, byte x[]) throws VirtuosoException { @@ -1878,7 +1874,7 @@ public void updateBytes(String columnName, byte x[]) throws VirtuosoException * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateDate(String columnName, java.sql.Date x) throws VirtuosoException { @@ -1896,7 +1892,7 @@ public void updateDate(String columnName, java.sql.Date x) throws VirtuosoExcept * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateTime(String columnName, java.sql.Time x) throws VirtuosoException { @@ -1914,7 +1910,7 @@ public void updateTime(String columnName, java.sql.Time x) throws VirtuosoExcept * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateTimestamp(String columnName, java.sql.Timestamp x) throws VirtuosoException { @@ -1933,7 +1929,7 @@ public void updateTimestamp(String columnName, java.sql.Timestamp x) throws Virt * @param columnName the name of the column * @param x the new column value * @param length of the stream - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateAsciiStream(String columnName, InputStream x, int length) throws VirtuosoException { @@ -1952,7 +1948,7 @@ public void updateAsciiStream(String columnName, InputStream x, int length) thro * @param columnName the name of the column * @param x the new column value * @param length of the stream - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateBinaryStream(String columnName, InputStream x, int length) throws VirtuosoException { @@ -1971,7 +1967,7 @@ public void updateBinaryStream(String columnName, InputStream x, int length) thr * @param columnName the name of the column * @param x the new column value * @param length of the stream - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateCharacterStream(String columnName, Reader reader, int length) throws VirtuosoException { @@ -1992,7 +1988,7 @@ public void updateCharacterStream(String columnName, Reader reader, int length) * @param scale For java.sql.Types.DECIMAL or java.sql.Types.NUMERIC types * this is the number of digits after the decimal. For all other * types this value will be ignored. - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateObject(String columnName, Object x, int scale) throws VirtuosoException { @@ -2010,7 +2006,7 @@ public void updateObject(String columnName, Object x, int scale) throws Virtuoso * * @param columnName the name of the column * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateObject(String columnName, Object x) throws VirtuosoException { @@ -2018,7 +2014,6 @@ public void updateObject(String columnName, Object x) throws VirtuosoException updateObject(findColumn(columnName),x); } -#if JDK_VER >= 12 /** * Returns the value in the specified column as a Java object. * This method uses the specified Map object for @@ -2046,7 +2041,6 @@ public Ref getRef(String columnName) throws VirtuosoException // First get the column number return getRef(findColumn(columnName)); } -#endif /** * Gets a BLOB value in the current row of this ResultSet object. @@ -2054,14 +2048,10 @@ public Ref getRef(String columnName) throws VirtuosoException * @param colName the name of the column from which to retrieve the value * @return a Blob object representing the SQL BLOB value in * the specified column - * @see virtuoso.jdbc2.VirtuosoBlob + * @see virtuoso.jdbc4.VirtuosoBlob */ public -#if JDK_VER >= 12 Blob -#else - VirtuosoBlob -#endif getBlob(String columnName) throws VirtuosoException { // First get the column number @@ -2074,21 +2064,16 @@ public Ref getRef(String columnName) throws VirtuosoException * @param colName the name of the column from which to retrieve the value * @return a Clob object representing the SQL CLOB value in * the specified column - * @see virtuoso.jdbc2.VirtuosoClob + * @see virtuoso.jdbc4.VirtuosoClob */ public -#if JDK_VER >= 12 Clob -#else - VirtuosoClob -#endif getClob(String columnName) throws VirtuosoException { // First get the column number return getClob(findColumn(columnName)); } -#if JDK_VER >= 12 /** * Gets an SQL ARRAY value in the current row of this ResultSet object. * @@ -2101,7 +2086,6 @@ public Array getArray(String columnName) throws VirtuosoException // First get the column number return getArray(findColumn(columnName)); } -#endif /** * Gets the value of a column in the current row as a java.sql.Date @@ -2112,7 +2096,7 @@ public Array getArray(String columnName) throws VirtuosoException * @param columnName the SQL name of the column from which to retrieve the value * @param cal the calendar to use in constructing the date * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public java.sql.Date getDate(String columnName, Calendar cal) throws VirtuosoException { @@ -2129,7 +2113,7 @@ public java.sql.Date getDate(String columnName, Calendar cal) throws VirtuosoExc * @param columnName the SQL name of the column * @param cal the calendar to use in constructing the time * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public java.sql.Time getTime(String columnName, Calendar cal) throws VirtuosoException { @@ -2146,7 +2130,7 @@ public java.sql.Time getTime(String columnName, Calendar cal) throws VirtuosoExc * @param columnName the SQL name of the column * @param cal the calendar to use in constructing the timestamp * @return the column value; if the value is SQL NULL, the result is null - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public java.sql.Timestamp getTimestamp(String columnName, Calendar cal) throws VirtuosoException { @@ -2175,7 +2159,7 @@ protected void wasNull(boolean flag) * sequence of multiple results. A ResultSet is also automatically * closed when it is garbage collected. * - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#close */ public void close() throws VirtuosoException @@ -2198,10 +2182,12 @@ public void close() throws VirtuosoException statement = null; } #endif - if (statement != null && !is_prepared) + if (statement != null) { - statement.close_rs(false); - statement = null; + statement.close_rs(false, is_prepared); + if (!is_prepared) { + statement = null; + } } row = null; @@ -2216,7 +2202,7 @@ public void close() throws VirtuosoException * * @return boolean True if the new current row is valid; false if there * are no more rows. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just implementation). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just implementation). * @see java.sql.ResultSet#next */ public boolean next() throws VirtuosoException @@ -2289,7 +2275,7 @@ public boolean next() throws VirtuosoException } // Call the extended fetch RPC extended_fetch(VirtuosoTypes.SQL_FETCH_NEXT,0,(prefetch == 0) ? VirtuosoTypes.DEFAULTPREFETCH : prefetch); - // Here, it's a statid or dynamic cursor, and there are no more results in the row set + // Here, it is a statid or dynamic cursor, and there are no more results in the row set if(rows.size() == 0) { currentRow = 1; @@ -2311,7 +2297,7 @@ public boolean next() throws VirtuosoException * second number 2, and so on. * * @return int The current row number; 0 if there is no current row. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just implementation). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just implementation). * @see java.sql.ResultSet#getRow */ public int getRow() throws VirtuosoException @@ -2343,14 +2329,14 @@ else if (type == VirtuosoResultSet.TYPE_FORWARD_ONLY) * makes sense to call previous() when there is no current row. * * @return true if the cursor is on a valid row; false if it is off the result set - * @exception virtuoso.jdbc2.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. + * @exception virtuoso.jdbc4.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. * @see java.sql.ResultSet#previous */ public boolean previous() throws VirtuosoException { // The JDBC spec if(type == VirtuosoResultSet.TYPE_FORWARD_ONLY) - throw new VirtuosoException("Can't access to the previous row, the type is forward only.",VirtuosoException.ERRORONTYPE); + throw new VirtuosoException("Cannot access to the previous row, the type is forward only.",VirtuosoException.ERRORONTYPE); if (currentRow == 0) return false; // Try to go to the previous row @@ -2371,7 +2357,7 @@ public boolean previous() throws VirtuosoException int book = getRow(); // Call the extended fetch RPC extended_fetch(VirtuosoTypes.SQL_FETCH_PRIOR,0,(prefetch == 0) ? VirtuosoTypes.DEFAULTPREFETCH : prefetch); - // Here, it's a statid or dynamic cursor, and there are no more results in the row set + // Here, it is a statid or dynamic cursor, and there are no more results in the row set if(rows.size() == 0) { currentRow = 0; @@ -2398,7 +2384,7 @@ public boolean previous() throws VirtuosoException book = row.getBookmark(); // Call the extended fetch RPC extended_fetch(VirtuosoTypes.SQL_FETCH_PRIOR,0,(prefetch == 0) ? VirtuosoTypes.DEFAULTPREFETCH : prefetch); - // Here, it's a statid or dynamic cursor, and there are no more results in the row set + // Here, it is a statid or dynamic cursor, and there are no more results in the row set if(rows.size() == 0) { currentRow = 0; @@ -2433,7 +2419,7 @@ public boolean previous() throws VirtuosoException * Moves the cursor to the front of the result set, just before the * first row. Has no effect if the result set contains no rows. * - * @exception virtuoso.jdbc2.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. + * @exception virtuoso.jdbc4.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. * @see java.sql.ResultSet#beforeFirst */ public void beforeFirst() throws VirtuosoException @@ -2446,7 +2432,7 @@ public void beforeFirst() throws VirtuosoException * Moves the cursor to the end of the result set, just after the last * row. Has no effect if the result set contains no rows. * - * @exception virtuoso.jdbc2.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. + * @exception virtuoso.jdbc4.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. * @see java.sql.ResultSet#afterLast */ public void afterLast() throws VirtuosoException @@ -2460,7 +2446,7 @@ public void afterLast() throws VirtuosoException * * @return true if the cursor is on a valid row; false if * there are no rows in the result set - * @exception virtuoso.jdbc2.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. + * @exception virtuoso.jdbc4.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. * @see java.sql.ResultSet#first */ public boolean first() throws VirtuosoException @@ -2474,7 +2460,7 @@ public boolean first() throws VirtuosoException * * @return true if the cursor is before the first row, false otherwise. Returns * false when the result set contains no rows. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just implementation). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just implementation). * @see java.sql.ResultSet#isBeforeFirst */ public boolean isBeforeFirst() throws VirtuosoException @@ -2488,7 +2474,7 @@ public boolean isBeforeFirst() throws VirtuosoException * * @return true if the cursor is after the last row, false otherwise. Returns * false when the result set contains no rows. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just implementation). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just implementation). * @see java.sql.ResultSet#isAfterLast */ public boolean isAfterLast() throws VirtuosoException @@ -2500,7 +2486,7 @@ public boolean isAfterLast() throws VirtuosoException * Indicates whether the cursor is on the first row of the result set. * * @return true if the cursor is on the first row, false otherwise. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just implementation). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just implementation). * @see java.sql.ResultSet#isFirst */ public boolean isFirst() throws VirtuosoException @@ -2512,7 +2498,7 @@ public boolean isFirst() throws VirtuosoException * Indicates whether the cursor is on the last row of the result set. * * @return true if the cursor is on the last row, false otherwise. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just implementation). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just implementation). * @see java.sql.ResultSet#isLast */ public boolean isLast() throws VirtuosoException @@ -2525,7 +2511,7 @@ public boolean isLast() throws VirtuosoException * * @return true if the cursor is on a valid row; * false if there are no rows in the result set - * @exception virtuoso.jdbc2.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. + * @exception virtuoso.jdbc4.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. * @see java.sql.ResultSet#last */ public boolean last() throws VirtuosoException @@ -2537,17 +2523,17 @@ public boolean last() throws VirtuosoException * Moves the cursor to the given row number in the result set. * * @return true if the cursor is on the result set; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. + * @exception virtuoso.jdbc4.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. * @see java.sql.ResultSet#absolute */ public boolean absolute(int row) throws VirtuosoException { // The JDBC spec if(type == VirtuosoResultSet.TYPE_FORWARD_ONLY) - throw new VirtuosoException("Can't go before the first row, the type is forward only.",VirtuosoException.ERRORONTYPE); + throw new VirtuosoException("Cannot go before the first row, the type is forward only.",VirtuosoException.ERRORONTYPE); // Call the extended fetch RPC extended_fetch(VirtuosoTypes.SQL_FETCH_ABSOLUTE,row,(prefetch == 0) ? VirtuosoTypes.DEFAULTPREFETCH : prefetch); - // Here, it's a statid or dynamic cursor, and there are no more results in the row set + // Here, it is a statid or dynamic cursor, and there are no more results in the row set if(rows.size() == 0) { currentRow = (row > 0) ? 0 : 1; @@ -2562,17 +2548,17 @@ public boolean absolute(int row) throws VirtuosoException * Moves the cursor a relative number of rows, either positive or negative. * * @return true if the cursor is on a row; false otherwise - * @exception virtuoso.jdbc2.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. + * @exception virtuoso.jdbc4.VirtuosoException If the result set type is TYPE_FORWARD_ONLY. * @see java.sql.ResultSet#relative */ public boolean relative(int row) throws VirtuosoException { // The JDBC spec if(type == VirtuosoResultSet.TYPE_FORWARD_ONLY) - throw new VirtuosoException("Can't go before the first row, the type is forward only.",VirtuosoException.ERRORONTYPE); + throw new VirtuosoException("Cannot go before the first row, the type is forward only.",VirtuosoException.ERRORONTYPE); // Call the extended fetch RPC extended_fetch(VirtuosoTypes.SQL_FETCH_RELATIVE,row,(prefetch == 0) ? VirtuosoTypes.DEFAULTPREFETCH : prefetch); - // Here, it's a statid or dynamic cursor, and there are no more results in the row set + // Here, it is a statid or dynamic cursor, and there are no more results in the row set if(rows.size() == 0) { currentRow = (row > 0) ? 0 : 1; @@ -2587,7 +2573,7 @@ public boolean relative(int row) throws VirtuosoException * Gets the name of the SQL cursor used by this ResultSet. * * @return the ResultSet's SQL cursor name - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public String getCursorName() throws VirtuosoException { @@ -2602,11 +2588,7 @@ public String getCursorName() throws VirtuosoException * the specified column */ public -#if JDK_VER >= 12 Blob -#else - VirtuosoBlob -#endif getBlob(int i) throws VirtuosoException { // Get and check the current row number @@ -2624,11 +2606,7 @@ public String getCursorName() throws VirtuosoException * the specified column */ public -#if JDK_VER >= 12 Clob -#else - VirtuosoClob -#endif getClob(int i) throws VirtuosoException { // Get and check the current row number @@ -2645,7 +2623,7 @@ public String getCursorName() throws VirtuosoException * * @return true if the row has been visibly updated by the owner or * another, and updates are detected - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see DatabaseMetaData#updatesAreDetected */ public boolean rowUpdated() throws VirtuosoException @@ -2658,7 +2636,7 @@ public boolean rowUpdated() throws VirtuosoException * depends on whether or not the result set can detect visible inserts. * * @return true if a row has had an insertion and insertions are detected - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see DatabaseMetaData#insertsAreDetected */ public boolean rowInserted() throws VirtuosoException @@ -2673,7 +2651,7 @@ public boolean rowInserted() throws VirtuosoException * or not the result set can detect deletions. * * @return true if a row was deleted and deletions are detected - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see DatabaseMetaData#deletesAreDetected */ public boolean rowDeleted() throws VirtuosoException @@ -2689,7 +2667,7 @@ public boolean rowDeleted() throws VirtuosoException * methods are called to update the database. * * @param columnIndex the first column is 1, the second is 2, ... - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateNull(int columnIndex) throws VirtuosoException { @@ -2715,7 +2693,7 @@ public void updateNull(int columnIndex) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateBoolean(int columnIndex, boolean x) throws VirtuosoException { @@ -2741,7 +2719,7 @@ public void updateBoolean(int columnIndex, boolean x) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateByte(int columnIndex, byte x) throws VirtuosoException { @@ -2767,7 +2745,7 @@ public void updateByte(int columnIndex, byte x) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateShort(int columnIndex, short x) throws VirtuosoException { @@ -2793,7 +2771,7 @@ public void updateShort(int columnIndex, short x) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateInt(int columnIndex, int x) throws VirtuosoException { @@ -2819,7 +2797,7 @@ public void updateInt(int columnIndex, int x) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateLong(int columnIndex, long x) throws VirtuosoException { @@ -2845,7 +2823,7 @@ public void updateLong(int columnIndex, long x) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateFloat(int columnIndex, float x) throws VirtuosoException { @@ -2871,7 +2849,7 @@ public void updateFloat(int columnIndex, float x) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateDouble(int columnIndex, double x) throws VirtuosoException { @@ -2897,7 +2875,7 @@ public void updateDouble(int columnIndex, double x) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateBigDecimal(int columnIndex, BigDecimal x) throws VirtuosoException { @@ -2923,7 +2901,7 @@ public void updateBigDecimal(int columnIndex, BigDecimal x) throws VirtuosoExcep * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateString(int columnIndex, String x) throws VirtuosoException { @@ -2949,7 +2927,7 @@ public void updateString(int columnIndex, String x) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateBytes(int columnIndex, byte x[]) throws VirtuosoException { @@ -2987,7 +2965,7 @@ public void updateBytes(int columnIndex, byte x[]) throws VirtuosoException * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateDate(int columnIndex, java.sql.Date x) throws VirtuosoException { @@ -3013,7 +2991,7 @@ public void updateDate(int columnIndex, java.sql.Date x) throws VirtuosoExceptio * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateTime(int columnIndex, java.sql.Time x) throws VirtuosoException { @@ -3039,7 +3017,7 @@ public void updateTime(int columnIndex, java.sql.Time x) throws VirtuosoExceptio * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateTimestamp(int columnIndex, java.sql.Timestamp x) throws VirtuosoException { @@ -3066,7 +3044,7 @@ public void updateTimestamp(int columnIndex, java.sql.Timestamp x) throws Virtuo * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value * @param length the length of the stream - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateAsciiStream(int columnIndex, InputStream x, int length) throws VirtuosoException { @@ -3084,7 +3062,7 @@ public void updateAsciiStream(int columnIndex, InputStream x, int length) throws } // After check, check if a Blob object is already associated or not Object _obj = row[columnIndex - 1]; - // Check now if it's a Blob + // Check now if it is a Blob if(_obj instanceof VirtuosoBlob) { ((VirtuosoBlob)_obj).setInputStream(x,length); @@ -3105,7 +3083,7 @@ public void updateAsciiStream(int columnIndex, InputStream x, int length) throws * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value * @param length the length of the stream - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateBinaryStream(int columnIndex, InputStream x, int length) throws VirtuosoException { @@ -3123,7 +3101,7 @@ public void updateBinaryStream(int columnIndex, InputStream x, int length) throw } // After check, check if a Blob object is already associated or not Object _obj = row[columnIndex - 1]; - // Check now if it's a Blob + // Check now if it is a Blob if(_obj instanceof VirtuosoBlob) { ((VirtuosoBlob)_obj).setInputStream(x,length); @@ -3144,7 +3122,7 @@ public void updateBinaryStream(int columnIndex, InputStream x, int length) throw * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value * @param length the length of the stream - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateCharacterStream(int columnIndex, Reader x, int length) throws VirtuosoException { @@ -3162,7 +3140,7 @@ public void updateCharacterStream(int columnIndex, Reader x, int length) throws } // After check, check if a Blob object is already associated or not Object _obj = row[columnIndex - 1]; - // Check now if it's a Blob + // Check now if it is a Blob if(_obj instanceof VirtuosoBlob) { ((VirtuosoBlob)_obj).setReader(x,length); @@ -3182,7 +3160,7 @@ public void updateCharacterStream(int columnIndex, Reader x, int length) throws * * @param columnIndex the first column is 1, the second is 2, ... * @param x the new column value - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateObject(int columnIndex, Object x) throws VirtuosoException { @@ -3200,7 +3178,7 @@ public void updateObject(int columnIndex, Object x) throws VirtuosoException } // After check, check if a Blob object is already associated or not Object _obj = row[columnIndex - 1]; - // Check now if it's a Blob + // Check now if it is a Blob if(_obj instanceof VirtuosoBlob) { ((VirtuosoBlob)_obj).setObject(x); @@ -3222,7 +3200,7 @@ public void updateObject(int columnIndex, Object x) throws VirtuosoException * @param scale For java.sql.Types.DECIMAL or java.sql.Types.NUMERIC types * this is the number of digits after the decimal. For all other * types this value will be ignored. - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void updateObject(int columnIndex, Object x, int scale) throws VirtuosoException { @@ -3237,12 +3215,12 @@ public void updateObject(int columnIndex, Object x, int scale) throws VirtuosoEx * updateRow has already been called, then this method has no * effect. * - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs or if + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs or if * called when on the insert row */ public void cancelRowUpdates() throws VirtuosoException { - // Check if there's a row to update + // Check if there is a row to update if(row != null) row = null; } @@ -3251,7 +3229,7 @@ public void cancelRowUpdates() throws VirtuosoException * Inserts the contents of the insert row into the result set and * the database. Must be on the insert row when this method is called. * - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs, + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs, * if called when not on the insert row, or if not all of non-nullable columns in * the insert row have been given a value */ @@ -3267,7 +3245,7 @@ public void insertRow() throws VirtuosoException * Updates the underlying database with the new contents of the * current row. Cannot be called when on the insert row. * - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs or + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs or * if called when on the insert row */ public void updateRow() throws VirtuosoException @@ -3289,7 +3267,7 @@ public void updateRow() throws VirtuosoException * Deletes the current row from the result set and the underlying * database. Cannot be called when on the insert row. * - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs or if + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs or if * called when on the insert row. */ public void deleteRow() throws VirtuosoException @@ -3318,7 +3296,7 @@ public void deleteRow() throws VirtuosoException * updates made to the row are lost. Calling the method refreshRow frequently * will likely slow performance. * - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs or if + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs or if * called when on the insert row */ public void refreshRow() throws VirtuosoException @@ -3346,7 +3324,7 @@ public void refreshRow() throws VirtuosoException * The method updateXXX must be called before a * getXXX method can be called on a column value. * - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * or the result set is not updatable */ public void moveToInsertRow() throws VirtuosoException @@ -3363,7 +3341,7 @@ public void moveToInsertRow() throws VirtuosoException * current row. This method has no effect if the cursor is not on the insert * row. * - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * or the result set is not updatable */ public void moveToCurrentRow() throws VirtuosoException @@ -3376,7 +3354,6 @@ public void moveToCurrentRow() throws VirtuosoException } // ================================================================== -#if JDK_VER >= 12 /** * Returns the value of a column in the current row as a Java object. * This method uses the given Map object @@ -3413,7 +3390,6 @@ public Array getArray(int i) throws VirtuosoException { return null; } -#endif protected void sendBlobData (openlink.util.Vector result) throws VirtuosoException { @@ -3503,7 +3479,6 @@ public boolean equals(Object obj) } -#if JDK_VER >= 14 /** * Retrieves the value of the designated column in the current row * of this ResultSet object as a java.net.URL @@ -3677,7 +3652,6 @@ public void updateArray(String columnName, Array x) throws SQLException } -#if JDK_VER >= 16 //------------------------- JDBC 4.0 ----------------------------------- /** @@ -5002,7 +4976,7 @@ public void updateNClob(String columnLabel, Reader reader) throws SQLException public T unwrap(java.lang.Class iface) throws java.sql.SQLException { try { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.cast(this); } catch (ClassCastException cce) { throw new VirtuosoException ("Unable to unwrap to "+iface.toString(), "22023", VirtuosoException.BADPARAM); @@ -5026,7 +5000,7 @@ public T unwrap(java.lang.Class iface) throws java.sql.SQLException */ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.isInstance(this); } @@ -5063,10 +5037,10 @@ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLExcepti public T getObject(int columnIndex, Class type) throws SQLException { if (type == null) { - throw new VirtuosoException ("Type parameter can not be null", + throw new VirtuosoException ("Type parameter cannot be null", "S1009", VirtuosoException.BADPARAM); } - + if (type.equals(String.class)) { return (T) getString(columnIndex); } else if (type.equals(BigDecimal.class)) { @@ -5100,19 +5074,19 @@ public T getObject(int columnIndex, Class type) throws SQLException } else if (type.equals(java.net.URL.class)) { return (T) getURL(columnIndex); // } else if (type.equals(Struct.class)) { -// -// } +// +// } // } else if (type.equals(RowId.class)) { -// +// // } else if (type.equals(NClob.class)) { -// +// // } else if (type.equals(SQLXML.class)) { - + } else { try { return (T) getObject(columnIndex); } catch (ClassCastException cce) { - throw new VirtuosoException ("Conversion not supported for type " + type.getName(), + throw new VirtuosoException ("Conversion not supported for type " + type.getName(), "S1009", VirtuosoException.BADPARAM); } } @@ -5153,7 +5127,5 @@ public T getObject(String columnLabel, Class type) throws SQLException #endif -#endif -#endif } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSetMetaData.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoResultSetMetaData.java similarity index 89% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSetMetaData.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoResultSetMetaData.java index 41c16581da..9b0f2dfa20 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoResultSetMetaData.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoResultSetMetaData.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; import java.util.*; @@ -37,16 +37,12 @@ * * @version 1.0 (JDBC API 2.0 implementation) * @see java.sql.ResultSetMetaData - * @see virtuoso.jdbc2.VirtuosoResultSet#getMetaData + * @see virtuoso.jdbc4.VirtuosoResultSet#getMetaData */ public class VirtuosoResultSetMetaData implements ResultSetMetaData { // Hash table to sort columns by their names -#if JDK_VER >= 16 protected Hashtable hcolumns; -#else - protected Hashtable hcolumns; -#endif // Description of columns private openlink.util.Vector columnsMetaData = new openlink.util.Vector(10,20); @@ -55,16 +51,12 @@ public class VirtuosoResultSetMetaData implements ResultSetMetaData * Constructs a new VirtuosoResultSetMetaData. * * @param args The column description in the DV format. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ protected VirtuosoResultSetMetaData (VirtuosoConnection conn, String [] columns, int [] dtps) { // Create the hash table -#if JDK_VER >= 16 hcolumns = new Hashtable(); -#else - hcolumns = new Hashtable(); -#endif // Process args in DV format for(int i = 0;i < columns.length;i++) { @@ -87,11 +79,7 @@ protected VirtuosoResultSetMetaData (VirtuosoConnection conn, String [] columns, else return; // Create the hash table -#if JDK_VER >= 16 hcolumns = new Hashtable(); -#else - hcolumns = new Hashtable(); -#endif // Process args in DV format for(int i = 0;i < vect.size();i++) { @@ -110,7 +98,7 @@ protected VirtuosoResultSetMetaData (VirtuosoConnection conn, String [] columns, * Returns the number of columns in the ResultSet. * * @return int The number of columns. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.ResultSetMetaData#getColumnCount */ public int getColumnCount() throws VirtuosoException @@ -123,7 +111,7 @@ public int getColumnCount() throws VirtuosoException * * @param column the first column is 1, the second is 2, ... * @return boolean True if so. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#isAutoIncrement */ public boolean isAutoIncrement(int column) throws VirtuosoException @@ -136,11 +124,11 @@ public boolean isAutoIncrement(int column) throws VirtuosoException } /** - * Indicates whether a column's case matters. + * Indicates whether a column case matters. * * @param column the first column is 1, the second is 2, ... * @return boolean True if so. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#isCaseSensitive */ public boolean isCaseSensitive(int column) throws VirtuosoException @@ -157,7 +145,7 @@ public boolean isCaseSensitive(int column) throws VirtuosoException * * @param column the first column is 1, the second is 2, ... * @return boolean True if so. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#isSearchable */ public boolean isSearchable(int column) throws VirtuosoException @@ -174,7 +162,7 @@ public boolean isSearchable(int column) throws VirtuosoException * * @param column the first column is 1, the second is 2, ... * @return boolean True if so. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#isCurrency */ public boolean isCurrency(int column) throws VirtuosoException @@ -192,7 +180,7 @@ public boolean isCurrency(int column) throws VirtuosoException * @param column the first column is 1, the second is 2, ... * @return the nullability status of the given column; one of columnNoNulls, * columnNullable or columnNullableUnknown - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#isNullable */ public int isNullable(int column) throws VirtuosoException @@ -209,7 +197,7 @@ public int isNullable(int column) throws VirtuosoException * * @param column the first column is 1, the second is 2, ... * @return boolean True if so. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#isSigned */ public boolean isSigned(int column) throws VirtuosoException @@ -222,12 +210,12 @@ public boolean isSigned(int column) throws VirtuosoException } /** - * Indicates the column's normal max width in chars. + * Indicates the column normal max width in chars. * * @param column the first column is 1, the second is 2, ... * @return the normal maximum number of characters allowed as the width * of the designated column - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#getColumnDisplaySize */ public int getColumnDisplaySize(int column) throws VirtuosoException @@ -245,7 +233,7 @@ public int getColumnDisplaySize(int column) throws VirtuosoException * * @param column the first column is 1, the second is 2, ... * @return String The suggested column title. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#getColumnLabel */ public String getColumnLabel(int column) throws VirtuosoException @@ -254,11 +242,11 @@ public String getColumnLabel(int column) throws VirtuosoException } /** - * Gets a column's name. + * Gets a column name. * * @param column the first column is 1, the second is 2, ... * @returnString The column name. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#getColumnName */ public String getColumnName(int column) throws VirtuosoException @@ -280,11 +268,11 @@ public void setColumnName(int column, String name) throws VirtuosoException } /** - * Gets a column's number of decimal digits. + * Gets a column number of decimal digits. * * @param column the first column is 1, the second is 2, ... - * @return int The column's precision. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @return int The column precision. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#getPrecision */ public int getPrecision(int column) throws VirtuosoException @@ -297,11 +285,11 @@ public int getPrecision(int column) throws VirtuosoException } /** - * Gets a column's number of digits to right of the decimal point. + * Gets a column number of digits to right of the decimal point. * * @param column the first column is 1, the second is 2, ... - * @return int The column's scale. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @return int The column scale. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#getScale */ public int getScale(int column) throws VirtuosoException @@ -314,11 +302,11 @@ public int getScale(int column) throws VirtuosoException } /** - * Retrieves a column's SQL type. + * Retrieves a column SQL type. * * @param column the first column is 1, the second is 2, ... * @return int SQL type. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#getColumnType * @see java.sql.Types */ @@ -332,12 +320,12 @@ public int getColumnType(int column) throws VirtuosoException } /** - * Retrieves a column's database-specific type name. + * Retrieves a column database-specific type name. * * @param column the first column is 1, the second is 2, ... * @return type name used by the database. If the column type is * a user-defined type, then a fully-qualified type name is returned. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#getColumnTypeName */ public String getColumnTypeName(int column) throws VirtuosoException @@ -412,17 +400,9 @@ protected static String _getColumnTypeName(int columnType) throws VirtuosoExcept return "VARBINARY"; case Types.VARCHAR: return "VARCHAR"; -#if JDK_VER >= 16 case Types.NVARCHAR: -#else - case -9: -#endif return "NVARCHAR"; -#if JDK_VER >= 16 case Types.LONGNVARCHAR: -#else - case -16: -#endif return "LONG NVARCHAR"; } ; @@ -434,7 +414,7 @@ protected static String _getColumnTypeName(int columnType) throws VirtuosoExcept * * @param column the first column is 1, the second is 2, ... * @return boolean True if so. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#isReadOnly */ public boolean isReadOnly(int column) throws VirtuosoException @@ -451,7 +431,7 @@ public boolean isReadOnly(int column) throws VirtuosoException * * @param column the first column is 1, the second is 2, ... * @return boolean True if so. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#isWritable */ public boolean isWritable(int column) throws VirtuosoException @@ -468,7 +448,7 @@ public boolean isWritable(int column) throws VirtuosoException * * @param column the first column is 1, the second is 2, ... * @return boolean True if so. - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#isDefinitelyWritable */ public boolean isDefinitelyWritable(int column) throws VirtuosoException @@ -482,7 +462,7 @@ public boolean isDefinitelyWritable(int column) throws VirtuosoException * @param column the first column is 1, the second is 2, ... * @return the fully-qualified name of the class in the Java programming * language that would be used by the method - * @exception virtuoso.jdbc2.VirtuosoException If an internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException If an internal error occurred. * @see java.sql.ResultSetMetaData#getColumnClassName */ public String getColumnClassName(int column) throws VirtuosoException @@ -495,11 +475,11 @@ public String getColumnClassName(int column) throws VirtuosoException } /** - * Gets a column's table's schema. + * Gets a column table's schema. * * @param column the first column is 1, the second is 2, ... * @return schema name or "" if not applicable - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public String getSchemaName(int column) throws VirtuosoException { @@ -507,11 +487,11 @@ public String getSchemaName(int column) throws VirtuosoException } /** - * Gets a column's table name. + * Gets a column table name. * * @param column the first column is 1, the second is 2, ... * @return table name or "" if not applicable - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public String getTableName(int column) throws VirtuosoException { @@ -519,11 +499,11 @@ public String getTableName(int column) throws VirtuosoException } /** - * Gets a column's table's catalog name. + * Gets a column table's catalog name. * * @param column the first column is 1, the second is 2, ... * @return column name or "" if not applicable. - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public String getCatalogName(int column) throws VirtuosoException { @@ -571,7 +551,6 @@ protected boolean isXml (int column) } -#if JDK_VER >= 16 /** * Returns an object that implements the given interface to allow access to * non-standard methods, or standard methods not exposed by the proxy. @@ -592,7 +571,7 @@ protected boolean isXml (int column) public T unwrap(java.lang.Class iface) throws java.sql.SQLException { try { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.cast(this); } catch (ClassCastException cce) { throw new VirtuosoException ("Unable to unwrap to "+iface.toString(), "22023", VirtuosoException.BADPARAM); @@ -616,10 +595,9 @@ public T unwrap(java.lang.Class iface) throws java.sql.SQLException */ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.isInstance(this); } -#endif } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRow.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoRow.java similarity index 94% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRow.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoRow.java index cb6572f0bf..0d15a30365 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoRow.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoRow.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.io.*; import java.sql.*; @@ -52,7 +52,7 @@ class VirtuosoRow * Construct a new VirtuosoRow class which stores the row's content. * * @param Vector Content of the row. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ VirtuosoRow(VirtuosoResultSet resultSet, openlink.util.Vector args) throws VirtuosoException { @@ -82,7 +82,7 @@ protected void getContent(Object anArray[]) * * @param column The first column is 1, the second is 2, ... * @return VirtuosoAsciiInputStream A Java input stream that delivers the database column value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getAsciiStream */ protected InputStream getAsciiStream(int column) throws VirtuosoException @@ -116,7 +116,7 @@ protected InputStream getAsciiStream(int column) throws VirtuosoException * * @param column The first column is 1, the second is 2, ... * @return ByteArrayInputStream A Java input stream that delivers the database column value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBinaryStream */ protected InputStream getBinaryStream(int column) throws VirtuosoException @@ -151,7 +151,7 @@ protected InputStream getBinaryStream(int column) throws VirtuosoException * * @param column The first column is 1, the second is 2, ... * @return CharArrayReader A Java input stream that delivers the database column value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getCharacterStream */ protected Reader getCharacterStream(int column) throws VirtuosoException @@ -204,7 +204,7 @@ protected Reader getCharacterStream(int column) throws VirtuosoException * * @param column The first column is 1, the second is 2, ... * @return BigDecimal The column value (full precision). - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBigDecimal */ protected BigDecimal getBigDecimal(int column) throws VirtuosoException @@ -249,7 +249,7 @@ protected BigDecimal getBigDecimal(int column) throws VirtuosoException * * @param column The first column is 1, the second is 2, ... * @return boolean The column boolean value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBoolean */ protected boolean getBoolean(int column) throws VirtuosoException @@ -280,7 +280,7 @@ protected boolean getBoolean(int column) throws VirtuosoException * * @param column The first column is 1, the second is 2, ... * @return byte The column byte value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getByte */ protected byte getByte(int column) throws VirtuosoException @@ -322,7 +322,7 @@ protected byte getByte(int column) throws VirtuosoException * * @param column The first column is 1, the second is 2, ... * @return byte The column byte array value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getBytes */ protected byte[] getBytes(int column) throws VirtuosoException @@ -368,7 +368,7 @@ else if (obj instanceof java.lang.String) * * @param column The first column is 1, the second is 2, ... * @return byte The column double value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getDouble */ protected double getDouble(int column) throws VirtuosoException @@ -410,7 +410,7 @@ protected double getDouble(int column) throws VirtuosoException * * @param column The first column is 1, the second is 2, ... * @return Date The column date value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getDate */ protected java.sql.Date getDate(int column) throws VirtuosoException @@ -441,7 +441,7 @@ else if(obj instanceof java.sql.Date) return new java.sql.Date(((java.sql.Date)obj).getTime()); else if (obj instanceof String) return VirtuosoTypes.strToDate((String)obj); - else if (obj instanceof java.util.Date) + else if (obj instanceof java.util.Date) return new java.sql.Date(((java.util.Date)obj).getTime()); else throw new VirtuosoException("Column does not contain a Date.",VirtuosoException.CASTERROR); @@ -455,7 +455,7 @@ else if (obj instanceof java.util.Date) * * @param column The first column is 1, the second is 2, ... * @return Time The column time value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getTime */ protected java.sql.Time getTime(int column) throws VirtuosoException @@ -500,7 +500,7 @@ else if(obj instanceof String) * * @param column The first column is 1, the second is 2, ... * @return Timestamp The column timestamp value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getTimestamp */ protected java.sql.Timestamp getTimestamp(int column) throws VirtuosoException @@ -553,7 +553,7 @@ else if(obj instanceof String) * * @param column The first column is 1, the second is 2, ... * @return byte The column float value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getFloat */ protected float getFloat(int column) throws VirtuosoException @@ -595,7 +595,7 @@ protected float getFloat(int column) throws VirtuosoException * * @param column The first column is 1, the second is 2, ... * @return byte The column int value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getInt */ protected int getInt(int column) throws VirtuosoException @@ -637,7 +637,7 @@ protected int getInt(int column) throws VirtuosoException * * @param column The first column is 1, the second is 2, ... * @return byte The column long value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getLong */ protected long getLong(int column) throws VirtuosoException @@ -679,7 +679,7 @@ protected long getLong(int column) throws VirtuosoException * * @param column The first column is 1, the second is 2, ... * @return short The column short value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getShort */ protected short getShort(int column) throws VirtuosoException @@ -721,7 +721,7 @@ protected short getShort(int column) throws VirtuosoException * * @param column The first column is 1, the second is 2, ... * @return String The column string value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getString */ protected String getString(int column) throws VirtuosoException @@ -791,7 +791,7 @@ else if (obj instanceof VirtuosoBlob) * * @param column The first column is 1, the second is 2, ... * @return Blob The blob. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getString */ protected VirtuosoBlob getBlob(int column) throws VirtuosoException @@ -818,30 +818,20 @@ protected VirtuosoBlob getBlob(int column) throws VirtuosoException * * @param column The first column is 1, the second is 2, ... * @return Clob The clob. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getString */ protected -#if JDK_VER >= 12 VirtuosoBlob -#else - VirtuosoClob -#endif getClob(int column) throws VirtuosoException { // Get and check parameter if(column < 1 || column > maxCol) throw new VirtuosoException("Bad column number : " + column + " not in 1= 12 VirtuosoBlob obj = (content.elementAt(column - 1) instanceof String) ? new VirtuosoBlob(((String)content.elementAt(column - 1)).getBytes()) : (VirtuosoBlob)(content.elementAt(column - 1)); -#else - VirtuosoClob obj = (content.elementAt(column - 1) instanceof String) ? - new VirtuosoClob(((String)content.elementAt(column - 1)).getBytes()) : - (VirtuosoClob)(content.elementAt(column - 1)); -#endif // JDBC api spec if(obj != null) { @@ -859,11 +849,7 @@ protected Object createDOMT (Object data) throws VirtuosoException // calls javax.xml.parsers.DocumentBuilderFactory.newInstance () try { -#if JDK_VER >= 16 Class dbfact_cls = Class.forName ("javax.xml.parsers.DocumentBuilderFactory"); -#else - Class dbfact_cls = Class.forName ("javax.xml.parsers.DocumentBuilderFactory"); -#endif Object dbfact; Method newInstMtd, newDbMtd; newInstMtd = dbfact_cls.getDeclaredMethod ("newInstance", new Class [0]); @@ -874,16 +860,9 @@ protected Object createDOMT (Object data) throws VirtuosoException // db = dbfact.newDocumentBuilder (); db = newDbMtd.invoke (dbfact, new Object [0]); -#if JDK_VER >= 16 Class db_cls = Class.forName ("javax.xml.parsers.DocumentBuilder"); Class parse_args = Class.forName ("java.io.InputStream"); parse_mtd = db_cls.getDeclaredMethod ("parse", parse_args); -#else - Class db_cls = Class.forName ("javax.xml.parsers.DocumentBuilder"); - Class [] parse_args = { Class.forName ("java.io.InputStream") }; - //System.out.println ("xml=[" + ((String)data) + "]"); - parse_mtd = db_cls.getDeclaredMethod ("parse", parse_args); -#endif } catch (Throwable t) { @@ -923,7 +902,7 @@ else if (data instanceof VirtuosoBlob) * * @param column The first column is 1, the second is 2, ... * @return Object The column Object value. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet#getObject */ protected Object getObject(int column) throws VirtuosoException @@ -948,7 +927,7 @@ else if(obj instanceof VirtuosoTime) else if (obj instanceof VirtuosoDate) return ((VirtuosoDate)obj).clone(); else if(obj instanceof java.sql.Date) - { + { return new java.sql.Date(((java.sql.Date)obj).getTime()); } else if(obj instanceof java.sql.Time) diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoStatement.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoStatement.java similarity index 90% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoStatement.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoStatement.java index 69e378cfe4..aede4bb82b 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoStatement.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoStatement.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.*; import java.util.*; @@ -44,13 +44,7 @@ public class VirtuosoStatement implements Statement // Parameters for a prepared statement protected openlink.util.Vector parameters, objparams; -#if JDK_VER >= 16 protected LinkedList batch; -#elif JDK_VER >= 12 - protected LinkedList batch; -#else - protected openlink.util.Vector batch; -#endif // The concurrency to use for this Statement private int concurrency; @@ -110,16 +104,14 @@ public class VirtuosoStatement implements Statement protected boolean closeOnCompletion = false; -#if JDK_VER >= 14 // Its params data protected VirtuosoParameterMetaData paramsMetaData = null; -#endif /** * Constructs a new VirtuosoStatement that is forward-only and read-only. * * @param connection The VirtuosoConnection which owns it. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. */ VirtuosoStatement(VirtuosoConnection connection) throws VirtuosoException { @@ -138,7 +130,7 @@ public class VirtuosoStatement implements Statement * @param connection The VirtuosoConnection which owns it. * @param type The result set type. * @param concurrency The result set concurrency. - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.ResultSet */ VirtuosoStatement(VirtuosoConnection connection, int type, int concurrency) throws VirtuosoException @@ -175,7 +167,6 @@ protected VectorOfLong getStmtOpts () throws VirtuosoException } arrLong[1] = new Long(0); arrLong[2] = new Long(maxRows); -#if JDK_VER >= 14 if (connection.getGlobalTransaction()) { VirtuosoXAConnection xac = (VirtuosoXAConnection) connection.xa_connection; if (VirtuosoFuture.rpc_log != null) @@ -186,9 +177,6 @@ protected VectorOfLong getStmtOpts () throws VirtuosoException } else { arrLong[3] = new Long(txn_timeout * 1000); } -#else - arrLong[3] = new Long(txn_timeout * 1000); -#endif if (VirtuosoFuture.rpc_log != null) { VirtuosoFuture.rpc_log.println ("VirtuosoStatement.getStmtOpts (txn_timeout=" + arrLong[3] + ") (con=" + connection.hashCode() + ") :" + hashCode()); @@ -226,7 +214,7 @@ protected VectorOfLong getStmtOpts () throws VirtuosoException * @param sql the SQL request. * @return ResultSet A ResultSet that contains the data produced by * the query; never null. - * @exception virtuoso.jdbc2.VirtuosoException If a database access error occurs. + * @exception virtuoso.jdbc4.VirtuosoException If a database access error occurs. */ protected VirtuosoResultSet sendQuery(String sql) throws VirtuosoException { @@ -291,7 +279,7 @@ public void finalize() throws Throwable * This method can be used by one thread to cancel a statement that * is being executed by another thread. * - * @exception virtuoso.jdbc2.VirtuosoException If a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException If a database access error occurs */ public void cancel() throws VirtuosoException { @@ -324,11 +312,11 @@ protected void cancel_rs() throws VirtuosoException } } - public void close_rs(boolean close_stmt) throws VirtuosoException + public void close_rs(boolean close_stmt, boolean is_prepared) throws VirtuosoException { if(close_flag) return; - + synchronized (connection) { // System.out.println("Close statement : "+this); @@ -343,12 +331,12 @@ public void close_rs(boolean close_stmt) throws VirtuosoException return; // Cancel current result set cancel_rs(); - if (!result_opened) + if (!close_stmt && !result_opened) return; // Build the args array Object[] args = new Object[2]; args[0] = statid; - args[1] = new Long(VirtuosoTypes.STAT_DROP); + args[1] = close_stmt ? new Long(VirtuosoTypes.STAT_DROP): new Long(VirtuosoTypes.STAT_CLOSE); // Create and get a future for this future = connection.getFuture(VirtuosoFuture.close,args, this.rpc_timeout); // Read the answer @@ -357,7 +345,9 @@ public void close_rs(boolean close_stmt) throws VirtuosoException connection.removeFuture(future); future = null; result_opened = false; - metaData = null; + if (!is_prepared) { + metaData = null; + } } catch(IOException e) { @@ -366,13 +356,13 @@ public void close_rs(boolean close_stmt) throws VirtuosoException } } - - + + /** * Clears all the warnings reported on this Statement object. - * Virtuoso doesn't generate warnings, so this function does nothing. + * Virtuoso does not generate warnings, so this function does nothing. * - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Statement#clearWarnings */ public void clearWarnings() throws VirtuosoException @@ -384,12 +374,12 @@ public void clearWarnings() throws VirtuosoException * and JDBC resources immediately instead of new wait for * this to happen when it is automatically closed. * - * @exception virtuoso.jdbc2.VirtuosoException If a database access error occurs. + * @exception virtuoso.jdbc4.VirtuosoException If a database access error occurs. * @see java.sql.Statement#close */ public void close() throws VirtuosoException { - close_rs(true); + close_rs(true, false); } /** @@ -403,9 +393,9 @@ public void close() throws VirtuosoException * @return boolean True if the next result is a ResultSet; false if it is * an update count or there are no more results. * @exception VirtuosoException If a database access error occurs. - * @see virtuoso.jdbc2.VirtuosoStatement#getResultSet - * @see virtuoso.jdbc2.VirtuosoStatement#getUpdateCount - * @see virtuoso.jdbc2.VirtuosoStatement#getMoreResults + * @see virtuoso.jdbc4.VirtuosoStatement#getResultSet + * @see virtuoso.jdbc4.VirtuosoStatement#getUpdateCount + * @see virtuoso.jdbc4.VirtuosoStatement#getMoreResults * @see java.sql.Statement#execute */ public boolean execute(String sql) throws VirtuosoException @@ -422,7 +412,7 @@ public boolean execute(String sql) throws VirtuosoException * @param sql Typically this is a static SQL SELECT statement. (null is possible) * @return ResultSet A ResultSet that contains the data produced by * the query; never null. - * @exception virtuoso.jdbc2.VirtuosoException If a database access error occurs. + * @exception virtuoso.jdbc4.VirtuosoException If a database access error occurs. * @see java.sql.Statement#executeQuery */ public ResultSet executeQuery(String sql) throws VirtuosoException @@ -441,7 +431,7 @@ public ResultSet executeQuery(String sql) throws VirtuosoException * statement that returns nothing * @return either the row count for INSERT, UPDATE or DELETE or 0 * for SQL statements that return nothing - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see java.sql.Statement#executeUpdate */ public int executeUpdate(String sql) throws VirtuosoException @@ -460,7 +450,7 @@ public int executeUpdate(String sql) throws VirtuosoException * discarded. * * @return int The current max column size limit; zero means unlimited - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Statement#getMaxFieldSize */ public int getMaxFieldSize() throws VirtuosoException @@ -474,7 +464,7 @@ public int getMaxFieldSize() throws VirtuosoException * rows are silently dropped. * * @return int The current max row limit; zero means unlimited. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Statement#getMaxRows */ public int getMaxRows() throws VirtuosoException @@ -493,8 +483,8 @@ public int getMaxRows() throws VirtuosoException * @return true if the next result is a ResultSet; false if it is * an update count or there are no more results * @exception VirtuosoException if a database access error occurs - * @see virtuoso.jdbc2.VirtuosoStatement#getResultSet - * @see virtuoso.jdbc2.VirtuosoStatement#execute + * @see virtuoso.jdbc4.VirtuosoStatement#getResultSet + * @see virtuoso.jdbc4.VirtuosoStatement#execute * @see java.sql.Statement#getMoreResults */ public boolean getMoreResults() throws VirtuosoException @@ -505,7 +495,7 @@ public boolean getMoreResults() throws VirtuosoException { try { - // First of all, check if there's at least the first result set + // First of all, check if there is at least the first result set if(vresultSet == null || vresultSet.isLastResult) { if (vresultSet.isLastResult) vresultSet = null; @@ -539,7 +529,7 @@ public boolean getMoreResults() throws VirtuosoException * VirtuosoException is thrown. * * @return int The current query timeout limit in seconds; zero means unlimited. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Statement#getQueryTimeOut */ public int getQueryTimeout() throws VirtuosoException @@ -553,9 +543,9 @@ public int getQueryTimeout() throws VirtuosoException * * @return the current result as a ResultSet; null if the result * is an update count or there are no more results - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). - * @see virtuoso.jdbc2.VirtuosoStatement#getResultSet - * @see virtuoso.jdbc2.VirtuosoStatement#execute + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). + * @see virtuoso.jdbc4.VirtuosoStatement#getResultSet + * @see virtuoso.jdbc4.VirtuosoStatement#execute * @see java.sql.Statement#getResultSet */ public ResultSet getResultSet() throws VirtuosoException @@ -571,7 +561,7 @@ public ResultSet getResultSet() throws VirtuosoException * * @return the current result as an update count; -1 if it is a * ResultSet or there are no more results - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs * @see #execute */ public int getUpdateCount() throws VirtuosoException @@ -592,11 +582,11 @@ public int getUpdateCount() throws VirtuosoException /** * Retrieves the first warning reported by calls on this Statement. * Subsequent Statement warnings will be chained to this - * SQLWarning. Virtuoso doesn't generate warnings, so this function + * SQLWarning. Virtuoso does not generate warnings, so this function * will return always null. * * @return SQLWarning The first SQLWarning or null (must be null for the moment) - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Statement#getWarnings */ public SQLWarning getWarnings() throws VirtuosoException @@ -614,7 +604,7 @@ public SQLWarning getWarnings() throws VirtuosoException * greater than 256. * * @param max The new max column size limit; zero means unlimited - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Statement#setMaxFieldSize */ public void setMaxFieldSize(int max) throws VirtuosoException @@ -631,7 +621,7 @@ public void setMaxFieldSize(int max) throws VirtuosoException * If the limit is exceeded, the excess rows are silently dropped. * * @param max The new max rows limit; zero means unlimited - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.Statement#setMaxRows */ public void setMaxRows(int max) throws VirtuosoException @@ -648,7 +638,7 @@ public void setMaxRows(int max) throws VirtuosoException * * @param int Seconds the new query timeout limit in seconds; zero means. * unlimited - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.Statement#setQueryTimeOut */ public void setQueryTimeout(int seconds) throws VirtuosoException @@ -665,7 +655,7 @@ public void setQueryTimeout(int seconds) throws VirtuosoException * VirtuosoStatement object. * * @return Connection The connection that produced this statement - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Statement#getConnection */ public Connection getConnection() throws VirtuosoException { @@ -679,7 +669,7 @@ public Connection getConnection() throws VirtuosoException { * * @return int The default fetch direction for result sets generated * from this VirtuosoStatement object. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Statement#getFetchDirection */ public int getFetchDirection() throws VirtuosoException @@ -693,7 +683,7 @@ public int getFetchDirection() throws VirtuosoException * * @return int The default fetch size for result sets generated * from this Statement object. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Statement#getFetchSize */ public int getFetchSize() throws VirtuosoException @@ -705,7 +695,7 @@ public int getFetchSize() throws VirtuosoException * Returns the result set concurrency. * * @return int The result set concurrency. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.ResultSet * @see java.sql.Statement#getResultSetConcurrency */ @@ -718,7 +708,7 @@ public int getResultSetConcurrency() throws VirtuosoException * Returns the result set type. * * @return int The result set type. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.ResultSet * @see java.sql.Statement#getResultSetType */ @@ -734,7 +724,7 @@ public int getResultSetType() throws VirtuosoException * its own fetch direction. * * @param direction the initial direction for processing rows - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.Statement#setFetchDirection */ public void setFetchDirection(int direction) throws VirtuosoException @@ -751,14 +741,14 @@ public void setFetchDirection(int direction) throws VirtuosoException * be fetched from the database when more rows are needed. * * @param rows the number of rows to fetch - * @exception virtuoso.jdbc2.VirtuosoException An internal error occurred. + * @exception virtuoso.jdbc4.VirtuosoException An internal error occurred. * @see java.sql.Statement#setFetchSize */ public void setFetchSize(int rows) throws VirtuosoException { if(rows < 0 || (maxRows > 0 && rows > maxRows)) throw new VirtuosoException("Bad parameters.",VirtuosoException.BADPARAM); - + prefetch = (rows == 0 ? VirtuosoTypes.DEFAULTPREFETCH : rows); } @@ -767,7 +757,7 @@ public void setFetchSize(int rows) throws VirtuosoException * subsequent Statement execute methods. This name can then be * used in SQL positioned update/delete statements to identify the * current row in the ResultSet generated by this statement. If - * the database doesn't support positioned update/delete, this + * the database does not support positioned update/delete, this * method is a noop. To insure that a cursor has the proper isolation * level to support updates, the cursor's SELECT statement should be * of the form 'select for update ...'. If the 'for update' phrase is @@ -780,7 +770,7 @@ public void setFetchSize(int rows) throws VirtuosoException * * @param name the new cursor name, which must be unique within * a connection - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void setCursorName(String name) throws VirtuosoException { @@ -791,7 +781,7 @@ public void setCursorName(String name) throws VirtuosoException * Adds a SQL command to the current batch of commands for the statement. * * @param sql typically this is a static SQL INSERT or UPDATE statement - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void addBatch(String sql) throws VirtuosoException { @@ -799,35 +789,21 @@ public void addBatch(String sql) throws VirtuosoException if(sql == null) return; if(batch == null) -#if JDK_VER >= 16 batch = new LinkedList(); // Add the sql request at the end batch.add(sql); -#elif JDK_VER >= 12 - batch = new LinkedList(); - // Add the sql request at the end - batch.add(sql); -#else - batch = new openlink.util.Vector(10,10); - // Add the sql request at the end - batch.addElement(sql); -#endif } /** * Makes the set of commands in the current batch empty. * - * @exception virtuoso.jdbc2.VirtuosoException if a database access error occurs + * @exception virtuoso.jdbc4.VirtuosoException if a database access error occurs */ public void clearBatch() throws VirtuosoException { // Check if the batch vector exists if(batch != null) -#if JDK_VER >= 12 batch.clear(); -#else - batch.removeAllElements(); -#endif } /** @@ -848,23 +824,15 @@ public int[] executeBatch() throws BatchUpdateException int[] outres = null; int outcount = 0; int i; - // Flag to say if there's a problem + // Flag to say if there is a problem boolean error = false; VirtuosoException ex = null; -#if JDK_VER >= 12 i = 0; for(ListIterator it = batch.listIterator(); it.hasNext(); ) -#else - for(i = 0; i < batch.size(); i++) -#endif { try { -#if JDK_VER >= 12 String stmt = (String)it.next(); -#else - String stmt = (String)batch.elementAt(i); -#endif VirtuosoResultSet rset = sendQuery(stmt); result[i] = rset.getUpdateCount(); if(rset.kindop()==VirtuosoTypes.QT_SELECT) @@ -880,15 +848,9 @@ public int[] executeBatch() throws BatchUpdateException ex = e; } outcount++; -#if JDK_VER >= 12 i++; -#endif } -#if JDK_VER >= 12 batch.clear(); -#else - batch.removeAllElements(); -#endif if(error) { outres = new int[outcount]; @@ -907,7 +869,7 @@ public int[] executeBatch() throws BatchUpdateException * database. * * @param enable Indicate whether to enable or disable escape processing. - * @exception virtuoso.jdbc2.VirtuosoException No errors returned (just an implementation question). + * @exception virtuoso.jdbc4.VirtuosoException No errors returned (just an implementation question). * @see java.sql.Statement#setEscapeProcessing */ public void setEscapeProcessing(boolean enable) throws VirtuosoException @@ -934,7 +896,6 @@ public boolean isClosed ( ) return close_flag; } -#if JDK_VER >= 14 /* JDK 1.4 functions */ public boolean getMoreResults(int current) throws SQLException @@ -996,7 +957,6 @@ public int getResultSetHoldability() throws SQLException { return ResultSet.CLOSE_CURSORS_AT_COMMIT; } -#endif protected void notify_error (Throwable e) throws VirtuosoException { @@ -1007,14 +967,11 @@ protected void notify_error (Throwable e) throws VirtuosoException else { VirtuosoException ve = new VirtuosoException(e.getMessage(), VirtuosoException.IOERROR); -#if JDK_VER >= 14 ve.initCause (e); -#endif throw ve; } } -#if JDK_VER >= 16 //------------------------- JDBC 4.0 ----------------------------------- private boolean isPoolable = true; /** @@ -1083,7 +1040,7 @@ public boolean isPoolable() throws SQLException public T unwrap(java.lang.Class iface) throws java.sql.SQLException { try { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.cast(this); } catch (ClassCastException cce) { throw new VirtuosoException ("Unable to unwrap to "+iface.toString(), "22023", VirtuosoException.BADPARAM); @@ -1107,7 +1064,7 @@ public T unwrap(java.lang.Class iface) throws java.sql.SQLException */ public boolean isWrapperFor(java.lang.Class iface) throws java.sql.SQLException { - // This works for classes that aren't actually wrapping anything + // This works for classes that are not actually wrapping anything return iface.isInstance(this); } @@ -1153,6 +1110,5 @@ public boolean isCloseOnCompletion() throws SQLException } } -#endif #endif } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoString.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoString.java similarity index 98% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoString.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoString.java index da47d22f5a..bec1aaf6d5 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoString.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoString.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.lang.*; import java.io.*; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTime.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoTime.java similarity index 95% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTime.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoTime.java index c67887fed8..7aac8482ba 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTime.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoTime.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,14 +21,14 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; import java.sql.*; -public class VirtuosoTime extends java.sql.Time +public class VirtuosoTime extends java.sql.Time { int timezone = 0; boolean with_timezone = false; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTimestamp.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoTimestamp.java similarity index 96% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTimestamp.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoTimestamp.java index 3d4f067ff1..d1b5f0ba34 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTimestamp.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoTimestamp.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,14 +21,14 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; import java.sql.*; -public class VirtuosoTimestamp extends java.sql.Timestamp +public class VirtuosoTimestamp extends java.sql.Timestamp { int timezone = 0; boolean with_timezone = false; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTypes.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoTypes.java similarity index 97% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTypes.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoTypes.java index 47d8e87e39..2196ca0d86 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoTypes.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoTypes.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.util.*; import java.sql.Types; @@ -460,11 +460,7 @@ protected static Object mapJavaTypeToSqlType (Object x, int targetSqlType, int s return x.toString(); case Types.LONGVARCHAR: -#if JDK_VER >= 12 if (x instanceof java.sql.Clob || x instanceof java.sql.Blob || x instanceof java.lang.String) -#else - if (x instanceof VirtuosoClob || x instanceof VirtuosoBlob || x instanceof java.lang.String) -#endif return x; else return x.toString(); @@ -486,7 +482,7 @@ else if(x instanceof java.sql.Date) return new java.sql.Date(((java.sql.Date)x).getTime()); else if (x instanceof String) return VirtuosoTypes.strToDate((String)x); - else if (x instanceof java.util.Date) + else if (x instanceof java.util.Date) return new java.sql.Date(((java.util.Date)x).getTime()); break; @@ -512,7 +508,7 @@ else if(x instanceof String) break; case Types.TIMESTAMP: - + if (x instanceof VirtuosoTimestamp) return ((VirtuosoTimestamp)x).clone(); else if(x instanceof VirtuosoTime) @@ -589,9 +585,7 @@ else if (x instanceof java.lang.String) case Types.SMALLINT: case Types.TINYINT: case Types.BIT: -#if JDK_VER >= 14 case Types.BOOLEAN: -#endif if (x instanceof java.lang.Short) return x; else if (x instanceof java.lang.String) @@ -601,12 +595,8 @@ else if (x instanceof java.lang.Number) break; case Types.ARRAY: -#if JDK_VER >= 14 case Types.DATALINK: -#endif -#if JDK_VER >= 16 case Types.ROWID: -#endif case Types.DISTINCT: case Types.REF: throw new VirtuosoException ("Type not supported", VirtuosoException.NOTIMPLEMENTED); @@ -617,11 +607,7 @@ else if (x instanceof java.lang.Number) break; case Types.LONGVARBINARY: -#if JDK_VER >= 12 if (x instanceof java.sql.Blob || x instanceof byte []) -#else - if (x instanceof VirtuosoBlob || x instanceof byte []) -#endif return x; break; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAConnection.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoXAConnection.java similarity index 98% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAConnection.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoXAConnection.java index ddca291f9a..6835bf4140 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAConnection.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoXAConnection.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,15 +21,13 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.Connection; import java.sql.SQLException; import javax.sql.XAConnection; import javax.sql.ConnectionEventListener; -#if JDK_VER >= 16 import javax.sql.StatementEventListener; -#endif import javax.transaction.xa.XAResource; public class VirtuosoXAConnection implements XAConnection { @@ -143,7 +141,6 @@ public void removeConnectionEventListener(ConnectionEventListener listener) { pconn.removeConnectionEventListener(listener); } -#if JDK_VER >= 16 /** * Registers a StatementEventListener with this PooledConnection object. Components that * wish to be notified when PreparedStatements created by the @@ -175,6 +172,5 @@ public void removeStatementEventListener(StatementEventListener listener) { //??TODO throw OPLMessage_x.makeExceptionV(OPLMessage_x.errx_Method_XX_not_yet_implemented, "removeStatementEventListener(listener)"); } -#endif } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXADataSource.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoXADataSource.java similarity index 84% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXADataSource.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoXADataSource.java index cae42fc570..560f1ddf83 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXADataSource.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoXADataSource.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.sql.SQLException; import javax.sql.XAConnection; @@ -43,15 +43,9 @@ public VirtuosoXADataSource() //==================== interface Referenceable - public Reference getReference() throws NamingException + public Reference getReference() throws NamingException { -#if JDK_VER < 14 - Reference ref = new Reference(getClass().getName(), "virtuoso.jdbc2.VirtuosoDataSourceFactory", null); -#elif JDK_VER < 16 - Reference ref = new Reference(getClass().getName(), "virtuoso.jdbc3.VirtuosoDataSourceFactory", null); -#else Reference ref = new Reference(getClass().getName(), "virtuoso.jdbc4.VirtuosoDataSourceFactory", null); -#endif addProperties(ref); return ref; } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAResource.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoXAResource.java similarity index 98% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAResource.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoXAResource.java index 5aa3625c18..bccb831722 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXAResource.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoXAResource.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.io.IOException; import java.sql.Statement; @@ -298,11 +298,7 @@ public Xid[] recover(int param) throws XAException { if (param != XAResource.TMSTARTRSCAN) return new Xid[0]; -#if JDK_VER >= 16 Vector xidv = new Vector (); -#else - Vector xidv = new Vector (); -#endif try { VirtuosoConnection con = vConnection.getVirtuosoConnection(); @@ -377,7 +373,7 @@ private void transact(XATransaction ctx, int action) throws XAException { } catch (SQLException ex) { throw new XAException(ex.toString()); } - + rpc(con, action, encodedXid); rpc(con, SQL_XA_WAIT, encodedXid); } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXid.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoXid.java similarity index 99% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXid.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoXid.java index d08b15b8e6..79fd71e7c0 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/VirtuosoXid.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/VirtuosoXid.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import javax.transaction.xa.*; diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/XAResourceManager.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/XAResourceManager.java similarity index 94% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/XAResourceManager.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/XAResourceManager.java index 1d74c59872..785adb98f9 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/XAResourceManager.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/XAResourceManager.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import java.util.ArrayList; import java.util.HashMap; @@ -33,13 +33,8 @@ class XAResourceManager { private String serverName; private int portNumber; -#if JDK_VER >= 16 private HashMap transactions = new HashMap(); private static ArrayList managers = new ArrayList(); -#else - private HashMap transactions = new HashMap(); - private static ArrayList managers = new ArrayList(); -#endif private XAResourceManager(String serverName, int portNumber) { if (VirtuosoFuture.rpc_log != null) diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/XATransaction.java b/libsrc/JDBCDriverType4/virtuoso/jdbc/XATransaction.java similarity index 95% rename from libsrc/JDBCDriverType4/virtuoso/jdbc2/XATransaction.java rename to libsrc/JDBCDriverType4/virtuoso/jdbc/XATransaction.java index b5fb521d67..67ada7343c 100644 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/XATransaction.java +++ b/libsrc/JDBCDriverType4/virtuoso/jdbc/XATransaction.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -21,7 +21,7 @@ * */ -package virtuoso.jdbc2; +package virtuoso.jdbc4; import javax.transaction.xa.XAException; @@ -116,7 +116,7 @@ private String getName(int _status) { private XAException createException(int nstatus) { - XAException ex = new XAException("Can't change transaction state from "+getName(status)+" to "+getName(nstatus)); + XAException ex = new XAException("Cannot change transaction state from "+getName(status)+" to "+getName(nstatus)); ex.errorCode = XAException.XAER_RMFAIL; return ex; } diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am deleted file mode 100644 index 37a11018e8..0000000000 --- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am +++ /dev/null @@ -1,655 +0,0 @@ -# -# This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -# project. -# -# Copyright (C) 1998-2018 OpenLink Software -# -# This project is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; only version 2 of the License, dated June 1991. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# -# - - -########################################### -# Prevent issues with make -jX -########################################### -.NOTPARALLEL: - - -########################################### -# Settings -########################################### - -if WITH_JDK2 -CLASSPATH2=$(CLASSPATH2) -JDK2=@ac_jdk2_path@ -JDK2_FLAGS=-g -endif - -if WITH_JDK3 -CLASSPATH3=$(CLASSPATH3) -JDK3=@ac_jdk3_path@ -JDK3_FLAGS=-g #-Xlint:deprecation -Xlint:unchecked -endif - -if WITH_JDK4 -CLASSPATH4=$(CLASSPATH4) -JDK4=@ac_jdk4_path@ -JDK4_FLAGS=-g #-Xlint:deprecation -Xlint:unchecked -endif - -if WITH_JDK4_1 -CLASSPATH4=$(CLASSPATH4) -JDK4_1=@ac_jdk4_1_path@ -JDK4_1_FLAGS=-g #-Xlint:deprecation -Xlint:unchecked -endif - -if WITH_JDK4_2 -CLASSPATH4=$(CLASSPATH4) -JDK4_2=@ac_jdk4_2_path@ -JDK4_2_FLAGS=-g #-Xlint:deprecation -Xlint:unchecked -endif - - -jdbc1_defs = -DJDK_VER=11 '-DVIRT_JDBC_VER="1.x"' -Djdbc2=jdbc -jdbc2_defs = -DJDK_VER=13 '-DVIRT_JDBC_VER="2.x"' -jdbc3_defs = -DJDK_VER=14 -Djdbc2=jdbc3 '-DVIRT_JDBC_VER="3.x"' -jdbc4_defs = -DJDK_VER=16 -Djdbc2=jdbc4 '-DVIRT_JDBC_VER="4.0"' -jdbc4_1_defs = -DJDK_VER=17 -Djdbc2=jdbc4 '-DVIRT_JDBC_VER="4.1"' -jdbc4_2_defs = -DJDK_VER=18 -Djdbc2=jdbc4 '-DVIRT_JDBC_VER="4.2"' - - -########################################### -# Sources -########################################### -infiles = \ - DateObject.java \ - Driver.java \ - VirtuosoAsciiInputStream.java \ - VirtuosoBlob.java \ - VirtuosoBlobStream.java \ - VirtuosoCallableStatement.java \ - VirtuosoClobStream.java \ - VirtuosoColumn.java \ - VirtuosoConnection.java \ - VirtuosoDatabaseMetaData.java \ - VirtuosoException.java \ - VirtuosoExplicitString.java \ - VirtuosoExtendedString.java \ - VirtuosoFuture.java \ - VirtuosoInputStream.java \ - VirtuosoNullParameter.java \ - VirtuosoOutputStream.java \ - VirtuosoPreparedStatement.java \ - VirtuosoRdfBox.java \ - VirtuosoPoint.java \ - VirtuosoResultSet.java \ - VirtuosoResultSetMetaData.java \ - VirtuosoRow.java \ - VirtuosoStatement.java \ - VirtuosoTypes.java \ - VirtuosoDate.java \ - VirtuosoTime.java \ - VirtuosoTimestamp.java - -in1files = \ - BatchUpdateException.java \ - Types.java \ - VirtuosoClob.java - -in3files = \ - CallableStatementWrapper.java \ - Closeable.java \ - ConnectionWrapper.java \ - PreparedStatementWrapper.java \ - ResultSetWrapper.java \ - StatementWrapper.java \ - VirtuosoArray.java \ - VirtuosoConnectionPoolDataSource.java \ - VirtuosoDataSource.java \ - VirtuosoDataSourceFactory.java \ - VirtuosoParameterMetaData.java \ - VirtuosoPooledConnection.java \ - VirtuosoPoolManager.java \ - VirtuosoPoolStatistic.java \ - VirtuosoXAConnection.java \ - VirtuosoXADataSource.java \ - VirtuosoXAResource.java \ - VirtuosoXid.java \ - XAResourceManager.java \ - XATransaction.java - -in4files = \ - LRUCache.java \ - VirtuosoFNSException.java - -utilfiles = \ - MD5.java \ - Vector.java \ - VectorOfDouble.java \ - VectorOfFloat.java \ - VectorOfLong.java - -util3files = \ - BaseMessage.java \ - OPLHeapBlob.java \ - OPLHeapClob.java \ - OPLMessage_u.java \ - messages_u.java - -util4files = \ - OPLHeapNClob.java - - -javaxfiles = \ - BaseRowSet.java \ - OPLCachedRowSet.java \ - OPLJdbcRowSet.java \ - OPLMessage_x.java \ - OPLRowSetMetaData.java \ - messages_x.java - -sqlfiles = \ - ExtendedString.java \ - RdfBox.java - - -########################################### -# JDBC 2.x -########################################### -std2javafiles = \ - $(utilfiles:%.java=outstd2/openlink/util/%.java) \ - $(sqlfiles:%.java=outstd2/virtuoso/sql/%.java) \ - $(infiles:%.java=outstd2/virtuoso/jdbc2/%.java) - - -.PHONY: doc2 -doc2: ../../virtjdbc2.jar - @cd outstd2 ; $(JDK2)/javadoc -d ../../../doc/virtjdbc2 -classpath . virtuoso/jdbc2/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - - -.PHONY: std2 -std2: ../../virtjdbc2.jar - -../../virtjdbc2.jar: outstd2 $(std2javafiles) - @echo jdbc2 javac $(JDK2_FLAGS) - @cd outstd2 ; $(JDK2)/javac $(JDK2_FLAGS) -classpath . virtuoso/jdbc2/*.java openlink/util/*.java virtuoso/sql/*.java - @cd outstd2 ; $(JDK2)/jar cf ../../../virtjdbc2.jar virtuoso/jdbc2/*.class openlink/util/*.class virtuoso/sql/*.class - @echo "............. Virtuoso pure Java 2.0 built" - -outstd2: - @mkdir outstd2 - @mkdir outstd2/virtuoso - @mkdir outstd2/virtuoso/jdbc2 - @mkdir outstd2/virtuoso/sql - @mkdir outstd2/openlink - @mkdir outstd2/openlink/util - -outstd2/virtuoso/jdbc2/%.java: %.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc2_defs) $< >$@ - -outstd2/openlink/util/%.java: ../../openlink/util/%.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc2_defs) $< >$@ - -outstd2/virtuoso/sql/%.java: ../../virtuoso/sql/%.java - cd outstd2/virtuoso/sql; cp ../../../$< . - - -########################################### -# JDBC 2.x (SSL) -########################################### -ssl2javafiles = \ - $(infiles:%.java=outssl2/virtuoso/jdbc2/%.java) \ - $(sqlfiles:%.java=outssl2/virtuoso/sql/%.java) \ - $(utilfiles:%.java=outssl2/openlink/util/%.java) - -jssljars = ../../../security/jcert.jar:../../../security/jnet.jar:../../../security/jsse.jar - -.PHONY: ssl2 -ssl2: ../../virtjdbc2ssl.jar - -../../virtjdbc2ssl.jar: outssl2 $(ssljavafiles) - @echo jdbc2 javac $(JDK2_FLAGS) - @cd outssl2 ; $(JDK2)/javac -classpath ".:$(jssljars)" $(JDK2_FLAGS) virtuoso/jdbc2/*.java openlink/util/*.java virtuoso/sql/*.java - @cd outssl2 ; $(JDK2)/jar cfm ../../../virtjdbc2ssl.jar ../../../manifest2.main virtuoso/jdbc2/*.class openlink/util/*.class virtuoso/sql/*.class - @echo "............. Virtuoso pure Java SSL 2.0 built" - -outssl2: - @mkdir outssl2 - @mkdir outssl2/virtuoso - @mkdir outssl2/virtuoso/jdbc2 - @mkdir outssl2/virtuoso/sql - @mkdir outssl2/openlink - @mkdir outssl2/openlink/util - -outssl2/virtuoso/jdbc2/%.java: %.java - $(JAVACPP) -P -DSSL $(JCPPOPTS) $(jdbc2_defs) $< >$@ - -outssl2/openlink/util/%.java: ../../openlink/util/%.java - $(JAVACPP) -P -DSSL $(JCPPOPTS) $(jdbc2_defs) $< >$@ - -outssl2/virtuoso/sql/%.java: ../../virtuoso/sql/%.java - cd outssl/virtuoso/sql; cp ../../../$< . - - -########################################### -# JDBC 3.x -########################################### -std3javafiles = \ - $(utilfiles:%.java=outstd3/openlink/util/%.java) \ - $(sqlfiles:%.java=outstd3/virtuoso/sql/%.java) \ - $(util3files:%.java=outstd3/openlink/util/%.java) \ - $(in3files:%.java=outstd3/virtuoso/jdbc3/%.java) \ - $(infiles:%.java=outstd3/virtuoso/jdbc3/%.java) \ - $(javaxfiles:%.java=outstd3/virtuoso/javax/%.java) - - -.PHONY: doc3 -doc3: ../../virtjdbc3.jar - @cd outstd3 ; $(JDK3)/javadoc -d ../../../doc/virtjdbc3 -classpath . virtuoso/jdbc3/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - - -.PHONY: std3 -std3: ../../virtjdbc3.jar - -../../virtjdbc3.jar: outstd3 $(std3javafiles) - @echo jdbc3 javac $(JDK3_FLAGS) - @cd outstd3 ; $(JDK3)/javac $(JDK3_FLAGS) -classpath . virtuoso/jdbc3/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - @cd outstd3 ; $(JDK3)/jar cfm ../../../virtjdbc3.jar ../../../manifest3.main virtuoso/jdbc3/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class META-INF - @echo "............. Virtuoso pure Java 3.0 built" - -outstd3: - @mkdir outstd3 - @mkdir outstd3/virtuoso - @mkdir outstd3/virtuoso/jdbc3 - @mkdir outstd3/virtuoso/sql - @mkdir outstd3/openlink - @mkdir outstd3/openlink/util - @mkdir outstd3/virtuoso/javax - @mkdir outstd3/META-INF - @mkdir outstd3/META-INF/services - @cp ../../java.sql.Driver3 outstd3/META-INF/services/java.sql.Driver - -outstd3/virtuoso/jdbc3/%.java: %.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc3_defs) $< >$@ - -outstd3/openlink/util/%.java: ../../openlink/util/%.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc3_defs) $< >$@ - -outstd3/virtuoso/sql/%.java: ../../virtuoso/sql/%.java - cd outstd3/virtuoso/sql; cp ../../../$< . - -outstd3/virtuoso/javax/%.java: ../javax/%.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc3_defs) $< >$@ - - -########################################### -# JDBC 3.x (SSL) -########################################### -ssl3javafiles = \ - $(utilfiles:%.java=outssl3/openlink/util/%.java) \ - $(sqlfiles:%.java=outssl3/virtuoso/sql/%.java) \ - $(util3files:%.java=outssl3/openlink/util/%.java) \ - $(in3files:%.java=outssl3/virtuoso/jdbc3/%.java) \ - $(infiles:%.java=outssl3/virtuoso/jdbc3/%.java) \ - $(javaxfiles:%.java=outssl3/virtuoso/javax/%.java) - -.PHONY: ssl3 -ssl3: ../../virtjdbc3ssl.jar - -../../virtjdbc3ssl.jar: outssl3 $(ssl3javafiles) - @echo jdbc3 ssl javac $(JDK3_FLAGS) - @cd outssl3 ; $(JDK3)/javac $(JDK3_FLAGS) -classpath . virtuoso/jdbc3/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - @cd outssl3 ; $(JDK3)/jar cfm ../../../virtjdbc3ssl.jar ../../../manifest3.main virtuoso/jdbc3/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class META-INF - @echo "............. Virtuoso pure Java SSL 3.0 built" - -outssl3: - @mkdir outssl3 - @mkdir outssl3/virtuoso - @mkdir outssl3/virtuoso/jdbc3 - @mkdir outssl3/virtuoso/sql - @mkdir outssl3/openlink - @mkdir outssl3/openlink/util - @mkdir outssl3/virtuoso/javax - @mkdir outssl3/META-INF - @mkdir outssl3/META-INF/services - @cp ../../java.sql.Driver3 outssl3/META-INF/services/java.sql.Driver - -outssl3/virtuoso/jdbc3/%.java: %.java - $(JAVACPP) -P $(JCPPOPTS) -DSSL $(jdbc3_defs) $< >$@ - -outssl3/openlink/util/%.java: ../../openlink/util/%.java - $(JAVACPP) -P $(JCPPOPTS) -DSSL $(jdbc3_defs) $< >$@ - -outssl3/virtuoso/sql/%.java: ../../virtuoso/sql/%.java - cd outssl3/virtuoso/sql; cp ../../../$< . - -outssl3/virtuoso/javax/%.java: ../../virtuoso/javax/%.java - $(JAVACPP) -P $(JCPPOPTS) -DSSL $(jdbc3_defs) $< >$@ - - -########################################### -# JDBC 4.x -########################################### -std4javafiles = \ - $(utilfiles:%.java=outstd4/openlink/util/%.java) \ - $(sqlfiles:%.java=outstd4/virtuoso/sql/%.java) \ - $(util3files:%.java=outstd4/openlink/util/%.java) \ - $(util4files:%.java=outstd4/openlink/util/%.java) \ - $(in3files:%.java=outstd4/virtuoso/jdbc4/%.java) \ - $(in4files:%.java=outstd4/virtuoso/jdbc4/%.java) \ - $(infiles:%.java=outstd4/virtuoso/jdbc4/%.java) \ - $(javaxfiles:%.java=outstd4/virtuoso/javax/%.java) - - -.PHONY: doc4 -doc4: ../../virtjdbc4.jar - @cd outstd4 ; $(JDK4)/javadoc -d ../../../doc/virtjdbc4 -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - - - -.PHONY: std4 -std4: ../../virtjdbc4.jar - -../../virtjdbc4.jar: outstd4 $(std4javafiles) - @echo jdbc4 ssl javac $(JDK4_FLAGS) - @cd outstd4 ; $(JDK4)/javac $(JDK4_FLAGS) -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - @cd outstd4 ; $(JDK4)/jar cfm ../../../virtjdbc4.jar ../../../manifest4.main virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class META-INF - @echo "............. Virtuoso pure Java 4.0 built" - -outstd4: - @mkdir outstd4 - @mkdir outstd4/virtuoso - @mkdir outstd4/virtuoso/jdbc4 - @mkdir outstd4/virtuoso/sql - @mkdir outstd4/openlink - @mkdir outstd4/openlink/util - @mkdir outstd4/virtuoso/javax - @mkdir outstd4/META-INF - @mkdir outstd4/META-INF/services - @cp ../../java.sql.Driver4 outstd4/META-INF/services/java.sql.Driver - -outstd4/virtuoso/jdbc4/%.java: %.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_defs) $< >$@ - -outstd4/openlink/util/%.java: ../../openlink/util/%.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_defs) $< >$@ - -outstd4/virtuoso/sql/%.java: ../../virtuoso/sql/%.java - cd outstd4/virtuoso/sql; cp ../../../$< . - -outstd4/virtuoso/javax/%.java: ../javax/%.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_defs) $< >$@ - - -########################################### -# JDBC 4.x (SSL) -########################################### -ssl4javafiles = \ - $(utilfiles:%.java=outssl4/openlink/util/%.java) \ - $(sqlfiles:%.java=outssl4/virtuoso/sql/%.java) \ - $(util3files:%.java=outssl4/openlink/util/%.java) \ - $(util4files:%.java=outssl4/openlink/util/%.java) \ - $(in3files:%.java=outssl4/virtuoso/jdbc4/%.java) \ - $(in4files:%.java=outssl4/virtuoso/jdbc4/%.java) \ - $(infiles:%.java=outssl4/virtuoso/jdbc4/%.java) \ - $(javaxfiles:%.java=outssl4/virtuoso/javax/%.java) - -.PHONY: ssl4 -ssl4: ../../virtjdbc4ssl.jar - -../../virtjdbc4ssl.jar: outssl4 $(ssl4javafiles) - @echo jdbc4 ssl javac $(JDK4_FLAGS) - @cd outssl4 ; $(JDK4)/javac $(JDK4_FLAGS) -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - @cd outssl4 ; $(JDK4)/jar cfm ../../../virtjdbc4ssl.jar ../../../manifest4.main virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class META-INF - @echo "............. Virtuoso pure Java SSL 4.0 built" - -outssl4: - @mkdir outssl4 - @mkdir outssl4/virtuoso - @mkdir outssl4/virtuoso/jdbc4 - @mkdir outssl4/virtuoso/sql - @mkdir outssl4/openlink - @mkdir outssl4/openlink/util - @mkdir outssl4/virtuoso/javax - @mkdir outssl4/META-INF - @mkdir outssl4/META-INF/services - @cp ../../java.sql.Driver4 outssl4/META-INF/services/java.sql.Driver - -outssl4/virtuoso/jdbc4/%.java: %.java - $(JAVACPP) -P $(JCPPOPTS) -DSSL $(jdbc4_defs) $< >$@ - -outssl4/openlink/util/%.java: ../../openlink/util/%.java - $(JAVACPP) -P $(JCPPOPTS) -DSSL $(jdbc4_defs) $< >$@ - -outssl4/virtuoso/sql/%.java: ../../virtuoso/sql/%.java - cd outssl4/virtuoso/sql; cp ../../../$< . - -outssl4/virtuoso/javax/%.java: ../../virtuoso/javax/%.java - $(JAVACPP) -P $(JCPPOPTS) -DSSL $(jdbc4_defs) $< >$@ - - -########################################### -# JDBC 4.1 -########################################### -std4_1javafiles = \ - $(utilfiles:%.java=outstd4_1/openlink/util/%.java) \ - $(sqlfiles:%.java=outstd4_1/virtuoso/sql/%.java) \ - $(util3files:%.java=outstd4_1/openlink/util/%.java) \ - $(util4files:%.java=outstd4_1/openlink/util/%.java) \ - $(in3files:%.java=outstd4_1/virtuoso/jdbc4/%.java) \ - $(in4files:%.java=outstd4_1/virtuoso/jdbc4/%.java) \ - $(infiles:%.java=outstd4_1/virtuoso/jdbc4/%.java) \ - $(javaxfiles:%.java=outstd4_1/virtuoso/javax/%.java) - - -.PHONY: doc4_1 -doc4_1: ../../virtjdbc4_1.jar - @cd outstd4_1 ; $(JDK4_1)/javadoc -d ../../../doc/virtjdbc4_1 -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - - - -.PHONY: std4_1 -std4_1: ../../virtjdbc4_1.jar - -../../virtjdbc4_1.jar: outstd4_1 $(std4_1javafiles) - @echo jdbc4_1 ssl javac $(JDK4_1_FLAGS) - @cd outstd4_1 ; $(JDK4_1)/javac $(JDK4_1_FLAGS) -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - @cd outstd4_1 ; $(JDK4_1)/jar cfm ../../../virtjdbc4_1.jar ../../../manifest4.main virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class META-INF - @echo "............. Virtuoso pure Java 4.1 built" - -outstd4_1: - @mkdir outstd4_1 - @mkdir outstd4_1/virtuoso - @mkdir outstd4_1/virtuoso/jdbc4 - @mkdir outstd4_1/virtuoso/sql - @mkdir outstd4_1/openlink - @mkdir outstd4_1/openlink/util - @mkdir outstd4_1/virtuoso/javax - @mkdir outstd4_1/META-INF - @mkdir outstd4_1/META-INF/services - @cp ../../java.sql.Driver4 outstd4_1/META-INF/services/java.sql.Driver - -outstd4_1/virtuoso/jdbc4/%.java: %.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_1_defs) $< >$@ - -outstd4_1/openlink/util/%.java: ../../openlink/util/%.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_1_defs) $< >$@ - -outstd4_1/virtuoso/sql/%.java: ../../virtuoso/sql/%.java - cd outstd4_1/virtuoso/sql; cp ../../../$< . - -outstd4_1/virtuoso/javax/%.java: ../javax/%.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_1_defs) $< >$@ - - -########################################### -# JDBC 4.1 (SSL) -########################################### -ssl4_1javafiles = \ - $(utilfiles:%.java=outssl4_1/openlink/util/%.java) \ - $(sqlfiles:%.java=outssl4_1/virtuoso/sql/%.java) \ - $(util3files:%.java=outssl4_1/openlink/util/%.java) \ - $(util4files:%.java=outssl4_1/openlink/util/%.java) \ - $(in3files:%.java=outssl4_1/virtuoso/jdbc4/%.java) \ - $(in4files:%.java=outssl4_1/virtuoso/jdbc4/%.java) \ - $(infiles:%.java=outssl4_1/virtuoso/jdbc4/%.java) \ - $(javaxfiles:%.java=outssl4_1/virtuoso/javax/%.java) - -.PHONY: ssl4_1 -ssl4_1: ../../virtjdbc4_1ssl.jar - -../../virtjdbc4_1ssl.jar: outssl4_1 $(ssl4_1javafiles) - @echo jdbc4_1 ssl javac $(JDK4_1_FLAGS) - @cd outssl4_1 ; $(JDK4_1)/javac $(JDK4_1_FLAGS) -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - @cd outssl4_1 ; $(JDK4_1)/jar cfm ../../../virtjdbc4_1ssl.jar ../../../manifest4.main virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class META-INF - @echo "............. Virtuoso pure Java SSL 4.1 built" - -outssl4_1: - @mkdir outssl4_1 - @mkdir outssl4_1/virtuoso - @mkdir outssl4_1/virtuoso/jdbc4 - @mkdir outssl4_1/virtuoso/sql - @mkdir outssl4_1/openlink - @mkdir outssl4_1/openlink/util - @mkdir outssl4_1/virtuoso/javax - @mkdir outssl4_1/META-INF - @mkdir outssl4_1/META-INF/services - @cp ../../java.sql.Driver4 outssl4_1/META-INF/services/java.sql.Driver - -outssl4_1/virtuoso/jdbc4/%.java: %.java - $(JAVACPP) -P $(JCPPOPTS) -DSSL $(jdbc4_1_defs) $< >$@ - -outssl4_1/openlink/util/%.java: ../../openlink/util/%.java - $(JAVACPP) -P $(JCPPOPTS) -DSSL $(jdbc4_1_defs) $< >$@ - -outssl4_1/virtuoso/sql/%.java: ../../virtuoso/sql/%.java - cd outssl4_1/virtuoso/sql; cp ../../../$< . - -outssl4_1/virtuoso/javax/%.java: ../../virtuoso/javax/%.java - $(JAVACPP) -P $(JCPPOPTS) -DSSL $(jdbc4_1_defs) $< >$@ - - -########################################### -# JDBC 4.2 -########################################### -std4_2javafiles = \ - $(utilfiles:%.java=outstd4_2/openlink/util/%.java) \ - $(sqlfiles:%.java=outstd4_2/virtuoso/sql/%.java) \ - $(util3files:%.java=outstd4_2/openlink/util/%.java) \ - $(util4files:%.java=outstd4_2/openlink/util/%.java) \ - $(in3files:%.java=outstd4_2/virtuoso/jdbc4/%.java) \ - $(in4files:%.java=outstd4_2/virtuoso/jdbc4/%.java) \ - $(infiles:%.java=outstd4_2/virtuoso/jdbc4/%.java) \ - $(javaxfiles:%.java=outstd4_2/virtuoso/javax/%.java) - - -.PHONY: doc4_2 -doc4_2: ../../virtjdbc4_2.jar - @cd outstd4_2 ; $(JDK4_2)/javadoc -d ../../../doc/virtjdbc4_2 -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - - - -.PHONY: std4_2 -std4_2: ../../virtjdbc4_2.jar - -../../virtjdbc4_2.jar: outstd4_2 $(std4_2javafiles) - @echo jdbc4_2 ssl javac $(JDK4_2_FLAGS) - @cd outstd4_2 ; $(JDK4_2)/javac $(JDK4_2_FLAGS) -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - @cd outstd4_2 ; $(JDK4_2)/jar cfm ../../../virtjdbc4_2.jar ../../../manifest4.main virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class META-INF - @echo "............. Virtuoso pure Java 4.2 built" - -outstd4_2: - @mkdir outstd4_2 - @mkdir outstd4_2/virtuoso - @mkdir outstd4_2/virtuoso/jdbc4 - @mkdir outstd4_2/virtuoso/sql - @mkdir outstd4_2/openlink - @mkdir outstd4_2/openlink/util - @mkdir outstd4_2/virtuoso/javax - @mkdir outstd4_2/META-INF - @mkdir outstd4_2/META-INF/services - @cp ../../java.sql.Driver4 outstd4_2/META-INF/services/java.sql.Driver - -outstd4_2/virtuoso/jdbc4/%.java: %.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_2_defs) $< >$@ - -outstd4_2/openlink/util/%.java: ../../openlink/util/%.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_2_defs) $< >$@ - -outstd4_2/virtuoso/sql/%.java: ../../virtuoso/sql/%.java - cd outstd4_2/virtuoso/sql; cp ../../../$< . - -outstd4_2/virtuoso/javax/%.java: ../javax/%.java - $(JAVACPP) -P $(JCPPOPTS) $(jdbc4_2_defs) $< >$@ - - -########################################### -# JDBC 4.2 (SSL) -########################################### -ssl4_2javafiles = \ - $(utilfiles:%.java=outssl4_2/openlink/util/%.java) \ - $(sqlfiles:%.java=outssl4_2/virtuoso/sql/%.java) \ - $(util3files:%.java=outssl4_2/openlink/util/%.java) \ - $(util4files:%.java=outssl4_2/openlink/util/%.java) \ - $(in3files:%.java=outssl4_2/virtuoso/jdbc4/%.java) \ - $(in4files:%.java=outssl4_2/virtuoso/jdbc4/%.java) \ - $(infiles:%.java=outssl4_2/virtuoso/jdbc4/%.java) \ - $(javaxfiles:%.java=outssl4_2/virtuoso/javax/%.java) - -.PHONY: ssl4_2 -ssl4_2: ../../virtjdbc4_2ssl.jar - -../../virtjdbc4_2ssl.jar: outssl4_2 $(ssl4_2javafiles) - @echo jdbc4_2 ssl javac $(JDK4_2_FLAGS) - @cd outssl4_2 ; $(JDK4_2)/javac $(JDK4_2_FLAGS) -classpath . virtuoso/jdbc4/*.java openlink/util/*.java virtuoso/javax/*.java virtuoso/sql/*.java - @cd outssl4_2 ; $(JDK4_2)/jar cfm ../../../virtjdbc4_2ssl.jar ../../../manifest4.main virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class META-INF - @echo "............. Virtuoso pure Java SSL 4.2 built" - -outssl4_2: - @mkdir outssl4_2 - @mkdir outssl4_2/virtuoso - @mkdir outssl4_2/virtuoso/jdbc4 - @mkdir outssl4_2/virtuoso/sql - @mkdir outssl4_2/openlink - @mkdir outssl4_2/openlink/util - @mkdir outssl4_2/virtuoso/javax - @mkdir outssl4_2/META-INF - @mkdir outssl4_2/META-INF/services - @cp ../../java.sql.Driver4 outssl4_2/META-INF/services/java.sql.Driver - -outssl4_2/virtuoso/jdbc4/%.java: %.java - $(JAVACPP) -P $(JCPPOPTS) -DSSL $(jdbc4_2_defs) $< >$@ - -outssl4_2/openlink/util/%.java: ../../openlink/util/%.java - $(JAVACPP) -P $(JCPPOPTS) -DSSL $(jdbc4_2_defs) $< >$@ - -outssl4_2/virtuoso/sql/%.java: ../../virtuoso/sql/%.java - cd outssl4_2/virtuoso/sql; cp ../../../$< . - -outssl4_2/virtuoso/javax/%.java: ../../virtuoso/javax/%.java - $(JAVACPP) -P $(JCPPOPTS) -DSSL $(jdbc4_2_defs) $< >$@ - - -########################################### -# Cleanup -########################################### -clean-local: - rm -f *.class version.h - rm -rf outstd outssl - rm -rf outstd1 outssl1 - rm -rf outstd2 outssl2 - rm -rf outstd3 outssl3 - rm -rf outstd4 outssl4 - rm -rf outstd4_1 outssl4_1 - rm -rf outstd4_2 outssl4_2 diff --git a/libsrc/JDBCDriverType4/virtuoso/sql/ExtendedString.java b/libsrc/JDBCDriverType4/virtuoso/sql/ExtendedString.java index 5900402e34..12c7e2c63a 100644 --- a/libsrc/JDBCDriverType4/virtuoso/sql/ExtendedString.java +++ b/libsrc/JDBCDriverType4/virtuoso/sql/ExtendedString.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/JDBCDriverType4/virtuoso/sql/RdfBox.java b/libsrc/JDBCDriverType4/virtuoso/sql/RdfBox.java index 609f7e7c8e..f22a90e4e6 100644 --- a/libsrc/JDBCDriverType4/virtuoso/sql/RdfBox.java +++ b/libsrc/JDBCDriverType4/virtuoso/sql/RdfBox.java @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Makefile.am b/libsrc/Makefile.am index fee7e9aac8..c5f92c75bf 100644 --- a/libsrc/Makefile.am +++ b/libsrc/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/Dkthread.h b/libsrc/Thread/Dkthread.h index d3fe476ab9..cc98b7fa5a 100644 --- a/libsrc/Thread/Dkthread.h +++ b/libsrc/Thread/Dkthread.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -87,7 +87,8 @@ typedef int (*thread_init_func) (void *arg); typedef int32 TVAL; #define TV_INFINITE ((TVAL)-1) -#define thread_create oplthread_create +#define thread_create oplthread_create + /* * Thread priority (thr_priority) @@ -152,26 +153,26 @@ extern int _thread_num_dead; /* sched_fiber.c, sched_pthread.c, sched_winthread.c */ EXE_EXPORT (thread_t *, thread_current, (void)); -thread_t *thread_initial (unsigned long stack_size); -thread_t *thread_create (thread_init_func init, unsigned long stack_size, void *init_arg); -thread_t *thread_attach (void); - -void thread_allow_schedule (void); -void thread_exit (int n); -int *thread_errno (void); -int thread_set_priority (thread_t *self, int prio); -int thread_get_priority (thread_t *self); +EXE_EXPORT (thread_t *, thread_initial, (unsigned long stack_size)); +EXE_EXPORT (thread_t *, thread_create, (thread_init_func init, unsigned long stack_size, void *init_arg)); +EXE_EXPORT (thread_t *, thread_attach, (void)); + +EXE_EXPORT (void, thread_allow_schedule, (void)); +EXE_EXPORT (void, thread_exit, (int n)); +EXE_EXPORT (int *, thread_errno, (void)); +EXE_EXPORT (int, thread_set_priority, (thread_t *self, int prio)); +EXE_EXPORT (int, thread_get_priority, (thread_t *self)); EXE_EXPORT (void *, thread_setattr, (thread_t *self, void *key, void *value)); EXE_EXPORT (void *, thread_getattr, (thread_t *self, void *key)); -void thread_freeze (void); -int thread_unfreeze (thread_t *self); -int thread_wait_cond (void *event, dk_mutex_t *holds, TVAL timeout); -int thread_signal_cond (void *event); -int thread_release_dead_threads (int leave_count); +extern void thread_freeze (void); +extern int thread_unfreeze (thread_t *self); +extern int thread_wait_cond (void *event, dk_mutex_t *holds, TVAL timeout); +extern int thread_signal_cond (void *event); +EXE_EXPORT (int, thread_release_dead_threads, (int leave_count)); /* fiber_unix.c, sched_pthread.c, sched_winthread.c */ -int thread_select (int n, fd_set *rfds, fd_set *wfds, void *event, TVAL timeout); -void thread_sleep (TVAL msec); +extern int thread_select (int n, fd_set *rfds, fd_set *wfds, void *event, TVAL timeout); +extern void thread_sleep (TVAL msec); EXE_EXPORT (caddr_t, thr_get_error_code, (thread_t *thr)); EXE_EXPORT (void, thr_set_error_code, (thread_t *thr, caddr_t err)); @@ -201,14 +202,13 @@ ssize_t thread_recv (int sock, void *buffer, size_t length, TVAL timeout); /* sched_fiber.c, sched_pthread.c, sched_winthread.c */ EXE_EXPORT (semaphore_t *, semaphore_allocate, (int entry_count)); -void semaphore_free (semaphore_t *sem); -int semaphore_enter (semaphore_t *sem); -int semaphore_try_enter (semaphore_t *sem); +EXE_EXPORT (void, semaphore_free, (semaphore_t *sem)); +EXE_EXPORT (int, semaphore_enter, (semaphore_t *sem)); +EXE_EXPORT (int, semaphore_try_enter, (semaphore_t *sem)); +EXE_EXPORT (void, semaphore_leave, (semaphore_t *sem)); #ifdef SEM_DEBUG void semaphore_leave_dbg (int ln, const char *file, semaphore_t *sem); #define semaphore_leave(s) semaphore_leave_dbg (__LINE__, __FILE__, s) -#else -void semaphore_leave (semaphore_t *sem); #endif EXE_EXPORT (dk_mutex_t *, mutex_allocate, (void)); @@ -235,21 +235,23 @@ void mutex_option (dk_mutex_t * mtx, char * name, mtx_entry_check_t ck, void * c #define MUTEX_OPTION_NOP #define mutex_option(mtx,name,ck,cd) do { ; } while (0) #endif -int mutex_try_enter (dk_mutex_t *mtx); -void mutex_stat (void); +EXE_EXPORT (int, mutex_try_enter, (dk_mutex_t *mtx)); +void mutex_stat (int mode, int max); spinlock_t * spinlock_allocate (void); void spinlock_free (spinlock_t *self); void spinlock_enter (spinlock_t *self); void spinlock_leave (spinlock_t *self); -rwlock_t * rwlock_allocate (void); -void rwlock_free (rwlock_t *); -void rwlock_rdlock (rwlock_t *); -int rwlock_tryrdlock (rwlock_t *); -void rwlock_wrlock (rwlock_t *); -int rwlock_trywrlock (rwlock_t *); -void rwlock_unlock (rwlock_t *); +EXE_EXPORT (rwlock_t *, rwlock_allocate, (void)); +EXE_EXPORT (void, rwlock_free, (rwlock_t *)); +EXE_EXPORT (void, rwlock_rdlock, (rwlock_t *)); +EXE_EXPORT (int, rwlock_tryrdlock, (rwlock_t *)); +EXE_EXPORT (void, rwlock_wrlock, (rwlock_t *)); +EXE_EXPORT (int, rwlock_trywrlock, (rwlock_t *)); +EXE_EXPORT (void, rwlock_unlock, (rwlock_t *)); + + END_CPLUSPLUS diff --git a/libsrc/Thread/Makefile.am b/libsrc/Thread/Makefile.am index 265ed62ae1..4714233ee9 100644 --- a/libsrc/Thread/Makefile.am +++ b/libsrc/Thread/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/fiber1_generic.c b/libsrc/Thread/fiber1_generic.c index 9d969e0b61..411c7e2f9f 100644 --- a/libsrc/Thread/fiber1_generic.c +++ b/libsrc/Thread/fiber1_generic.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/fiber1_win32.c b/libsrc/Thread/fiber1_win32.c index 47323345f5..18aafaf50a 100644 --- a/libsrc/Thread/fiber1_win32.c +++ b/libsrc/Thread/fiber1_win32.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/fiber2_generic.c b/libsrc/Thread/fiber2_generic.c index 0939a4d2af..84a21e4e24 100644 --- a/libsrc/Thread/fiber2_generic.c +++ b/libsrc/Thread/fiber2_generic.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/fiber_unix.c b/libsrc/Thread/fiber_unix.c index 92de01ba2d..5ba649ac31 100644 --- a/libsrc/Thread/fiber_unix.c +++ b/libsrc/Thread/fiber_unix.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/fiber_win32.c b/libsrc/Thread/fiber_win32.c index a8cbff9da3..cd52e5c736 100644 --- a/libsrc/Thread/fiber_win32.c +++ b/libsrc/Thread/fiber_win32.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/io_unix.c b/libsrc/Thread/io_unix.c index a89b7ce568..b3090d3e5c 100644 --- a/libsrc/Thread/io_unix.c +++ b/libsrc/Thread/io_unix.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/mtest.c b/libsrc/Thread/mtest.c index a4b7928a72..699d696947 100644 --- a/libsrc/Thread/mtest.c +++ b/libsrc/Thread/mtest.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/mtest1.c b/libsrc/Thread/mtest1.c index 6138a9aa3e..83aa1b38f0 100644 --- a/libsrc/Thread/mtest1.c +++ b/libsrc/Thread/mtest1.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/mtest2.c b/libsrc/Thread/mtest2.c index 8f7b6fb139..a20309d8c3 100644 --- a/libsrc/Thread/mtest2.c +++ b/libsrc/Thread/mtest2.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/sched_fiber.c b/libsrc/Thread/sched_fiber.c index f5d5a468c5..7620134d6c 100644 --- a/libsrc/Thread/sched_fiber.c +++ b/libsrc/Thread/sched_fiber.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/sched_pthread.c b/libsrc/Thread/sched_pthread.c index 319c342d8a..04f318ea63 100644 --- a/libsrc/Thread/sched_pthread.c +++ b/libsrc/Thread/sched_pthread.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -1467,9 +1467,9 @@ mutex_leave (dk_mutex_t *mtx) void -mutex_stat () +mutex_stat (int mode, int max) { - #ifdef MTX_METER +#ifdef MTX_METER DO_HT (dk_mutex_t *, mtx, void*, ign, all_mtxs) { if (!mtx->mtx_enters) @@ -1484,7 +1484,7 @@ mutex_stat () #endif } END_DO_SET(); - #else +#else printf ("Mutex stats not enabled.}\n"); #endif } diff --git a/libsrc/Thread/sched_pthread_gc.c b/libsrc/Thread/sched_pthread_gc.c index 01422680b2..0d682f05f4 100644 --- a/libsrc/Thread/sched_pthread_gc.c +++ b/libsrc/Thread/sched_pthread_gc.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/sched_single.c b/libsrc/Thread/sched_single.c index 50b2fbe8bf..8d469190b1 100644 --- a/libsrc/Thread/sched_single.c +++ b/libsrc/Thread/sched_single.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -353,3 +353,51 @@ mutex_enter (dk_mutex_t * mtx) return (mutex_enter_dbg (__LINE__, __FILE__, mtx)); } #endif + +/****************************************************************************** + * + * rwlock + * + ******************************************************************************/ + +rwlock_t * +rwlock_allocate (void) +{ + return (rwlock_t *) 1L; +} + + +void +rwlock_free (rwlock_t * l) +{ +} + + +void +rwlock_rdlock (rwlock_t * l) +{ +} + + +int +rwlock_tryrdlock (rwlock_t * l) +{ +} + + +void +rwlock_wrlock (rwlock_t * l) +{ +} + + +int +rwlock_trywrlock (rwlock_t * l) +{ +} + + +void +rwlock_unlock (rwlock_t * l) +{ +} diff --git a/libsrc/Thread/sched_winthread.c b/libsrc/Thread/sched_winthread.c index b5f0ba92a9..37af2710b9 100644 --- a/libsrc/Thread/sched_winthread.c +++ b/libsrc/Thread/sched_winthread.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/sched_winthread_gc.c b/libsrc/Thread/sched_winthread_gc.c index 7d742ad3dc..87df966a89 100644 --- a/libsrc/Thread/sched_winthread_gc.c +++ b/libsrc/Thread/sched_winthread_gc.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/thread_attr.c b/libsrc/Thread/thread_attr.c index 31044ce2a9..a02c19ebcb 100644 --- a/libsrc/Thread/thread_attr.c +++ b/libsrc/Thread/thread_attr.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/thread_int.h b/libsrc/Thread/thread_int.h index 8ed8ac73dd..c3b8453722 100644 --- a/libsrc/Thread/thread_int.h +++ b/libsrc/Thread/thread_int.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/thread_queue.c b/libsrc/Thread/thread_queue.c index 6af29311be..bcf344d098 100644 --- a/libsrc/Thread/thread_queue.c +++ b/libsrc/Thread/thread_queue.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/thread_rwlock.c b/libsrc/Thread/thread_rwlock.c index d3b4b659ce..de21fddfba 100644 --- a/libsrc/Thread/thread_rwlock.c +++ b/libsrc/Thread/thread_rwlock.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/timer_queue.c b/libsrc/Thread/timer_queue.c index de05000065..b4d0ba3cde 100644 --- a/libsrc/Thread/timer_queue.c +++ b/libsrc/Thread/timer_queue.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/timer_queue.h b/libsrc/Thread/timer_queue.h index 8488a947d1..8b11db7b67 100644 --- a/libsrc/Thread/timer_queue.h +++ b/libsrc/Thread/timer_queue.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Thread/tvmac.h b/libsrc/Thread/tvmac.h index b8e04995b0..b8d654492d 100644 --- a/libsrc/Thread/tvmac.h +++ b/libsrc/Thread/tvmac.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Tidy/Makefile.am b/libsrc/Tidy/Makefile.am index 1a3a22d601..5a22c47813 100644 --- a/libsrc/Tidy/Makefile.am +++ b/libsrc/Tidy/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/2pc.c b/libsrc/Wi/2pc.c index 73a5bd0a5d..b667dfa932 100644 --- a/libsrc/Wi/2pc.c +++ b/libsrc/Wi/2pc.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/2pc.h b/libsrc/Wi/2pc.h index c9a6db4dee..a70ecf17ee 100644 --- a/libsrc/Wi/2pc.h +++ b/libsrc/Wi/2pc.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/2pc.sql b/libsrc/Wi/2pc.sql index 28e040993e..c6e4a94223 100644 --- a/libsrc/Wi/2pc.sql +++ b/libsrc/Wi/2pc.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/2pc_client.c b/libsrc/Wi/2pc_client.c index 826f3485b5..fe97f6ae51 100644 --- a/libsrc/Wi/2pc_client.c +++ b/libsrc/Wi/2pc_client.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/2pc_client.h b/libsrc/Wi/2pc_client.h index 4046185fcb..12ec5af8af 100644 --- a/libsrc/Wi/2pc_client.h +++ b/libsrc/Wi/2pc_client.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/CLI.h b/libsrc/Wi/CLI.h index 5c5661340d..47ca6de2b7 100644 --- a/libsrc/Wi/CLI.h +++ b/libsrc/Wi/CLI.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -417,6 +417,7 @@ SQLLEN dv_to_place (caddr_t it, int c_type, SQLSMALLINT sql_type, SQLLEN max, ca #ifndef MAP_DIRECT_BIN_CHAR void bin_dv_to_str_place (unsigned char *str, char *place, size_t nbytes); void bin_dv_to_wstr_place (unsigned char *str, wchar_t *place, size_t nbytes); +void bin_dv_to_utf16_place (unsigned char *str, uint16 *place, size_t nbytes); #endif void stmt_set_columns (cli_stmt_t *stmt, caddr_t *row, int nth_in_set); unsigned char *strncasestr (unsigned char *string1, unsigned char *string2, size_t maxbytes); @@ -430,6 +431,8 @@ caddr_t buffer_to_dv (caddr_t place, SQLLEN * len, int c_type, int sql_type, lon cli_stmt_t * err_stmt, int inprocess); caddr_t stmt_param_place_ptr ( parm_binding_t * pb, int nth, cli_stmt_t * stmt, SQLULEN length ); SQLULEN sqlc_sizeof (int sqlc, SQLULEN deflt); +SQLULEN sqlc_sizeof_1 (int sqlc, SQLULEN cbColDef, SQLLEN cbValueMax, int wide_as_utf16); + SQLCHAR * stmt_convert_brace_escapes (SQLCHAR * statement_text, SQLINTEGER * newCB); void stmt_free_current_rows (cli_stmt_t * stmt); @@ -759,7 +762,8 @@ caddr_t cli_box_server_msg (char *msg); #define DESC_CHARSET1(hdesc) \ DESC (desc, hdesc); \ - wcharset_t *charset = desc->d_stmt->stmt_connection->con_charset + wcharset_t *charset = desc->d_stmt->stmt_connection->con_charset; \ + int wide_as_utf16 = desc->d_stmt->stmt_connection->con_wide_as_utf16 #define DESC_CHARSET(Handle, HandleType) \ /*ENV (env, Handle);*/ \ diff --git a/libsrc/Wi/CLIcr.c b/libsrc/Wi/CLIcr.c index 5db7da4175..daf00bcf64 100644 --- a/libsrc/Wi/CLIcr.c +++ b/libsrc/Wi/CLIcr.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -465,6 +465,7 @@ set_pos_param_row (cli_stmt_t * stmt, int nth) place += btype == 0 ? nth * sqlc_sizeof (c_type, cb->cb_max_length) : nth * btype; place += rebind_offset; + if (length) { *((char **) &length) += btype == 0 ? nth * sizeof (SDWORD) : btype * nth; @@ -474,7 +475,7 @@ set_pos_param_row (cli_stmt_t * stmt, int nth) row[iparam] = (dk_alloc_box (0, DV_IGNORE)); else { - caddr_t v = buffer_to_dv (place, length, c_type, c_type, BHID (nth, iparam + 1), NULL, CON_IS_INPROCESS (stmt->stmt_connection)); + caddr_t v = buffer_to_dv (place, length, c_type, c_type, BHID (nth, iparam + 1), stmt, CON_IS_INPROCESS (stmt->stmt_connection)); row[iparam] = v; if (IS_BOX_POINTER (v) && DV_DAE == box_tag (v)) diff --git a/libsrc/Wi/CLIodbc3.c b/libsrc/Wi/CLIodbc3.c index f517686fcd..6cfb1f6419 100644 --- a/libsrc/Wi/CLIodbc3.c +++ b/libsrc/Wi/CLIodbc3.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -1095,6 +1095,20 @@ virtodbc__SQLSetConnectAttr (SQLHDBC connectionHandle, switch (Attribute) { +#if !defined (WIN32) + case SQL_ATTR_APP_WCHAR_ID: + { + SQLUINTEGER val = (SQLUINTEGER) (ptrlong) ValuePtr; + cli_dbg_printf (("SQLSetConnectAttr(..., SQL_ATTR_APP_WCHAR_ID, ...) called\n")); + if (val == SQL_DM_CP_UTF16) + con->con_wide_as_utf16 = TRUE; + else if (val == SQL_DM_CP_UCS4) + con->con_wide_as_utf16 = FALSE; + else + return SQL_ERROR; + } + break; +#endif case SQL_ATTR_ASYNC_ENABLE: cli_dbg_printf (("SQLSetConnectAttr(..., ASYNC_ENABLE, ...) called\n")); diff --git a/libsrc/Wi/CLIsql1.c b/libsrc/Wi/CLIsql1.c index d5b9375fb1..61e7846360 100644 --- a/libsrc/Wi/CLIsql1.c +++ b/libsrc/Wi/CLIsql1.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -220,6 +220,16 @@ SQLBindCol ( STMT (stmt, hstmt); col_binding_t *col = stmt_nth_col (stmt, icol); + if (cbValueMax == 0 && icol > 0 && fCType != SQL_C_DEFAULT) + { + /* + * If fCType == SQL_C_DEFAULT, we need to know the SQL type of the data to + * determine which ODBC C type to use. Depending on when SQLBindCol + * is called, we may not be able to determine the SQL type now + */ + cbValueMax = sqlc_sizeof (fCType, cbValueMax); + } + col->cb_c_type = fCType; col->cb_place = (caddr_t) rgbValue; col->cb_length = pcbValue; @@ -804,7 +814,9 @@ internal_sql_connect ( if (con->con_charset) { - wide_charset_free (con->con_charset); + if (con->con_charset != CHARSET_UTF8) + wide_charset_free (con->con_charset); + con->con_charset = NULL; } strncpy (addr_lst, dsn, (sizeof (addr_lst) - 1)); @@ -1047,31 +1059,38 @@ internal_sql_connect ( con_set_defaults (con, login_res); - if (BOX_ELEMENTS (login_res) > LG_CHARSET) - { - caddr_t *cs_info = (caddr_t *) login_res[LG_CHARSET]; - if (cs_info && DV_TYPE_OF (cs_info) == DV_ARRAY_OF_POINTER && BOX_ELEMENTS (cs_info) > 1) - con->con_charset = - wide_charset_create (cs_info[0], (wchar_t *) cs_info[1], box_length (cs_info[1]) / sizeof (wchar_t) - 1, NULL); - } + if (con->con_string_is_utf8) + { + con->con_charset = CHARSET_UTF8; + } + else + { + if (BOX_ELEMENTS (login_res) > LG_CHARSET) + { + caddr_t *cs_info = (caddr_t *) login_res[LG_CHARSET]; + if (cs_info && DV_TYPE_OF (cs_info) == DV_ARRAY_OF_POINTER && BOX_ELEMENTS (cs_info) > 1) + con->con_charset = + wide_charset_create (cs_info[0], (wchar_t *) cs_info[1], box_length (cs_info[1]) / sizeof (wchar_t) - 1, NULL); + } - if (con->con_charset_name && (!con->con_charset || strcmp (con->con_charset->chrs_name, con->con_charset_name))) - { - if (strcmp ("ISO-8859-1", con->con_charset_name)) + if (con->con_charset_name && (!con->con_charset || strcmp (con->con_charset->chrs_name, con->con_charset_name))) + { + if (strcmp ("ISO-8859-1", con->con_charset_name)) + { + snprintf (err, sizeof (err), + "Charset %s not available. Server default %s will be used.", + con->con_charset_name, con->con_charset ? con->con_charset->chrs_name : "ISO-8859-1"); + set_success_info (&con->con_error, "2C000", "CL035", err, 0); + rc = SQL_SUCCESS_WITH_INFO; + } + } + else if (!con->con_charset_name && con->con_charset && strcmp ("ISO-8859-1", con->con_charset->chrs_name)) { - snprintf (err, sizeof (err), - "Charset %s not available. Server default %s will be used.", - con->con_charset_name, con->con_charset ? con->con_charset->chrs_name : "ISO-8859-1"); - set_success_info (&con->con_error, "2C000", "CL035", err, 0); + snprintf (err, sizeof (err), "Switching to the server default charset %s.", con->con_charset->chrs_name); + set_success_info (&con->con_error, "01S02", "CL036", err, 0); rc = SQL_SUCCESS_WITH_INFO; } - } - else if (!con->con_charset_name && con->con_charset && strcmp ("ISO-8859-1", con->con_charset->chrs_name)) - { - snprintf (err, sizeof (err), "Switching to the server default charset %s.", con->con_charset->chrs_name); - set_success_info (&con->con_error, "01S02", "CL036", err, 0); - rc = SQL_SUCCESS_WITH_INFO; - } + } if (con->con_charset_name) dk_free_box (con->con_charset_name); @@ -1692,7 +1711,7 @@ virtodbc__SQLFreeConnect (SQLHDBC hdbc) if (con->con_bookmarks) hash_table_free (con->con_bookmarks); - if (con->con_charset) + if (con->con_charset && con->con_charset != CHARSET_UTF8) wide_charset_free (con->con_charset); if (con->con_user) @@ -2176,9 +2195,6 @@ virtodbc__SQLBindParameter ( if (fCType == SQL_C_DEFAULT) fCType = sql_type_to_sqlc_default (fSqlType); - if (fCType == SQL_C_WCHAR && cbValueMax % sizeof (wchar_t)) - cbValueMax = ((SQLLEN) (cbValueMax / sizeof (wchar_t))) * sizeof (wchar_t); - pb->pb_c_type = fCType; pb->pb_sql_type = fSqlType; pb->pb_place = (caddr_t) rgbValue; diff --git a/libsrc/Wi/CLIsql2.c b/libsrc/Wi/CLIsql2.c index ec944b2145..381466c9e3 100644 --- a/libsrc/Wi/CLIsql2.c +++ b/libsrc/Wi/CLIsql2.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -31,6 +31,7 @@ #include "CLI.h" #include "sqlver.h" #include "multibyte.h" +#include "langfunc.h" #include "libutil.h" @@ -151,7 +152,7 @@ char *sql_columns_text_casemode_2 = " c.\"COLUMN\" AS COLUMN_NAME VARCHAR(128), \n" " cast (case ? when 1 then dv_to_sql_type3(c.COL_DTP) else dv_to_sql_type(c.COL_DTP) end as INTEGER) AS DATA_TYPE SMALLINT,\n" " case when (c.COL_DTP in (125, 132) and get_keyword ('xml_col', coalesce (c.COL_OPTIONS, vector ())) is not null) then 'XMLType' else dv_type_title(c.COL_DTP) end AS TYPE_NAME VARCHAR(128),\n" /* DV_BLOB=125, DV_BLOB_WIDE=132 */ -" case when (c.COL_PREC = 0 and c.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (c.COL_PREC = 0 and c.COL_DTP = 225) then " VARCHAR_UNSPEC_SIZE " else c.COL_PREC end AS COLUMN_SIZE INTEGER,\n" +" case when (c.COL_PREC = 0 and c.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (c.COL_PREC = 0 and c.COL_DTP = __tag of nvarchar) then " VARCHAR_UNSPEC_SIZE " else c.COL_PREC end AS COLUMN_SIZE INTEGER,\n" " c.COL_PREC AS BUFFER_LENGTH INTEGER,\n" " c.COL_SCALE AS DECIMAL_DIGITS SMALLINT,\n" " 2 AS NUM_PREC_RADIX SMALLINT,\n" @@ -187,7 +188,7 @@ char *sql_columns_text_casemode_0 = " c.\"COLUMN\" AS COLUMN_NAME VARCHAR(128), \n" " cast (case ? when 1 then dv_to_sql_type3(c.COL_DTP) else dv_to_sql_type(c.COL_DTP) end as SMALLINT) AS DATA_TYPE SMALLINT,\n" " case when (c.COL_DTP in (125, 132) and get_keyword ('xml_col', coalesce (c.COL_OPTIONS, vector ())) is not null) then 'XMLType' else dv_type_title(c.COL_DTP) end AS TYPE_NAME VARCHAR(128),\n" /* DV_BLOB=125, DV_BLOB_WIDE=132 */ -" case when (c.COL_PREC = 0 and c.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (c.COL_PREC = 0 and c.COL_DTP = 225) then " VARCHAR_UNSPEC_SIZE " else c.COL_PREC end AS COLUMN_SIZE INTEGER,\n" +" case when (c.COL_PREC = 0 and c.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (c.COL_PREC = 0 and c.COL_DTP = __tag of nvarchar) then " VARCHAR_UNSPEC_SIZE " else c.COL_PREC end AS COLUMN_SIZE INTEGER,\n" " c.COL_PREC AS BUFFER_LENGTH INTEGER,\n" " c.COL_SCALE AS DECIMAL_DIGITS SMALLINT,\n" " 2 AS NUM_PREC_RADIX SMALLINT,\n" @@ -223,7 +224,7 @@ char *sql_columnsw_text_casemode_2 = " charset_recode (c.\"COLUMN\", 'UTF-8', '_WIDE_') AS COLUMN_NAME VARCHAR(128), \n" " case ? when 1 then dv_to_sql_type3(c.COL_DTP) else dv_to_sql_type(c.COL_DTP) end AS DATA_TYPE SMALLINT,\n" " case when (c.COL_DTP in (125, 132) and get_keyword ('xml_col', coalesce (c.COL_OPTIONS, vector ())) is not null) then 'XMLType' else dv_type_title(c.COL_DTP) end AS TYPE_NAME VARCHAR(128),\n" /* DV_BLOB=125, DV_BLOB_WIDE=132 */ -" case when (c.COL_PREC = 0 and c.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (c.COL_PREC = 0 and c.COL_DTP = 225) then " VARCHAR_UNSPEC_SIZE " else c.COL_PREC end AS COLUMN_SIZE INTEGER,\n" +" case when (c.COL_PREC = 0 and c.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (c.COL_PREC = 0 and c.COL_DTP = __tag of nvarchar) then " VARCHAR_UNSPEC_SIZE " else c.COL_PREC end AS COLUMN_SIZE INTEGER,\n" " c.COL_PREC AS BUFFER_LENGTH INTEGER,\n" " c.COL_SCALE AS DECIMAL_DIGITS SMALLINT,\n" " 2 AS NUM_PREC_RADIX SMALLINT,\n" @@ -259,7 +260,7 @@ char *sql_columnsw_text_casemode_0 = " charset_recode (c.\"COLUMN\", 'UTF-8', '_WIDE_') AS COLUMN_NAME VARCHAR(128), \n" " case ? when 1 then dv_to_sql_type3(c.COL_DTP) else dv_to_sql_type(c.COL_DTP) end AS DATA_TYPE SMALLINT,\n" " case when (c.COL_DTP in (125, 132) and get_keyword ('xml_col', coalesce (c.COL_OPTIONS, vector ())) is not null) then 'XMLType' else dv_type_title(c.COL_DTP) end AS TYPE_NAME VARCHAR(128),\n" /* DV_BLOB=125, DV_BLOB_WIDE=132 */ -" case when (c.COL_PREC = 0 and c.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (c.COL_PREC = 0 and c.COL_DTP = 225) then " VARCHAR_UNSPEC_SIZE " else c.COL_PREC end AS COLUMN_SIZE INTEGER,\n" +" case when (c.COL_PREC = 0 and c.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (c.COL_PREC = 0 and c.COL_DTP = __tag of nvarchar) then " VARCHAR_UNSPEC_SIZE " else c.COL_PREC end AS COLUMN_SIZE INTEGER,\n" " c.COL_PREC AS BUFFER_LENGTH INTEGER,\n" " c.COL_SCALE AS DECIMAL_DIGITS SMALLINT,\n" " 2 AS NUM_PREC_RADIX SMALLINT,\n" @@ -1069,14 +1070,17 @@ virtodbc__SQLGetConnectOption ( case SQL_CHARSET: { - char *chrs_name = ""; - if (CON_CONNECTED (con)) + char *chrs_name = "UTF-8"; + if (!con->con_string_is_utf8) { - if (con->con_charset->chrs_name) - chrs_name = con->con_charset->chrs_name; + if (CON_CONNECTED (con)) + { + if (con->con_charset->chrs_name) + chrs_name = con->con_charset->chrs_name; + } + else + chrs_name = (char *) con->con_charset; } - else - chrs_name = (char *) con->con_charset; V_SET_ODBC_STR (chrs_name, pvParam, StringLength, StringLengthPtr, &con->con_error); } break; @@ -1228,59 +1232,62 @@ virtodbc__SQLSetConnectOption ( break; case SQL_CHARSET: - if (CON_CONNECTED (con)) - { - SQLHSTMT stmt; - SQLRETURN rc = virtodbc__SQLAllocStmt (hdbc, &stmt); - wchar_t charset_table[256]; - char szCharsetName[50]; - SQLLEN nCharsetLen; + if (!con->con_string_is_utf8) + { + if (CON_CONNECTED (con)) + { + SQLHSTMT stmt; + SQLRETURN rc = virtodbc__SQLAllocStmt (hdbc, &stmt); + wchar_t charset_table[256]; + char szCharsetName[50]; + SQLLEN nCharsetLen; - if (SQL_SUCCESS != rc) - return rc; + if (SQL_SUCCESS != rc) + return rc; - if (vParam) - { - int i; + if (vParam) + { + int i; - for (i = 0; i < 49 && ((char *) vParam)[i]; i++) - ((char *) charset_table)[i] = szCharsetName[i] = toupper (((char *) vParam)[i]); + for (i = 0; i < 49 && ((char *) vParam)[i]; i++) + ((char *) charset_table)[i] = szCharsetName[i] = toupper (((char *) vParam)[i]); - ((char *) charset_table)[i] = szCharsetName[i] = 0; - nCharsetLen = i; - } - else - { - szCharsetName[0] = 0; - charset_table[0] = 0; - nCharsetLen = SQL_NULL_DATA; - } + ((char *) charset_table)[i] = szCharsetName[i] = 0; + nCharsetLen = i; + } + else + { + szCharsetName[0] = 0; + charset_table[0] = 0; + nCharsetLen = SQL_NULL_DATA; + } - rc = virtodbc__SQLBindParameter (stmt, 1, SQL_PARAM_INPUT_OUTPUT, - SQL_C_CHAR, SQL_CHAR, 0, 0, (char *) charset_table, sizeof (charset_table), &nCharsetLen); + rc = virtodbc__SQLBindParameter (stmt, 1, SQL_PARAM_INPUT_OUTPUT, + SQL_C_CHAR, SQL_CHAR, 0, 0, (char *) charset_table, sizeof (charset_table), &nCharsetLen); - if (rc == SQL_SUCCESS) - rc = virtodbc__SQLExecDirect (stmt, (SQLCHAR *) "__set ('CHARSET', ?)", SQL_NTS); + if (rc == SQL_SUCCESS) + rc = virtodbc__SQLExecDirect (stmt, (SQLCHAR *) "__set ('CHARSET', ?)", SQL_NTS); - if (rc == SQL_SUCCESS && nCharsetLen > 0) - { - if (con->con_charset) - wide_charset_free (con->con_charset); + if (rc == SQL_SUCCESS && nCharsetLen > 0) + { + if (con->con_charset) + wide_charset_free (con->con_charset); - con->con_charset = wide_charset_create (szCharsetName, - (wchar_t *) charset_table, (int) (nCharsetLen - 1 / sizeof (wchar_t)), NULL); - } + con->con_charset = wide_charset_create (szCharsetName, + (wchar_t *) charset_table, (int) (nCharsetLen - 1 / sizeof (wchar_t)), NULL); + } - virtodbc__SQLFreeStmt (stmt, SQL_DROP); + virtodbc__SQLFreeStmt (stmt, SQL_DROP); - return rc; - } - else - { - if (con->con_charset) - dk_free_box ((box_t) con->con_charset); + return rc; + } + else + { + if (con->con_charset) + dk_free_box ((box_t) con->con_charset); - con->con_charset = vParam ? (wcharset_t *) box_string ((char *) vParam) : NULL; + con->con_charset = vParam ? (wcharset_t *) box_string ((char *) vParam) : NULL; + } } break; @@ -3541,7 +3548,7 @@ char *sql_special_columns1_casemode_0 = " SYS_COLS.\\COLUMN AS \\COLUMN_NAME VARCHAR(128)," /* NOT NULL */ " dv_to_sql_type(SYS_COLS.COL_DTP) AS \\DATA_TYPE SMALLINT,"/* NOT NULL */ " case when (SYS_COLS.COL_DTP in (125, 132) and get_keyword ('xml_col', coalesce (SYS_COLS.COL_OPTIONS, vector ())) is not null) then 'XMLType' else dv_type_title(SYS_COLS.COL_DTP) end AS TYPE_NAME VARCHAR(128),\n" /* DV_BLOB=125, DV_BLOB_WIDE=132 */ -" case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = 225) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" +" case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = __tag of nvarchar) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" " SYS_COLS.COL_PREC AS \\LENGTH INTEGER," " SYS_COLS.COL_SCALE AS \\SCALE SMALLINT," " 1 AS \\PSEUDO_COLUMN SMALLINT " /* = SQL_PC_NOT_PSEUDO */ @@ -3564,7 +3571,7 @@ char *sql_special_columns1_casemode_2 = " SYS_COLS.\\COLUMN AS \\COLUMN_NAME VARCHAR(128)," /* NOT NULL */ " dv_to_sql_type(SYS_COLS.COL_DTP) AS \\DATA_TYPE SMALLINT,"/* NOT NULL */ " case when (SYS_COLS.COL_DTP in (125, 132) and get_keyword ('xml_col', coalesce (SYS_COLS.COL_OPTIONS, vector ())) is not null) then 'XMLType' else dv_type_title(SYS_COLS.COL_DTP) end AS TYPE_NAME VARCHAR(128),\n" /* DV_BLOB=125, DV_BLOB_WIDE=132 */ -" case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = 225) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" +" case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = __tag of nvarchar) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" " SYS_COLS.COL_PREC AS \\LENGTH INTEGER," " SYS_COLS.COL_SCALE AS \\SCALE SMALLINT," " 1 AS \\PSEUDO_COLUMN SMALLINT " /* = SQL_PC_NOT_PSEUDO */ @@ -3587,7 +3594,7 @@ char *sql_special_columns2_casemode_0 = " \\COLUMN as \\COLUMN_NAME varchar(128)," /* not null */ " dv_to_sql_type(COL_DTP) as \\DATA_TYPE smallint," /* not null */ " case when (SYS_COLS.COL_DTP in (125, 132) and get_keyword ('xml_col', coalesce (SYS_COLS.COL_OPTIONS, vector ())) is not null) then 'XMLType' else dv_type_title(SYS_COLS.COL_DTP) end AS TYPE_NAME VARCHAR(128),\n" /* DV_BLOB=125, DV_BLOB_WIDE=132 */ - " case when (c.COL_PREC = 0 and c.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (c.COL_PREC = 0 and c.COL_DTP = 225) then " VARCHAR_UNSPEC_SIZE " else c.COL_PREC end AS \\PRECISION INTEGER,\n" + " case when (c.COL_PREC = 0 and c.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (c.COL_PREC = 0 and c.COL_DTP = __tag of nvarchar) then " VARCHAR_UNSPEC_SIZE " else c.COL_PREC end AS \\PRECISION INTEGER,\n" " COL_PREC as \\LENGTH integer," " COL_SCALE as \\SCALE smallint," " 1 as \\PSEUDO_COLUMN smallint " /* = sql_pc_not_pseudo */ @@ -3604,7 +3611,7 @@ char *sql_special_columns2_casemode_2 = " \\COLUMN as \\COLUMN_NAME varchar(128)," /* NOT NULL */ " dv_to_sql_type(COL_DTP) as \\DATA_TYPE smallint," /* NOT NULL */ " case when (SYS_COLS.COL_DTP in (125, 132) and get_keyword ('xml_col', coalesce (SYS_COLS.COL_OPTIONS, vector ())) is not null) then 'XMLType' else dv_type_title(SYS_COLS.COL_DTP) end AS TYPE_NAME VARCHAR(128),\n" /* DV_BLOB=125, DV_BLOB_WIDE=132 */ - " case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = 225) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" + " case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = __tag of nvarchar) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" " COL_PREC as \\LENGTH integer," " COL_SCALE as \\SCALE smallint," " 1 as \\PSEUDO_COLUMN smallint " /* = SQL_PC_NOT_PSEUDO */ @@ -3621,7 +3628,7 @@ char *sql_special_columnsw1_casemode_0 = " charset_recode (SYS_COLS.\\COLUMN, 'UTF-8', '_WIDE_') AS \\COLUMN_NAME NVARCHAR(128)," /* NOT NULL */ " dv_to_sql_type(SYS_COLS.COL_DTP) AS \\DATA_TYPE SMALLINT,"/* NOT NULL */ " case when (SYS_COLS.COL_DTP in (125, 132) and get_keyword ('xml_col', coalesce (SYS_COLS.COL_OPTIONS, vector ())) is not null) then 'XMLType' else dv_type_title(SYS_COLS.COL_DTP) end AS TYPE_NAME VARCHAR(128),\n" /* DV_BLOB=125, DV_BLOB_WIDE=132 */ -" case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = 225) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" +" case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = __tag of nvarchar) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" " SYS_COLS.COL_PREC AS \\LENGTH INTEGER," " SYS_COLS.COL_SCALE AS \\SCALE SMALLINT," " 1 AS \\PSEUDO_COLUMN SMALLINT " /* = SQL_PC_NOT_PSEUDO */ @@ -3644,7 +3651,7 @@ char *sql_special_columnsw1_casemode_2 = " charset_recode (SYS_COLS.\\COLUMN, 'UTF-8', '_WIDE_') AS \\COLUMN_NAME NVARCHAR(128)," /* NOT NULL */ " dv_to_sql_type(SYS_COLS.COL_DTP) AS \\DATA_TYPE SMALLINT,"/* NOT NULL */ " case when (SYS_COLS.COL_DTP in (125, 132) and get_keyword ('xml_col', coalesce (SYS_COLS.COL_OPTIONS, vector ())) is not null) then 'XMLType' else dv_type_title(SYS_COLS.COL_DTP) end AS TYPE_NAME VARCHAR(128),\n" /* DV_BLOB=125, DV_BLOB_WIDE=132 */ -" case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = 225) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" +" case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = __tag of nvarchar) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" " SYS_COLS.COL_PREC AS \\LENGTH INTEGER," " SYS_COLS.COL_SCALE AS \\SCALE SMALLINT," " 1 AS \\PSEUDO_COLUMN SMALLINT " /* = SQL_PC_NOT_PSEUDO */ @@ -3667,7 +3674,7 @@ char *sql_special_columnsw2_casemode_0 = " charset_recode (\\COLUMN, 'UTF-8', '_WIDE_') as \\COLUMN_NAME nvarchar(128)," /* not null */ " dv_to_sql_type(COL_DTP) as \\DATA_TYPE smallint," /* not null */ " case when (SYS_COLS.COL_DTP in (125, 132) and get_keyword ('xml_col', coalesce (SYS_COLS.COL_OPTIONS, vector ())) is not null) then 'XMLType' else dv_type_title(SYS_COLS.COL_DTP) end AS TYPE_NAME VARCHAR(128),\n" /* DV_BLOB=125, DV_BLOB_WIDE=132 */ - " case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = 225) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" + " case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = __tag of nvarchar) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" " COL_PREC as \\LENGTH integer," " COL_SCALE as \\SCALE smallint," " 1 as \\PSEUDO_COLUMN smallint " /* = sql_pc_not_pseudo */ @@ -3684,7 +3691,7 @@ char *sql_special_columnsw2_casemode_2 = " charset_recode (\\COLUMN, 'UTF-8', '_WIDE_') as \\COLUMN_NAME nvarchar(128)," /* NOT NULL */ " dv_to_sql_type(COL_DTP) as \\DATA_TYPE smallint," /* NOT NULL */ " case when (SYS_COLS.COL_DTP in (125, 132) and get_keyword ('xml_col', coalesce (SYS_COLS.COL_OPTIONS, vector ())) is not null) then 'XMLType' else dv_type_title(SYS_COLS.COL_DTP) end AS TYPE_NAME VARCHAR(128),\n" /* DV_BLOB=125, DV_BLOB_WIDE=132 */ - " case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = 225) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" + " case when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP in (125, 132)) then " VARCHAR_UNSPEC_SIZE " when (SYS_COLS.COL_PREC = 0 and SYS_COLS.COL_DTP = __tag of nvarchar) then " VARCHAR_UNSPEC_SIZE " else SYS_COLS.COL_PREC end AS \\PRECISION INTEGER,\n" " COL_PREC as \\LENGTH integer," " COL_SCALE as \\SCALE smallint," " 1 as \\PSEUDO_COLUMN smallint " /* = SQL_PC_NOT_PSEUDO */ @@ -4674,10 +4681,12 @@ SQLNumParams ( void * stmt_bhid_place (cli_stmt_t * stmt, long bhid) { + int wide_as_utf16 = stmt->stmt_connection->con_wide_as_utf16; + if (SQL_API_SQLEXECDIRECT == stmt->stmt_pending.p_api) { parm_binding_t *pb = stmt_nth_parm (stmt, BHID_COL (bhid)); - size_t len = sqlc_sizeof (pb->pb_c_type, pb->pb_max_length); + size_t len = sqlc_sizeof_1 (pb->pb_c_type, pb->pb_max_length, pb->pb_max, wide_as_utf16); int btype = stmt->stmt_param_bind_type; size_t off = btype == 0 ? BHID_ROW (bhid) * len : BHID_ROW (bhid) * btype; int c_type = pb->pb_c_type; @@ -4705,8 +4714,9 @@ stmt_bhid_place (cli_stmt_t * stmt, long bhid) stmt && stmt->stmt_compilation && stmt->stmt_compilation->sc_columns && BOX_ELEMENTS (stmt->stmt_compilation->sc_columns) >= ((uint32) BHID_COL (bhid)) - && BHID_COL (bhid) > - 0 ? ((dtp_t) ((col_desc_t *) stmt->stmt_compilation->sc_columns[BHID_COL (bhid) - 1])->cd_dtp) : DV_LONG_STRING; + && ((BHID_COL (bhid) > 0) ? + ((dtp_t) ((col_desc_t *) stmt->stmt_compilation->sc_columns[BHID_COL (bhid) - 1])->cd_dtp) : + DV_LONG_STRING ); stmt->stmt_next_putdata_translate_char_bin = (c_type == SQL_C_CHAR && col_dtp == DV_BLOB_BIN); #endif @@ -4929,12 +4939,25 @@ SQLPutData ( STMT (stmt, hstmt); SQLRETURN rc = SQL_SUCCESS; dk_session_t *ses = stmt->stmt_connection->con_session; - volatile SQLLEN newValue; + volatile SQLLEN newValue = cbValue; + int wide_as_utf16 = stmt->stmt_connection->con_wide_as_utf16; + int wchar_size = wide_as_utf16 ? sizeof(uint16) : sizeof(wchar_t); + if (stmt->stmt_next_putdata_dtp == DV_WIDE) /* Wides are serialized with 4 byte length no matter whether they're shorter than 256 or not */ stmt->stmt_next_putdata_dtp = DV_LONG_WIDE; - newValue = (cbValue == SQL_NTS ? - (stmt->stmt_next_putdata_dtp == DV_LONG_STRING ? - strlen ((const char *) rgbValue) : wcslen ((wchar_t *) rgbValue) * sizeof (wchar_t)) : cbValue); + + if (cbValue == SQL_NTS) + { + if (stmt->stmt_next_putdata_dtp == DV_LONG_STRING) + { + newValue = strlen ((const char *) rgbValue); + } + else + { + newValue = wide_as_utf16 ? virt_ucs2len((uint16 *) rgbValue) : wcslen ((wchar_t *) rgbValue); + newValue *= wchar_size; + } + } if (STS_LOCAL_DAE == stmt->stmt_status) { @@ -4961,43 +4984,101 @@ SQLPutData ( } else if (stmt->stmt_next_putdata_dtp == DV_LONG_WIDE && rgbValue != NULL && cbValue != 0) { /* put a session for wides */ - size_t wlen; - wchar_t *wValue = (wchar_t *) rgbValue, *wptr; - virt_mbstate_t ps; dk_session_t *ses; char *nbuffer; + size_t wlen; - if (cbValue != SQL_NTS && cbValue % sizeof (wchar_t)) + if (cbValue != SQL_NTS && cbValue % wchar_size) { set_error (&stmt->stmt_error, "22023", "CLXXX", "Length argument passed to SQLPutData must be a multiple of the size of the wide char."); return SQL_ERROR; } - wptr = wValue; - memset (&ps, 0, sizeof (ps)); - wlen = cbValue == SQL_NTS ? wcslen (wValue) : (cbValue / sizeof (wchar_t)); - - ses = strses_allocate (); - strses_set_utf8 (ses, 1); - nbuffer = (char *) dk_alloc (65000); - wptr = wValue; - while (wptr - wValue < wlen) + if (wide_as_utf16) { - size_t res; - - res = virt_wcsnrtombs ((unsigned char *) nbuffer, &wptr, wlen - (wptr - wValue), 65000, &ps); - if (res == (size_t) - 1) - { - set_error (&stmt->stmt_error, "22023", "CLXXX", "Invalid wide data passed to SQLPutData"); - dk_free (nbuffer, 65000); - strses_free (ses); - return SQL_ERROR; - } + virt_mbstate_t ps; + char *us = (char *) rgbValue; + char *us_end = (char *)(((char *)rgbValue) + newValue); + wchar_t wc; + unsigned char mbs[VIRT_MB_CUR_MAX]; + size_t n = 0, buf_size = 65000; + + memset (&ps, 0, sizeof (ps)); + ses = strses_allocate (); + strses_set_utf8 (ses, 1); + nbuffer = (char *) dk_alloc (65000); + n = 0; + + while(us < us_end) + { +#ifdef WORDS_BIGENDIAN + wc = eh_decode_char__UTF16BE((__constcharptr *) &us, us_end); +#else + wc = eh_decode_char__UTF16LE((__constcharptr *) &us, us_end); +#endif + if (wc == UNICHAR_EOD || wc == UNICHAR_NO_DATA || wc == UNICHAR_BAD_ENCODING) + break; + + len = virt_wcrtomb (mbs, wc, &ps); + if (((long) len) < 0) + { + set_error (&stmt->stmt_error, "22023", "CLXXX", "Invalid wide data passed to SQLPutData"); + dk_free (nbuffer, 65000); + strses_free (ses); + return SQL_ERROR; + } + else if (((long) len) > 0) + { + if ((n + len) >= buf_size) + { + session_buffered_write (ses, nbuffer, n); + memcpy(nbuffer, mbs, len); + n = len; + } + else + { + memcpy(nbuffer + n, mbs, len); + n += len; + } + } + } + if (n != 0) + { + session_buffered_write (ses, nbuffer, n); + } + } + else + { + wchar_t *wValue = (wchar_t *) rgbValue, *wptr; + virt_mbstate_t ps; + + wptr = wValue; + memset (&ps, 0, sizeof (ps)); + wlen = cbValue == SQL_NTS ? wcslen (wValue) : (cbValue / sizeof (wchar_t)); + + ses = strses_allocate (); + strses_set_utf8 (ses, 1); + nbuffer = (char *) dk_alloc (65000); + + wptr = wValue; + while (wptr - wValue < wlen) + { + size_t res; + + res = virt_wcsnrtombs ((unsigned char *) nbuffer, (const wchar_t**)&wptr, wlen - (wptr - wValue), 65000, &ps); + if (res == (size_t) - 1) + { + set_error (&stmt->stmt_error, "22023", "CLXXX", "Invalid wide data passed to SQLPutData"); + dk_free (nbuffer, 65000); + strses_free (ses); + return SQL_ERROR; + } - if (res != 0) - session_buffered_write (ses, nbuffer, res); + if (res != 0) + session_buffered_write (ses, nbuffer, res); + } } dae = (caddr_t) ses; @@ -5030,7 +5111,7 @@ SQLPutData ( if (newValue % 2) { set_error (&stmt->stmt_error, "S1010", "CL054", - "Invalid buffer length (even) in passing character data to binary column in SQLPutData"); + "Invalid buffer length (odd) in passing character data to binary column in SQLPutData" ); return SQL_ERROR; } @@ -5041,8 +5122,7 @@ SQLPutData ( if ((chr < '0' || chr > '9') && (chr < 'A' || chr > 'F')) { set_error (&stmt->stmt_error, "S1010", "CL055", - "Invalid buffer length (even) in passing character data to binary column in SQLPutData"); - + "Characters should be hexadecimal digits, 0 to 9 and A to F in passing data to binary column in SQLPutData" ); return SQL_ERROR; } } @@ -5072,7 +5152,7 @@ SQLPutData ( { _lo = toupper (src[1]); _hi = toupper (src[0]); - _res = ((_hi - (_hi <= '9' ? '0' : 'A' + 10)) << 4) | (_lo - (_lo <= '9' ? '0' : 'A' + 10)); + _res = ((_hi - (_hi <= '9' ? '0' : ('A' - 10))) << 4) | (_lo - (_lo <= '9' ? '0' : ('A' - 10))); session_buffered_write_char (_res, ses); } } @@ -5083,6 +5163,75 @@ SQLPutData ( session_buffered_write (ses, (const char *) rgbValue, newValue); } } + else if (wide_as_utf16) + { + size_t utf8_len, len; + virt_mbstate_t state; + char *us; + char *us_end; + wchar_t wc; + unsigned char mbs[VIRT_MB_CUR_MAX]; + + us = (char *) rgbValue; + us_end = (char *) (((char *)rgbValue) + newValue); + memset (&state, 0, sizeof (virt_mbstate_t)); + utf8_len = 0; + while (us < us_end) + { +#ifdef WORDS_BIGENDIAN + wc = eh_decode_char__UTF16BE((__constcharptr *) &us, us_end); +#else + wc = eh_decode_char__UTF16LE((__constcharptr *) &us, us_end); +#endif + if (wc == UNICHAR_BAD_ENCODING) + { + print_long ((long) 0, ses); + set_error (&stmt->stmt_error, "S1010", "CL093", "Invalid wide data supplied to SQLPutData"); + rc = SQL_ERROR; + break; + } + if (wc == UNICHAR_EOD || wc == UNICHAR_NO_DATA) + break; + + len = virt_wcrtomb (mbs, wc, &state); + if (((long) len) < 0) + { + print_long ((long) 0, ses); + set_error (&stmt->stmt_error, "S1010", "CL093", "Invalid wide data supplied to SQLPutData"); + rc = SQL_ERROR; + break; + } + utf8_len += len; + } + + if (rc == SQL_SUCCESS) + { + us = (char *) rgbValue; + us_end = (char *) (((char *)rgbValue) + newValue); + memset (&state, 0, sizeof (virt_mbstate_t)); + + print_long ((long) utf8_len, ses); + + while(utf8_len > 0) + { +#ifdef WORDS_BIGENDIAN + wc = eh_decode_char__UTF16BE((__constcharptr *) &us, us_end); +#else + wc = eh_decode_char__UTF16LE((__constcharptr *) &us, us_end); +#endif + if (wc == UNICHAR_EOD || wc == UNICHAR_NO_DATA || wc == UNICHAR_BAD_ENCODING) + break; + + len = virt_wcrtomb (mbs, wc, &state); + if (len > 0) + { + session_buffered_write (ses, (char *) mbs, len); + utf8_len -= len; + } + } + + } + } else { wchar_t *wstr = (wchar_t *) rgbValue; @@ -5093,7 +5242,7 @@ SQLPutData ( wstr = (wchar_t *) rgbValue; memset (&state, 0, sizeof (virt_mbstate_t)); - utf8_len = virt_wcsnrtombs (NULL, &wstr, newValue / sizeof (wchar_t), 0, &state); + utf8_len = virt_wcsnrtombs (NULL, (const wchar_t **)&wstr, newValue / sizeof (wchar_t), 0, &state); if (utf8_len != (size_t) - 1) { @@ -5184,14 +5333,14 @@ virtodbc__SQLGetData ( caddr_t *val; caddr_t *row; caddr_t col; -#ifdef SAFE_SQLGETDATA unsigned char *rgbValue_end; -#endif + int data_are_binary = 0; #ifndef MAP_DIRECT_BIN_CHAR - col_desc_t *col_desc = NULL; int is_blob_to_char = 0; #endif int rlen; + int wide_as_utf16 = stmt->stmt_connection->con_wide_as_utf16; + size_t wchar_size = wide_as_utf16 ? sizeof(uint16) : sizeof(wchar_t); cli_dbg_printf (("SQLGetData (%lx, %d, %d, --, %d, --)\n", hstmt, icol, fCType, cbValueMax)); @@ -5218,16 +5367,15 @@ virtodbc__SQLGetData ( col = row[icol]; -#ifndef MAP_DIRECT_BIN_CHAR if (stmt->stmt_compilation && stmt->stmt_compilation->sc_is_select && BOX_ELEMENTS (stmt->stmt_compilation->sc_columns) >= icol) { - col_desc = (col_desc_t *) stmt->stmt_compilation->sc_columns[icol - 1]; - is_blob_to_char = (fCType == SQL_C_CHAR || fCType == SQL_C_WCHAR) && col_desc->cd_dtp == DV_BLOB_BIN; - } + col_desc_t *col_desc = (col_desc_t *) stmt->stmt_compilation->sc_columns[icol - 1]; + data_are_binary = (col_desc->cd_dtp == DV_BLOB_BIN); +#ifndef MAP_DIRECT_BIN_CHAR + is_blob_to_char = data_are_binary && (fCType == SQL_C_CHAR || fCType == SQL_C_WCHAR); #endif - + } set_error (&stmt->stmt_error, NULL, NULL, NULL); - /* IvAn/DvBlobXper/001212 Case for XPER added */ if (IS_BOX_POINTER (col) && IS_BLOB_HANDLE_DTP (DV_TYPE_OF (col))) { /* it's a blob? */ @@ -5253,14 +5401,14 @@ virtodbc__SQLGetData ( cb->cb_not_first_getdata = 1; - if (!cbValueMax || (is_nts && cbValueMax == 1) || (is_wnts && cbValueMax == sizeof (wchar_t))) + if (!cbValueMax || (is_nts && cbValueMax == 1) || (is_wnts && cbValueMax == wchar_size)) { if (pcbValue) { #ifndef MAP_DIRECT_BIN_CHAR - *pcbValue = length * (is_wnts ? sizeof (wchar_t) : sizeof (char)) * (is_blob_to_char ? 2 : 1); + *pcbValue = length * (is_wnts ? wchar_size : sizeof (char)) * (is_blob_to_char ? 2 : 1); #else - *pcbValue = length * (is_wnts ? sizeof (wchar_t) : sizeof (char)); + *pcbValue = length * (is_wnts ? wchar_size : sizeof (char)); #endif } @@ -5279,18 +5427,11 @@ virtodbc__SQLGetData ( if (is_wnts) { - if (cbValueMax % sizeof (wchar_t)) - cbValueMax = ((int) (cbValueMax / sizeof (wchar_t))) * sizeof (wchar_t); - -#ifdef SAFE_SQLGETDATA - rgbValue_end = ((unsigned char *) (rgbValue)) + cbValueMax; -#endif - cbValueMax = cbValueMax / sizeof (wchar_t) - 1; + if (cbValueMax % wchar_size) + cbValueMax = ((int) (cbValueMax / wchar_size)) * wchar_size; + cbValueMax -= wchar_size; } -#ifdef SAFE_SQLGETDATA - else - rgbValue_end = ((unsigned char *) (rgbValue)) + cbValueMax; -#endif + rgbValue_end = ((unsigned char *) (rgbValue)) + cbValueMax; if (stmt->stmt_connection->con_autocommit || (stmt->stmt_compilation && stmt->stmt_compilation->sc_is_select == QT_PROC_CALL) @@ -5322,13 +5463,21 @@ virtodbc__SQLGetData ( cbValueMax / (is_blob_to_char ? 2 : 1), bh->bh_position, bh->bh_key_id, - bh->bh_frag_no, bh->bh_dir_page, bh->bh_pages, (ptrlong)(DV_TYPE_OF (bh) == DV_BLOB_WIDE_HANDLE), (ptrlong)bh->bh_timestamp + bh->bh_frag_no, + bh->bh_dir_page, + bh->bh_pages, + (ptrlong)(DV_TYPE_OF (bh) == DV_BLOB_WIDE_HANDLE), + (ptrlong)bh->bh_timestamp #else bh->bh_current_page, cbValueMax, bh->bh_position, bh->bh_key_id, - bh->bh_frag_no, bh->bh_dir_page, bh->bh_pages, (ptrlong)(DV_TYPE_OF (bh) == DV_BLOB_WIDE_HANDLE), (ptrlong)bh->bh_timestamp + bh->bh_frag_no, + bh->bh_dir_page, + bh->bh_pages, + (ptrlong)(DV_TYPE_OF (bh) == DV_BLOB_WIDE_HANDLE), + (ptrlong)bh->bh_timestamp #endif )); } @@ -5364,7 +5513,7 @@ virtodbc__SQLGetData ( for (inx = 0; inx < strings; inx++) { /* take 1 off for the terminating 0 added by reader: */ - long len = box_length (val[inx]) - (IS_WIDE_STRING_DTP (box_tag (val[inx])) ? sizeof (wchar_t) : 1); + long len = box_length (val[inx]) - (IS_WIDE_STRING_DTP (box_tag (val[inx])) ? sizeof(wchar_t) : 1); switch (box_tag (val[inx])) { case DV_ARRAY_OF_LONG: @@ -5382,13 +5531,25 @@ virtodbc__SQLGetData ( #ifdef SAFE_SQLGETDATA if (is_nts) { + /* Wide => Char */ int added = cli_wide_to_narrow (stmt->stmt_connection->con_charset, 0, (wchar_t *) val[inx], len / sizeof (wchar_t), - rgbValue_tail, rgbValue_end - rgbValue_tail, NULL, NULL); + rgbValue_tail, + rgbValue_end - rgbValue_tail, NULL, NULL); rgbValue_tail += added; } + else if (is_wnts && wide_as_utf16) + { + /* Wide => UTF16 */ + int added = cli_wide_to_utf16 ( + 0, (wchar_t *) val[inx], len / sizeof (wchar_t), + rgbValue_tail, + rgbValue_end - rgbValue_tail); + rgbValue_tail += (added * sizeof(uint16)); + } else { + /* Wide => Wide */ int added = rgbValue_end - rgbValue_tail; if (added > len) @@ -5399,13 +5560,31 @@ virtodbc__SQLGetData ( } #else if (is_nts) - cli_wide_to_narrow (stmt->stmt_connection->con_charset, + { + /* Wide => Char */ + cli_wide_to_narrow (stmt->stmt_connection->con_charset, 0, (wchar_t *) val[inx], len / sizeof (wchar_t), - ((unsigned char *) rgbValue) + fill, len / sizeof (wchar_t), NULL, NULL); - else - memcpy (((wchar_t *) rgbValue) + fill, val[inx], len); + ((unsigned char *) rgbValue) + fill, + len / sizeof(wchar_t), NULL, NULL); - fill += len / sizeof (wchar_t); + fill += len; + } + else if (is_wnts && wide_as_utf16) + { + /* Wide => UTF16 */ + int added = cli_wide_to_utf16 ( + 0, (wchar_t *) val[inx], len / sizeof (wchar_t), + ((unsigned char *) rgbValue) + fill, + len / sizeof(wchar_t) * sizeof(uint16)); + + fill += added * sizeof(uint16); + } + else + { + /* Wide => Wide */ + memcpy (((wchar_t *) rgbValue) + fill, val[inx], len); + fill += len / sizeof (wchar_t); + } #endif break; } @@ -5417,12 +5596,16 @@ virtodbc__SQLGetData ( # ifdef SAFE_SQLGETDATA if (is_wnts) { - int nbytes = (rgbValue_end - rgbValue_tail) / (2 * sizeof (wchar_t)); + int nbytes = (rgbValue_end - rgbValue_tail) / (2 * wchar_size); if (nbytes > len) - nbytes = len; + nbytes = len; + + if (wide_as_utf16) + bin_dv_to_utf16_place ((unsigned char *) val[inx], (uint16 *) rgbValue_tail, nbytes); + else + bin_dv_to_wstr_place ((unsigned char *) val[inx], (wchar_t *) rgbValue_tail, nbytes); - bin_dv_to_wstr_place ((unsigned char *) val[inx], (wchar_t *) rgbValue_tail, nbytes); - rgbValue_tail += nbyte * 2 * sizeof (wchar_t); + rgbValue_tail += nbyte * 2 * wchar_size; } else { @@ -5436,7 +5619,12 @@ virtodbc__SQLGetData ( } # else if (is_wnts) - bin_dv_to_wstr_place ((unsigned char *) val[inx], ((wchar_t *) rgbValue) + fill, len); + { + if (wide_as_utf16) + bin_dv_to_utf16_place ((unsigned char *) val[inx], ((uint16 *) rgbValue) + fill, len); + else + bin_dv_to_wstr_place ((unsigned char *) val[inx], ((wchar_t *) rgbValue) + fill, len); + } else bin_dv_to_str_place ((unsigned char *) val[inx], ((char *) rgbValue) + fill, len); fill += len * 2; @@ -5448,11 +5636,19 @@ virtodbc__SQLGetData ( #ifdef SAFE_SQLGETDATA if (is_wnts) { - int added = cli_narrow_to_wide (stmt->stmt_connection->con_charset, 0, - (unsigned char *) val[inx], len, - ((wchar_t *) rgbValue_tail), - ((wchar_t *) rgbValue_end) - ((wchar_t *) rgbValue_tail)); - rgbValue_tail += added * sizeof (wchar_t); + int added; + if (wide_as_utf16) + added = cli_narrow_to_utf16 (stmt->stmt_connection->con_charset, 0, + (unsigned char *) val[inx], len, + ((uint16 *) rgbValue_tail), + ((uint16 *) rgbValue_end) - ((uint16 *) rgbValue_tail)); + else + added = cli_narrow_to_wide (stmt->stmt_connection->con_charset, 0, + (unsigned char *) val[inx], len, + ((wchar_t *) rgbValue_tail), + ((wchar_t *) rgbValue_end) - ((wchar_t *) rgbValue_tail)); + + rgbValue_tail += added * wchar_size; } else { @@ -5466,8 +5662,14 @@ virtodbc__SQLGetData ( } #else if (is_wnts) - cli_narrow_to_wide (stmt->stmt_connection->con_charset, 0, - (unsigned char *) val[inx], len, ((wchar_t *) rgbValue) + fill, len); + { + if (wide_as_utf16) + cli_narrow_to_utf16 (stmt->stmt_connection->con_charset, 0, + (unsigned char *) val[inx], len, ((uint16 *) rgbValue) + fill, len); + else + cli_narrow_to_wide (stmt->stmt_connection->con_charset, 0, + (unsigned char *) val[inx], len, ((wchar_t *) rgbValue) + fill, len); + } else memcpy (((char *) rgbValue) + fill, val[inx], len); @@ -5496,33 +5698,45 @@ virtodbc__SQLGetData ( } #ifdef SAFE_SQLGETDATA + if (rgbvale_tail < rgbValue_end) + { if (is_nts) ((char *) rgbValue_tail)[0] = '\x0'; - if (is_wnts) - ((wchar_t *) rgbValue_tail)[0] = L'\x0'; + { + if (wide_as_utf16) + ((uint16 *) rgbValue_tail)[0] = L'\x0'; + else + ((wchar_t *) rgbValue_tail)[0] = L'\x0'; + } + } #else if (is_nts) - ((char *) rgbValue)[fill] = 0; - + ((unsigned char *) rgbValue)[fill] = 0; if (is_wnts) - ((wchar_t *) rgbValue)[fill] = L'\x0'; + { + if (wide_as_utf16) + ((uint16 *) rgbValue)[fill] = L'\x0'; + else + ((wchar_t *) rgbValue)[fill] = L'\x0'; + } #endif if (pcbValue) #ifndef MAP_DIRECT_BIN_CHAR - *pcbValue = length * (is_wnts ? sizeof (wchar_t) : sizeof (char)) * (is_blob_to_char ? 2 : 1); + *pcbValue = length * (is_wnts ? wchar_size : sizeof (char)) * (is_blob_to_char ? 2 : 1); #ifdef SAFE_SQLGETDATA - cb->cb_read_up_to += (rgbValue_tail - ((unsigned char *) rgbValue)) / (is_blob_to_char ? 2 : 1); + cb->cb_read_up_to += (rgbValue_tail - ((unsigned char *) rgbValue)) / (is_blob_to_char ? 2 : 1) / (is_wnts && wide_as_utf16 ? sizeof(wchar_t)/sizeof(uint16) : 1); #else - cb->cb_read_up_to += fill / (is_blob_to_char ? 2 : 1); + cb->cb_read_up_to += fill / (is_blob_to_char ? 2 : 1) / (is_wnts && wide_as_utf16 ? sizeof(wchar_t)/sizeof(uint16) : 1); #endif #else - *pcbValue = length * (is_wnts ? sizeof (wchar_t) : sizeof (char)); + *pcbValue = length * (is_wnts ? wchar_size : sizeof (char)); + #ifdef SAFE_SQLGETDATA - cb->cb_read_up_to += (rgbValue_tail - ((unsigned char *) rgbValue)); + cb->cb_read_up_to += (rgbValue_tail - ((unsigned char *) rgbValue)) / (is_wnts && wide_as_utf16 ? sizeof(wchar_t)/sizeof(uint16) : 1); #else - cb->cb_read_up_to += fill; + cb->cb_read_up_to += fill / (is_wnts && wide_as_utf16 ? sizeof(wchar_t)/sizeof(uint16) : 1); #endif #endif diff --git a/libsrc/Wi/CLIsql3.c b/libsrc/Wi/CLIsql3.c index 6b5bc86a3f..19fe5e84e8 100644 --- a/libsrc/Wi/CLIsql3.c +++ b/libsrc/Wi/CLIsql3.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -139,6 +139,11 @@ static SQLRETURN SQL_API virtodbc__SQLDriverConnect (SQLHDBC hdbc, HWND hwnd, SQ #define DEFAULT_DATABASE_PER_USER _T("") +#ifndef UNICODE +int virt_wide_as_utf16 = 0; +#else +extern int virt_wide_as_utf16; +#endif typedef struct { @@ -548,6 +553,72 @@ StrCopyInW (TCHAR ** poutStr, TCHAR * inStr, short size) return 0; } + + +static int +StrCopyInUTF16 (TCHAR ** poutStr, TCHAR * inStr, short size) +{ + TCHAR *outStr; + uint16 *cp = (uint16 *) inStr; + int i; + + if (inStr == NULL) + inStr = _T (""); + + if (size == SQL_NTS) + { + size = 0; + + while(*cp++ != 0) + size++; + } + + if ((outStr = (TCHAR *) malloc ((size + 1) * sizeof (TCHAR))) != NULL) + { + cp = (uint16 *) inStr; + + for(i = 0; i < size; i++) + outStr[i] = (TCHAR) cp[i]; + + outStr[size] = (TCHAR) '\0'; + } + + *poutStr = outStr; + + return 0; +} + + +static int +confirm_UTF16(TCHAR * inStr, short size) +{ + uint16 *s = (uint16 *) inStr; + uint16 *cp; + int i; + + if (inStr == NULL) + return 0; + + if (size == SQL_NTS) + { + for (cp = s; *cp; cp++) + { + if (*cp == '=') + return 1; + } + } + else + { + for(i = 0; i < size; i++) + { + if (s[i] == '=') + return 1; + } + } + return 0; +} + + #else #define StrCopyInW StrCopyIn #endif @@ -607,7 +678,33 @@ virtodbc__SQLDriverConnect (SQLHDBC hdbc, connStr = _tcsdup (_T ("")); } else - StrCopyInW (&connStr, (TCHAR *) szConnStrIn, cbConnStrIn); + { +#ifdef UNICODE + if (sizeof(TCHAR) == 4) + { + char *ch = (char *) szConnStrIn; + int wsize = 4; + // try detect charset in connection string +#ifdef WORDS_BIGENDIAN + if (ch[0]==0 && ch[1]!=0 && ch[2]==0) + wsize = 2; +#else + if (ch[0]!=0 && ch[1]==0 && ch[2]!=0) + wsize = 2; +#endif + if (wsize == 2 + && confirm_UTF16((TCHAR *)szConnStrIn, cbConnStrIn) == 1 + ) + { + StrCopyInUTF16 (&connStr, (TCHAR *) szConnStrIn, cbConnStrIn); + } + else + StrCopyInW (&connStr, (TCHAR *) szConnStrIn, cbConnStrIn); + } + else +#endif + StrCopyInW (&connStr, (TCHAR *) szConnStrIn, cbConnStrIn); + } ParseOptions (cfgdata, NULL, 1); PutConnectionOptions (cfgdata, con); @@ -688,6 +785,7 @@ virtodbc__SQLDriverConnect (SQLHDBC hdbc, nst = virt_wide_to_ansi (cfgdata[oWideUTF16].data); nst1 = toupper (*nst); con->con_wide_as_utf16 = OPTION_TRUE (nst1) ? 1 : 0; + virt_wide_as_utf16 = con->con_wide_as_utf16; free_wide_buffer (nst); } @@ -719,13 +817,14 @@ virtodbc__SQLDriverConnect (SQLHDBC hdbc, if (cfgdata[oCHARSET].data && _tcslen (cfgdata[oCHARSET].data)) { char * cs = virt_wide_to_ansi (cfgdata[oCHARSET].data); - if (!strcmp (cs, "UTF-8")) + if (cs && !strcmp (cs, "UTF-8")) { free (cfgdata[oCHARSET].data); cfgdata[oCHARSET].data = NULL; cfgdata[oCHARSET].supplied = FALSE; con->con_string_is_utf8 = 1; } + free_wide_buffer(cs); } CHARSETW = (cfgdata[oCHARSET].data && _tcslen (cfgdata[oCHARSET].data)) ? cfgdata[oCHARSET].data : NULL; @@ -924,9 +1023,54 @@ SQLConnect (SQLHDBC hdbc, TCHAR *pwd; TCHAR *pcmd = &(cmd[0]); - StrCopyInW (&dsn, (TCHAR *) szDSN, cbDSN); - StrCopyInW (&uid, (TCHAR *) szUID, cbUID); - StrCopyInW (&pwd, (TCHAR *) szPWD, cbPWD); +#ifdef UNICODE + if (sizeof(TCHAR) == 4) + { + int wsize = 4; + char *ch; + + // try detect charset in szDSN string + ch = (char *) szDSN; +#ifdef WORDS_BIGENDIAN + if (ch && ch[0]==0 && ch[1]!=0 && ch[2]==0) + wsize = 2; +#else + if (ch && ch[0]!=0 && ch[1]==0 && ch[2]!=0) + wsize = 2; +#endif + if (wsize == 4) + { + // try recheck charset in szUID string + ch = (char *) szUID; +#ifdef WORDS_BIGENDIAN + if (ch && ch[0]==0 && ch[1]!=0 && ch[2]==0) + wsize = 2; +#else + if (ch && ch[0]!=0 && ch[1]==0 && ch[2]!=0) + wsize = 2; +#endif + } + + if (wsize == 2) + { + StrCopyInUTF16 (&dsn, (TCHAR *) szDSN, cbDSN); + StrCopyInUTF16 (&uid, (TCHAR *) szUID, cbUID); + StrCopyInUTF16 (&pwd, (TCHAR *) szPWD, cbPWD); + } + else + { + StrCopyInW (&dsn, (TCHAR *) szDSN, cbDSN); + StrCopyInW (&uid, (TCHAR *) szUID, cbUID); + StrCopyInW (&pwd, (TCHAR *) szPWD, cbPWD); + } + } + else +#endif + { + StrCopyInW (&dsn, (TCHAR *) szDSN, cbDSN); + StrCopyInW (&uid, (TCHAR *) szUID, cbUID); + StrCopyInW (&pwd, (TCHAR *) szPWD, cbPWD); + } if ((cbDSN < 0 && cbDSN != SQL_NTS) || (cbUID < 0 && cbUID != SQL_NTS) || (cbPWD < 0 && cbPWD != SQL_NTS)) { diff --git a/libsrc/Wi/CLIsql3W.c b/libsrc/Wi/CLIsql3W.c index c32099ab2b..9a4b53c267 100644 --- a/libsrc/Wi/CLIsql3W.c +++ b/libsrc/Wi/CLIsql3W.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/CLIuti.c b/libsrc/Wi/CLIuti.c index 12c84b007d..f69b41a8fb 100644 --- a/libsrc/Wi/CLIuti.c +++ b/libsrc/Wi/CLIuti.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -368,6 +368,21 @@ box_n_wstring (wchar_t * str, SDWORD len) } +caddr_t +box_n_ustring (uint16 * str, SDWORD len) +{ + SQLLEN ulen = (len == SQL_NTS ? virt_ucs2len (str) : len); + SQLLEN bytes = (ulen + 1) * sizeof (wchar_t); + caddr_t box = dk_alloc_box (bytes, DV_WIDE); + wchar_t *dest = (wchar_t *)box; + + size_t n = cli_utf16_to_wide (0, (const char *)str, ulen * sizeof(uint16), + dest, ulen); + dest[n] = L'\0'; + return box; +} + + caddr_t box_numeric_string (SQLCHAR * str, SQLLEN len1) { @@ -574,9 +589,9 @@ void set_data_truncated_success_info (cli_stmt_t *stmt, const char *virt_state, SQLUSMALLINT icol) { char *base_col = NULL; - char icol_buf[30]; + char icol_buf[40]; char base_tbl_col[MAX_QUAL_NAME_LEN + MAX_NAME_LEN + 20]; - char buf[MAX_QUAL_NAME_LEN + MAX_NAME_LEN + 100]; + char buf[MAX_QUAL_NAME_LEN + MAX_NAME_LEN + 110]; int is_select = stmt->stmt_compilation && stmt->stmt_compilation->sc_is_select && (icol > 0); col_desc_t *jammed_col = NULL; char *alias_name = NULL; @@ -1101,6 +1116,7 @@ caddr_t buffer_to_dv (caddr_t place, SQLLEN * len, int c_type, int sql_type, long bhid, cli_stmt_t * err_stmt, int inprocess) { + int wide_as_utf16 = err_stmt->stmt_connection->con_wide_as_utf16; if (len && (SQL_NULL_DATA == *len || SQL_IGNORE == *len)) return dk_alloc_box (0, DV_DB_NULL); @@ -1198,7 +1214,12 @@ buffer_to_dv (caddr_t place, SQLLEN * len, int c_type, int sql_type, long bhid, case SQL_C_WCHAR: { char temp[100]; - long nlen = (long) (len ? (*len >= 0 ? *len / sizeof (wchar_t) : wcslen ((wchar_t *) place)) : wcslen ((wchar_t *) place)); + long nlen; + + if (wide_as_utf16) + nlen = (long) (len ? (*len >= 0 ? *len / sizeof (uint16) : virt_ucs2len ((uint16 *) place)) : virt_ucs2len ((uint16 *) place)); + else + nlen = (long) (len ? (*len >= 0 ? *len / sizeof (wchar_t) : wcslen ((wchar_t *) place)) : wcslen ((wchar_t *) place)); switch (sql_type) { @@ -1215,7 +1236,12 @@ buffer_to_dv (caddr_t place, SQLLEN * len, int c_type, int sql_type, long bhid, caddr_t res = dk_alloc_box (DT_LENGTH, DV_DATETIME); nlen = nlen > 100 ? 100 : nlen; - cli_wide_to_narrow (err_stmt->stmt_connection->con_charset, + + if (wide_as_utf16) + cli_utf16_to_narrow (err_stmt->stmt_connection->con_charset, + 0, (uint16 *) place, nlen, (unsigned char *) temp, nlen, NULL, NULL); + else + cli_wide_to_narrow (err_stmt->stmt_connection->con_charset, 0, (wchar_t *) place, nlen, (unsigned char *) temp, nlen, NULL, NULL); odbc_string_to_any_dt (temp, res, &err_msg); @@ -1236,7 +1262,12 @@ buffer_to_dv (caddr_t place, SQLLEN * len, int c_type, int sql_type, long bhid, case SQL_DECIMAL: { /* E.g. SQL_C_CHAR, SQL_C_BINARY, any other. */ nlen = nlen > 100 ? 100 : nlen; - cli_wide_to_narrow (err_stmt->stmt_connection->con_charset, 0, + + if (wide_as_utf16) + cli_utf16_to_narrow (err_stmt->stmt_connection->con_charset, 0, + (uint16 *) place, nlen, (unsigned char *) temp, nlen, NULL, NULL); + else + cli_wide_to_narrow (err_stmt->stmt_connection->con_charset, 0, (wchar_t *) place, nlen, (unsigned char *) temp, nlen, NULL, NULL); return box_numeric_string ((SQLCHAR *) temp, nlen); @@ -1246,6 +1277,7 @@ buffer_to_dv (caddr_t place, SQLLEN * len, int c_type, int sql_type, long bhid, case -7: case SQL_INTEGER: { +#if 0 #if defined (__APPLE__) char tmp[100]; cli_wide_to_narrow (NULL, 0, (wchar_t *) place, 100, tmp, sizeof (tmp), "?", NULL); @@ -1256,12 +1288,24 @@ buffer_to_dv (caddr_t place, SQLLEN * len, int c_type, int sql_type, long bhid, return (box_num (n)); #endif +#endif + char tmp[100]; + + if (wide_as_utf16) + cli_utf16_to_narrow (NULL, 0, (uint16 *) place, 100, (unsigned char *)tmp, sizeof (tmp), "?", NULL); + else + cli_wide_to_narrow (NULL, 0, (wchar_t *) place, 100, (unsigned char *)tmp, sizeof (tmp), "?", NULL); + + return (box_num (atoi (tmp))); + + } case SQL_FLOAT: case SQL_REAL: case SQL_DOUBLE: { +#if 0 #if defined (__APPLE__) char tmp[100]; double d = 0; @@ -1274,6 +1318,17 @@ buffer_to_dv (caddr_t place, SQLLEN * len, int c_type, int sql_type, long bhid, return (box_double (d)); #endif +#endif + char tmp[100]; + double d = 0; + + if (wide_as_utf16) + cli_utf16_to_narrow (NULL, 0, (uint16 *) place, 100, (unsigned char *)tmp, sizeof (tmp), "?", NULL); + else + cli_wide_to_narrow (NULL, 0, (wchar_t *) place, 100, (unsigned char *)tmp, sizeof (tmp), "?", NULL); + + sscanf (tmp, "%lg", &d); + return (box_double (d)); } case SQL_CHAR: @@ -1281,10 +1336,15 @@ buffer_to_dv (caddr_t place, SQLLEN * len, int c_type, int sql_type, long bhid, case SQL_LONGVARCHAR: { caddr_t res = dk_alloc_box (nlen + 1, DV_LONG_STRING); - cli_wide_to_narrow (err_stmt->stmt_connection->con_charset, 0, + + if (wide_as_utf16) + cli_utf16_to_narrow (err_stmt->stmt_connection->con_charset, 0, + (uint16 *) place, nlen, (unsigned char *) res, nlen + 1, NULL, NULL); + else + cli_wide_to_narrow (err_stmt->stmt_connection->con_charset, 0, (wchar_t *) place, nlen, (unsigned char *) res, nlen + 1, NULL, NULL); - res[nlen] = 0; + res[nlen] = 0; return res; } @@ -1298,7 +1358,10 @@ buffer_to_dv (caddr_t place, SQLLEN * len, int c_type, int sql_type, long bhid, } default: - return box_n_wstring ((wchar_t *) place, nlen); + if (wide_as_utf16) + return box_n_ustring ((uint16 *) place, nlen); + else + return box_n_wstring ((wchar_t *) place, nlen); } } @@ -1399,17 +1462,17 @@ buffer_to_dv (caddr_t place, SQLLEN * len, int c_type, int sql_type, long bhid, if (len1 % 2) { set_error (&err_stmt->stmt_error, "22002", "CL069", - "Invalid (odd) length in conversion from SQL_C_CHAR to SQL_BINARY"); + "Invalid (odd) length in conversion from SQL_C_CHAR to SQL_BINARY" ); return NULL; } for (src = (unsigned char *) place; src - ((unsigned char *) place) < len1; src++) { chr = toupper (*src); - if ((chr < '0' || chr > '9') && (chr < 'A' || chr > 'F')) + if (!isxdigit (chr)) { set_error (&err_stmt->stmt_error, "S1010", "CL070", - "Invalid buffer length (even) in passing character data to binary column in SQLPutData"); + "Characters should be hexadecimal digits, 0 to 9 and A to F in conversion from SQL_C_CHAR to SQL_BINARY" ); return NULL; } } @@ -1420,7 +1483,7 @@ buffer_to_dv (caddr_t place, SQLLEN * len, int c_type, int sql_type, long bhid, { _lo = toupper (src[1]); _hi = toupper (src[0]); - *ptr = ((_hi - (_hi <= '9' ? '0' : 'A' + 10)) << 4) | (_lo - (_lo <= '9' ? '0' : 'A' + 10)); + *ptr = ((_hi - (_hi <= '9' ? '0' : ('A' - 10))) << 4) | (_lo - (_lo <= '9' ? '0' : ('A' - 10))); } #else res = dk_alloc_box (len1, DV_BIN); @@ -1488,11 +1551,67 @@ sqlc_sizeof (int sqlc, SQLULEN deflt) } +SQLULEN +sqlc_sizeof_1 (int sqlc, SQLULEN cbColDef, SQLLEN cbValueMax, int wide_as_utf16) +{ + SQLLEN wchar_size = wide_as_utf16 ? sizeof(uint16) : sizeof(wchar_t); + + switch (sqlc) + { + + case SQL_C_LONG: + case SQL_C_SLONG: + case SQL_C_ULONG: + return sizeof (long); + + case SQL_C_SHORT: + case SQL_C_SSHORT: + case SQL_C_USHORT: + return sizeof (short); + + case SQL_C_FLOAT: + case SQL_FLOAT: + return sizeof (float); + + case SQL_C_BIT: + return 1; + + case SQL_C_DOUBLE: + return sizeof (double); + + case SQL_C_BOX: + return sizeof (caddr_t); + + case SQL_C_TIMESTAMP: + return sizeof (TIMESTAMP_STRUCT); + + case SQL_C_DATE: + return sizeof (DATE_STRUCT); + + case SQL_C_TIME: + return sizeof (TIME_STRUCT); + + case SQL_C_CHAR: + case SQL_C_BINARY: + return cbValueMax == 0 ? cbColDef : cbValueMax; + + case SQL_C_WCHAR: + return cbValueMax == 0 ? cbColDef * wchar_size : cbValueMax; + + default: + return cbColDef; + } +} + + caddr_t stmt_parm_to_dv (parm_binding_t * pb, int nth, long bhid, cli_stmt_t *stmt) { + int wide_as_utf16 = stmt->stmt_connection->con_wide_as_utf16; + caddr_t place = stmt_param_place_ptr (pb, nth, stmt, - sqlc_sizeof (pb->pb_c_type, pb->pb_max_length)); + sqlc_sizeof_1 (pb->pb_c_type, pb->pb_max_length, pb->pb_max, wide_as_utf16)); + SQLLEN *len = stmt_param_length_ptr (pb, nth, stmt); if (SQL_PARAM_OUTPUT == pb->pb_param_type || SQL_RETURN_VALUE == pb->pb_param_type) @@ -1539,6 +1658,7 @@ stmt_collect_parms (cli_stmt_t * stmt) while (pb && iparm < parm_count) { caddr_t v = stmt_parm_to_dv (pb, inx, BHID (inx, iparm + 1), stmt); + row[iparm] = v; if (IS_BOX_POINTER (v) && DV_DAE == box_tag (v)) @@ -1598,7 +1718,7 @@ str_box_to_buffer ( if (string_length_ptr != NULL) { if (length_is_long) - *(SDWORD *) string_length_ptr = len; + *(SQLINTEGER *) string_length_ptr = len; else *(SQLSMALLINT *) string_length_ptr = len; } @@ -1619,7 +1739,7 @@ str_box_to_buffer ( if (string_length_ptr != NULL) { if (length_is_long) - *(SDWORD *) string_length_ptr = 0; + *(SQLINTEGER *) string_length_ptr = 0; else *(SQLSMALLINT *) string_length_ptr = 0; } @@ -1814,6 +1934,18 @@ bin_dv_to_wstr_place (unsigned char *str, wchar_t *place, size_t nbytes) } } +void +bin_dv_to_utf16_place (unsigned char *str, uint16 *place, size_t nbytes) +{ + unsigned char *ptr; + + for (ptr = str; ((size_t) (ptr - str)) < nbytes; ptr++, place += 2) + { + place[0] = ((*ptr & 0xF0) >> 4) + ((((*ptr & 0xF0) >> 4) < 10) ? L'0' : L'A' - 10); + place[1] = (*ptr & 0x0F) + (((*ptr & 0x0F) < 10) ? L'0' : L'A' - 10); + } +} + # else void @@ -1841,6 +1973,18 @@ bin_dv_to_wstr_place (unsigned char *str, wchar_t *place, size_t nbytes) } } +void +bin_dv_to_utf16_place (unsigned char *str, uint16 *place, size_t nbytes) +{ + unsigned char *tail = str, *end = str + nbytes; + + while (tail < end) + { + (place++)[0] = L"0123456789ABCDEF"[(tail[0] >> 4) & 0xF]; + (place++)[0] = L"0123456789ABCDEF"[(tail++)[0] & 0xF]; + } +} + # endif #endif @@ -2130,6 +2274,8 @@ dv_to_str_place (caddr_t it, dtp_t dtp, SQLLEN max, caddr_t place, SQLLEN len = 0, piece_len = 0; char temp[500]; /* Enough? - greater than max length of numeric output by sprintf */ char *str = temp; + int wide_as_utf16 = stmt->stmt_connection->con_wide_as_utf16; + size_t wchar_size = wide_as_utf16 ? sizeof(uint16) : sizeof(wchar_t); #ifndef MAP_DIRECT_BIN_CHAR /*col_desc_t *col_desc = NULL; */ int blob_to_char = 0; @@ -2308,14 +2454,18 @@ dv_to_str_place (caddr_t it, dtp_t dtp, SQLLEN max, caddr_t place, { piece_len = max - 1; cli_wide_to_narrow (stmt->stmt_connection->con_charset, - 0, ((wchar_t *) it) + str_from_pos, piece_len, (unsigned char *) place, piece_len, NULL, NULL); + 0, ((wchar_t *) it) + str_from_pos, + piece_len, (unsigned char *) place, + piece_len, NULL, NULL); place[piece_len] = 0; set_data_truncated_success_info (stmt, "CL074", nth_col); } else { cli_wide_to_narrow (stmt->stmt_connection->con_charset, - 0, ((wchar_t *) it) + str_from_pos, len + 1, (unsigned char *) place, max - 1, NULL, NULL); + 0, ((wchar_t *) it) + str_from_pos, + len + 1, (unsigned char *) place, + max - 1, NULL, NULL); piece_len = len; } @@ -2326,36 +2476,52 @@ dv_to_str_place (caddr_t it, dtp_t dtp, SQLLEN max, caddr_t place, case SQL_C_WCHAR: len -= str_from_pos / sizeof (wchar_t); - max /= sizeof (wchar_t); - - if (len >= max) + if (wide_as_utf16) { - piece_len = max - 1; - memcpy (place, (wchar_t *) (it + str_from_pos), piece_len * sizeof (wchar_t)); - ((wchar_t *) place)[piece_len] = L'\x0'; - set_data_truncated_success_info (stmt, "CL075", nth_col); - piece_len *= sizeof (wchar_t); + size_t rc = cli_wide_to_utf16(0, + (wchar_t *) (it + str_from_pos), + (len + 1), + (unsigned char *)place, + max); + + if (out_chars) + *out_chars = rc * sizeof(uint16); + + if (len_ret) + *len_ret = (box_len / sizeof(wchar_t)) * sizeof(uint16) - sizeof(uint16); } else { - if (stmt->stmt_connection->con_wide_as_utf16) - { - eh_encode_wchar_buffer__UTF16LE ( - (wchar_t *) (it + str_from_pos), - (wchar_t *) (it + str_from_pos) + (len + 1), - place, - place + max); - if (out_chars) - *out_chars = len * sizeof (short); - } - else - memcpy (place, (wchar_t *) (it + str_from_pos), (len + 1) * sizeof (wchar_t)); - piece_len = len * sizeof (wchar_t); + max /= sizeof (wchar_t); + if (len >= max) + { + piece_len = max - 1; + if (stmt->stmt_connection->con_wide_as_utf16) + { + eh_encode_wchar_buffer__UTF16LE ( + (wchar_t *) (it + str_from_pos), + (wchar_t *) (it + str_from_pos) + piece_len, + place, + place + max); + if (out_chars) + *out_chars = piece_len * sizeof (short); + } + else + memcpy (place, (wchar_t *) (it + str_from_pos), piece_len * sizeof (wchar_t)); + ((wchar_t *) place)[piece_len] = L'\x0'; + set_data_truncated_success_info (stmt, "CL075", nth_col); + piece_len *= sizeof (wchar_t); + } + else + { + memcpy (place, (wchar_t *) (it + str_from_pos), (len + 1) * sizeof (wchar_t)); + piece_len = len * sizeof (wchar_t); + } + + if (len_ret) + *len_ret = box_len - sizeof(wchar_t); } - if (len_ret) - *len_ret = box_len - sizeof (wchar_t); - break; } } @@ -2390,14 +2556,14 @@ dv_to_str_place (caddr_t it, dtp_t dtp, SQLLEN max, caddr_t place, len = (SDWORD) strlen (temp); if (len_ret) - *len_ret = len * (SQL_C_WCHAR == c_type ? sizeof (wchar_t) : sizeof (char)); + *len_ret = len * (SQL_C_WCHAR == c_type ? wchar_size : sizeof (char)); /* What if str_from_pos is greater than len ? */ #ifndef MAP_DIRECT_BIN_CHAR if (SQL_C_WCHAR == c_type) { - str += str_from_pos / (sizeof (wchar_t) * (blob_to_char ? 2 : 1)); - len -= str_from_pos / (sizeof (wchar_t) * (blob_to_char ? 2 : 1)); + str += str_from_pos / (wchar_size * (blob_to_char ? 2 : 1)); + len -= str_from_pos / (wchar_size * (blob_to_char ? 2 : 1)); } else { @@ -2407,8 +2573,8 @@ dv_to_str_place (caddr_t it, dtp_t dtp, SQLLEN max, caddr_t place, #else if (SQL_C_WCHAR == c_type) { - str += str_from_pos / sizeof (wchar_t); - len -= str_from_pos / sizeof (wchar_t); + str += str_from_pos / wchar_size; + len -= str_from_pos / wchar_size; } else { @@ -2467,14 +2633,30 @@ dv_to_str_place (caddr_t it, dtp_t dtp, SQLLEN max, caddr_t place, } else if (SQL_C_WCHAR == c_type) { - if (len >= ((SDWORD) (max / sizeof (wchar_t)))) + if (len >= ((SDWORD) (max / wchar_size))) { - piece_len = max / sizeof (wchar_t) - 1; - cli_narrow_to_wide (stmt->stmt_connection->con_charset, 0, - (unsigned char *) str, piece_len, (wchar_t *) place, piece_len); - - if (piece_len >= 0) - ((wchar_t *) place)[piece_len] = 0; + piece_len = max / wchar_size - 1; + if (wide_as_utf16) + { + size_t rc = cli_narrow_to_utf16 (stmt->stmt_connection->con_charset, 0, + (unsigned char *) str, piece_len, + (uint16 *) place, piece_len); + + if (piece_len >= 0) + ((uint16 *) place)[rc] = 0; + + if (out_chars) + *out_chars = rc * sizeof (uint16); + } + else + { + cli_narrow_to_wide (stmt->stmt_connection->con_charset, 0, + (unsigned char *) str, piece_len, + (wchar_t *) place, piece_len); + + if (piece_len >= 0) + ((wchar_t *) place)[piece_len] = 0; + } set_data_truncated_success_info (stmt, "CL078", nth_col); } @@ -2482,39 +2664,31 @@ dv_to_str_place (caddr_t it, dtp_t dtp, SQLLEN max, caddr_t place, { size_t wides; - if (stmt->stmt_connection->con_string_is_utf8) - { - caddr_t wide; - long wlen; - wide = box_utf8_as_wide_char (str, NULL, len, 0); - wlen = box_length (wide) / sizeof (wchar_t) - 1; - if (stmt->stmt_connection->con_wide_as_utf16) - { - eh_encode_wchar_buffer__UTF16LE ( - (wchar_t *) wide, - (wchar_t *) wide + wlen + 1, - place, - place + max); - if (out_chars) - *out_chars = wlen * sizeof (short); - } - else - memcpy (place, wide, wlen + 1); - dk_free_box (wide); + if (wide_as_utf16) + { + wides = cli_narrow_to_utf16 (stmt->stmt_connection->con_charset, 0, + (unsigned char *) str, len, + (uint16 *) place, max / sizeof (uint16)); + + if (wides >= 0 && wides < max / sizeof (uint16)) + ((uint16 *) place)[wides] = 0; + + if (out_chars) + *out_chars = wides * sizeof (uint16); } else { wides = cli_narrow_to_wide (stmt->stmt_connection->con_charset, 0, - (unsigned char *) str, len, (wchar_t *) place, - max / sizeof (wchar_t)); + (unsigned char *) str, len, + (wchar_t *) place, max / sizeof (wchar_t)); - if (wides >= 0 && wides < max / sizeof (wchar_t)) - ((wchar_t *) place)[wides] = 0; + if (wides >= 0 && wides < max / sizeof (wchar_t)) + ((wchar_t *) place)[wides] = 0; } piece_len = len; } - piece_len *= sizeof (wchar_t); + piece_len *= wchar_size; } else /* (SQL_C_BINARY == c_type) */ diff --git a/libsrc/Wi/CLIw.c b/libsrc/Wi/CLIw.c index 460a0dac56..f1a39c8743 100644 --- a/libsrc/Wi/CLIw.c +++ b/libsrc/Wi/CLIw.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -34,6 +34,8 @@ #define WCHAR_CAST #endif +extern int virt_wide_as_utf16; + #define MAX_MESSAGE_LEN 0 #ifdef STD_N_BYTES_IN_PCB @@ -45,6 +47,7 @@ #define DEFINE_INPUT_NARROW(param) \ SQLCHAR *sz##param = NULL +#if 0 #define MAKE_INPUT_NARROW_N(param) \ if (wsz##param) \ { \ @@ -67,7 +70,33 @@ sz##param = (SQLCHAR *) box_wide_as_utf8_char ((caddr_t) wsz##param, len, DV_LONG_STRING); \ } \ } +#endif + +#define MAKE_INPUT_NARROW_1(param, con) \ + if (wsz##param) \ + { \ + if ((con)->con_defs.cdef_utf8_execs || (con)->con_string_is_utf8) \ + { \ + len = cb##param > 0 ? cb##param : wcslen (WCHAR_CAST wsz##param); \ + if ((con)->con_wide_as_utf16) \ + sz##param = (SQLCHAR *) box_utf16_as_utf8_char ((caddr_t) wsz##param, len, DV_LONG_STRING); \ + else \ + sz##param = (SQLCHAR *) box_wide_as_utf8_char ((caddr_t) wsz##param, len, DV_LONG_STRING); \ + } \ + else \ + { \ + len = cb##param > 0 ? cb##param : wcslen (WCHAR_CAST wsz##param); \ + sz##param = (SQLCHAR *) dk_alloc_box (len + 1, DV_LONG_STRING); \ + if ((con)->con_wide_as_utf16) \ + cli_utf16_to_narrow (charset, 0, (uint16 *) wsz##param, len, sz##param, len, NULL, NULL); \ + else \ + cli_wide_to_narrow (charset, 0, WCHAR_CAST wsz##param, len, sz##param, len, NULL, NULL); \ + sz##param[len] = 0; \ + } \ + } + +#if 0 #define MAKE_INPUT_ESCAPED_NARROW_N(param) \ if (wsz##param) \ { \ @@ -91,6 +120,44 @@ sz##param = (SQLCHAR *) box_wide_as_utf8_char ((caddr_t) wsz##param, len, DV_LONG_STRING); \ } \ } +#endif + + +#define MAKE_INPUT_ESCAPED_NARROW_1(param, con) \ + if (wsz##param) \ + { \ + if ((con)->con_defs.cdef_utf8_execs || (con)->con_string_is_utf8) \ + { \ + if ((con)->con_wide_as_utf16) \ + { \ + len = cb##param > 0 ? cb##param : virt_ucs2len ((uint16 *) wsz##param); \ + sz##param = (SQLCHAR *) box_utf16_as_utf8_char ((caddr_t) wsz##param, len, DV_LONG_STRING); \ + } \ + else \ + { \ + len = cb##param > 0 ? cb##param : wcslen (WCHAR_CAST wsz##param); \ + sz##param = (SQLCHAR *) box_wide_as_utf8_char ((caddr_t) wsz##param, len, DV_LONG_STRING); \ + } \ + } \ + else \ + { \ + unsigned out_len; \ + if ((con)->con_wide_as_utf16) \ + { \ + len = cb##param > 0 ? cb##param : virt_ucs2len ((uint16 *) wsz##param); \ + sz##param = (SQLCHAR *) dk_alloc_box (len * 9 + 1, DV_LONG_STRING); \ + out_len = (unsigned) cli_utf16_to_escaped (charset, 0, (uint16 *) wsz##param, len, sz##param, len * 9, NULL, NULL); \ + sz##param[out_len] = 0; \ + } \ + else \ + { \ + len = cb##param > 0 ? cb##param : wcslen (WCHAR_CAST wsz##param); \ + sz##param = (SQLCHAR *) dk_alloc_box (len * 9 + 1, DV_LONG_STRING); \ + out_len = (unsigned) cli_wide_to_escaped (charset, 0, WCHAR_CAST wsz##param, len, sz##param, len * 9, NULL, NULL); \ + sz##param[out_len] = 0; \ + } \ + } \ + } #define FREE_INPUT_NARROW(param) \ if (wsz##param) \ @@ -101,7 +168,7 @@ #define DEFINE_OUTPUT_CHAR_NARROW_N(param, type) \ SQLCHAR *sz##param = NULL; \ type _vpcb##param, *_pcb##param = &_vpcb##param; \ - type _cb##param = MAX_MESSAGE_LEN + cb##param / sizeof (wchar_t) + type _cb##param = MAX_MESSAGE_LEN + cb##param / (wide_as_utf16 ? sizeof (uint16) :sizeof (wchar_t)) #define MAKE_OUTPUT_CHAR_NARROW_N(param) \ if (wsz##param) \ @@ -109,6 +176,7 @@ sz##param = (SQLCHAR *) dk_alloc_box (cb##param, DV_LONG_STRING); \ } +#if 0 #define SET_AND_FREE_OUTPUT_CHAR_NARROW_N(param) \ if (wsz##param) \ { \ @@ -125,21 +193,23 @@ } \ if (pcb##param) \ *pcb##param = *_pcb##param * N_BYTES_PER_CHAR; +#endif #define DEFINE_OUTPUT_CHAR_NARROW(param, con, type) \ SQLCHAR *sz##param = NULL; \ type _vpcb##param, *_pcb##param = &_vpcb##param; \ - type _cb##param = MAX_MESSAGE_LEN + cb##param * ((con)->con_defs.cdef_utf8_execs ? VIRT_MB_CUR_MAX : 1) + type _cb##param = MAX_MESSAGE_LEN + cb##param * (((con)->con_defs.cdef_utf8_execs || (con)->con_string_is_utf8)? VIRT_MB_CUR_MAX : 1) #define MAKE_OUTPUT_CHAR_NARROW(param, con) \ if (wsz##param) \ { \ - if ((con)->con_defs.cdef_utf8_execs) \ + if ((con)->con_defs.cdef_utf8_execs || (con)->con_string_is_utf8) \ sz##param = (SQLCHAR *) dk_alloc_box (cb##param * VIRT_MB_CUR_MAX, DV_LONG_STRING); \ else \ sz##param = (SQLCHAR *) dk_alloc_box (_cb##param, DV_LONG_STRING); \ } +#if 0 #define SET_AND_FREE_OUTPUT_CHAR_NARROW(param, con) \ if (wsz##param) \ { \ @@ -176,10 +246,43 @@ } \ if (pcb##param) \ *pcb##param = *_pcb##param * N_BYTES_PER_CHAR; +#endif + +#define SET_AND_FREE_OUTPUT_CHAR_NARROW_1(param, con) \ + if (wsz##param) \ + { \ + SQLSMALLINT len1; \ + wcharset_t *_charset = charset; \ + if ((con) && (con)->con_defs.cdef_utf8_execs) \ + _charset = CHARSET_UTF8; \ + if (SQL_SUCCEEDED(rc) && cb##param > 0) \ + { \ + if (wide_as_utf16) \ + { \ + len1 = (SQLSMALLINT) cli_narrow_to_utf16 (_charset, 0, sz##param, *_pcb##param, (uint16 *) wsz##param, cb##param - 1); \ + if (len1 >= 0) \ + ((uint16 *) wsz##param)[len1] = 0; \ + else \ + ((uint16 *) wsz##param)[0] = 0; \ + } \ + else \ + { \ + len1 = (SQLSMALLINT) cli_narrow_to_wide (_charset, 0, sz##param, *_pcb##param, WCHAR_CAST wsz##param, cb##param - 1); \ + if (len1 >= 0) \ + (WCHAR_CAST wsz##param)[len1] = 0; \ + else \ + (WCHAR_CAST wsz##param)[0] = 0; \ + } \ + *_pcb##param = len1; \ + } \ + dk_free_box ((box_t) sz##param); \ + } \ + if (pcb##param) \ + *pcb##param = *_pcb##param * (wide_as_utf16 ? 2 : N_BYTES_PER_CHAR); #define DEFINE_OUTPUT_NONCHAR_NARROW(wide, len, pcb, con, type) \ - type _##len = (type) (len / sizeof (wchar_t) * (( (con) && (con)->con_defs.cdef_utf8_execs) ? VIRT_MB_CUR_MAX : 1)); \ + type _##len = (type) (len / (wide_as_utf16 ? sizeof(uint16) : sizeof (wchar_t)) * (( (con) && ((con)->con_defs.cdef_utf8_execs || (con)->con_string_is_utf8)) ? VIRT_MB_CUR_MAX : 1)); \ caddr_t _##wide = NULL; \ type _v##pcb, * _##pcb = &_v##pcb @@ -187,12 +290,13 @@ #define MAKE_OUTPUT_NONCHAR_NARROW(wide, len, con) \ if (wide && len > 0) \ { \ - if ((con) && (con)->con_defs.cdef_utf8_execs) \ + if ((con) && ((con)->con_defs.cdef_utf8_execs || (con)->con_string_is_utf8)) \ _##wide = (char *) dk_alloc_box (_##len * VIRT_MB_CUR_MAX + 1, DV_LONG_STRING); \ else \ _##wide = (char *) dk_alloc_box (_##len + 1, DV_LONG_STRING); \ } +#if 0 #define SET_AND_FREE_OUTPUT_NONCHAR_NARROW(wide, len, plen, con) \ if (wide && len > 0) \ { \ @@ -230,26 +334,67 @@ if (plen) \ *plen = (SQLSMALLINT) *_##plen * /*N_BYTES_PER_CHAR */sizeof (wchar_t); \ } +#endif + +#define SET_AND_FREE_OUTPUT_NONCHAR_NARROW_1(wide, len, plen, con) \ + if (wide && len > 0) \ + { \ + size_t len2 = (!_##plen || (_##plen && *_##plen == SQL_NTS)) ? strlen (_##wide) : *_##plen; \ + wcharset_t *_charset = charset; \ + if ((con)->con_defs.cdef_utf8_execs) \ + _charset = CHARSET_UTF8; \ + if ((con)->con_wide_as_utf16) \ + { \ + size_t len1 = cli_narrow_to_utf16 (_charset, 0, (unsigned char *) _##wide, len2, (uint16 *) wide, len); \ + ((uint16 *) wide)[len1] = 0; \ + if (plen) \ + *plen = (SQLSMALLINT) len2 * /*N_BYTES_PER_CHAR */sizeof (uint16); \ + } \ + else \ + { \ + size_t len1 = cli_narrow_to_wide (_charset, 0, (unsigned char *) _##wide, len2, WCHAR_CAST wide, len); \ + ((wchar_t *) wide)[len1] = 0; \ + if (plen) \ + *plen = (SQLSMALLINT) len2 * /*N_BYTES_PER_CHAR */sizeof (wchar_t); \ + } \ + dk_free_box ((box_t) _##wide); \ + } \ + else \ + { \ + if (plen) \ + { \ + if ((con)->con_wide_as_utf16) \ + *plen = (SQLSMALLINT) *_##plen * /*N_BYTES_PER_CHAR */sizeof (uint16); \ + else \ + *plen = (SQLSMALLINT) *_##plen * /*N_BYTES_PER_CHAR */sizeof (wchar_t); \ + } \ + } #define DEFINE_INPUT_NONCHAR_NARROW(wide, len) \ - long _##len = (long) (len < 0 ? wcslen ((wchar_t *)wide) : len); \ + long _##len = (long) (len < 0 ? (wide_as_utf16 ? virt_ucs2len ((uint16 *)wide) : wcslen ((wchar_t *)wide) ) : len); \ unsigned char * _##wide = NULL #define MAKE_INPUT_NONCHAR_NARROW_N(wide, len) \ if (_##len > 0 && wide) \ { \ _##wide = (unsigned char *) dk_alloc_box (_##len + 1, DV_LONG_STRING); \ - cli_wide_to_narrow (charset, 0, (wchar_t *)wide, _##len, _##wide, _##len, NULL, NULL); \ + if (wide_as_utf16) \ + cli_utf16_to_narrow (charset, 0, (uint16 *)wide, _##len, _##wide, _##len, NULL, NULL); \ + else \ + cli_wide_to_narrow (charset, 0, (wchar_t *)wide, _##len, _##wide, _##len, NULL, NULL); \ _##wide[_##len] = 0; \ } #define MAKE_INPUT_NONCHAR_NARROW(wide, len, con) \ - if ((con)->con_defs.cdef_utf8_execs) \ + if ((con)->con_defs.cdef_utf8_execs || (con)->con_string_is_utf8) \ { \ if (_##len > 0 && wide) \ { \ - _##wide = (unsigned char *) box_wide_as_utf8_char ((caddr_t) wide, _##len, DV_LONG_STRING); \ + if (wide_as_utf16) \ + _##wide = (unsigned char *) box_utf16_as_utf8_char ((caddr_t) wide, _##len, DV_LONG_STRING); \ + else \ + _##wide = (unsigned char *) box_wide_as_utf8_char ((caddr_t) wide, _##len, DV_LONG_STRING); \ _##len = (long) strlen ((const char *) _##wide); \ } \ } \ @@ -320,6 +465,7 @@ SQLRETURN SQL_API virtodbc__SQLColAttributesW( SQLLEN *pfDesc) { STMT_CHARSET (hstmt); + int wide_as_utf16 = stmt->stmt_connection->con_wide_as_utf16; switch (fDescType) { @@ -345,7 +491,7 @@ SQLRETURN SQL_API virtodbc__SQLColAttributesW( rc = virtodbc__SQLColAttributes (hstmt, icol, fDescType, _rgbDesc, _cbDescMax, _pcbDesc, pfDesc); - SET_AND_FREE_OUTPUT_NONCHAR_NARROW (rgbDesc, cbDescMax, pcbDesc, stmt->stmt_connection); + SET_AND_FREE_OUTPUT_NONCHAR_NARROW_1 (rgbDesc, cbDescMax, pcbDesc, stmt->stmt_connection); return rc; } @@ -385,6 +531,7 @@ SQLRETURN SQL_API SQLColAttributeW( { SQLRETURN rc; STMT_CHARSET (hstmt); + int wide_as_utf16 = stmt->stmt_connection->con_wide_as_utf16; DEFINE_OUTPUT_NONCHAR_NARROW (wszCharAttr, cbCharAttr, pcbCharAttr, stmt->stmt_connection, SQLSMALLINT); @@ -392,7 +539,7 @@ SQLRETURN SQL_API SQLColAttributeW( rc = (virtodbc__SQLColAttribute (hstmt, iCol, iField, _wszCharAttr, _cbCharAttr, _pcbCharAttr, pNumAttr)); - SET_AND_FREE_OUTPUT_NONCHAR_NARROW (wszCharAttr, cbCharAttr, pcbCharAttr, stmt->stmt_connection); + SET_AND_FREE_OUTPUT_NONCHAR_NARROW_1 (wszCharAttr, cbCharAttr, pcbCharAttr, stmt->stmt_connection); return rc; } @@ -418,10 +565,10 @@ SQLColumnPrivilegesW ( DEFINE_INPUT_NARROW (TableName); DEFINE_INPUT_NARROW (ColumnName); - MAKE_INPUT_NARROW (TableQualifier, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableOwner, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableName, stmt->stmt_connection); - MAKE_INPUT_NARROW (ColumnName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableQualifier, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableOwner, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (ColumnName, stmt->stmt_connection); rc = virtodbc__SQLColumnPrivileges (hstmt, szTableQualifier, cbTableQualifier, szTableOwner, cbTableOwner, szTableName, cbTableName, szColumnName, cbColumnName); @@ -454,10 +601,10 @@ SQLColumnsW ( DEFINE_INPUT_NARROW (TableName); DEFINE_INPUT_NARROW (ColumnName); - MAKE_INPUT_NARROW (TableQualifier, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableOwner, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableName, stmt->stmt_connection); - MAKE_INPUT_NARROW (ColumnName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableQualifier, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableOwner, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (ColumnName, stmt->stmt_connection); rc = virtodbc__SQLColumns (hstmt, szTableQualifier, cbTableQualifier, szTableOwner, cbTableOwner, szTableName, cbTableName, szColumnName, cbColumnName); @@ -517,12 +664,13 @@ SQLDescribeColW ( SQLRETURN rc; STMT_CHARSET (hstmt); DEFINE_OUTPUT_CHAR_NARROW (ColName, stmt->stmt_connection, SQLSMALLINT); + int wide_as_utf16 = stmt->stmt_connection->con_wide_as_utf16; MAKE_OUTPUT_CHAR_NARROW (ColName, stmt->stmt_connection); rc = virtodbc__SQLDescribeCol (hstmt, icol, szColName, _cbColName, _pcbColName, pfSqlType, pcbColDef, pibScale, pfNullable); - SET_AND_FREE_OUTPUT_CHAR_NARROW (ColName, stmt->stmt_connection); + SET_AND_FREE_OUTPUT_CHAR_NARROW_1 (ColName, stmt->stmt_connection); return rc; } @@ -545,31 +693,41 @@ SQLErrorW ( wcharset_t *charset = con ? con->con_charset : (stmt ? stmt->stmt_connection->con_charset : NULL); SQLCHAR szSqlState[6]; SQLRETURN rc; + int wide_as_utf16 = virt_wide_as_utf16; + if (con || stmt) { cli_connection_t *conn = con ? con : stmt->stmt_connection; + wide_as_utf16 = conn->con_wide_as_utf16; + DEFINE_OUTPUT_CHAR_NARROW (ErrorMsg, conn, SQLSMALLINT); MAKE_OUTPUT_CHAR_NARROW (ErrorMsg, conn); rc = virtodbc__SQLError (henv, hdbc, hstmt, szSqlState, pfNativeError, szErrorMsg, _cbErrorMsg, _pcbErrorMsg, 1); - SET_AND_FREE_OUTPUT_CHAR_NARROW (ErrorMsg, conn); + SET_AND_FREE_OUTPUT_CHAR_NARROW_1 (ErrorMsg, conn); } else { + cli_connection_t *_con = NULL; DEFINE_OUTPUT_CHAR_NARROW_N (ErrorMsg, SQLSMALLINT); MAKE_OUTPUT_CHAR_NARROW_N (ErrorMsg); rc = virtodbc__SQLError (henv, hdbc, hstmt, szSqlState, pfNativeError, szErrorMsg, _cbErrorMsg, pcbErrorMsg, 1); - SET_AND_FREE_OUTPUT_CHAR_NARROW_N (ErrorMsg); + SET_AND_FREE_OUTPUT_CHAR_NARROW_1 (ErrorMsg, _con); } if (wszSqlState) - cli_narrow_to_wide (charset, 0, szSqlState, 6, WCHAR_CAST wszSqlState, 6); + { + if (wide_as_utf16) + cli_narrow_to_utf16 (charset, 0, szSqlState, 6, (uint16 *) wszSqlState, 6); + else + cli_narrow_to_wide (charset, 0, szSqlState, 6, WCHAR_CAST wszSqlState, 6); + } return rc; } @@ -586,7 +744,7 @@ SQLExecDirectW ( STMT_CHARSET (hstmt); DEFINE_INPUT_NARROW (SqlStr); - MAKE_INPUT_ESCAPED_NARROW (SqlStr, stmt->stmt_connection); + MAKE_INPUT_ESCAPED_NARROW_1 (SqlStr, stmt->stmt_connection); rc = virtodbc__SQLExecDirect (hstmt, szSqlStr, SQL_NTS); @@ -623,12 +781,12 @@ SQLForeignKeysW ( DEFINE_INPUT_NARROW (FkTableName); - MAKE_INPUT_NARROW (PkTableQualifier, stmt->stmt_connection); - MAKE_INPUT_NARROW (PkTableOwner, stmt->stmt_connection); - MAKE_INPUT_NARROW (PkTableName, stmt->stmt_connection); - MAKE_INPUT_NARROW (FkTableQualifier, stmt->stmt_connection); - MAKE_INPUT_NARROW (FkTableOwner, stmt->stmt_connection); - MAKE_INPUT_NARROW (FkTableName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (PkTableQualifier, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (PkTableOwner, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (PkTableName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (FkTableQualifier, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (FkTableOwner, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (FkTableName, stmt->stmt_connection); rc = virtodbc__SQLForeignKeys (hstmt, szPkTableQualifier, cbPkTableQualifier, szPkTableOwner, cbPkTableOwner, szPkTableName, cbPkTableName, szFkTableQualifier, cbFkTableQualifier, szFkTableOwner, cbFkTableOwner, szFkTableName, cbFkTableName); @@ -651,6 +809,7 @@ SQLGetConnectAttrW (SQLHDBC connectionHandle, SQLINTEGER * StringLengthPtr) { CON_CHARSET (connectionHandle); + int wide_as_utf16 = con->con_wide_as_utf16; switch (Attribute) { @@ -667,7 +826,7 @@ SQLGetConnectAttrW (SQLHDBC connectionHandle, rc = virtodbc__SQLGetConnectAttr (connectionHandle, Attribute, _ValuePtr, _StringLength, _StringLengthPtr); - SET_AND_FREE_OUTPUT_NONCHAR_NARROW (ValuePtr, StringLength, StringLengthPtr, con); + SET_AND_FREE_OUTPUT_NONCHAR_NARROW_1 (ValuePtr, StringLength, StringLengthPtr, con); return rc; } @@ -685,6 +844,7 @@ SQLGetConnectOptionW ( { CON_CHARSET (hdbc); SQLRETURN rc; + int wide_as_utf16 = con->con_wide_as_utf16; switch (fOption) { @@ -700,7 +860,7 @@ SQLGetConnectOptionW ( rc = virtodbc__SQLGetConnectOption (hdbc, fOption, _pvParam, _StrLen, _StrLenPtr); - SET_AND_FREE_OUTPUT_NONCHAR_NARROW (pvParam, StrLen, StrLenPtr, con); + SET_AND_FREE_OUTPUT_NONCHAR_NARROW_1 (pvParam, StrLen, StrLenPtr, con); return rc; } @@ -721,12 +881,13 @@ SQLGetCursorNameW ( SQLRETURN rc; STMT_CHARSET (hstmt); DEFINE_OUTPUT_CHAR_NARROW (Cursor, stmt->stmt_connection, SQLSMALLINT); + int wide_as_utf16 = stmt->stmt_connection->con_wide_as_utf16; MAKE_OUTPUT_CHAR_NARROW (Cursor, stmt->stmt_connection); rc = virtodbc__SQLGetCursorName (hstmt, szCursor, _cbCursor, _pcbCursor); - SET_AND_FREE_OUTPUT_CHAR_NARROW (Cursor, stmt->stmt_connection); + SET_AND_FREE_OUTPUT_CHAR_NARROW_1 (Cursor, stmt->stmt_connection); return rc; } @@ -763,7 +924,7 @@ SQLGetDescFieldW (SQLHDESC descriptorHandle, rc = virtodbc__SQLGetDescField (descriptorHandle, RecNumber, FieldIdentifier, _ValuePtr, _BufferLength, _StringLengthPtr); - SET_AND_FREE_OUTPUT_NONCHAR_NARROW (ValuePtr, BufferLength, StringLengthPtr, desc->d_stmt->stmt_connection); + SET_AND_FREE_OUTPUT_NONCHAR_NARROW_1 (ValuePtr, BufferLength, StringLengthPtr, desc->d_stmt->stmt_connection); return rc; } @@ -795,7 +956,7 @@ SQLGetDescRecW (SQLHDESC descriptorHandle, rc = virtodbc__SQLGetDescRec (descriptorHandle, RecNumber, szName, _cbName, _pcbName, TypePtr, SubTypePtr, LengthPtr, PrecisionPtr, ScalePtr, NullablePtr); - SET_AND_FREE_OUTPUT_CHAR_NARROW (Name, desc->d_stmt->stmt_connection); + SET_AND_FREE_OUTPUT_CHAR_NARROW_1 (Name, desc->d_stmt->stmt_connection); return rc; } @@ -826,6 +987,7 @@ SQLGetDiagFieldW (SQLSMALLINT nHandleType, cli_connection_t *conn = (nHandleType == SQL_HANDLE_DBC ? con : (nHandleType == SQL_HANDLE_STMT ? stmt->stmt_connection : (nHandleType == SQL_HANDLE_DESC ? desc->d_stmt->stmt_connection : NULL))); + int wide_as_utf16 = conn ? conn->con_wide_as_utf16 : virt_wide_as_utf16; DEFINE_OUTPUT_NONCHAR_NARROW (pDiagInfoPtr, nBufferLength, pnStringLengthPtr, conn, SQLSMALLINT); @@ -833,7 +995,7 @@ SQLGetDiagFieldW (SQLSMALLINT nHandleType, rc = virtodbc__SQLGetDiagField (nHandleType, Handle, nRecNumber, nDiagIdentifier, _pDiagInfoPtr, _nBufferLength, _pnStringLengthPtr); - SET_AND_FREE_OUTPUT_NONCHAR_NARROW (pDiagInfoPtr, nBufferLength, pnStringLengthPtr, conn); + SET_AND_FREE_OUTPUT_NONCHAR_NARROW_1 (pDiagInfoPtr, nBufferLength, pnStringLengthPtr, conn); return rc; } @@ -861,6 +1023,7 @@ SQLGetDiagRecW (SQLSMALLINT HandleType, cli_connection_t *conn = (HandleType == SQL_HANDLE_DBC ? con : (HandleType == SQL_HANDLE_STMT ? stmt->stmt_connection : (HandleType == SQL_HANDLE_DESC ? desc->d_stmt->stmt_connection : NULL))); + int wide_as_utf16 = conn ? conn->con_wide_as_utf16 : virt_wide_as_utf16; if (conn) { @@ -870,24 +1033,30 @@ SQLGetDiagRecW (SQLSMALLINT HandleType, rc = virtodbc__SQLGetDiagRec (HandleType, Handle, RecNumber, szSqlState, NativeErrorPtr, szMessageText, _cbMessageText, _pcbMessageText); - SET_AND_FREE_OUTPUT_CHAR_NARROW (MessageText, conn); + SET_AND_FREE_OUTPUT_CHAR_NARROW_1 (MessageText, conn); /*if (pcbMessageText) - explicit bug, _cbMessageText is a temp buffer length *pcbMessageText = ((SQLSMALLINT) _cbMessageText);*/ } else { + cli_connection_t *_con = NULL; DEFINE_OUTPUT_CHAR_NARROW_N (MessageText, SQLSMALLINT); MAKE_OUTPUT_CHAR_NARROW_N (MessageText); rc = virtodbc__SQLGetDiagRec (HandleType, Handle, RecNumber, szSqlState, NativeErrorPtr, szMessageText, _cbMessageText, _pcbMessageText); - SET_AND_FREE_OUTPUT_CHAR_NARROW_N (MessageText); + SET_AND_FREE_OUTPUT_CHAR_NARROW_1 (MessageText, _con); } if (wszSqlstate) - cli_narrow_to_wide (charset, 0, szSqlState, 6, WCHAR_CAST wszSqlstate, 6); + { + if (wide_as_utf16) + cli_narrow_to_utf16 (charset, 0, szSqlState, 6, (uint16 *) wszSqlstate, 6); + else + cli_narrow_to_wide (charset, 0, szSqlState, 6, WCHAR_CAST wszSqlstate, 6); + } return rc; } @@ -902,6 +1071,7 @@ SQLGetInfoW ( SQLSMALLINT * pcbInfoValue) { CON_CHARSET (hdbc); + int wide_as_utf16 = con->con_wide_as_utf16; switch (fInfoType) { @@ -951,7 +1121,7 @@ SQLGetInfoW ( rc = virtodbc__SQLGetInfo (hdbc, fInfoType, _rgbInfoValue, _cbInfoValueMax, _pcbInfoValue); - SET_AND_FREE_OUTPUT_NONCHAR_NARROW (rgbInfoValue, cbInfoValueMax, pcbInfoValue, con); + SET_AND_FREE_OUTPUT_NONCHAR_NARROW_1 (rgbInfoValue, cbInfoValueMax, pcbInfoValue, con); return rc; } @@ -985,15 +1155,16 @@ SQLNativeSqlW ( CON_CHARSET (hdbc); SQLRETURN rc; size_t len; + int wide_as_utf16 = con ? con->con_wide_as_utf16 : virt_wide_as_utf16; DEFINE_INPUT_NARROW (SqlStrIn); DEFINE_OUTPUT_CHAR_NARROW (SqlStr, con, SQLINTEGER); - MAKE_INPUT_NARROW (SqlStrIn, con); + MAKE_INPUT_NARROW_1 (SqlStrIn, con); MAKE_OUTPUT_CHAR_NARROW (SqlStr, con); rc = virtodbc__SQLNativeSql (hdbc, szSqlStrIn, SQL_NTS, szSqlStr, _cbSqlStr, _pcbSqlStr); - SET_AND_FREE_OUTPUT_CHAR_NARROW (SqlStr, con); + SET_AND_FREE_OUTPUT_CHAR_NARROW_1 (SqlStr, con); FREE_INPUT_NARROW (SqlStrIn); return rc; @@ -1011,7 +1182,7 @@ SQLPrepareW ( STMT_CHARSET (hstmt); DEFINE_INPUT_NARROW (SqlStr); - MAKE_INPUT_ESCAPED_NARROW (SqlStr, stmt->stmt_connection); + MAKE_INPUT_ESCAPED_NARROW_1 (SqlStr, stmt->stmt_connection); rc = virtodbc__SQLPrepare (hstmt, szSqlStr, SQL_NTS); @@ -1039,9 +1210,9 @@ SQLPrimaryKeysW ( DEFINE_INPUT_NARROW (TableOwner); DEFINE_INPUT_NARROW (TableName); - MAKE_INPUT_NARROW (TableQualifier, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableOwner, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableQualifier, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableOwner, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableName, stmt->stmt_connection); rc = virtodbc__SQLPrimaryKeys (hstmt, szTableQualifier, cbTableQualifier, szTableOwner, cbTableOwner, szTableName, cbTableName); @@ -1074,10 +1245,10 @@ SQLProcedureColumnsW ( DEFINE_INPUT_NARROW (ProcName); DEFINE_INPUT_NARROW (ColumnName); - MAKE_INPUT_NARROW (ProcQualifier, stmt->stmt_connection); - MAKE_INPUT_NARROW (ProcOwner, stmt->stmt_connection); - MAKE_INPUT_NARROW (ProcName, stmt->stmt_connection); - MAKE_INPUT_NARROW (ColumnName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (ProcQualifier, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (ProcOwner, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (ProcName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (ColumnName, stmt->stmt_connection); rc = virtodbc__SQLProcedureColumns (hstmt, szProcQualifier, cbProcQualifier, szProcOwner, cbProcOwner, szProcName, cbProcName, szColumnName, cbColumnName); @@ -1108,9 +1279,9 @@ SQLProceduresW ( DEFINE_INPUT_NARROW (ProcOwner); DEFINE_INPUT_NARROW (ProcName); - MAKE_INPUT_NARROW (ProcQualifier, stmt->stmt_connection); - MAKE_INPUT_NARROW (ProcOwner, stmt->stmt_connection); - MAKE_INPUT_NARROW (ProcName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (ProcQualifier, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (ProcOwner, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (ProcName, stmt->stmt_connection); rc = virtodbc__SQLProcedures (hstmt, szProcQualifier, cbProcQualifier, szProcOwner, cbProcOwner, szProcName, cbProcName); @@ -1129,6 +1300,7 @@ SQLSetConnectAttrW (SQLHDBC connectionHandle, SQLINTEGER StringLength) { CON_CHARSET (connectionHandle); + int wide_as_utf16 = con->con_wide_as_utf16; switch (Attribute) { @@ -1161,6 +1333,8 @@ SQLSetConnectOptionW ( SQLULEN vParam) { CON_CHARSET (hdbc); + int wide_as_utf16 = con->con_wide_as_utf16; + switch (fOption) { case SQL_CURRENT_QUALIFIER: @@ -1195,7 +1369,7 @@ SQLSetCursorNameW ( size_t len; DEFINE_INPUT_NARROW (Cursor); - MAKE_INPUT_NARROW (Cursor, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (Cursor, stmt->stmt_connection); rc = virtodbc__SQLSetCursorName (hstmt, szCursor, cbCursor); @@ -1274,9 +1448,9 @@ SQLSpecialColumnsW ( DEFINE_INPUT_NARROW (TableOwner); DEFINE_INPUT_NARROW (TableName); - MAKE_INPUT_NARROW (TableQualifier, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableOwner, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableQualifier, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableOwner, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableName, stmt->stmt_connection); rc = virtodbc__SQLSpecialColumns (hstmt, fColType, szTableQualifier, cbTableQualifier, szTableOwner, cbTableOwner, szTableName, cbTableName, fScope, fNullable); @@ -1307,9 +1481,9 @@ SQLStatisticsW ( DEFINE_INPUT_NARROW (TableOwner); DEFINE_INPUT_NARROW (TableName); - MAKE_INPUT_NARROW (TableQualifier, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableOwner, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableQualifier, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableOwner, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableName, stmt->stmt_connection); rc = virtodbc__SQLStatistics (hstmt, szTableQualifier, cbTableQualifier, szTableOwner, cbTableOwner, szTableName, cbTableName, fUnique, fAccuracy); @@ -1338,9 +1512,9 @@ SQLTablePrivilegesW ( DEFINE_INPUT_NARROW (TableOwner); DEFINE_INPUT_NARROW (TableName); - MAKE_INPUT_NARROW (TableQualifier, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableOwner, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableQualifier, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableOwner, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableName, stmt->stmt_connection); rc = virtodbc__SQLTablePrivileges (hstmt, szTableQualifier, cbTableQualifier, szTableOwner, cbTableOwner, szTableName, cbTableName); @@ -1372,10 +1546,10 @@ SQLTablesW ( DEFINE_INPUT_NARROW (TableName); DEFINE_INPUT_NARROW (TableType); - MAKE_INPUT_NARROW (TableQualifier, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableOwner, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableName, stmt->stmt_connection); - MAKE_INPUT_NARROW (TableType, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableQualifier, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableOwner, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableName, stmt->stmt_connection); + MAKE_INPUT_NARROW_1 (TableType, stmt->stmt_connection); rc = virtodbc__SQLTables (hstmt, szTableQualifier, cbTableQualifier, szTableOwner, cbTableOwner, szTableName, cbTableName, szTableType, cbTableType); diff --git a/libsrc/Wi/Makefile.am b/libsrc/Wi/Makefile.am index d97a053f78..9ef89df82c 100644 --- a/libsrc/Wi/Makefile.am +++ b/libsrc/Wi/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -1060,6 +1060,7 @@ EXTRA_DIST = \ bif_kerberoscli.c \ bif_mts.c \ bif_purify.c \ + bmcmp.c \ box2any.c \ cebits.c \ cebitsdec.c \ diff --git a/libsrc/Wi/aqueue.c b/libsrc/Wi/aqueue.c index b89ea6f040..174eb75ecd 100644 --- a/libsrc/Wi/aqueue.c +++ b/libsrc/Wi/aqueue.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/aqueue.h b/libsrc/Wi/aqueue.h index 5e89edd20f..ef7ff6da3e 100644 --- a/libsrc/Wi/aqueue.h +++ b/libsrc/Wi/aqueue.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/arith.c b/libsrc/Wi/arith.c index 44b924a439..262a95de13 100644 --- a/libsrc/Wi/arith.c +++ b/libsrc/Wi/arith.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/arith.h b/libsrc/Wi/arith.h index abb9380072..2257a6141d 100644 --- a/libsrc/Wi/arith.h +++ b/libsrc/Wi/arith.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/autoexec.sql b/libsrc/Wi/autoexec.sql index 5f625e2aeb..b336b43293 100644 --- a/libsrc/Wi/autoexec.sql +++ b/libsrc/Wi/autoexec.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/auxfiles.c b/libsrc/Wi/auxfiles.c index 9de2060eed..622c0b311d 100644 --- a/libsrc/Wi/auxfiles.c +++ b/libsrc/Wi/auxfiles.c @@ -10,7 +10,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -40,6 +40,9 @@ char * https_port; char * https_cert; char * https_key; char * https_extra; +char * https_dhparam; +char * https_ecdh_curve; +int32 https_hsts_max_age = -1; char * https_cipher_list; char * https_protocols; int32 https_client_verify = 0; @@ -525,7 +528,7 @@ _db_read_cfg (dbe_storage_t * ignore, char *mode) dbe_auto_sql_stats = (long) (ptrlong) cfg_get_parm (wholefile, "\nauto_sql_stats:", 0); callstack_on_exception = (long) (ptrlong) cfg_get_parm (wholefile, "\ncallstack_on_exception:", 0); - + public_debug = (long) (ptrlong) cfg_get_parm (wholefile, "\npublic_debug:", 0); pl_debug_all = (long) (ptrlong) cfg_get_parm (wholefile, "\npl_debug:", 0); pl_debug_cov_file = cfg_get_parm (wholefile, "\ntest_coverage:", 1); diff --git a/libsrc/Wi/bif_audio.c b/libsrc/Wi/bif_audio.c index d5c5f9734f..bfd3feb450 100644 --- a/libsrc/Wi/bif_audio.c +++ b/libsrc/Wi/bif_audio.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_audio_tags.h b/libsrc/Wi/bif_audio_tags.h index 62b6ea29e7..037dacf141 100644 --- a/libsrc/Wi/bif_audio_tags.h +++ b/libsrc/Wi/bif_audio_tags.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_crypto.c b/libsrc/Wi/bif_crypto.c index ab7c0cd492..29c6b72f7b 100644 --- a/libsrc/Wi/bif_crypto.c +++ b/libsrc/Wi/bif_crypto.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_date.c b/libsrc/Wi/bif_date.c index 49fd09c3c2..cb2a62dcc9 100644 --- a/libsrc/Wi/bif_date.c +++ b/libsrc/Wi/bif_date.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_dav.c b/libsrc/Wi/bif_dav.c index 78aa954bdf..ba35300193 100644 --- a/libsrc/Wi/bif_dav.c +++ b/libsrc/Wi/bif_dav.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_diff.c b/libsrc/Wi/bif_diff.c index 3b45fc70d2..7b18849341 100644 --- a/libsrc/Wi/bif_diff.c +++ b/libsrc/Wi/bif_diff.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_explain.c b/libsrc/Wi/bif_explain.c index a535209803..ae2b683a15 100644 --- a/libsrc/Wi/bif_explain.c +++ b/libsrc/Wi/bif_explain.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -3253,10 +3253,10 @@ node_print_xml (QI * qi, dk_session_t * s, data_source_t * qn) { if (!ik) continue; - ses_sprintf (s, "", ik->ik_key->key_name); - if (ik->ik_slots) - ssl_array_print_xml (ik->ik_slots, s); - SES_PRINT (s, ""); + ses_sprintf (s, "", ik->ik_key->key_name); + if (ik->ik_slots) + ssl_array_print_xml (ik->ik_slots, s); + SES_PRINT (s, ""); } END_DO_BOX; } diff --git a/libsrc/Wi/bif_file.c b/libsrc/Wi/bif_file.c index be5ef60d9e..9748c46652 100644 --- a/libsrc/Wi/bif_file.c +++ b/libsrc/Wi/bif_file.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -50,6 +50,14 @@ # endif #endif +#ifndef P_tmpdir +# ifdef _P_tmpdir /* native Windows */ +# define P_tmpdir _P_tmpdir +# else +# define P_tmpdir "/tmp" +# endif +#endif + #define UUID_T_DEFINED #include "libutil.h" /* needed by bif_cfg_* functions */ #include "statuslog.h" @@ -7475,7 +7483,7 @@ bif_file_init (void) bif_define_ex ("md5_update", bif_md5_update, BMD_RET_TYPE, &bt_varchar, BMD_DONE); bif_define_ex ("md5_final", bif_md5_final, BMD_RET_TYPE, &bt_varchar, BMD_DONE); bif_define_ex ("__vector_sort", bif_vector_sort, BMD_RET_TYPE, &bt_any, BMD_DONE); - bif_define_ex ("uuid", bif_uuid, BMD_ALIAS, "rdf_struuid_impl", BMD_RET_TYPE, &bt_varchar, BMD_DONE); + bif_define_ex ("uuid", bif_uuid, BMD_ALIAS, "rdf_struuid_impl", BMD_RET_TYPE, &bt_varchar, BMD_NO_FOLD, BMD_DONE); bif_define ("dime_compose", bif_dime_compose); bif_define ("dime_tree", bif_dime_tree); bif_define_ex ("file_stat", bif_file_stat, BMD_RET_TYPE, &bt_any, BMD_DONE); diff --git a/libsrc/Wi/bif_geo.c b/libsrc/Wi/bif_geo.c index 8636a9afc6..aab3758bb8 100644 --- a/libsrc/Wi/bif_geo.c +++ b/libsrc/Wi/bif_geo.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -77,8 +77,7 @@ bif_earth_radius (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) return box_double (EARTH_RADIUS_GEOM_MEAN_KM); } -double -haversine (double lat1, double lat2, double long_sep) +double haversine (double lat1, double lat2, double long_sep) { double sqrthaversin_lat_sep = sin ((lat1 - lat2) / 2.0); double sqrthaversin_long_sep = sin (long_sep / 2.0); @@ -95,13 +94,30 @@ haversine_deg_km (double long1, double lat1, double long2, double lat2) long2 *= (M_PI / 180.0); hs = haversine (lat1, lat2, long2 - long1); if (hs > 0.999999) - return (M_PI * (EARTH_RADIUS_GEOM_MEAN_KM + cos (lat1) * cos (lat2) * (EARTH_RADIUS_EQUATOR_KM - EARTH_RADIUS_GEOM_MEAN_KM))); + return (M_PI * (EARTH_RADIUS_GEOM_MEAN_KM + + cos (lat1) * cos (lat2) * (EARTH_RADIUS_EQUATOR_KM - EARTH_RADIUS_GEOM_MEAN_KM) ) ); else if (hs <= 0.0) return (0); else return (EARTH_RADIUS_GEOM_MEAN_KM * 2.0 * asin (sqrt (hs))); } +double +haversine_deg_deg (double long1, double lat1, double long2, double lat2) +{ + double hs; + lat1 *= (M_PI / 180.0); + long1 *= (M_PI / 180.0); + lat2 *= (M_PI / 180.0); + long2 *= (M_PI / 180.0); + hs = haversine (lat1, lat2, long2 - long1); + if (hs > 0.999999) + return 180.0; + else if (hs <= 0.0) + return 0.0; + else + return 2.0 * asin (sqrt (hs)) * 180.0 / M_PI; +} caddr_t bif_haversine_deg_km (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) @@ -380,6 +396,8 @@ Then building bounding boxes and filling in chainboxes. */ int first_new_point_ofs, addon_count; switch (GEO_TYPE_NO_ZM (itm->geo_flags)) { + case GEO_NULL_SHAPE: + continue; case GEO_POINT: if ((fabs (itm->XYbox.Xmin - prevX) <= geoc_EPSILON) && (fabs (itm->XYbox.Ymin - prevY) <= geoc_EPSILON)) continue; @@ -747,7 +765,9 @@ bif_st_may_intersect (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) caddr_t bif_st_astext (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) { - geo_t * g = bif_geo_arg (qst, args, 0, "st_wkt", GEO_ARG_ANY_NONNULL); + geo_t * g = bif_geo_arg (qst, args, 0, "st_wkt", GEO_ARG_ANY_NULLABLE); + if (NULL == g) + return box_dv_short_string ("EMPTY"); return geo_wkt ((caddr_t)g); } @@ -1477,29 +1497,29 @@ geo_pred (geo_t * g1, geo_t * g2, int op, double prec) { if ((NULL == g1) || (NULL == g2)) return 0; - if (GEO_POINT == GEO_TYPE_NO_ZM (g2->geo_flags)) - { - if (GEO_POINT == GEO_TYPE_NO_ZM (g1->geo_flags)) - { - if (prec >= geo_distance (g1->geo_srcode, Xkey(g1), Ykey(g1), Xkey(g2), Ykey(g2))) - return 1; - return 0; - } - if (GEO_BOX == GEO_TYPE_NO_ZM (g1->geo_flags)) - { - geoc boxproximaX = ((Xkey(g2) > g1->XYbox.Xmax) ? g1->XYbox.Xmax : ((Xkey(g2) < g1->XYbox.Xmin) ? g1->XYbox.Xmin : Xkey(g2))); - geoc boxproximaY = ((Ykey(g2) > g1->XYbox.Ymax) ? g1->XYbox.Ymax : ((Ykey(g2) < g1->XYbox.Ymin) ? g1->XYbox.Ymin : Ykey(g2))); - if (prec >= geo_distance (g1->geo_srcode, Xkey(g2), Ykey(g2), boxproximaX, boxproximaY)) - return 1; - return 0; - } - if ( (Xkey(g2) < g1->XYbox.Xmin - prec) - || (Xkey(g2) > g1->XYbox.Xmax + prec) - || (Ykey(g2) < g1->XYbox.Ymin - prec) - || (Ykey(g2) > g1->XYbox.Ymax + prec) ) + if (GEO_POINT == GEO_TYPE_NO_ZM (g2->geo_flags)) + { + if (GEO_POINT == GEO_TYPE_NO_ZM (g1->geo_flags)) + { + if (prec >= geo_distance (g1->geo_srcode, Xkey(g1), Ykey(g1), Xkey(g2), Ykey(g2))) + return 1; return 0; - return 1; - } + } + if (GEO_BOX == GEO_TYPE_NO_ZM (g1->geo_flags)) + { + geoc boxproximaX = ((Xkey(g2) > g1->XYbox.Xmax) ? g1->XYbox.Xmax : ((Xkey(g2) < g1->XYbox.Xmin) ? g1->XYbox.Xmin : Xkey(g2))); + geoc boxproximaY = ((Ykey(g2) > g1->XYbox.Ymax) ? g1->XYbox.Ymax : ((Ykey(g2) < g1->XYbox.Ymin) ? g1->XYbox.Ymin : Ykey(g2))); + if (prec >= geo_distance (g1->geo_srcode, Xkey(g2), Ykey(g2), boxproximaX, boxproximaY)) + return 1; + return 0; + } + if ( (Xkey(g2) < g1->XYbox.Xmin - prec) + || (Xkey(g2) > g1->XYbox.Xmax + prec) + || (Ykey(g2) < g1->XYbox.Ymin - prec) + || (Ykey(g2) > g1->XYbox.Ymax + prec) ) + return 0; + return 1; + } if ( (g2->XYbox.Xmin < g1->XYbox.Xmin - prec) || (g2->XYbox.Xmax > g1->XYbox.Xmax + prec) || (g2->XYbox.Ymin < g1->XYbox.Ymin - prec) @@ -1513,6 +1533,110 @@ geo_pred (geo_t * g1, geo_t * g2, int op, double prec) return 0; } +id_hash_iterator_t *sr_iri_to_srid_iter = NULL; +id_hash_iterator_t *sr_srid_to_iri_iter = NULL; + +id_hash_iterator_t ** +get_sr_iri_to_srid_iter (void) +{ + return &sr_iri_to_srid_iter; +} + +id_hash_iterator_t ** +get_sr_srid_to_iri_iter (void) +{ + return &sr_srid_to_iri_iter; +} + +boxint +geo_sr_iri_to_srid (caddr_t sr_iri) +{ + if (NULL == sr_iri_to_srid_iter) + { + if (!strcmp (sr_iri, "http://www.opengis.net/def/crs/OGC/1.3/CRS84")) + return SRID_WGS84; + return -1; + } + else + { + id_hash_t *sr_iri_to_srid = sr_iri_to_srid_iter->hit_hash; + caddr_t *hit, res; + boxint unboxed_res; + HT_RDLOCK (sr_iri_to_srid); + hit = (caddr_t *)id_hash_get (sr_iri_to_srid, (caddr_t)(&sr_iri)); + if (NULL == hit) + { + HT_UNLOCK (sr_iri_to_srid); + return -1; + } + res = hit[0]; + if (DV_LONG_INT != DV_TYPE_OF (res)) + { + HT_UNLOCK (sr_iri_to_srid); + return -2; + } + unboxed_res = unbox (res); + HT_UNLOCK (sr_iri_to_srid); + return unboxed_res; + } +} + +caddr_t +geo_sr_srid_to_iri (boxint srid) +{ + if (NULL == sr_srid_to_iri_iter) + { + if (SRID_WGS84 == srid) + return box_dv_uname_string ("http://www.opengis.net/def/crs/OGC/1.3/CRS84"); + return NULL; + } + else + { + id_hash_t *sr_srid_to_iri = sr_srid_to_iri_iter->hit_hash; + caddr_t boxed_srid = box_num (srid); + caddr_t *hit, res; + HT_RDLOCK (sr_srid_to_iri); + hit = (caddr_t *)id_hash_get (sr_srid_to_iri, (caddr_t)(&boxed_srid)); + if (NULL == hit) + { + HT_UNLOCK (sr_srid_to_iri); + return NULL; + } + res = hit[0]; + if ((DV_STRING != DV_TYPE_OF (res)) && (DV_UNAME != DV_TYPE_OF (res))) + { + HT_UNLOCK (sr_srid_to_iri); + return NULL; + } + res = box_copy (res); + HT_UNLOCK (sr_srid_to_iri); + return res; + } +} + +caddr_t +bif_sr_iri_to_srid (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + caddr_t sr_iri = bif_string_arg (qst, args, 0, "sr_iri_to_srid"); + boxint srid = geo_sr_iri_to_srid (sr_iri); + if (0 > srid) + return NEW_DB_NULL; + return box_num (srid); +} + +caddr_t +bif_sr_srid_to_iri (caddr_t * qst, caddr_t * err, state_slot_t ** args) +{ + boxint srid = bif_long_arg (qst, args, 0, "sr_srid_to_iri"); + caddr_t res; + if (0 > srid) + return NEW_DB_NULL; + res = geo_sr_srid_to_iri (srid); + if (NULL == res) + return NEW_DB_NULL; + return res; +} + caddr_t bif_st_ewkt_read (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) { @@ -1522,7 +1646,7 @@ bif_st_ewkt_read (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) caddr_t err = NULL; if (1 < BOX_ELEMENTS (args)) srid = bif_long_arg (qst, args, 1, "st_ewkt_read"); - res = ewkt_parse_2 (strg, srid, &err); + res = ewkt_parse_2 (strg, GEO_SRCODE_OF_SRID(srid), &err); if (NULL != err) sqlr_resignal (err); geo_calc_bounding (res, GEO_CALC_BOUNDING_DO_ALL); @@ -1538,6 +1662,57 @@ bif_http_st_ewkt (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) return (caddr_t)NULL; } +caddr_t +bif_st_wkb_read (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ +#ifdef DISABLE_WKB + sqlr_new_error ("41000", "GEO16", "Function st_wkb_read() is disabled in this build of Virtuoso"); +#else + geo_t *res; + caddr_t strg = bif_arg (qst, args, 0, "st_wkb_read"); + int srid = SRID_DEFAULT; + if (1 < BOX_ELEMENTS (args)) + srid = bif_long_arg (qst, args, 1, "st_wkb_read"); + switch (DV_TYPE_OF (strg)) + { + case DV_STRING_SESSION: + { + dk_session_t *ses = (dk_session_t *)strg; + CATCH_READ_FAIL_S (ses) + { + res = wkb_read_ses (ses, GEO_SRCODE_OF_SRID(srid), 0); + } + FAILED + { + THROW_READ_FAIL_S (ses); + } + END_READ_FAIL_S (ses); + break; + } + default: + sqlr_new_error ("22023", "GEO16", "Function st_wkb_read needs a string or string output as argument 0, not an arg of type %s (%d)", + dv_type_title (DV_TYPE_OF (strg)), DV_TYPE_OF (strg) ); + return NULL; /* never reached */ + } + geo_calc_bounding (res, GEO_CALC_BOUNDING_DO_ALL); + return (caddr_t)res; +#endif +} + + +caddr_t +bif_http_st_wkb (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ +#ifdef DISABLE_WKB + sqlr_new_error ("41000", "GEO16", "Function http_st_wkb() is disabled in this build of Virtuoso"); +#else + geo_t *g = bif_geo_arg (qst, args, 0, "http_st_wkb", GEO_ARG_ANY_NONNULL); + dk_session_t *ses = bif_strses_or_http_ses_arg (qst, args, 1, "http_st_wkb"); + wkb_print (g, ses, 1, 0); + return (caddr_t)NULL; +#endif +} + caddr_t bif_http_st_dxf_entity (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) { @@ -1550,24 +1725,19 @@ bif_http_st_dxf_entity (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) } caddr_t -bif_st_get_bounding_box (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +bif_st_get_bounding_box_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, int get_prec_args, const char *fname, int geotype) { - geo_t *g = bif_geo_arg (qst, args, 0, "st_get_bounding_box", GEO_ARG_ANY_NULLABLE); + geo_t *g = bif_geo_arg (qst, args, 0, fname, geotype); double prec_x = 0, prec_y = 0; int argcount = BOX_ELEMENTS (args); geo_t *res, xy; - if (NULL == g) + if (DV_GEO != DV_TYPE_OF (g)) + return (caddr_t)g; + if (get_prec_args) { -#if 0 - res = geo_alloc (GEO_BOX, 0, SRID_DEFAULT); - GEO_XYBOX_SET_EMPTY (res->XYbox); - return (caddr_t)res; -#else - return NEW_DB_NULL; -#endif + if (2 <= argcount) prec_y = prec_x = bif_double_arg (qst, args, 1, fname); + if (3 <= argcount) prec_y = bif_double_arg (qst, args, 2, fname); } - if (2 <= argcount) prec_y = prec_x = bif_double_arg (qst, args, 1, "st_get_bounding_box"); - if (3 <= argcount) prec_y = bif_double_arg (qst, args, 2, "st_get_bounding_box"); geo_get_bounding_XYbox (g, &xy, prec_x, prec_y); res = geo_alloc (GEO_BOX | (g->geo_flags & (GEO_A_Z | GEO_A_M)), 0, g->geo_srcode); res->XYbox = xy.XYbox; @@ -1588,6 +1758,15 @@ bif_st_get_bounding_box (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) return (caddr_t)res; } +caddr_t +bif_st_get_bounding_box (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ + caddr_t res = bif_st_get_bounding_box_impl (qst, err_ret, args, 1, "st_get_bounding_box", GEO_ARG_ANY_NULLABLE); + if (DV_GEO != DV_TYPE_OF (res)) + return NEW_DB_NULL; + return res; +} + caddr_t bif_st_get_chainbox (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) { @@ -1632,6 +1811,65 @@ bif_geometry_type (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) } +int +st_n_points (geo_t *g) +{ + if (NULL == g) + return 0; + if (g->geo_flags & (GEO_A_COMPOUND | GEO_A_RINGS | GEO_A_MULTI | GEO_A_ARRAY)) + { + int ctr, total = 0; + for (ctr = g->_.parts.len; ctr--; /* no step */) total += st_n_points (g->_.parts.items[ctr]); + return total; + } + switch (GEO_TYPE_CORE (g->geo_flags)) + { + case GEO_NULL_SHAPE: return 0; + case GEO_POINT: return 1; + case GEO_LINESTRING: return g->_.pline.len; + case GEO_BOX: return 2; + case GEO_POINTLIST: return g->_.pline.len; + case GEO_ARCSTRING: return g->_.pline.len; + case GEO_GSOP: return 1; + default: return 0; + } +} + +caddr_t +bif_st_n_points (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ + geo_t *g = bif_geo_arg (qst, args, 0, "ST_NPoints", GEO_ARG_ANY_NULLABLE); + return box_num (st_n_points (g)); +} + +caddr_t +bif_st_point_n (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ + geo_t *g = bif_geo_arg (qst, args, 0, "ST_PointN", GEO_ARG_ANY_NULLABLE); + geo_flags_t g_type_nozm; + boxint idx = bif_long_arg (qst, args, 1, "ST_PointN"); + geo_t *res; + if (NULL == g) + return NEW_DB_NULL; + g_type_nozm = GEO_TYPE_NO_ZM (g->geo_flags); + if (!(((GEO_LINESTRING == g_type_nozm) || (GEO_ARCSTRING == g_type_nozm) || (GEO_POINTLIST == g_type_nozm) || (GEO_RING == g_type_nozm)))) + return NEW_DB_NULL; + if ((0 == idx) || (idx > g->_.pline.len) || (-idx > g->_.pline.len)) + sqlr_new_error ("22023", "GEO..", "Invalid index value " BOXINT_FMT ", valid values for this geometery are 1 to %ld and -%ld to -1", (boxint)idx, (long)(g->_.pline.len), (long)(g->_.pline.len)); + if (0 > idx) + idx = (g->_.pline.len + idx); + else + idx--; + res = geo_alloc (GEO_POINT | (g->geo_flags & (GEO_A_Z | GEO_A_M)), 0, g->geo_srcode); + res->XYbox.Xmin = res->XYbox.Xmax = g->_.pline.Xs[idx]; + res->XYbox.Ymin = res->XYbox.Ymax = g->_.pline.Ys[idx]; + if (g->geo_flags & GEO_A_Z) + res->_.point.point_ZMbox.Zmin = res->_.point.point_ZMbox.Zmax = g->_.pline.Zs[idx]; + if (g->geo_flags & GEO_A_M) + res->_.point.point_ZMbox.Mmin = res->_.point.point_ZMbox.Mmax = g->_.pline.Ms[idx]; + return (caddr_t)res; +} + caddr_t bif_st_num_geometries (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) { @@ -1875,27 +2113,45 @@ geo_dummy_srid_transform_cbk (caddr_t *qst, geo_t *g, int dest_srid, caddr_t *er int orig_srid = GEO_SRID (g->geo_srcode); if (dest_srid == orig_srid) return g; - err_ret[0] = srv_make_new_error ("22023", "GEOxx", "The function requires an implicit call of ST_Transform(), because argument with SRID %d should be transformed to SRID %d; please try plugin \"v7proj4\" or similar", + err_ret[0] = srv_make_new_error ("22023", "GEOxx", "The function requires an implicit call of ST_Transform(), because argument with SRID %d should be transformed to SRID %d; please try plugin \"proj4\" or similar", orig_srid, dest_srid ); return NULL; } geo_srid_transform_cbk_t *geo_default_srid_transform_cbk = geo_dummy_srid_transform_cbk; +void geo_set_default_srid_transform_cbk (geo_srid_transform_cbk_t *cbk) { geo_default_srid_transform_cbk = cbk; } +geo_srid_transform_cbk_t *geo_get_default_srid_transform_cbk (void) { return geo_default_srid_transform_cbk; } -void -geo_set_default_srid_transform_cbk (geo_srid_transform_cbk_t *cbk) +static void * +geo_dummy_pj_by_srid_or_string_cbk (caddr_t * qst, caddr_t *err_ret, int srid, caddr_t strg_or_null, const char *bifname, const char *argname) { - geo_default_srid_transform_cbk = cbk; + err_ret[0] = srv_make_new_error ("22023", "GEOxx", "The function \"%.50s\"() requires access to data about spatial reference systems in order to process geometry with SRID %d; please try plugin \"proj4\" or similar", + bifname, srid ); + return NULL; } +geo_pj_by_srid_or_string_cbk_t *geo_default_pj_by_srid_or_string_cbk = geo_dummy_pj_by_srid_or_string_cbk; +void geo_set_default_pj_by_srid_or_string_cbk (geo_pj_by_srid_or_string_cbk_t *cbk) { geo_default_pj_by_srid_or_string_cbk = cbk; } +geo_pj_by_srid_or_string_cbk_t *geo_get_default_pj_by_srid_or_string_cbk (void) { return geo_default_pj_by_srid_or_string_cbk; } + +int geo_dummy_pj_is_latlong_cbk (void *pj) { return -1; } +int geo_dummy_pj_is_geocent_cbk (void *pj) { return -1; } +geo_pj_yn_cbk_t *geo_default_pj_is_latlong_cbk = geo_dummy_pj_is_latlong_cbk; +geo_pj_yn_cbk_t *geo_default_pj_is_geocent_cbk = geo_dummy_pj_is_geocent_cbk; + +void geo_set_default_pj_yn_cbks (geo_pj_yn_cbk_t *is_latlong_cbk, geo_pj_yn_cbk_t *is_geocent_cbk) { geo_default_pj_is_latlong_cbk = is_latlong_cbk; geo_default_pj_is_geocent_cbk = is_geocent_cbk; } +geo_pj_yn_cbk_t * geo_get_default_pj_is_latlong_cbk (void) { return geo_default_pj_is_latlong_cbk; } +geo_pj_yn_cbk_t * geo_get_default_pj_is_geocent_cbk (void) { return geo_default_pj_is_geocent_cbk; } + +#include "bmcmp.c" + void bif_geo_init () { bif_define ("earth_radius", bif_earth_radius); bif_define ("haversine_deg_km", bif_haversine_deg_km); bif_define ("dist_from_point_to_line_segment", bif_dist_from_point_to_line_segment); - bif_define_ex ("st_point", bif_st_point, BMD_ALIAS, "ST_Point", BMD_RET_TYPE, &bt_any_box, BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, - 4, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_point" , bif_st_point , BMD_ALIAS, "ST_Point" , BMD_RET_TYPE, &bt_any_box , BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 4 , BMD_IS_PURE, BMD_DONE); bif_define_ex ("st_linestring", bif_st_linestring, BMD_RET_TYPE, &bt_any_box, BMD_IS_PURE, BMD_DONE); bif_define_ex ("st_x", bif_st_x, BMD_ALIAS, "ST_X", BMD_RET_TYPE, &bt_double, BMD_IS_PURE, BMD_DONE); bif_define_ex ("st_y", bif_st_y, BMD_ALIAS, "ST_Y", BMD_RET_TYPE, &bt_double, BMD_IS_PURE, BMD_DONE); @@ -1910,49 +2166,42 @@ bif_geo_init () bif_define_ex ("st_zmax", bif_st_zmax, BMD_RET_TYPE, &bt_double, BMD_IS_PURE, BMD_DONE); bif_define_ex ("st_mmin", bif_st_mmin, BMD_RET_TYPE, &bt_double, BMD_IS_PURE, BMD_DONE); bif_define_ex ("st_mmax", bif_st_mmax, BMD_RET_TYPE, &bt_double, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_intersects", bif_st_intersects, BMD_ALIAS, "ST_Intersects", BMD_RET_TYPE, &bt_integer, BMD_MIN_ARGCOUNT, 2, - BMD_MAX_ARGCOUNT, 3, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_may_intersect", bif_st_may_intersect, BMD_RET_TYPE, &bt_integer, BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 3, - BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_contains", bif_st_contains, BMD_ALIAS, "ST_Contains", BMD_RET_TYPE, &bt_integer, BMD_MIN_ARGCOUNT, 2, - BMD_MAX_ARGCOUNT, 3, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_may_contain", bif_st_may_contain, BMD_RET_TYPE, &bt_integer, BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 3, - BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_within", bif_st_within, BMD_ALIAS, "ST_Within", BMD_RET_TYPE, &bt_integer, BMD_MIN_ARGCOUNT, 2, - BMD_MAX_ARGCOUNT, 3, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_intersects" , bif_st_intersects , BMD_ALIAS, "ST_Intersects" , BMD_RET_TYPE, &bt_integer , BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 3 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_may_intersect" , bif_st_may_intersect , BMD_RET_TYPE, &bt_integer , BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 3 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_contains" , bif_st_contains , BMD_ALIAS, "ST_Contains" , BMD_RET_TYPE, &bt_integer , BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 3 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_may_contain" , bif_st_may_contain , BMD_RET_TYPE, &bt_integer , BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 3 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_within" , bif_st_within , BMD_ALIAS, "ST_Within" , BMD_RET_TYPE, &bt_integer , BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 3 , BMD_IS_PURE, BMD_DONE); bif_define_ex ("st_distance" , bif_st_distance , BMD_IS_PURE, BMD_DONE); bif_define_ex ("isgeometry" , bif_is_geometry , BMD_RET_TYPE, &bt_integer , BMD_IS_PURE, BMD_DONE); bif_define_ex ("st_astext" , bif_st_astext , BMD_RET_TYPE, &bt_varchar , BMD_IS_PURE, BMD_DONE); bif_define_ex ("st_srid", bif_st_srid, BMD_ALIAS, "ST_SRID", BMD_RET_TYPE, &bt_integer, BMD_IS_PURE, BMD_DONE); bif_define_ex ("st_setsrid", bif_st_setsrid, BMD_ALIAS, "ST_SetSRID", BMD_DONE); - bif_define_ex ("st_ewkt_read", bif_st_ewkt_read, BMD_ALIAS, "st_geomfromtext", BMD_ALIAS, "ST_GeomFromText", BMD_ALIAS, - "ST_GeometryFromText", BMD_ALIAS, "ST_GeomFromEWKT", BMD_ALIAS, "ST_WKTToSQL", BMD_RET_TYPE, &bt_any_box, BMD_MIN_ARGCOUNT, 1, - BMD_MAX_ARGCOUNT, 2, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("sr_iri_to_srid" , bif_sr_iri_to_srid , BMD_RET_TYPE, &bt_integer , BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1 , BMD_DONE); + bif_define_ex ("sr_srid_to_iri" , bif_sr_srid_to_iri , BMD_RET_TYPE, &bt_varchar , BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1 , BMD_DONE); + bif_define_ex ("st_ewkt_read" , bif_st_ewkt_read , BMD_ALIAS, "st_geomfromtext" + , BMD_ALIAS, "ST_GeomFromText" + , BMD_ALIAS, "ST_GeometryFromText" + , BMD_ALIAS, "ST_GeomFromEWKT" + , BMD_ALIAS, "ST_WKTToSQL" , BMD_RET_TYPE, &bt_any_box , BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 2 , BMD_IS_PURE, BMD_DONE); bif_define_ex ("http_st_ewkt" , bif_http_st_ewkt , BMD_DONE); + bif_define_ex ("st_wkb_read" , bif_st_wkb_read , BMD_RET_TYPE, &bt_any_box , BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 2 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("http_st_wkb" , bif_http_st_wkb , BMD_DONE); bif_define_ex ("http_st_dxf_entity" , bif_http_st_dxf_entity , BMD_DONE); bif_define_ex ("st_get_bounding_box" , bif_st_get_bounding_box , BMD_IS_PURE, BMD_DONE); bif_define_ex ("st_get_chainbox", bif_st_get_chainbox, BMD_IS_PURE, BMD_DONE); bif_define_ex ("st_dv_geo_length" , bif_st_dv_geo_length , BMD_IS_PURE, BMD_DONE); - bif_define_ex ("geometrytype", bif_geometry_type, BMD_ALIAS, "GeometryType", BMD_RET_TYPE, &bt_varchar, BMD_MIN_ARGCOUNT, 1, - BMD_MAX_ARGCOUNT, 1, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_numgeometries", bif_st_num_geometries, BMD_ALIAS, "ST_NumGeometries", BMD_RET_TYPE, &bt_integer, - BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_geometryn", bif_st_geometry_n, BMD_ALIAS, "ST_GeometryN", BMD_RET_TYPE, &bt_any_box, BMD_MIN_ARGCOUNT, 2, - BMD_MAX_ARGCOUNT, 2, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_exteriorring", bif_st_exterior_ring, BMD_ALIAS, "ST_ExteriorRing", BMD_RET_TYPE, &bt_any_box, BMD_MIN_ARGCOUNT, - 1, BMD_MAX_ARGCOUNT, 1, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_numinteriorrings", bif_st_num_interior_rings, BMD_ALIAS, "ST_NumInteriorRings", BMD_RET_TYPE, &bt_integer, - BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_interiorringn", bif_st_interior_ring_n, BMD_ALIAS, "ST_InteriorRingN", BMD_RET_TYPE, &bt_any_box, - BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_get_bounding_box_n", bif_st_get_bounding_box_n, BMD_RET_TYPE, &bt_any_box, BMD_MIN_ARGCOUNT, 2, - BMD_MAX_ARGCOUNT, 2, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_translate", bif_st_translate, BMD_ALIAS, "ST_Translate", BMD_RET_TYPE, &bt_any_box, BMD_MIN_ARGCOUNT, 3, - BMD_MAX_ARGCOUNT, 4, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_transscale", bif_st_transscale, BMD_ALIAS, "ST_TransScale", BMD_RET_TYPE, &bt_any_box, BMD_MIN_ARGCOUNT, 5, - BMD_MAX_ARGCOUNT, 5, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_affine", bif_st_affine, BMD_ALIAS, "ST_Affine", BMD_RET_TYPE, &bt_any_box, BMD_MIN_ARGCOUNT, 7, - BMD_MAX_ARGCOUNT, 7, BMD_IS_PURE, BMD_DONE); - bif_define_ex ("st_transform_by_custom_projection", bif_st_transform_by_custom_projection, BMD_RET_TYPE, &bt_any_box, - BMD_MIN_ARGCOUNT, 2, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("geometrytype" , bif_geometry_type , BMD_ALIAS, "GeometryType" , BMD_RET_TYPE, &bt_varchar , BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_npoints" , bif_st_n_points , BMD_ALIAS, "ST_NPoints" , BMD_RET_TYPE, &bt_integer , BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_pointn" , bif_st_point_n , BMD_ALIAS, "ST_PointN" , BMD_RET_TYPE, &bt_any_box , BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_numgeometries" , bif_st_num_geometries , BMD_ALIAS, "ST_NumGeometries" , BMD_RET_TYPE, &bt_integer , BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_geometryn" , bif_st_geometry_n , BMD_ALIAS, "ST_GeometryN" , BMD_RET_TYPE, &bt_any_box , BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_exteriorring" , bif_st_exterior_ring , BMD_ALIAS, "ST_ExteriorRing" , BMD_RET_TYPE, &bt_any_box , BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_numinteriorrings" , bif_st_num_interior_rings , BMD_ALIAS, "ST_NumInteriorRings" , BMD_RET_TYPE, &bt_integer , BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_interiorringn" , bif_st_interior_ring_n , BMD_ALIAS, "ST_InteriorRingN" , BMD_RET_TYPE, &bt_any_box , BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_get_bounding_box_n" , bif_st_get_bounding_box_n , BMD_RET_TYPE, &bt_any_box , BMD_MIN_ARGCOUNT, 2, BMD_MAX_ARGCOUNT, 2 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_translate" , bif_st_translate , BMD_ALIAS, "ST_Translate" , BMD_RET_TYPE, &bt_any_box , BMD_MIN_ARGCOUNT, 3, BMD_MAX_ARGCOUNT, 4 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_transscale" , bif_st_transscale , BMD_ALIAS, "ST_TransScale" , BMD_RET_TYPE, &bt_any_box , BMD_MIN_ARGCOUNT, 5, BMD_MAX_ARGCOUNT, 5 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_affine" , bif_st_affine , BMD_ALIAS, "ST_Affine" , BMD_RET_TYPE, &bt_any_box , BMD_MIN_ARGCOUNT, 7, BMD_MAX_ARGCOUNT, 7 , BMD_IS_PURE, BMD_DONE); + bif_define_ex ("st_transform_by_custom_projection" , bif_st_transform_by_custom_projection , BMD_RET_TYPE, &bt_any_box , BMD_MIN_ARGCOUNT, 2 , BMD_IS_PURE, BMD_DONE); + bm_cmp_init (); } diff --git a/libsrc/Wi/bif_gnw.c b/libsrc/Wi/bif_gnw.c index cba96f5b05..dc06e9614c 100644 --- a/libsrc/Wi/bif_gnw.c +++ b/libsrc/Wi/bif_gnw.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_imap.c b/libsrc/Wi/bif_imap.c index 9f22c282d8..5469076458 100644 --- a/libsrc/Wi/bif_imap.c +++ b/libsrc/Wi/bif_imap.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_intl.c b/libsrc/Wi/bif_intl.c index 2fbfed7ccb..5d7cfdeb68 100644 --- a/libsrc/Wi/bif_intl.c +++ b/libsrc/Wi/bif_intl.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_json.c b/libsrc/Wi/bif_json.c index e3a9cccce0..ac956ed90e 100644 --- a/libsrc/Wi/bif_json.c +++ b/libsrc/Wi/bif_json.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_kerberoscli.c b/libsrc/Wi/bif_kerberoscli.c index 3a969b7a4a..6a54659c1a 100644 --- a/libsrc/Wi/bif_kerberoscli.c +++ b/libsrc/Wi/bif_kerberoscli.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_ldapcli.c b/libsrc/Wi/bif_ldapcli.c index ec230d0d66..1cc563fa4c 100644 --- a/libsrc/Wi/bif_ldapcli.c +++ b/libsrc/Wi/bif_ldapcli.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -255,7 +255,10 @@ ldap_get_version (caddr_t * qst) { query_instance_t *qi = (query_instance_t *) qst; client_connection_t * cli = qi->qi_client; - caddr_t *ret = (caddr_t *)id_hash_get (cli->cli_globals, (caddr_t) &con_ldap_version_name); + int rdlocked; + caddr_t *ret; + HT_RDLOCK_COND(cli->cli_globals,rdlocked); + ret = (caddr_t *)id_hash_get (cli->cli_globals, (caddr_t) &con_ldap_version_name); int ver = LDAP_DEF_VERSION; if (ret && DV_LONG_INT == DV_TYPE_OF (*ret)) { @@ -263,6 +266,7 @@ ldap_get_version (caddr_t * qst) if (ver < LDAP_VERSION_MIN || ver > LDAP_VERSION_MAX) ver = LDAP_DEF_VERSION; } + HT_UNLOCK_COND(cli->cli_globals,rdlocked); return ver; } diff --git a/libsrc/Wi/bif_mts.c b/libsrc/Wi/bif_mts.c index 1a61240d6b..f18ac46993 100644 --- a/libsrc/Wi/bif_mts.c +++ b/libsrc/Wi/bif_mts.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_nntp.c b/libsrc/Wi/bif_nntp.c index 1b029d1391..ee278ef734 100644 --- a/libsrc/Wi/bif_nntp.c +++ b/libsrc/Wi/bif_nntp.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_phrasematch.c b/libsrc/Wi/bif_phrasematch.c index afc29cc182..7676fd8eb4 100644 --- a/libsrc/Wi/bif_phrasematch.c +++ b/libsrc/Wi/bif_phrasematch.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_pop3.c b/libsrc/Wi/bif_pop3.c index c68342f43b..4cac498dfd 100644 --- a/libsrc/Wi/bif_pop3.c +++ b/libsrc/Wi/bif_pop3.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_purify.c b/libsrc/Wi/bif_purify.c index ae9f603de8..c700bb039a 100644 --- a/libsrc/Wi/bif_purify.c +++ b/libsrc/Wi/bif_purify.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_regexp.c b/libsrc/Wi/bif_regexp.c index 8a49aec74f..1e5bd193c5 100644 --- a/libsrc/Wi/bif_regexp.c +++ b/libsrc/Wi/bif_regexp.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -37,8 +37,6 @@ } */ -#define HT_ENTER(h) mutex_enter (h->ht_mutex) -#define HT_LEAVE(h) mutex_leave (h->ht_mutex) #define NOFFSETS 20*3 @@ -103,10 +101,10 @@ release_compiled_regexp (id_hash_t *c_r, compiled_regexp_t *data) if (0 >= data->refctr) GPF_T1 ("Wrong refctr of a compiled regexp; memory corruption"); if (NULL != c_r) - HT_ENTER (c_r); + HT_WRLOCK (c_r); delete_data = (0 == --(data->refctr)); if (NULL != c_r) - HT_LEAVE (c_r); + HT_UNLOCK (c_r); if (!delete_data) return; if (NULL != data->code) @@ -144,15 +142,15 @@ get_compiled_regexp (id_hash_t *c_r, const char *pattern, int options, caddr_t * compiled_regexp_t tmp, *new_val; key.orig_strg = (caddr_t)pattern; key.options = options; - HT_ENTER (c_r); + HT_WRLOCK (c_r); val = (compiled_regexp_t **)id_hash_get (c_r, (caddr_t) &key); if (NULL != val) { val[0]->refctr++; - HT_LEAVE (c_r); + HT_UNLOCK (c_r); return val[0]; } - HT_LEAVE (c_r); + HT_UNLOCK (c_r); dbg_printf (("regex compiling (%s) with options %x ...\n", pattern, options)); tmp.code = pcre_compile (pattern, options, &error, &erroff, 0); if (NULL == tmp.code) @@ -195,7 +193,7 @@ get_compiled_regexp (id_hash_t *c_r, const char *pattern, int options, caddr_t * new_val->code = tmp.code; new_val->code_x = tmp.code_x; new_val->refctr = 1; - HT_ENTER (c_r); + HT_WRLOCK (c_r); pcre_cache_check (c_r); val = (compiled_regexp_t **)id_hash_get (c_r, (caddr_t) &key); if (NULL != val) /* double compile */ @@ -203,12 +201,12 @@ get_compiled_regexp (id_hash_t *c_r, const char *pattern, int options, caddr_t * dk_free_box (key.orig_strg); release_compiled_regexp (NULL, new_val); val[0]->refctr++; - HT_LEAVE (c_r); + HT_UNLOCK (c_r); return val[0]; } id_hash_set (c_r, (caddr_t)(&key), (caddr_t)(&new_val)); new_val->refctr++; - HT_LEAVE (c_r); + HT_UNLOCK (c_r); return new_val; } @@ -997,7 +995,7 @@ bif_regexp_init () compiled_regexps = id_hash_allocate (NHASHITEMS, sizeof (regexp_key_t), sizeof (compiled_regexp_t *), regexp_key_hash, regexp_key_hashcmp ); id_hash_set_rehash_pct (compiled_regexps, 200); - compiled_regexps->ht_mutex = mutex_allocate(); + compiled_regexps->ht_rwlock = rwlock_allocate(); bif_define_ex ("regexp_match", bif_regexp_match, BMD_RET_TYPE, &bt_varchar, BMD_DONE); bif_define_ex ("rdf_regex_impl", bif_rdf_regex_impl, BMD_RET_TYPE, &bt_integer, BMD_DONE); diff --git a/libsrc/Wi/bif_repl.c b/libsrc/Wi/bif_repl.c index 20e09e75a7..3503130821 100644 --- a/libsrc/Wi/bif_repl.c +++ b/libsrc/Wi/bif_repl.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_search_excerpt.c b/libsrc/Wi/bif_search_excerpt.c index 9891ac93c9..db894e6a0c 100644 --- a/libsrc/Wi/bif_search_excerpt.c +++ b/libsrc/Wi/bif_search_excerpt.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_smtp.c b/libsrc/Wi/bif_smtp.c index 8ee2b40a44..88902bd475 100644 --- a/libsrc/Wi/bif_smtp.c +++ b/libsrc/Wi/bif_smtp.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_soap.c b/libsrc/Wi/bif_soap.c index 76814bbd14..49d08e9e1a 100644 --- a/libsrc/Wi/bif_soap.c +++ b/libsrc/Wi/bif_soap.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -299,7 +299,7 @@ static caddr_t ws_uddi_error (dk_session_t * ses, char *state, char *message, int soap_version) { char tmp[4096]; - char * uddi_error = NULL, * uddi_code = uddi_errors[0]; + const char * uddi_error = NULL, * uddi_code = uddi_errors[0]; int ix = 0; caddr_t uddi_operator = NULL; strses_flush (ses); @@ -493,7 +493,7 @@ ws_soap12_error (dk_session_t *ses, char *code, char *state, char *message, int int len = code ? (int) strlen (code) : 0; int mcode = (len > 0 ? code[0] : '3') - '0'; int scode = (len > 1 ? code[1] : '0') - '0'; - char * code1 = soap12_errors[mcode], *code2 = soap12_sub_errors[scode]; + const char * code1 = soap12_errors[mcode], *code2 = soap12_sub_errors[scode]; if (http_resp_code) { @@ -761,7 +761,7 @@ xml_find_child (caddr_t *entity, const char *szSearchName, const char *szURI, in caddr_t * xml_find_one_child (caddr_t *entity, char *szSearchName, char **szURIs, int nth, int *start_inx) { - char **urls = szURIs; + const char **urls = szURIs; caddr_t * rc = NULL; for (; urls[0]; urls++) { @@ -2639,7 +2639,7 @@ proc_find_in_grants (char * name, dk_set_t * qrs, char * soap_action) if (soap_action && soap_action[0] != 0) { - if ((op_name && !strcmp (op_name, name)) || !strcmp (n, name)) + if ((op_name && !CASEMODESTRCMP (op_name, name)) || !CASEMODESTRCMP (n, name)) { if (action && !strcmp (action, soap_action)) { @@ -2657,7 +2657,7 @@ proc_find_in_grants (char * name, dk_set_t * qrs, char * soap_action) } else { - if ((op_name && !strcmp (op_name, name)) || !strcmp (n, name)) + if ((op_name && !CASEMODESTRCMP (op_name, name)) || !CASEMODESTRCMP (n, name)) { if (!found) res = proc; @@ -2895,7 +2895,7 @@ soap12_custom_error (dk_session_t * ses, client_connection_t * cli, soap_ctx_t * int len = code ? (int) strlen (code) : 0; int mcode = (len > 0 ? code[0] : '3') - '0'; int scode = (len > 1 ? code[1] : '0') - '0'; - char * code1 = soap12_errors[0], *code2 = soap12_sub_errors[0]; + const char * code1 = soap12_errors[0], *code2 = soap12_sub_errors[0]; if (mcode >= 0 && mcode < (sizeof (soap12_errors) / sizeof (char*))) code1 = soap12_errors[mcode]; @@ -4333,7 +4333,7 @@ bif_soap_call (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) #ifdef _SSL SSL * ssl = NULL; SSL_CTX* ssl_ctx = NULL; - SSL_METHOD *ssl_meth = NULL; + const SSL_METHOD *ssl_meth = NULL; #endif soap_ctx_t ctx; query_instance_t *qi = (query_instance_t *) qst; @@ -10209,7 +10209,7 @@ soap_print_box_validating (caddr_t box, const char * tag, dk_session_t *ses, caddr_t type_name; caddr_t *e_ptr; caddr_t *schema_tree = NULL, new_box = NULL; - dtp_t proposed_type; + dtp_t proposed_type = '\0'; char temp[1024]; int is_in_schema; sql_class_t *check_udt = check_sqt ? check_sqt->sqt_class : NULL; @@ -11412,7 +11412,7 @@ ws_soap_http (ws_connection_t * ws) qrs = get_granted_qrs (cli, NULL, NULL, 0); if (!(qr = proc_find_in_grants (szMethod, &qrs, NULL))) { - err = srv_make_new_error ("37000", "SOH03", "There is no such procedure"); + err = srv_make_new_error ("37000", "SOH03", "There is no such procedure: %.500s", szFullProcName); goto end; } } diff --git a/libsrc/Wi/bif_text.c b/libsrc/Wi/bif_text.c index d19af0ec82..52c5b73a67 100644 --- a/libsrc/Wi/bif_text.c +++ b/libsrc/Wi/bif_text.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -1223,18 +1223,18 @@ xte_vtb_feed (caddr_t * xte, vt_batch_t * vtb, lh_word_callback_t *cbk, char **t caddr_t name; size_t namelen; if (DV_ARRAY_OF_POINTER != DV_TYPE_OF (head)) - sqlr_new_error ("22023", "FT011", "Bad XML entity tree in vt_batch_feed"); - name = head[0]; - if (!DV_STRINGP (name)) - sqlr_new_error ("22023", "FT012", "Bad XML entity tree in vt_batch_feed"); - if (' ' == name[0]) - { - if (!strcmp(name," root")) - goto process_tag; /* see below */ - return hider; - } - if(box_length(name)>(XML_MAX_EXP_NAME-2)) - sqlr_new_error ("22023", "FT013", "Bad XML entity tree in vt_batch_feed"); + sqlr_new_error ("22023", "FT011", "Bad XML entity tree in vt_batch_feed"); + name = head[0]; + if (!DV_STRINGP (name)) + sqlr_new_error ("22023", "FT012", "Bad XML entity tree in vt_batch_feed"); + if (' ' == name[0]) + { + if (!strcmp(name," root")) + goto process_tag; /* see below */ + return hider; + } + if(box_length(name)>(XML_MAX_EXP_NAME-2)) + sqlr_new_error ("22023", "FT013", "Bad XML entity tree in vt_batch_feed"); process_tag: attr_idx_max = BOX_ELEMENTS(head) - 1; for (attr_idx = 1; attr_idx < attr_idx_max; attr_idx += 2) @@ -2191,8 +2191,8 @@ static char *vt_create_text_index_text = " vt_name := concat (tb, \'_\', col, \'_WORDS\');\n" /*" str := sprintf (\'create table \"%I\".\"%I\".\"%I\" (VT_WORD varchar, VT_D_ID any, VT_D_ID_2 any, VT_DATA varchar, VT_LONG_DATA long varchar, primary key (VT_WORD, VT_D_ID) not column)\',\n"*/ /* the PK can be bigint */ -" is_bigint_id := DB.DBA.col_of_type (tb, text_id_col, 247);\n" -" is_int_id := DB.DBA.col_of_type (tb, text_id_col, 189); \n" +" is_bigint_id := DB.DBA.col_of_type (tb, text_id_col, __tag of bigint);\n" +" is_int_id := DB.DBA.col_of_type (tb, text_id_col, __tag of integer); \n" " if (is_bigint_id = 0 and is_int_id = 0)" " signal (\'22023\', concat (\'the column \', text_id_col, \' is not an integer\'), \'FT024\'); \n" " text_id_col_type := case when is_bigint_id then \'BIGINT\' when is_int_id then \'INTEGER\' else \'ANY\' end;\n" @@ -2421,7 +2421,7 @@ static char *vt_free_text_proc_gen_text = " \'{\n\'," "\' declare inx integer;\n" " inx := 0;\n" -" if (__tag (invd) <> 193) return; \n" +" if (__tag (invd) <> __tag of vector) return; \n" " while (inx < length (invd))\n" " {\\\n\',\n" " sprintf (\n" @@ -2844,8 +2844,8 @@ static char *vt_create_update_log_text = " select VI_COL, VI_ID_COL, VI_ID_IS_PK, VI_INDEX into datacol, keycol, is_pk, key_name from DB.DBA.SYS_VT_INDEX where VI_TABLE = tablename; " " if (datacol is null)" " signal ('42000','Misc. error upon update log creation. The free text index cannot be created.', 'FT026');" -" is_bigint_id := DB.DBA.col_of_type (tablename, keycol, 247); \n" -" is_int_id := DB.DBA.col_of_type (tablename, keycol, 189); \n" +" is_bigint_id := DB.DBA.col_of_type (tablename, keycol, __tag of bigint); \n" +" is_int_id := DB.DBA.col_of_type (tablename, keycol, __tag of integer); \n" " id_col_type := case when is_bigint_id then \'BIGINT\' when is_int_id then \'INTEGER\' else \'ANY\' end;\n" " _lang_enc_args := concat (\', \\\'\', _lang, \'\\\', \\\'\', _enc, \'\\\'\');\n" " cl_part := DB.DBA.VT_GET_CLUSTER (tablename, key_name); \n" diff --git a/libsrc/Wi/bif_text.h b/libsrc/Wi/bif_text.h index 08d6385e70..8b705d07be 100644 --- a/libsrc/Wi/bif_text.h +++ b/libsrc/Wi/bif_text.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_tidy.c b/libsrc/Wi/bif_tidy.c index d9d49b6c7d..bf3cb125ca 100644 --- a/libsrc/Wi/bif_tidy.c +++ b/libsrc/Wi/bif_tidy.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_uuencode.c b/libsrc/Wi/bif_uuencode.c index d7651a2f47..bb5f04de6c 100644 --- a/libsrc/Wi/bif_uuencode.c +++ b/libsrc/Wi/bif_uuencode.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bif_xml.c b/libsrc/Wi/bif_xml.c index 6fb2d5fca0..997595f8fe 100644 --- a/libsrc/Wi/bif_xml.c +++ b/libsrc/Wi/bif_xml.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -5286,25 +5286,23 @@ bif_to_xml_array_arg (caddr_t * qst, state_slot_t ** args, int nth, const char * if (BOX_ELEMENTS (elem) < 1) sqlr_new_error ("37000", "XI027", "Argument of %s must be valid xml entity.", func); - if ((((caddr_t *) elem)[0]) == XMLATTRIBUTE_FLAG) - { /* XMLATTRIBUTES */ - int inx, attr_length = BOX_ELEMENTS (elem); + if ((((caddr_t *) elem)[0]) == XMLATTRIBUTE_FLAG) + { /* XMLATTRIBUTES */ + int inx, attr_length = BOX_ELEMENTS (elem); - for (inx = 1; inx < attr_length; inx += 2) - { - if (elem_is_writeable) - { - if (bif_to_xml_array_push_new_attr (head_set, ((caddr_t *) elem)[inx], 0, - ((caddr_t *) elem)[inx + 1])) - ((caddr_t *) elem)[inx] = NULL; - ((caddr_t *) elem)[inx + 1] = NULL; - } - else - bif_to_xml_array_push_new_attr (head_set, ((caddr_t *) elem)[inx], 1, - box_copy_tree (((caddr_t *) elem)[inx + 1])); - } - goto array_arg_done; - } + for (inx = 1; inx < attr_length; inx += 2) + { + if (elem_is_writeable) + { + if (bif_to_xml_array_push_new_attr (head_set, ((caddr_t *) elem)[inx], 0, ((caddr_t *) elem)[inx + 1])) + ((caddr_t *) elem)[inx] = NULL; + ((caddr_t *) elem)[inx + 1] = NULL; + } + else + bif_to_xml_array_push_new_attr (head_set, ((caddr_t *) elem)[inx], 1, box_copy_tree (((caddr_t *) elem)[inx + 1])); + } + goto array_arg_done; + } if (DV_ARRAY_OF_POINTER != DV_TYPE_OF (((caddr_t *)elem)[0]) || BOX_ELEMENTS (((caddr_t *)elem)[0]) < 1) sqlr_new_error ("37000", "XI027", "Argument of %s must be valid xml entity.", func); if (DV_UNAME != DV_TYPE_OF (XTE_HEAD_NAME (XTE_HEAD (elem)))) diff --git a/libsrc/Wi/bif_xper.c b/libsrc/Wi/bif_xper.c index 510c57020a..29f2cc40f0 100644 --- a/libsrc/Wi/bif_xper.c +++ b/libsrc/Wi/bif_xper.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -593,6 +593,10 @@ xper_blob_append_data (xper_ctx_t * ctx, const char *data, size_t len) if (filled >= PAGE_DATA_SZ) { size_t old_n_pages = BL_N_PAGES(ctx_bh->bh_length); /* number of new pages is old_n_pages + 1 */ +#ifndef NDEBUG + if (filled > PAGE_DATA_SZ) + GPF_T1("Page buffer overflow in xper_blob_append_data()"); +#endif buf = it_new_page (ctx->xpc_itc->itc_tree, ctx->xpc_itc->itc_page, DPF_BLOB, 0, 0); #ifdef DEBUG @@ -604,8 +608,8 @@ xper_blob_append_data (xper_ctx_t * ctx, const char *data, size_t len) if (!buf) { xper_destroy_ctx (ctx); - log_error ("Out of disk space for database"); - sqlr_new_error ("XE000", "XP9A7", "Out of disk space for database while parsing XML"); + log_error ("Out of disk space for database while storing persistent XML"); + sqlr_new_error ("XE000", "XP9A7", "Out of disk space for database while storing persistent XML"); return; } LONG_SET/*_NA*/ (ctx->xpc_buf->bd_buffer + DP_BLOB_LEN, PAGE_DATA_SZ); diff --git a/libsrc/Wi/bif_xper.h b/libsrc/Wi/bif_xper.h index 5be131bebc..7bce1fede0 100644 --- a/libsrc/Wi/bif_xper.h +++ b/libsrc/Wi/bif_xper.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bitmap.c b/libsrc/Wi/bitmap.c index a774b058c8..b866309d82 100644 --- a/libsrc/Wi/bitmap.c +++ b/libsrc/Wi/bitmap.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bitmap.h b/libsrc/Wi/bitmap.h index 29e827914e..147e81e803 100644 --- a/libsrc/Wi/bitmap.h +++ b/libsrc/Wi/bitmap.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/blob.c b/libsrc/Wi/blob.c index af5c0af437..9d1ab040a0 100644 --- a/libsrc/Wi/blob.c +++ b/libsrc/Wi/blob.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -233,7 +233,6 @@ bh_fill_page_generic ( case vNARROW: { int page_end = 0, oblom = 0; - int readbytes = 0; *nin = 0; *noutbytes = 0; *noutchars = 0; @@ -242,8 +241,8 @@ bh_fill_page_generic ( unsigned char cin[VIRT_MB_CUR_MAX]; int nl, len; page_end = 0; - readbytes = wide_blob_buffered_read (proc_arg, cin, 1, &bh->bh_state, &page_end, &len, get_data_proc); - nl = bh->bh_state.count; + wide_blob_buffered_read (proc_arg, cin, 1, &bh->bh_state, &page_end, &len, get_data_proc); + nl = bh->bh_state.bs_utf8_tail_count; if (!page_end) { *((char *) buffer + *noutbytes) = cin[0]; @@ -291,7 +290,7 @@ bh_fill_page_generic ( { log_error ( "Incomplete UTF-8 char found in filling up a BLOB." - " The wide blob data may be garbaled."); + " The wide blob data may be garbled."); memset (buffer, '?', ilen); ret = ilen; } @@ -389,7 +388,7 @@ GPF_T1 ("Default read ready not off in blob read"); static void bh_fill_pagedir_buffer (blob_handle_t * bh, buffer_desc_t * buf, it_cursor_t * itc_from, int *at_end, size_t *position); -static long bh_fill_data_buffer (blob_handle_t * bh, buffer_desc_t * buf, it_cursor_t * itc_from, int *status_ret, size_t *data_len_in_bytes); +static long bh_fill_data_buffer (blob_handle_t * source_bh, buffer_desc_t * dest_buf, it_cursor_t * itc_from, int *status_ret, size_t *data_len_in_bytes); static void __blob_chain_delete (it_cursor_t * it, dp_addr_t start, dp_addr_t first, int npages, blob_handle_t * bh); static void blob_delete_via_dir (it_cursor_t * it, blob_layout_t * bl); /* static int dk_set_blob_del_remove (dk_set_t * set, dp_addr_t addr); */ @@ -458,15 +457,18 @@ bh_set_it_fields (blob_handle_t *bh) static int get_data_from_client (void *arg, unsigned char *buf, int pos, int len) { - int ret = session_buffered_read ((dk_session_t*)arg, (caddr_t)buf, len); - return pos = ret; + return session_buffered_read ((dk_session_t*)arg, (caddr_t)buf, len); } static int get_data_from_box (void *arg, unsigned char *buf, int pos, int len) { - assert (pos + len <= (int)box_length (arg)); + int rest_len = (int)box_length (arg) - pos; + if (rest_len <= 0) + return rest_len; + if (len > rest_len) + len = rest_len; memcpy (buf, ((caddr_t)arg) + pos, len); return len; } @@ -481,10 +483,9 @@ get_data_from_strses (void *arg, unsigned char *buf, int pos, int len) } typedef struct bh_get_layout_s { - blob_handle_t * bh; - it_cursor_t * itc_from; - buffer_desc_t * buf; - int *at_end; + blob_handle_t * bgl_bh; + it_cursor_t * bgl_itc_from; + buffer_desc_t * bgl_buf; } bh_get_layout_t; @@ -541,45 +542,71 @@ page_wait_blob_access (it_cursor_t * itc, dp_addr_t dp_to, buffer_desc_t ** buf_ return 0; } -#define BLOB_AT_END_ERROR 2 - +void +bh_reset_read (blob_handle_t * bh) +{ + bh->bh_state.bs_utf8_char = '\0'; + bh->bh_state.bs_utf8_tail_count = 0; + if (NULL == bh->bh_state.bs_buffer) + { + bh->bh_state.bs_buffer = dk_alloc_box (PAGE_DATA_SZ + 1, DV_BIN); + bh->bh_state.bs_bufpos = 0; + bh->bh_state.bs_buflen = 0; + bh->bh_state.bs_buffered_page = 0; + bh->bh_state.bs_next_of_buffered_page = 0; + } + bh->bh_current_page = bh->bh_page; + bh->bh_position = 0; + bh->bh_state.bs_status = BLOB_BEFORE_READ; +} -static int -bh_pickup_page (blob_handle_t * bh, it_cursor_t * itc_from, int *at_end) +/* This copies the content of a blob page to the bh_state.buffer and advances to the next page, if there's such. */ +int +bh_pickup_page (blob_handle_t * bh, it_cursor_t * itc_from) { buffer_desc_t *buf_from; long next; long pagelen; - + if (BLOB_AT_END == bh->bh_state.bs_status) + { + bh->bh_state.bs_status = BLOB_AT_END_AGAIN; + return 0; + } + if (0 == bh->bh_current_page) + { + bh->bh_state.bs_bufpos = bh->bh_state.bs_buflen; + bh->bh_state.bs_status = BLOB_AT_END_AGAIN; + return 0; + } + if (bh->bh_state.bs_buffered_page == bh->bh_current_page) + { /* If buffered page is picked up already then no re-read. Blobs are not record pages, they can be replaced entirely but not changed so what's cached is not obsoleted during a transaction */ + bh->bh_state.bs_bufpos = 0; + bh->bh_current_page = bh->bh_state.bs_next_of_buffered_page; + bh->bh_state.bs_status = bh->bh_current_page ? BLOB_AT_MIDDLE : BLOB_AT_END; + return bh->bh_state.bs_buflen; + } if (!page_wait_blob_access (itc_from, bh->bh_current_page, &buf_from, PA_READ, bh, 1)) { - *at_end = BLOB_AT_END_ERROR; - bh->bh_current_page = bh->bh_page; /* ready for reuse */ - bh->bh_state.bufpos = 0; - bh->bh_state.buflen = 0; + bh->bh_current_page = 0; + bh->bh_state.bs_bufpos = 0; + bh->bh_state.bs_buflen = 0; + bh->bh_state.bs_status = BLOB_AT_END_AGAIN; return 0; } pagelen = LONG_REF (buf_from->bd_buffer + DP_BLOB_LEN); if (PAGE_DATA_SZ < pagelen) GPF_T1 ("Abnormal length of BLOB data in database page"); - - assert (NULL != bh->bh_state.buffer); - memcpy (bh->bh_state.buffer, buf_from->bd_buffer + DP_DATA, pagelen); - next = LONG_REF (buf_from->bd_buffer + DP_OVERFLOW); + assert (NULL != bh->bh_state.bs_buffer); + memcpy (bh->bh_state.bs_buffer, buf_from->bd_buffer + DP_DATA, pagelen); + bh->bh_state.bs_bufpos = 0; + bh->bh_state.bs_buflen = pagelen; + bh->bh_state.bs_buffered_page = bh->bh_current_page; + bh->bh_state.bs_next_of_buffered_page = next = LONG_REF (buf_from->bd_buffer + DP_OVERFLOW); ITC_IN_KNOWN_MAP (itc_from, buf_from->bd_page); page_leave_inner (buf_from); ITC_LEAVE_MAP_NC (itc_from); - bh->bh_state.bufpos = 0; - bh->bh_state.buflen = pagelen ; - if (!next) - { - *at_end = 1; - bh->bh_current_page = bh->bh_page; /* ready for reuse */ - } - else - { - bh->bh_current_page = next; - } + bh->bh_current_page = next; + bh->bh_state.bs_status = next ? BLOB_AT_MIDDLE : BLOB_AT_END; return pagelen; } @@ -588,41 +615,37 @@ static int get_data_from_blob (void *arg, unsigned char *buf, int pos, int len) { struct bh_get_layout_s *pbl = (struct bh_get_layout_s *)arg; - blob_handle_t * bh = pbl->bh; - it_cursor_t * itc_from = pbl->itc_from; - int *at_end = pbl->at_end; + blob_handle_t * bh = pbl->bgl_bh; + it_cursor_t * itc_from = pbl->bgl_itc_from; int copybytes = 0; - - if (NULL == bh->bh_state.buffer) - { - bh->bh_state.buffer = dk_alloc_box (PAGE_DATA_SZ + 1, DV_BIN); - bh->bh_state.bufpos = 0; - bh->bh_state.buflen = 0; - } + assert (NULL != bh->bh_state.bs_buffer); + if (BLOB_BEFORE_READ == bh->bh_state.bs_status) + bh_pickup_page (bh, itc_from); again: - if (bh->bh_state.bufpos < bh->bh_state.buflen) - { - int l = MIN (len, bh->bh_state.buflen - bh->bh_state.bufpos); - assert (bh->bh_state.buflen <= PAGE_DATA_SZ && bh->bh_state.bufpos <= PAGE_DATA_SZ && len <= PAGE_DATA_SZ); - memcpy (buf, bh->bh_state.buffer + bh->bh_state.bufpos, l); - bh->bh_state.bufpos += l; - assert (bh->bh_state.buflen <= PAGE_DATA_SZ && - bh->bh_state.bufpos <= PAGE_DATA_SZ && - bh->bh_state.bufpos <= bh->bh_state.buflen && + if (bh->bh_state.bs_bufpos < bh->bh_state.bs_buflen) + { + int l = MIN (len, bh->bh_state.bs_buflen - bh->bh_state.bs_bufpos); + assert (bh->bh_state.bs_buflen <= PAGE_DATA_SZ && bh->bh_state.bs_bufpos <= PAGE_DATA_SZ && len <= PAGE_DATA_SZ); + memcpy (buf, bh->bh_state.bs_buffer + bh->bh_state.bs_bufpos, l); + bh->bh_state.bs_bufpos += l; + assert (bh->bh_state.bs_buflen <= PAGE_DATA_SZ && + bh->bh_state.bs_bufpos <= PAGE_DATA_SZ && + bh->bh_state.bs_bufpos <= bh->bh_state.bs_buflen && len <= PAGE_DATA_SZ); len -= l; copybytes += l; } - if (len && bh->bh_state.bufpos == bh->bh_state.buflen) + if (len && bh->bh_state.bs_bufpos == bh->bh_state.bs_buflen) { - bh_pickup_page (bh, itc_from, at_end); - if (BLOB_AT_END_ERROR == *at_end) - return 0; + if (BLOB_AT_MIDDLE != bh->bh_state.bs_status) + return copybytes; + bh_pickup_page (bh, itc_from); + if ((BLOB_AT_MIDDLE != bh->bh_state.bs_status) && (BLOB_AT_END != bh->bh_state.bs_status)) + return copybytes; goto again; } - - return pos = copybytes; + return copybytes; } @@ -636,32 +659,32 @@ bh_tag_modify (blob_handle_t * bh, dtp_t tag, dtp_t ask_tag) { case DV_BLOB_WIDE: case DV_BLOB_WIDE_HANDLE: - bh->bh_state.ask_tag = DV_BLOB_WIDE; + bh->bh_state.bs_ask_tag = DV_BLOB_WIDE; break; case DV_BLOB_BIN: case DV_BIN: - bh->bh_state.ask_tag = DV_BIN; + bh->bh_state.bs_ask_tag = DV_BIN; break; default: - bh->bh_state.ask_tag = DV_BLOB; + bh->bh_state.bs_ask_tag = DV_BLOB; break; } switch (tag) { case DV_BLOB_WIDE: - bh->bh_state.need_tag = DV_BLOB_WIDE; + bh->bh_state.bs_need_tag = DV_BLOB_WIDE; box_tag_modify (bh, DV_BLOB_WIDE_HANDLE); break; case DV_BLOB_BIN: - bh->bh_state.need_tag = DV_BLOB_BIN; + bh->bh_state.bs_need_tag = DV_BLOB_BIN; box_tag_modify (bh, DV_BLOB_HANDLE); break; case DV_BLOB: - bh->bh_state.need_tag = DV_BLOB; + bh->bh_state.bs_need_tag = DV_BLOB; box_tag_modify (bh, DV_BLOB_HANDLE); break; case DV_BLOB_XPER: - bh->bh_state.need_tag = DV_BLOB_BIN; + bh->bh_state.bs_need_tag = DV_BLOB_BIN; box_tag_modify (bh, DV_BLOB_XPER_HANDLE); break; default: @@ -670,13 +693,78 @@ bh_tag_modify (blob_handle_t * bh, dtp_t tag, dtp_t ask_tag) return 0; } +blob_cvt_type_t +bh_flout (blob_handle_t * source_bh) +{ + switch (source_bh->bh_state.bs_need_tag) + { + case DV_BLOB_WIDE: return vUTF; + case DV_BLOB_BIN: return vBINARY; + case DV_BLOB: return vNARROW; + default: + switch (DV_TYPE_OF (source_bh)) + { + case DV_BLOB_XPER_HANDLE: return vBINARY; + case DV_BLOB_HANDLE: return vNARROW; + case DV_BLOB_WIDE_HANDLE: return vUTF; + } + return vBINARY; + } +} + +void +bh_read_header_of_user_data (blob_handle_t * bh, dk_session_t *ses_from) +{ + bh->bh_state.bs_ask_tag = session_buffered_read_char (ses_from); + switch (bh->bh_state.bs_ask_tag) + { + case DV_WIDE: + bh->bh_bytes_coming = (dtp_t) session_buffered_read_char (ses_from); + bh->bh_state.bs_ask_tag = DV_BLOB_WIDE; + break; + case DV_SHORT_STRING_SERIAL: + bh->bh_bytes_coming = (dtp_t) session_buffered_read_char (ses_from); + bh->bh_state.bs_ask_tag = DV_BLOB; + break; + case DV_BLOB_WIDE: + case DV_LONG_WIDE: + bh->bh_bytes_coming = read_long (ses_from); + bh->bh_state.bs_ask_tag = DV_BLOB_WIDE; + break; + case DV_BLOB_BIN: + bh->bh_bytes_coming = read_long (ses_from); + bh->bh_state.bs_ask_tag = DV_BLOB_BIN; + break; + case DV_BIN: + bh->bh_bytes_coming = (dtp_t) session_buffered_read_char (ses_from); + bh->bh_state.bs_ask_tag = DV_BLOB_BIN; + break; + case DV_BLOB: + case DV_LONG_STRING: + bh->bh_bytes_coming = read_long (ses_from); + bh->bh_state.bs_ask_tag = DV_BLOB; + break; + case DV_BLOB_XPER: + box_tag_modify (bh, DV_BLOB_XPER_HANDLE); + bh->bh_bytes_coming = read_long (ses_from); + bh->bh_state.bs_ask_tag = DV_BLOB; + bh->bh_state.bs_need_tag = DV_BLOB; + break; + case DV_DB_NULL: + bh->bh_all_received = BLOB_NULL_RECEIVED; + bh->bh_bytes_coming = 0; + break; + default: + bh->bh_all_received = BLOB_ALL_RECEIVED; + break; + } +} long bh_get_data_from_user (blob_handle_t * bh, client_connection_t * cli, db_buf_t to, int max_bytes) { /* Read blob contents from client or log (in roll forward) */ - dtp_t bh_tag = (dtp_t)box_tag (bh); dk_session_t *ses_from = cli->cli_session; volatile int to_go = max_bytes, n_in = 0; @@ -717,54 +805,9 @@ bh_get_data_from_user (blob_handle_t * bh, client_connection_t * cli, CATCH_READ_FAIL (ses_from) { - bh->bh_state.ask_tag = session_buffered_read_char (ses_from); - switch (bh->bh_state.ask_tag) + bh_read_header_of_user_data (bh, ses_from); + if ((BLOB_ALL_RECEIVED == bh->bh_all_received) || (BLOB_NULL_RECEIVED == bh->bh_all_received)) { - case DV_WIDE: - /*box_tag_modify (bh, DV_BLOB_WIDE_HANDLE);*/ - bh->bh_bytes_coming = (dtp_t) session_buffered_read_char (ses_from); - bh->bh_state.ask_tag = DV_BLOB_WIDE; - break; - case DV_SHORT_STRING_SERIAL: - /*box_tag_modify (bh, DV_BLOB_HANDLE);*/ - bh->bh_bytes_coming = (dtp_t) session_buffered_read_char (ses_from); - bh->bh_state.ask_tag = DV_BLOB; - break; - - case DV_BLOB_WIDE: - case DV_LONG_WIDE: - /*box_tag_modify (bh, DV_BLOB_WIDE_HANDLE);*/ - bh->bh_bytes_coming = read_long (ses_from); - bh->bh_state.ask_tag = DV_BLOB_WIDE; - break; - case DV_BLOB_BIN: - bh->bh_bytes_coming = read_long (ses_from); - bh->bh_state.ask_tag = DV_BLOB_BIN; - break; - case DV_BIN: - bh->bh_bytes_coming = (dtp_t) session_buffered_read_char (ses_from); - bh->bh_state.ask_tag = DV_BLOB_BIN; - break; - case DV_BLOB: - case DV_LONG_STRING: - /*box_tag_modify (bh, DV_BLOB_HANDLE);*/ - bh->bh_bytes_coming = read_long (ses_from); - bh->bh_state.ask_tag = DV_BLOB; - break; - case DV_BLOB_XPER: - box_tag_modify (bh, DV_BLOB_XPER_HANDLE); - bh->bh_bytes_coming = read_long (ses_from); - bh->bh_state.ask_tag = DV_BLOB; - bh_tag = DV_BLOB_HANDLE; - break; - case DV_DB_NULL: - bh->bh_all_received = BLOB_NULL_RECEIVED; - bh->bh_bytes_coming = 0; /* No data expected in the future */ - END_READ_FAIL (ses_from); - cli_end_blob_read (cli); - return n_in; - default: - bh->bh_all_received = BLOB_ALL_RECEIVED; END_READ_FAIL (ses_from); cli_end_blob_read (cli); return n_in; @@ -796,10 +839,9 @@ bh_get_data_from_user (blob_handle_t * bh, client_connection_t * cli, long readbytes = MIN (bh->bh_bytes_coming, to_go); #endif int page_end = 0; -#if 1 int nin = 0, nout = 0, ncout = 0; - blob_cvt_type_t flin = vBINARY, flout = vBINARY; - switch (bh->bh_state.ask_tag) { + blob_cvt_type_t flin = vBINARY, flout = bh_flout (bh); + switch (bh->bh_state.bs_ask_tag) { case DV_BLOB_WIDE: flin = vUTF; break; @@ -810,34 +852,6 @@ bh_get_data_from_user (blob_handle_t * bh, client_connection_t * cli, flin = vBINARY; break; }; - switch (bh->bh_state.need_tag) { - case DV_BLOB_WIDE: - flout= vUTF; - break; - case DV_BLOB_BIN: - flout = vBINARY; - break; - case DV_BLOB: - flout = vNARROW; - break; - default: - { - switch (bh_tag) { - case DV_BLOB_XPER_HANDLE: - flout= vBINARY; - break; - case DV_BLOB_HANDLE: - flout= vNARROW; - break; - case DV_BLOB_WIDE_HANDLE: - flout= vUTF; - break; - }; - break; - } - }; - - page_end = bh_fill_page_generic ( bh, cli->cli_charset, @@ -858,91 +872,6 @@ bh_get_data_from_user (blob_handle_t * bh, client_connection_t * cli, n_in += nout; assert (0 != readbytes); -#else - if (bh_tag == DV_BLOB_WIDE_HANDLE && DV_BLOB_WIDE == bh->bh_state.ask_tag) - { - readbytes = wide_blob_buffered_read (ses_from, (char *) to + n_in, readbytes, &bh->bh_state, &page_end); - if (readbytes < 0) - { - END_READ_FAIL (ses_from); - cli_end_blob_read (cli); - return n_in; - } - - bh->bh_bytes_coming -= readbytes; - to_go -= readbytes; - n_in += readbytes; - } - else if (bh_tag == DV_BLOB_HANDLE && DV_BLOB_WIDE == bh->bh_state.ask_tag) - { - while (to_go > 0 && bh->bh_bytes_coming > 0) - { - char cin[VIRT_MB_CUR_MAX]; - int nl, len; - page_end = 0; - readbytes = wide_blob_buffered_read (ses_from, cin, 1, &bh->bh_state, &page_end); - nl = bh->bh_state.count; - if (!page_end) - { - *((char *) to + n_in) = cin[0]; - to_go --; - n_in ++; - bh->bh_bytes_coming --; - continue; - } - if (nl + 1 < to_go) - len = wide_blob_buffered_read (ses_from, cin, nl + 1, &bh->bh_state, &page_end); - else - break; - - cli_utf8_to_narrow ((wcharset_t*)cli->cli_charset, cin, nl + 1, ((char *) to + n_in), 1); - - to_go --; - n_in ++; - bh->bh_bytes_coming -= nl + 1; - assert (bh->bh_bytes_coming>=0); - } - } - else if (bh_tag == DV_BLOB_WIDE_HANDLE && DV_BLOB == bh->bh_state.ask_tag) - { - int len = 0; - while (to_go >= VIRT_MB_CUR_MAX && bh->bh_bytes_coming > 0) - { - char cin; - cin = session_buffered_read_char (ses_from); - len = cli_narrow_to_utf8 (cli->cli_charset, &cin, 1, ((char *) to + n_in), VIRT_MB_CUR_MAX); - assert (len>0); - to_go -= len; - n_in += len; - bh->bh_bytes_coming --; - } - if (to_go < VIRT_MB_CUR_MAX) - to_go = 0; - } - else /*if (bh_tag == DV_BLOB_HANDLE && DV_BLOB == bh->ask_tag)*/ - { - session_buffered_read (ses_from, (char *) to + n_in, readbytes); - bh->bh_bytes_coming -= readbytes; - to_go -= readbytes; - n_in += readbytes; - } -/* long readbytes = MIN (bh->bh_bytes_coming, to_go); - int page_end = 0; - if ( DV_TYPE_OF(bh) == DV_BLOB_WIDE_HANDLE) - { - readbytes = wide_blob_buffered_read (ses_from, (char *) to + n_in, readbytes, &bh->bh_wb_state, &page_end); - } - else - session_buffered_read (ses_from, (char *) to + n_in, readbytes); - bh->bh_bytes_coming -= readbytes; - to_go -= readbytes; - n_in += readbytes; - if (page_end) - { - END_READ_FAIL (ses_from); - return n_in; - }*/ -#endif if (page_end) { END_READ_FAIL (ses_from); @@ -951,57 +880,7 @@ bh_get_data_from_user (blob_handle_t * bh, client_connection_t * cli, } if (0 == bh->bh_bytes_coming) - { - bh->bh_state.ask_tag = session_buffered_read_char (ses_from); - switch (bh->bh_state.ask_tag) - { - case DV_WIDE: - /*box_tag_modify (bh, DV_BLOB_WIDE_HANDLE);*/ - bh->bh_bytes_coming = - (dtp_t) session_buffered_read_char (ses_from); - bh->bh_state.ask_tag = DV_BLOB_WIDE; - break; - case DV_SHORT_STRING_SERIAL: - /*box_tag_modify (bh, DV_BLOB_HANDLE);*/ - bh->bh_bytes_coming = - (dtp_t) session_buffered_read_char (ses_from); - bh->bh_state.ask_tag = DV_BLOB; - break; - case DV_BLOB_WIDE: - case DV_LONG_WIDE: - /*box_tag_modify (bh, DV_BLOB_WIDE_HANDLE);*/ - bh->bh_bytes_coming = read_long (ses_from); - bh->bh_state.ask_tag = DV_BLOB_WIDE; - break; - case DV_BLOB_BIN: - bh->bh_bytes_coming = read_long (ses_from); - bh->bh_state.ask_tag = DV_BLOB_BIN; - break; - case DV_BIN: - bh->bh_bytes_coming = (dtp_t) session_buffered_read_char (ses_from); - bh->bh_state.ask_tag = DV_BLOB_BIN; - break; - case DV_BLOB: - case DV_LONG_STRING: - /*box_tag_modify (bh, DV_BLOB_HANDLE);*/ - bh->bh_state.ask_tag = DV_BLOB; - bh->bh_bytes_coming = read_long (ses_from); - break; - case DV_BLOB_XPER: - box_tag_modify (bh, DV_BLOB_XPER_HANDLE); - bh->bh_bytes_coming = read_long (ses_from); - bh->bh_state.ask_tag = DV_BLOB; - bh_tag = DV_BLOB_HANDLE; - break; - case DV_DB_NULL: - bh->bh_all_received = BLOB_NULL_RECEIVED; - bh->bh_bytes_coming = 0; /* No data expected in the future */ - break; - default: - bh->bh_all_received = BLOB_ALL_RECEIVED; - break; - } - } + bh_read_header_of_user_data (bh, ses_from); if (!to_go) { END_READ_FAIL (ses_from); @@ -1045,173 +924,121 @@ bh_fill_pagedir_buffer (blob_handle_t * bh, buffer_desc_t * buf, it_cursor_t * i } } - static long -bh_fill_data_buffer (blob_handle_t * bh, buffer_desc_t * buf, it_cursor_t * itc_from, int *status_ret, size_t *data_len_in_bytes) +bh_fill_data_buffer (blob_handle_t * source_bh, buffer_desc_t * dest_buf, it_cursor_t * itc_from, int *status_ret, size_t *data_len_in_bytes) { + blob_cvt_type_t flout = bh_flout (source_bh); /* Buffer is empty. Read from blob and set status_ret to BLOB_ALL_RECEIVED if at end or to BLOB_NULL_RECEIVED if NULL value found. Return bytes read */ - - if (bh->bh_string) + if (source_bh->bh_string) { - dtp_t string_tag = (dtp_t)DV_TYPE_OF (bh->bh_string); - dtp_t bh_tag = (dtp_t)DV_TYPE_OF (bh); - int page_end = 0, nin = 0, nout = 0, ncout = 0; - long len = box_length (bh->bh_string); + dtp_t string_tag = (dtp_t)DV_TYPE_OF (source_bh->bh_string); + int nin = 0, nout = 0, ncout = 0; + long source_byte_count = box_length (source_bh->bh_string); get_data_generic_proc proc = get_data_from_box; - void *arg = bh->bh_string; - blob_cvt_type_t flin = vBINARY, flout = vBINARY; - switch (string_tag) { - case DV_WIDE: case DV_LONG_WIDE: - flin = vWIDE; - len -= sizeof(wchar_t); - break; - case DV_STRING: - flin = vNARROW; - len --; - break; + void *arg = source_bh->bh_string; + blob_cvt_type_t flin = vBINARY; + switch (string_tag) + { + case DV_WIDE: case DV_LONG_WIDE: flin = vWIDE; source_byte_count -= sizeof(wchar_t); break; + case DV_STRING: flin = vNARROW; source_byte_count --; break; case DV_STRING_SESSION: - len = strses_length ((dk_session_t *) bh->bh_string); - proc = get_data_from_strses; - default: - flin = vBINARY; - break; - }; - switch (bh->bh_state.need_tag) { - case DV_BLOB_WIDE: - flout= vUTF; - break; - case DV_BLOB_BIN: - flout = vBINARY; - break; - case DV_BLOB: - flout = vNARROW; - break; - default: - { - switch (bh_tag) { - case DV_BLOB_XPER_HANDLE: - flout = vBINARY; - break; - case DV_BLOB_HANDLE: - flout= vNARROW; - break; - case DV_BLOB_WIDE_HANDLE: - flout= vUTF; - break; - }; - break; - } - }; - page_end = bh_fill_page_generic ( - bh, - itc_from->itc_ltrx->lt_client->cli_charset, - flin, - flout, - buf->bd_buffer + DP_DATA, - len - bh->bh_position, - PAGE_DATA_SZ, - &nin, - &nout, - &ncout, - proc, - arg, - bh->bh_position); - bh->bh_position += nin; - if (bh->bh_position == len) - { - bh->bh_position = 0; + source_byte_count = strses_length ((dk_session_t *) source_bh->bh_string); + proc = get_data_from_strses; + flin = vBINARY; + break; + default: flin = vBINARY; break; + } + bh_fill_page_generic ( + source_bh, + itc_from->itc_ltrx->lt_client->cli_charset, + flin, + flout, + dest_buf->bd_buffer + DP_DATA, + source_byte_count - source_bh->bh_position, + PAGE_DATA_SZ, + &nin, + &nout, + &ncout, + proc, + arg, + source_bh->bh_position ); + source_bh->bh_position += nin; + if (source_bh->bh_position == source_byte_count) + { + source_bh->bh_position = 0; status_ret[0] = BLOB_ALL_RECEIVED; } - LONG_SET (buf->bd_buffer + DP_BLOB_LEN, nout); + LONG_SET (dest_buf->bd_buffer + DP_BLOB_LEN, nout); *data_len_in_bytes = nout; return ncout; - } - if (bh->bh_current_page && !BH_FROM_CLUSTER (bh)) + } + if (source_bh->bh_page && !BH_FROM_CLUSTER (source_bh)) { - int page_end = 0, nin = 0, nout = 0, ncout = 0, __at_end = 0; - blob_cvt_type_t flin = vBINARY, flout = vBINARY; + int nin = 0, nout = 0, ncout = 0; + blob_cvt_type_t flin = vBINARY; struct bh_get_layout_s bl; - dtp_t bh_tag = (dtp_t)DV_TYPE_OF (bh); - bl.bh = bh; - bl.itc_from = itc_from; - bl.buf = buf; - bl.at_end = &__at_end; - - switch (bh->bh_state.ask_tag) { - case DV_BLOB_WIDE: - flin = vUTF; - break; - case DV_BLOB: - flin = vNARROW; - break; - default: - flin = vBINARY; - break; - }; - switch (bh->bh_state.need_tag) { - case DV_BLOB_WIDE: - flout= vUTF; - break; - case DV_BLOB_BIN: - flout = vBINARY; - break; - case DV_BLOB: - flout = vNARROW; - break; - default: - { - switch (bh_tag) { - case DV_BLOB_XPER_HANDLE: - flout = vBINARY; - break; - case DV_BLOB_HANDLE: - flout= vNARROW; - break; - case DV_BLOB_WIDE_HANDLE: - flout= vUTF; - break; - }; - break; - } - }; - page_end = bh_fill_page_generic ( - bh, - default_charset, - flin, - flout, - buf->bd_buffer + DP_DATA, - (int) (bh->bh_diskbytes - bh->bh_position), - PAGE_DATA_SZ, - &nin, - &nout, - &ncout, - get_data_from_blob, - &bl, - 0); - bh->bh_position += nin; - if (bh->bh_diskbytes <= (unsigned)bh->bh_position) - { - bh->bh_position = 0; + bl.bgl_bh = source_bh; + bl.bgl_itc_from = itc_from; + bl.bgl_buf = dest_buf; + switch (source_bh->bh_state.bs_ask_tag) + { + case DV_BLOB_WIDE: flin = vUTF; break; + case DV_BLOB: flin = vNARROW; break; + default: flin = vBINARY; break; + } + bh_fill_page_generic ( + source_bh, + default_charset, + flin, + flout, + dest_buf->bd_buffer + DP_DATA, + (int) MAX_UTF8_CHAR * PAGE_DATA_SZ /* was (source_bh->bh_diskbytes - source_bh->bh_position */, + PAGE_DATA_SZ, + &nin, + &nout, + &ncout, + get_data_from_blob, + &bl, + 0 ); + /*source_bh->bh_position += nin; + if (page_end && (0 != source_bh->bh_position % PAGE_DATA_SZ)) + source_bh->bh_position = ((source_bh->bh_position / PAGE_DATA_SZ) + 1) * PAGE_DATA_SZ; + if (source_bh->bh_diskbytes <= (unsigned)source_bh->bh_position) + { + source_bh->bh_position = 0; status_ret[0] = BLOB_ALL_RECEIVED; - } - if (BLOB_AT_END_ERROR == __at_end) - *status_ret = BLOB_ALL_RECEIVED; - LONG_SET (buf->bd_buffer + DP_BLOB_LEN, nout); + }*/ + switch (source_bh->bh_state.bs_status) + { + case BLOB_AT_MIDDLE: break; + case BLOB_AT_END: + if (source_bh->bh_state.bs_bufpos >= source_bh->bh_state.bs_buflen) + *status_ret = BLOB_ALL_RECEIVED; + break; + case BLOB_AT_END_ERROR: + *status_ret = BLOB_ALL_RECEIVED; + break; + default: + GPF_T1 ("Blob handle is in unexpacted state after reading"); + *status_ret = BLOB_ALL_RECEIVED; + break; + } + LONG_SET (dest_buf->bd_buffer + DP_BLOB_LEN, nout); *data_len_in_bytes = nout; return ncout; } - if (bh->bh_ask_from_client || BH_FROM_CLUSTER (bh)) + if (source_bh->bh_ask_from_client || BH_FROM_CLUSTER (source_bh)) { - long n_in = bh_get_data_from_user (bh, itc_from->itc_ltrx->lt_client, - buf->bd_buffer + DP_DATA, PAGE_DATA_SZ); - LONG_SET (buf->bd_buffer + DP_BLOB_LEN, n_in); - if ((BLOB_ALL_RECEIVED == bh->bh_all_received) || (BLOB_NULL_RECEIVED == bh->bh_all_received)) + long n_in = bh_get_data_from_user (source_bh, itc_from->itc_ltrx->lt_client, + dest_buf->bd_buffer + DP_DATA, PAGE_DATA_SZ); + LONG_SET (dest_buf->bd_buffer + DP_BLOB_LEN, n_in); + if ((BLOB_ALL_RECEIVED == source_bh->bh_all_received) || (BLOB_NULL_RECEIVED == source_bh->bh_all_received)) { - status_ret[0] = bh->bh_all_received; + status_ret[0] = source_bh->bh_all_received; } *data_len_in_bytes = n_in; - return (DV_TYPE_OF (bh) == DV_BLOB_WIDE_HANDLE ? - (long) wide_char_length_of_utf8_string (buf->bd_buffer + DP_DATA, n_in) : + return (DV_TYPE_OF (source_bh) == DV_BLOB_WIDE_HANDLE ? + (long) wide_char_length_of_utf8_string (dest_buf->bd_buffer + DP_DATA, n_in) : n_in); } GPF_T1 ("Blob handle is totally empty"); @@ -1901,7 +1728,6 @@ itc_set_blob_col (it_cursor_t * row_itc, db_buf_t col, it_cursor_t *blob_itc = &blob_itc_auto; dp_addr_t first_page = 0; int read_status = BLOB_NONE_RECEIVED; - size_t pos; size_t data_len = 0; dtp_t volatile dtp = (dtp_t)DV_TYPE_OF (data); buffer_desc_t *blob_buf = NULL, *next_blob_buf = NULL, *volatile first_buf = NULL; @@ -1981,7 +1807,6 @@ itc_set_blob_col (it_cursor_t * row_itc, db_buf_t col, if (IS_BLOB_HANDLE_DTP (dtp)) { source_bh = (blob_handle_t *) data; - source_bh->bh_current_page = source_bh->bh_page; if (source_bh->bh_ask_from_client) { blob_handle_t * ready_dae = cli_ready_dae (row_itc->itc_ltrx->lt_client, source_bh); @@ -2000,6 +1825,7 @@ itc_set_blob_col (it_cursor_t * row_itc, db_buf_t col, else target_bh = bh_alloc ((dtp_t)DV_BLOB_HANDLE_DTP_FOR_BLOB_DTP (col_dtp)); bh_tag_modify (source_bh, col_dtp, dtp); + bh_reset_read (source_bh); goto bh_is_ready; /* see below */ } #ifdef BIF_XML @@ -2079,8 +1905,6 @@ itc_set_blob_col (it_cursor_t * row_itc, db_buf_t col, ITC_INIT (blob_itc, NULL, row_itc->itc_ltrx); itc_from_it (blob_itc, source_bh->bh_it ? source_bh->bh_it : row_itc->itc_tree); - source_bh->bh_state.utf8_chr = '\0'; - source_bh->bh_state.count = '\0'; if (BH_FROM_CLUSTER (source_bh)) source_bh->bh_all_received = BLOB_NONE_RECEIVED; /* if going to assign blob from cluster, might assign many times and each time is a fresh copy */ @@ -2093,7 +1917,6 @@ itc_set_blob_col (it_cursor_t * row_itc, db_buf_t col, first_page = blob_buf->bd_page; dk_set_push ((dk_set_t *) &pages, DP_ADDR2VOID (first_page)); n_pages++; - pos = 0; target_bh->bh_diskbytes = 0; target_bh->bh_length = 0; blob_str_head_len (str_head_len, first_buf, target_bh); @@ -2760,7 +2583,7 @@ bh_string_output_n (lock_trx_t * lt, blob_handle_t * bh, int omit, int free_buff #define bh_string_list(lt, bh, get_bytes, omit) \ ((box_tag (bh) == DV_BLOB_WIDE_HANDLE) ? \ - bh_string_list_w (lt, bh, get_bytes, omit) : \ + bh_string_list_w (lt, bh, get_bytes / sizeof (wchar_t), omit) : \ bh_string_list_n (lt, bh, get_bytes, omit)) @@ -3087,23 +2910,25 @@ blob_check (blob_handle_t * bh) if (bh->bh_pages) { int inx, n = box_length ((caddr_t) bh->bh_pages) / sizeof (dp_addr_t); + int expected_n_of_pages = ((bh->bh_diskbytes - 1) / PAGE_DATA_SZ) + 1; dp_addr_t dp = bh->bh_dir_page; if (!dp && n > BL_DPS_ON_ROW) { error = 1; log_info ("blob handle L=%d with no dir but over VL_DPS_ON_ROW_PAGES", bh->bh_page); } - if (bh->bh_diskbytes && n != (((bh->bh_diskbytes - 1) / PAGE_DATA_SZ) + 1)) + if (bh->bh_diskbytes && n != expected_n_of_pages) { error = 1; - log_info ("Blob disk bytes and page dir length disagree L=%d bytes= %d dir pages=%d ", bh->bh_page, n, bh->bh_diskbytes); + log_info ("Blob disk bytes and page dir length disagree: start page %lu, dir page %lu, diskbytes=%ld, expected %d pages, actually %d pages", + (long)(bh->bh_page), (long)(bh->bh_dir_page), bh->bh_diskbytes, expected_n_of_pages, n); } if (!bh->bh_page_dir_complete && n > BL_DPS_ON_ROW) n = BL_DPS_ON_ROW; if (dp && (dp < 3 || dp > it->it_storage->dbs_n_pages)) { error = 1; - log_info ("Out of range blob dir page refd start = %d L=%d ", bh->bh_page, dp); + log_info ("Out of range blob dir page refd start=%d, L=%d ", bh->bh_page, dp); } else if (dp && dbs_is_free_page (it->it_storage, dp)) { @@ -3161,10 +2986,12 @@ bl_check (blob_layout_t * bl) { int inx, n = box_length ((caddr_t) bl->bl_pages) / sizeof (dp_addr_t); dp_addr_t dp = bl->bl_dir_start; - if (bl->bl_diskbytes && n != (((bl->bl_diskbytes - 1) / PAGE_DATA_SZ) + 1)) + int expected_n_of_pages = ((bl->bl_diskbytes - 1) / PAGE_DATA_SZ) + 1; + if (bl->bl_diskbytes && n != expected_n_of_pages) { error = 1; - log_info ("Blob disk bytes and page dir length disagree L=%d bytes= %d dir pages=" BOXINT_FMT, bl->bl_start, n, bl->bl_diskbytes); + log_info ("Blob layout disk bytes and page dir length disagree: start page %lu, dir page %lu, diskbytes=%ld, expected %d pages, actually %d pages", + (long)(bl->bl_start), (long)(bl->bl_dir_start), bl->bl_diskbytes, expected_n_of_pages, n); } if (!dp && n > BL_DPS_ON_ROW) { @@ -3273,8 +3100,7 @@ blob_send_bytes (lock_trx_t * lt, caddr_t bhp, long get_bytes, { blob_handle_t *bh = (blob_handle_t *) bhp; caddr_t arr; - dk_set_t string_list = - bh_string_list (/*NULL,*/ lt, (blob_handle_t *) bhp, get_bytes, 0); + dk_set_t string_list = bh_string_list (/*NULL,*/ lt, (blob_handle_t *) bhp, get_bytes, 0); if (BH_DIRTYREAD == string_list) { @@ -3494,7 +3320,10 @@ blob_to_string_isp (lock_trx_t * lt, caddr_t bhp) MAKE_TRX_ERROR (lt->lt_error, err, LT_ERROR_DETAIL (lt)); sqlr_resignal (err); } - + if (isWide) + ((wchar_t *) out)[bytes / sizeof (wchar_t)] = 0; + else + out[bytes] = 0; while (NULL != string_list) { caddr_t fragment = (box_t) dk_set_pop(&string_list); @@ -3508,14 +3337,8 @@ blob_to_string_isp (lock_trx_t * lt, caddr_t bhp) fill += len; dk_free_box (fragment); } - if (fill != bytes) goto stub_for_corrupted_blob; /* see below */ - - if (isWide) - ((wchar_t *) out)[bytes / sizeof (wchar_t)] = 0; - else - out[bytes] = 0; return out; /* If blob handle references to a field of deleted row, or in case of internal error, we should return empty string */ @@ -3537,6 +3360,8 @@ blob_to_string (lock_trx_t * lt, caddr_t bhp) { #ifdef DEBUG blob_handle_t * bh = (blob_handle_t *) bhp; + if (!IS_BLOB_HANDLE_DTP (DV_TYPE_OF (bh))) + log_info ("Attempt to convert a BLOB to a string, but the argument is not a BLOB handle"); #endif return blob_to_string_isp (lt, bhp); } @@ -3547,6 +3372,8 @@ blob_to_string_output (lock_trx_t * lt, caddr_t bhp) { #ifdef DEBUG blob_handle_t * bh = (blob_handle_t *) bhp; + if (!IS_BLOB_HANDLE_DTP (DV_TYPE_OF (bh))) + log_info ("Attempt to convert a BLOB to a string session, but the argument is not a BLOB handle"); #endif return blob_to_string_output_isp (lt, bhp); } @@ -3878,76 +3705,67 @@ wide_blob_buffered_read ( get_data_generic_proc get_data_proc) { unsigned char* buf_to = to; + int tail_count; int readbytes = 0; int readchars = 0; - unsigned char utf8_char = state->utf8_chr; + unsigned char utf8_char = state->bs_utf8_char; while (req_chars) { if (!utf8_char) - get_data_proc (ses_from, &utf8_char, 0, 1); /* there was: utf8_char = session_buffered_read_char (ses_from);*/ - - if (utf8_char < 0x80) - { - /* One byte sequence. */ - state->count = 0; - } + { + int fetched_byte_count = get_data_proc (ses_from, &utf8_char, 0, 1); + if (0 >= fetched_byte_count) /* No more source data */ + goto done; /* see below */ + } + if (utf8_char < 0x80) /* One byte sequence. */ + tail_count = 0; else if ((utf8_char & 0xe0) == 0xc0) - { - state->count = 1; - } + tail_count = 1; else if ((utf8_char & 0xf0) == 0xe0) - { - /* We expect three bytes. */ - state->count = 2; - } + tail_count = 2; else if ((utf8_char & 0xf8) == 0xf0) - { - /* We expect four bytes. */ - state->count = 3; - } + tail_count = 3; else if ((utf8_char & 0xfc) == 0xf8) - { - /* We expect five bytes. */ - state->count = 4; - } + tail_count = 4; else if ((utf8_char & 0xfe) == 0xfc) - { - /* We expect six bytes. */ - state->count = 5; - } + tail_count = 5; else - { - /* This is an illegal encoding. */ - /* errno = (EILSEQ); */ - /*GPF_T1 ("Received bad UTF8 string");*/ - /*return -1;*/ - state->count = 0; - log_error ("Invalid UTF-8 char (%02X) read in filling up a BLOB. The wide blob data may be garbaled.", + { + tail_count = 0; + log_error ("Invalid UTF-8 char (%02X) read in filling up a BLOB. The wide blob data may be garbled.", utf8_char); utf8_char = '?'; - } - - if (state->count > req_chars - 1) - { /* not enough space */ - state->utf8_chr = utf8_char; - page_end[0] = 1; - *preadchars = readchars; - return readbytes; - } - + } + state->bs_utf8_tail_count = tail_count; + if (tail_count > req_chars - 1) + { /* not enough space */ + state->bs_utf8_char = utf8_char; + page_end[0] = 1; + *preadchars = readchars; + return readbytes; + } *buf_to++ = utf8_char; - if (state->count) - get_data_proc (ses_from, buf_to, 0, state->count); /*there was: session_buffered_read (ses_from, buf_to, state->count);*/ - buf_to += state->count; - readbytes += state->count + 1; + if (tail_count) + { + int fetched_byte_count = get_data_proc (ses_from, buf_to, 0, tail_count); + if (fetched_byte_count < tail_count) + { + log_error ("Incomplete UTF-8 sequence beginning with (%02X) and only %d out of %d bytes fetched after it. The wide blob data may be garbled.", + utf8_char, fetched_byte_count, tail_count ); + goto done; /* see below */ + } + } + buf_to += tail_count; + readbytes += tail_count + 1; readchars ++; - req_chars -= state->count + 1; + req_chars -= tail_count + 1; if (req_chars < 0) - GPF_T; + GPF_T; utf8_char = 0; } - state->utf8_chr = 0; - state->count = 0; +done: + state->bs_utf8_char = 0; + state->bs_utf8_tail_count = 0; *preadchars = readchars; return readbytes; } @@ -3984,19 +3802,16 @@ bh_dp_list_n (lock_trx_t * lt, blob_handle_t * bh) { /* take current page at current place and make string of n bytes from the place and return as string list */ - caddr_t page_string; dk_set_t list = NULL; dp_addr_t start = bh->bh_current_page; buffer_desc_t *buf = NULL; - long from_byte = bh->bh_position; - long bytes_filled = 0, bytes_on_page; it_cursor_t *tmp_itc; tmp_itc = itc_create (NULL, lt); itc_from_it (tmp_itc, bh->bh_it); dk_set_push (&list, box_num (bh->bh_dir_page)); while (start) { - long len, next; + long next; uint32 timestamp; int type; diff --git a/libsrc/Wi/blobio.c b/libsrc/Wi/blobio.c index af2c81a377..476275414c 100644 --- a/libsrc/Wi/blobio.c +++ b/libsrc/Wi/blobio.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -508,10 +508,12 @@ bh_destroy (caddr_t box) dk_free_box ((box_t) bh->bh_pages); bh->bh_pages = NULL; } - if (NULL != bh->bh_state.buffer) + if (NULL != bh->bh_state.bs_buffer) { - dk_free_box (bh->bh_state.buffer); - bh->bh_state.buffer = NULL; + dk_free_box (bh->bh_state.bs_buffer); + bh->bh_state.bs_buffer = NULL; + bh->bh_state.bs_buffered_page = 0; + bh->bh_state.bs_next_of_buffered_page = 0; } if (bh->bh_source_session) { @@ -530,7 +532,7 @@ bh_copy (caddr_t box) memcpy (bhcopy, bh, sizeof (*bhcopy)); bhcopy->bh_pages = (dp_addr_t *) box_copy ((caddr_t) bhcopy->bh_pages); bh->bh_source_session = NULL; - bhcopy->bh_state.buffer = box_copy_tree (bhcopy->bh_state.buffer); + bhcopy->bh_state.bs_buffer = box_copy_tree (bhcopy->bh_state.bs_buffer); if (bh->bh_ask_from_client == 2 || bh->bh_ask_from_client == 2) bhcopy->bh_ask_from_client = 0; return (caddr_t) bhcopy; @@ -545,7 +547,7 @@ bh_mp_copy (mem_pool_t * mp, caddr_t box) memcpy (bhcopy, bh, sizeof (*bhcopy)); bhcopy->bh_pages = (dp_addr_t *) mp_box_copy (mp, (caddr_t) bhcopy->bh_pages); bh->bh_source_session = NULL; - bhcopy->bh_state.buffer = mp_full_box_copy_tree (mp, bhcopy->bh_state.buffer); + bhcopy->bh_state.bs_buffer = mp_full_box_copy_tree (mp, bhcopy->bh_state.bs_buffer); if (bh->bh_ask_from_client == 2 || bh->bh_ask_from_client == 2) bhcopy->bh_ask_from_client = 0; return (caddr_t) bhcopy; diff --git a/libsrc/Wi/blobio.h b/libsrc/Wi/blobio.h index 6aa9305441..6151b0a486 100644 --- a/libsrc/Wi/blobio.h +++ b/libsrc/Wi/blobio.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -30,15 +30,24 @@ #include "widv.h" #include "multibyte.h" +#define BLOB_BEFORE_READ 0 /*!< The bh_pickup_page() is never called or there was a bh_reset_read() recently, so bs_buffer is allocated but it can contain garbage (and bs_buffered_page is zero in that case) */ +#define BLOB_AT_MIDDLE 1 /*!< The bh_pickup_page() has made pickup of a page in the chain and there's a next page to read (or there was no pickup at all) */ +#define BLOB_AT_END 2 /*!< The bh_pickup_page() has made pickup of the last page in the chain, can not pickup more, the BLOB rewind is required before next pickup */ +#define BLOB_AT_END_AGAIN 3 /*!< There was a last page pickup and no rewind, then the call of bh_pickup_page () was redundand. Good code should neve enter this state, but that's safe and that's not an error that deserves GPF */ +#define BLOB_AT_END_ERROR 4 /*!< The bh_pickup_page () has failed to access the current page for PA_READ, blob handle is not usable from that page on */ + struct blob_state_s { - unsigned char utf8_chr; /* this is for reading utf8 data from client */ - unsigned char count; /* this is for prefetch in utf8 page read from client */ - dtp_t ask_tag; /* previously read data chunk tag (for bh_get_data_from_user) */ - dtp_t need_tag; /* column type (for bh_get_data_from_user) */ - caddr_t buffer; /* this is necessary for blob2blob conversion with recoding */ - int bufpos; /* current position in buffer */ - int buflen; /* data bytes read in buflen*/ + unsigned char bs_utf8_char; /*!< Incomplete UTF-8 char being read from client or from bs_buffer */ + unsigned char bs_utf8_tail_count; /*!< Count of remaining bytes of UTF-8 char to be read from client or from bs_buffer */ + dtp_t bs_ask_tag; /*!< Previously read data chunk tag (for bh_get_data_from_user()) */ + dtp_t bs_need_tag; /*!< Column type (for bh_get_data_from_user()) */ + caddr_t bs_buffer; /*!< Content of page of source blob for blob2blob conversion with recoding, allocated at first use */ + dp_addr_t bs_buffered_page; /*!< ID of page picked to bs_buffer */ + dp_addr_t bs_next_of_buffered_page; /*!< ID of "next" (DP_OVERFLOW) page of the picked to bs_buffer */ + int bs_bufpos; /*!< Current byte offset in bs_buffer */ + int bs_buflen; /*!< Data bytes read in bs_buffer */ + char bs_status; /*!< \c BLOB_NEVER_PICKED or \c BLOB_AT_MIDDLE or BLOB_AT_END_xxx state set by bh_pickup_page() */ }; typedef struct blob_state_s blob_state_t; @@ -47,34 +56,32 @@ typedef unsigned char wblob_state_t; struct blob_handle_s { - dp_addr_t bh_page; /* if blob is on disk as chained pages */ - dp_addr_t bh_current_page; /* Keep track of position over SQLGetData calls */ - dp_addr_t bh_dir_page; /* points at first directory page */ - int32 bh_position; /* -- */ /* point on page or string */ + dp_addr_t bh_page; /*!< If blob is on disk as chained pages then ID of its first page, 0 otherwise */ + dp_addr_t bh_current_page; /*!< ID of current page to keep track of position over SQLGetData calls() or bh_pickup_page(). It's zero after pickup of the last page to the bh_state.buffer by bh_pickup_page() or in case of failed page access. */ + dp_addr_t bh_dir_page; /*!< points at first directory page, 0 for short blobs */ + int32 bh_position; /*!< position on page identified by bh_current_page or offset in in-memory string */ short bh_frag_no; unsigned short bh_slice; - caddr_t bh_string; /* if BLOB is in RAM as DV string */ - int64 bh_length; /* Number of symbols in BLOB (either char-s or wchar_t-s */ - int64 bh_diskbytes; /* Number of bytes required to store BLOB on disk - equal to bh_length for narrow-char BLOBs, - length of UTF8-ed string for DV_BLOB_WIDE_HANDLE */ - - char bh_ask_from_client; /* true when coming from log or from client by PutData */ - int bh_page_dir_complete; /* true if bh_pages is complete, e.g. not only those dps ref'd on the row */ - char bh_all_received; /* true when client has sent end mark */ - char bh_send_as_bh; /*do not inline as string over serialization, use for blob req in cluster */ - uint32 bh_bytes_coming; /* byte count being sent by client */ - long bh_param_index; /* Use this index when asking from client */ - dp_addr_t *bh_pages; /* a contiguous array of pages IDs, allocated as a DV_CUSTOM. */ - struct index_tree_s * bh_it; + caddr_t bh_string; /*!< The whole BLOB value if BLOB is in RAM as DV string */ + int64 bh_length; /*!< Number of symbols in BLOB (either char-s or wchar_t-s) */ + int64 bh_diskbytes; /*!< Number of bytes required to store BLOB on disk, equal to bh_length for narrow-char BLOBs, equal to length of UTF8-ed string for DV_BLOB_WIDE_HANDLE with spare bytes at the ends of page _counted_. I.e., every LONG NVARCHAR page except the last one is counted as PAGE_DATA_SZ disk bytes even it it has up to 5 spare bytes at the end */ + + char bh_ask_from_client; /*!< Nonzero when coming from log or from client by PutData. More correctly, 1 when set by xp_log_update() or inside rd_fixup_blob_refs() or cluster IPC or gets bh_param_index set; 3 after __blob_handle_from_session(), BH_CLUSTER_DAE */ + int bh_page_dir_complete; /*!< True if bh_pages is complete, e.g. not only those dps ref'd on the row */ + char bh_all_received; /*!< true when client has sent end mark */ + char bh_send_as_bh; /*!< do not inline as string over serialization, use for blob request in cluster */ + uint32 bh_bytes_coming; /*!< byte count being sent by client */ + long bh_param_index; /*!< Use this index when asking from client */ + dp_addr_t *bh_pages; /*!< A contiguous array of pages IDs, allocated as a DV_CUSTOM. */ + struct index_tree_s * bh_it; uint32 bh_key_id; uint32 bh_timestamp; blob_state_t bh_state; - caddr_t bh_source_session; /* used when bh_get_data_from_client is 3 */ + caddr_t bh_source_session; /*!< Pointer to dk_session_t box of type DV_CONNECTION, set when bh_ask_from_client is 3 */ }; -#define BH_CLUSTER_DAE 5 /* in bh_ask_from_client to indicate that this is a data at exec blob made as temp before use on anothr partition */ +#define BH_CLUSTER_DAE 5 /* in bh_ask_from_client to indicate that this is a data at exec blob made as temp before use on another partition */ typedef struct blob_handle_s blob_handle_t; #define BH_ANY ((uint32)(-1)) @@ -92,14 +99,13 @@ typedef struct blob_handle_s blob_handle_t; lt_blobs_delete_at_rollback queues of transaction. It should be allocated by 'blob_layout_ctor' function and will be freed by 'blob_chain_delete' */ -/*#define BL_DEBUG*/ struct blob_layout_s { dtp_t bl_blob_handle_dtp; /*!< Type of BLOB handle, to pay special attention to the length of wide BLOBs */ dp_addr_t bl_start; /*!< First page of blob sequence */ dp_addr_t bl_dir_start; /*!< First page of blob directory sequence, if unknown = 0 and it will be tried to fetch it from DP_PARENT offset of the first blob page */ int64 bl_length; /*!< Number of symbols in BLOB, 0 if unknown */ - int64 bl_diskbytes; /*!< Number of bytes required to store BLOB on disk, 0 if unknown */ + int64 bl_diskbytes; /*!< Number of bytes required to store BLOB on disk, 0 if unknown, as in bh_diskbytes if nonzero */ dp_addr_t * bl_pages; /*!< Page directory or NULL if not yet known. */ int bl_page_dir_complete; /*!< Flags if we have to read bl_page_dir in order to get all pages */ int bl_delete_later; /*!< Flags if this blob should be deleted later in case of commit and/or rollback */ @@ -123,6 +129,7 @@ typedef struct blob_layout_s blob_layout_t; #define bh_alloc(handle_dtp) \ ((blob_handle_t *)(dk_alloc_box_zero (sizeof (blob_handle_t), (handle_dtp)))) +extern void bh_reset_read (blob_handle_t * bh); void bh_free (blob_handle_t * bh); void iri_id_write (iri_id_t *iid, dk_session_t * ses); diff --git a/libsrc/Wi/blog.xsl b/libsrc/Wi/blog.xsl index 37701d9396..0921ee3aaa 100644 --- a/libsrc/Wi/blog.xsl +++ b/libsrc/Wi/blog.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/bmcmp.c b/libsrc/Wi/bmcmp.c new file mode 100644 index 0000000000..35619bf41b --- /dev/null +++ b/libsrc/Wi/bmcmp.c @@ -0,0 +1,160 @@ +/* + * bmcmp.c + * + * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) + * project. + * + * Copyright (C) 1998-2019 OpenLink Software + * + * This project is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; only version 2 of the License, dated June 1991. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#define DC_INT(dc, sets, set) ((int64*)dc->dc_values)[sets[set]] +#define DC_ANY(dc, sets, set) ((db_buf_t*)dc->dc_values)[sets[set]] + +caddr_t +bif_bm_cmp (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ + sqlr_new_error ("42000", "BMCMPV", "bm_cmp is only for vectored contexts"); + return NULL; +} + +double +bm_cmp (int64 x1, int64 y1, int64 x2, int64 y2, db_buf_t bm1, int l1, db_buf_t bm2, int l2) +{ + int total_len = l1 + l2, min_len, inx, ones = 0; + min_len = MIN (l1, l2); + for (inx = 0; inx < min_len; inx++) + { + ones += byte_logcount[bm1[inx] & bm2[inx]]; + } + return (double) ones / total_len; +} + + +int * +dc_sets (caddr_t * inst, state_slot_t * ssl, data_col_t ** dc_ret, dtp_t dtp, data_col_t * tmp_dc) +{ + int *sets; + data_col_t *dc; + QNCAST (QI, qi, inst); + dc = *dc_ret = QST_BOX (data_col_t *, inst, ssl->ssl_index); + if (dtp != (*dc_ret)->dc_sqt.sqt_dtp && !(DV_ANY == dtp && (DCT_BOXES & dc->dc_type))) + + sqlr_new_error ("42000", "BMCAR", "Wrong type argument %s, expected %s", dv_type_title (dc->dc_sqt.sqt_dtp), + dv_type_title (dtp)); + sets = (int *) dc_alloc (tmp_dc, sizeof (int) * qi->qi_n_sets); + if (SSL_VEC == ssl->ssl_type) + int_asc_fill (sets, qi->qi_n_sets, 0); + else if (SSL_REF == ssl->ssl_type) + sslr_n_consec_ref (inst, (state_slot_ref_t *) ssl, sets, 0, qi->qi_n_sets); + else + sqlr_new_error ("42000", "BMCVC", "bm_cmp expects vector arguments"); + return sets; +} + + +db_buf_t +dc_string (caddr_t * qst, data_col_t * dc, int *sets, int set, int *len_ret, caddr_t * to_free_ret) +{ + *to_free_ret = NULL; + if ((DCT_BOXES & dc->dc_type)) + { + caddr_t box = ((caddr_t *) dc->dc_values)[sets[set]]; + dtp_t dtp = DV_TYPE_OF (box); + switch (dtp) + { + case DV_STRING: + *len_ret = box_length (box) - 1; + return (db_buf_t) box; + case DV_BIN: + *len_ret = box_length (box) - 1; + return (db_buf_t) box; + case DV_BLOB_HANDLE: + *to_free_ret = blob_to_string (((QI *) qst)->qi_trx, box); + *len_ret = box_length (*to_free_ret) - (DV_STRINGP (*to_free_ret) ? 1 : 0); + return (db_buf_t) * to_free_ret; + default: + sqlr_new_error ("42000", "", "expected string or binary arg, got %s", dv_type_title (dtp)); + } + } + else if (DV_ANY == dc->dc_sqt.sqt_dtp) + { + db_buf_t dv = ((db_buf_t *) dc->dc_values)[sets[set]]; + switch (*dv) + { + case DV_SHORT_STRING_SERIAL: + case DV_BIN: + *len_ret = dv[1]; + return dv + 2; + case DV_STRING: + case DV_LONG_BIN: + *len_ret = LONG_REF_NA (dv + 1); + return dv + 5; + default: + sqlr_new_error ("42000", "", "Expected string or binary arg, got %s", dv_type_title (*dv)); + } + } + else + sqlr_new_error ("42000", "", "Expected vector of boxes or anies, got %s", dv_type_title (dc->dc_sqt.sqt_dtp)); + return NULL; +} + +void +bif_bm_cmp_vec (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, state_slot_t * ret) +{ + QNCAST (QI, qi, qst); + int first_set = 0, set, n_sets = qi->qi_n_sets; + data_col_t *x1_dc, *x2_dc, *y1_dc, *y2_dc, *bm1_dc, *bm2_dc; + int *x1_sets, *x2_sets, *y1_sets, *y2_sets, *bm1_sets, *bm2_sets; + data_col_t *ret_dc = QST_BOX (data_col_t *, qst, ret->ssl_index); + db_buf_t set_mask = qi->qi_set_mask; + if (BOX_ELEMENTS (args) < 6) + sqlr_new_error ("BMVAR", "BMVAR", "Too few arguments for bm_cmp"); + x1_sets = dc_sets (qst, args[0], &x1_dc, DV_LONG_INT, ret_dc); + y1_sets = dc_sets (qst, args[1], &y1_dc, DV_LONG_INT, ret_dc); + x2_sets = dc_sets (qst, args[2], &x2_dc, DV_LONG_INT, ret_dc); + y2_sets = dc_sets (qst, args[3], &y2_dc, DV_LONG_INT, ret_dc); + bm1_sets = dc_sets (qst, args[4], &bm1_dc, DV_ANY, ret_dc); + bm2_sets = dc_sets (qst, args[5], &bm2_dc, DV_ANY, ret_dc); + DC_CHECK_LEN (ret_dc, n_sets - 1); + dc_reset (ret_dc); + SET_LOOP + { + double score; + int l1, l2; + caddr_t tmp1, tmp2; + db_buf_t bits1 = dc_string (qst, bm1_dc, bm1_sets, set, &l1, &tmp1); + db_buf_t bits2 = dc_string (qst, bm2_dc, bm2_sets, set, &l2, &tmp2); + score = bm_cmp (DC_INT (x1_dc, x1_sets, set), DC_INT (y1_dc, y1_sets, set), + DC_INT (x2_dc, x2_sets, set), DC_INT (y2_dc, y2_sets, set), bits1, l1, bits2, l2); + ((double *) ret_dc->dc_values)[set] = score; + ret_dc->dc_n_values = set + 1; + if (tmp1) + dk_free_box (tmp1); + if (tmp2) + dk_free_box (tmp2); + } + END_SET_LOOP; + dc_reset_alloc (ret_dc); +} + + +void +bm_cmp_init () +{ + bif_define_typed ("bm_cmp", bif_bm_cmp, &bt_double); + bif_set_vectored (bif_bm_cmp, bif_bm_cmp_vec); +} diff --git a/libsrc/Wi/box2any.c b/libsrc/Wi/box2any.c index 0b4fcc02f7..eec021fcf0 100644 --- a/libsrc/Wi/box2any.c +++ b/libsrc/Wi/box2any.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cebits.c b/libsrc/Wi/cebits.c index ec45f9fda5..bfd8a5d1ef 100644 --- a/libsrc/Wi/cebits.c +++ b/libsrc/Wi/cebits.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cebitsdec.c b/libsrc/Wi/cebitsdec.c index d646048421..493984b531 100644 --- a/libsrc/Wi/cebitsdec.c +++ b/libsrc/Wi/cebitsdec.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cedel.c b/libsrc/Wi/cedel.c index adc0c593cb..d736530dde 100644 --- a/libsrc/Wi/cedel.c +++ b/libsrc/Wi/cedel.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cedict1.c b/libsrc/Wi/cedict1.c index b52f09af55..20023b7046 100644 --- a/libsrc/Wi/cedict1.c +++ b/libsrc/Wi/cedict1.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cedictad.c b/libsrc/Wi/cedictad.c index 3c3aec70d6..f3efbf9bf4 100644 --- a/libsrc/Wi/cedictad.c +++ b/libsrc/Wi/cedictad.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/ceins.c b/libsrc/Wi/ceins.c index 3240150087..c5ab264202 100644 --- a/libsrc/Wi/ceins.c +++ b/libsrc/Wi/ceins.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/ceintd.c b/libsrc/Wi/ceintd.c index f2c3a059ce..062aed2f09 100644 --- a/libsrc/Wi/ceintd.c +++ b/libsrc/Wi/ceintd.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/ceintd2.c b/libsrc/Wi/ceintd2.c index ad596bf6cf..64ceccb71d 100644 --- a/libsrc/Wi/ceintd2.c +++ b/libsrc/Wi/ceintd2.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/ceintddec.c b/libsrc/Wi/ceintddec.c index ba1f4d278f..d24932c9d4 100644 --- a/libsrc/Wi/ceintddec.c +++ b/libsrc/Wi/ceintddec.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cesearch.c b/libsrc/Wi/cesearch.c index c2ba158f6e..f00da2ceed 100644 --- a/libsrc/Wi/cesearch.c +++ b/libsrc/Wi/cesearch.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cetop.c b/libsrc/Wi/cetop.c index 4c5603101d..bf7bd9a140 100644 --- a/libsrc/Wi/cetop.c +++ b/libsrc/Wi/cetop.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cevecf.c b/libsrc/Wi/cevecf.c index 2729279a89..ab46182cdb 100644 --- a/libsrc/Wi/cevecf.c +++ b/libsrc/Wi/cevecf.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/ceveci.c b/libsrc/Wi/ceveci.c index dfd1a54a7d..4110dc03b9 100644 --- a/libsrc/Wi/ceveci.c +++ b/libsrc/Wi/ceveci.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cevecins.c b/libsrc/Wi/cevecins.c index 3ca39a972f..73d8889c94 100644 --- a/libsrc/Wi/cevecins.c +++ b/libsrc/Wi/cevecins.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/chash.c b/libsrc/Wi/chash.c index 1d5f58dbf4..a9e5c34c2e 100644 --- a/libsrc/Wi/chash.c +++ b/libsrc/Wi/chash.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -1858,7 +1858,7 @@ cha_gb_dtp (dtp_t dtp, int is_key, gb_op_t * go) } index_tree_t * -DBG_NAME(cha_allocate) (setp_node_t * setp, caddr_t * inst, int64 card) +DBG_NAME(cha_allocate) (DBG_PARAMS setp_node_t * setp, caddr_t * inst, int64 card) { hash_area_t *ha = setp->setp_ha; int n_slots = BOX_ELEMENTS (ha->ha_slots), inx; diff --git a/libsrc/Wi/cl_stubs.c b/libsrc/Wi/cl_stubs.c index 2df9a3c891..2c4a960e4b 100644 --- a/libsrc/Wi/cl_stubs.c +++ b/libsrc/Wi/cl_stubs.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/clcli.c b/libsrc/Wi/clcli.c index acfb4c0a8b..f45ef60f7b 100644 --- a/libsrc/Wi/clcli.c +++ b/libsrc/Wi/clcli.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -420,11 +420,11 @@ clo_destroy (cl_op_t * clo) } break; case CLO_DELETE: - if (clo->_.delete.rd) + if (clo->_.delete_op.rd) { - if (clo->_.delete.rd->rd_itc) - itc_free (clo->_.delete.rd->rd_itc); - rd_free (clo->_.delete.rd); + if (clo->_.delete_op.rd->rd_itc) + itc_free (clo->_.delete_op.rd->rd_itc); + rd_free (clo->_.delete_op.rd); } break; case CLO_SELECT: diff --git a/libsrc/Wi/cldaq.c b/libsrc/Wi/cldaq.c index 60ddba2ff1..e1cf8d1663 100644 --- a/libsrc/Wi/cldaq.c +++ b/libsrc/Wi/cldaq.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -323,7 +323,7 @@ clrg_local_ins_del_single (cl_req_group_t * clrg) sqlr_resignal (err); } if (CLO_DELETE == clo->clo_op) - cls_vec_del_rd_layout (clo->_.delete.rd); + cls_vec_del_rd_layout (clo->_.delete_op.rd); err = NULL; qi->qi_client->cli_non_txn_insert = CLO_INSERT == clo->clo_op && clo->_.insert.non_txn; err = cl_vec_exec (qr, qi->qi_client, clrg->clrg_pool, clo->_.insert.rd->rd_values, NULL, QI_NO_SLICE, &set_mask, NULL, 0); diff --git a/libsrc/Wi/cldfg.c b/libsrc/Wi/cldfg.c index a781cf9fed..35433aded9 100644 --- a/libsrc/Wi/cldfg.c +++ b/libsrc/Wi/cldfg.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cldt.c b/libsrc/Wi/cldt.c index d009ab9f2d..cec9fec675 100644 --- a/libsrc/Wi/cldt.c +++ b/libsrc/Wi/cldt.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/clnode.c b/libsrc/Wi/clnode.c index e7d8fbf77f..2a642c1fdc 100644 --- a/libsrc/Wi/clnode.c +++ b/libsrc/Wi/clnode.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -449,8 +449,8 @@ cl_key_delete_op_vec (caddr_t * qst, dbe_key_t * key, { cl_op_t *clo = clrg_dml_clo (clrg, key, CLO_DELETE); int is_first = 0, fill = 0; - row_delta_t *rd = clo->_.delete.rd; - if (!clo->_.delete.rd->rd_values) + row_delta_t *rd = clo->_.delete_op.rd; + if (!clo->_.delete_op.rd->rd_values) { state_slot_t col_ssl; memzero (&col_ssl, sizeof (col_ssl)); @@ -479,7 +479,7 @@ cl_key_delete_op_vec (caddr_t * qst, dbe_key_t * key, END_DO_SET (); is_first = 1; } - rd = clo->_.delete.rd; + rd = clo->_.delete_op.rd; fill = 0; DO_SET (dbe_column_t *, col, &key->key_parts) { diff --git a/libsrc/Wi/clop.c b/libsrc/Wi/clop.c index aee42a2071..b9b3cb5ac8 100644 --- a/libsrc/Wi/clop.c +++ b/libsrc/Wi/clop.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/clq.h b/libsrc/Wi/clq.h index 2f738ec401..7ca0fc554a 100644 --- a/libsrc/Wi/clq.h +++ b/libsrc/Wi/clq.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/clrdf.c b/libsrc/Wi/clrdf.c index e4d3dded0f..7f9353e929 100644 --- a/libsrc/Wi/clrdf.c +++ b/libsrc/Wi/clrdf.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -457,7 +457,7 @@ rdf_repl_gs_batch (query_instance_t * qi, caddr_t * batch, int ins) LEAVE_TXN; if (!reg) { - dk_free_tree (batch); + dk_free_tree ((caddr_t)batch); return; } dk_free_box (reg); @@ -471,7 +471,7 @@ rdf_repl_gs_batch (query_instance_t * qi, caddr_t * batch, int ins) if (!delqr || !insqr) { log_error ("RDF replication failed."); - dk_free_tree (batch); + dk_free_tree ((caddr_t)batch); return; } pars = (caddr_t *) list (1, batch); @@ -480,7 +480,7 @@ rdf_repl_gs_batch (query_instance_t * qi, caddr_t * batch, int ins) { PRINT_ERR (err); } - dk_free_box (pars); + dk_free_box ((caddr_t)pars); } @@ -621,7 +621,7 @@ cl_rdf_call_insert_cb (cucurbit_t * cu, caddr_t * qst, caddr_t * err_ret) pre = id_hash_allocate (cu->cu_fill, sizeof (caddr_t), 0, treehash, treehashcmp); id_hash_set_rehash_pct (pre, 200); rdf_fetch_gs (qi, (caddr_t *) g_iid_to_delete, err_ret, pre); - dk_free_tree (g_iid_to_delete); + dk_free_tree ((caddr_t)g_iid_to_delete); ins = id_hash_allocate (cu->cu_fill, sizeof (caddr_t), 0, treehash, treehashcmp); id_hash_set_rehash_pct (ins, 200); cu_feed_ins (cu, pre, ins, 1, 0, qst); @@ -640,7 +640,7 @@ cl_rdf_call_insert_cb (cucurbit_t * cu, caddr_t * qst, caddr_t * err_ret) cu_feed_ins (cu, pre, ins, 0, &inserted, qst); DO_SET (caddr_t *, row, &cu->cu_ld_rows) /* release memory, not needed anymore */ { - dk_free_tree (row); + dk_free_tree ((caddr_t)row); } END_DO_SET (); dk_set_free (cu->cu_ld_rows); diff --git a/libsrc/Wi/clrdf23.sql b/libsrc/Wi/clrdf23.sql index affa285319..f0a2bea8af 100644 --- a/libsrc/Wi/clrdf23.sql +++ b/libsrc/Wi/clrdf23.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/clserial.c b/libsrc/Wi/clserial.c index 99240f1465..1cf669e2d5 100644 --- a/libsrc/Wi/clserial.c +++ b/libsrc/Wi/clserial.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/clsql.c b/libsrc/Wi/clsql.c index 6548364731..36093608f5 100644 --- a/libsrc/Wi/clsql.c +++ b/libsrc/Wi/clsql.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/clsrv.c b/libsrc/Wi/clsrv.c index 0464384188..71d490a7f9 100644 --- a/libsrc/Wi/clsrv.c +++ b/libsrc/Wi/clsrv.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cltrx.c b/libsrc/Wi/cltrx.c index e972a31461..c260bc8c07 100644 --- a/libsrc/Wi/cltrx.c +++ b/libsrc/Wi/cltrx.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cluster.h b/libsrc/Wi/cluster.h index db0d7b68e4..b1376de094 100644 --- a/libsrc/Wi/cluster.h +++ b/libsrc/Wi/cluster.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -233,7 +233,7 @@ typedef struct cl_op_s { row_delta_t * rd; /* key and key parts for finding the key to delete, must be first, same as insert */ slice_id_t * slices; - } delete; + } delete_op; struct { query_frag_t * qf; @@ -1553,8 +1553,8 @@ caddr_t cl_msg_string (int64 bytes); int cm_read_in_string (cl_message_t * cm); int cl_trx_check (int64 trx_no, int retry, int ask_host); void cls_blob_send (cl_thread_t * clt, cl_message_t * cm); -int cl_get_blob (lock_trx_t * lt, blob_handle_t * bh, int64 n, int64 skip, dk_session_t ** ses_ret); -dk_set_t cl_bh_string_list (lock_trx_t * lt, blob_handle_t * bh, int64 n, int64 skip); +int cl_get_blob (lock_trx_t * lt, blob_handle_t * bh, int64 get_bytes, int64 skip, dk_session_t ** ses_ret); +dk_set_t cl_bh_string_list (lock_trx_t * lt, blob_handle_t * bh, int64 get_bytes, int64 skip); void cls_timeouts (int flags); #define CL_TIMEOUT_ALL 1 /* cls_timeouts will mark all as timed out to recover from arbitrary hang */ void cu_dispatch (cucurbit_t * cu, value_state_t * vs, cu_func_t * cf, caddr_t val); diff --git a/libsrc/Wi/clvec.c b/libsrc/Wi/clvec.c index b7325306a6..33bd12ae18 100644 --- a/libsrc/Wi/clvec.c +++ b/libsrc/Wi/clvec.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/col.c b/libsrc/Wi/col.c index 28ba3372fc..7574ed1181 100644 --- a/libsrc/Wi/col.c +++ b/libsrc/Wi/col.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/col.h b/libsrc/Wi/col.h index 4d96e4e3d8..247351b238 100644 --- a/libsrc/Wi/col.h +++ b/libsrc/Wi/col.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/colin.c b/libsrc/Wi/colin.c index a75d3c3370..16b84f7c95 100644 --- a/libsrc/Wi/colin.c +++ b/libsrc/Wi/colin.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/colins.c b/libsrc/Wi/colins.c index 00323e9bc3..b38ff3646d 100644 --- a/libsrc/Wi/colins.c +++ b/libsrc/Wi/colins.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/collock.c b/libsrc/Wi/collock.c index d81e9ee570..a109592817 100644 --- a/libsrc/Wi/collock.c +++ b/libsrc/Wi/collock.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/colsearch.c b/libsrc/Wi/colsearch.c index 5e3d3958f2..8240f7efdf 100644 --- a/libsrc/Wi/colsearch.c +++ b/libsrc/Wi/colsearch.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/coltry.c b/libsrc/Wi/coltry.c index 16df2e1d1a..6eab15ba3f 100644 --- a/libsrc/Wi/coltry.c +++ b/libsrc/Wi/coltry.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cov_report.xsl b/libsrc/Wi/cov_report.xsl index 791f9b410a..36aaeba69c 100644 --- a/libsrc/Wi/cov_report.xsl +++ b/libsrc/Wi/cov_report.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/cov_time.xsl b/libsrc/Wi/cov_time.xsl index f18cbdb110..ede477b95b 100644 --- a/libsrc/Wi/cov_time.xsl +++ b/libsrc/Wi/cov_time.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/crsr.h b/libsrc/Wi/crsr.h index 3fb0a2e6bc..4433cbcf69 100644 --- a/libsrc/Wi/crsr.h +++ b/libsrc/Wi/crsr.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/crypt.c b/libsrc/Wi/crypt.c index a635219465..a8a6aaaae6 100644 --- a/libsrc/Wi/crypt.c +++ b/libsrc/Wi/crypt.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/date.h b/libsrc/Wi/date.h index bda3748771..d17d79a89f 100644 --- a/libsrc/Wi/date.h +++ b/libsrc/Wi/date.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/datesupp.c b/libsrc/Wi/datesupp.c index 014eaa9028..03325ebacc 100644 --- a/libsrc/Wi/datesupp.c +++ b/libsrc/Wi/datesupp.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/datesupp.h b/libsrc/Wi/datesupp.h index 3dadc40818..0bb282569e 100644 --- a/libsrc/Wi/datesupp.h +++ b/libsrc/Wi/datesupp.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/ddlrun.c b/libsrc/Wi/ddlrun.c index b26071fa93..cd29adce06 100644 --- a/libsrc/Wi/ddlrun.c +++ b/libsrc/Wi/ddlrun.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -6185,15 +6185,15 @@ const char *proc_add_col_row = " else prec := 0; \n" " if (length (dtp) > 3 and isstring (dtp[3]))\n" " _col_options := vector_concat (_col_options, vector ('sql_class', dtp[3]));\n" -" if (length (dtp) > 4 and __tag (dtp[4]) = 193) -- DV_ARRAY_OF_POINTER\n" +" if (length (dtp) > 4 and __tag (dtp[4]) = __tag of vector)\n" " _col_options := vector_concat (_col_options, dtp[4]);\n" " if (prec = 0 or prec is null) --- duplicate of ddl_dv_default_prec\n" " { \n" " prec := case aref (dtp, 0) \n" -" when 189 then 10 \n" +" when __tag of integer then 10 \n" " when 188 then 10 \n" " when 181 then 0 \n" -" when 182 then 0 \n" +" when __tag of varchar then 0 \n" " when 190 then 14 \n" " when 191 then 16 \n" " when 129 then 26 \n" @@ -6300,7 +6300,7 @@ const char * bm_proc_1 = " whenever not found goto err;\n" " select kp_col into last_col from sys_key_parts where kp_key_id = bm_id and kp_nth = (select max (kp_nth) from sys_key_parts where kp_key_id = bm_id);\n" " select col_dtp into last_col_dtp from sys_cols where col_id = last_col;\n" -" if (position ('bitmap', opts) and last_col_dtp not in (189, 243, 244, 247))\n" +" if (position ('bitmap', opts) and last_col_dtp not in (__tag of integer, __tag of IRI_ID, __tag of IRI_ID_8, __tag of bigint))\n" " signal ('42000', 'BM001: The last effective part of a bitmap index must be an int or iri_id');\n" " update sys_keys set key_options = opts where key_id = bm_id;\n" " return;\n" diff --git a/libsrc/Wi/disk.c b/libsrc/Wi/disk.c index 5e62def56f..2c4d422b3b 100644 --- a/libsrc/Wi/disk.c +++ b/libsrc/Wi/disk.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -1567,7 +1567,7 @@ bp_mtx_entry_check (dk_mutex_t * mtx, du_thread_t * self, void * cd) } int enable_buf_mprotect = 0; -#ifdef PAGE_DEBUG +#if defined(PAGE_DEBUG) || defined(MTX_DEBUG) void buf_prot_read (buffer_desc_t * buf) { diff --git a/libsrc/Wi/dks_esc.c b/libsrc/Wi/dks_esc.c index 0156d25931..b31bb38979 100644 --- a/libsrc/Wi/dks_esc.c +++ b/libsrc/Wi/dks_esc.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/dvcmp.c b/libsrc/Wi/dvcmp.c index a3035d92b8..0e3eddee4e 100644 --- a/libsrc/Wi/dvcmp.c +++ b/libsrc/Wi/dvcmp.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/eqlcomp.c b/libsrc/Wi/eqlcomp.c index b25c44f8a8..5c4ae687cc 100644 --- a/libsrc/Wi/eqlcomp.c +++ b/libsrc/Wi/eqlcomp.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -61,7 +61,7 @@ cc_new_instance_slot (comp_context_t * cc) { cc = cc->cc_super_cc; if (cc->cc_instance_fill > MAX_STATE_SLOTS) - GPF_T1 ("qi with state slots over the limit."); + SQL_GPF_T1 (cc, "Query too large, variables in state over the limit"); return (cc->cc_instance_fill++); } @@ -1375,16 +1375,17 @@ ks_free (key_source_t * ks) cv_free (ks->ks_local_test); cv_free (ks->ks_local_code); if (ks->ks_out_map || ks->ks_v_out_map) - dk_free_box ((caddr_t) ks->ks_out_map); - dk_free_box ((caddr_t) ks->ks_v_out_map); - dk_free_box ((caddr_t) ks->ks_vec_source); - dk_free_box ((caddr_t) ks->ks_vec_cast); - dk_free_box ((caddr_t) ks->ks_dc_val_cast); - dk_free_box (ks->ks_cast_null); - dk_free_box ((caddr_t) ks->ks_scalar_partition); - dk_free_box ((caddr_t) ks->ks_scalar_cp); - dk_free_box ((caddr_t) ks->ks_vec_cp); - + { /* There was no { and } here so there was unconditional free of everything after ks->ks_out_map . That was supposedly safe but waste of time */ + dk_free_box ((caddr_t) ks->ks_out_map); + dk_free_box ((caddr_t) ks->ks_v_out_map); + dk_free_box ((caddr_t) ks->ks_vec_source); + dk_free_box ((caddr_t) ks->ks_vec_cast); + dk_free_box ((caddr_t) ks->ks_dc_val_cast); + dk_free_box (ks->ks_cast_null); + dk_free_box ((caddr_t) ks->ks_scalar_partition); + dk_free_box ((caddr_t) ks->ks_scalar_cp); + dk_free_box ((caddr_t) ks->ks_vec_cp); + } dk_set_free (ks->ks_always_null); dk_free_box ((caddr_t)ks->ks_qf_output); if (ks->ks_cl_order) diff --git a/libsrc/Wi/eqlcomp.h b/libsrc/Wi/eqlcomp.h index 249150baf6..a435f2cb18 100644 --- a/libsrc/Wi/eqlcomp.h +++ b/libsrc/Wi/eqlcomp.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/extent.c b/libsrc/Wi/extent.c index c8948df065..bd4102b279 100644 --- a/libsrc/Wi/extent.c +++ b/libsrc/Wi/extent.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/extent.h b/libsrc/Wi/extent.h index 75d8c49248..9fecbd97e9 100644 --- a/libsrc/Wi/extent.h +++ b/libsrc/Wi/extent.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/ftp.sql b/libsrc/Wi/ftp.sql index 06197b9e5c..18a7347f55 100644 --- a/libsrc/Wi/ftp.sql +++ b/libsrc/Wi/ftp.sql @@ -3,7 +3,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -316,27 +316,26 @@ create procedure FTP_RNTO ( { new_name := cur_dir || new_name; } - old_id := DAV_SEARCH_SOME_ID (old_name, st); - if (DAV_HIDE_ERROR (old_id) is null and ("RIGHT" (old_name, 1) <> '/')) + st := DB.DBA.DAV_WHAT (old_name); + old_id := DB.DBA.DAV_SEARCH_ID (old_name, st); + if (DB.DBA.DAV_HIDE_ERROR (old_id) is null and (st <> 'C')) { - old_id := DAV_SEARCH_SOME_ID (old_name || '/', st); - if (DAV_HIDE_ERROR (old_id) is not null) - { - old_name := old_name || '/'; - } - else + st := 'C'; + old_id := DB.DBA.DAV_SEARCH_ID (old_name || '/', st); + if (DB.DBA.DAV_HIDE_ERROR (old_id) is null) { FTP_WRITE (_user, '550 The path (' || old_name || ') is not valid', in_str); return; } + old_name := old_name || '/'; } if ('C' = st) { - if ("RIGHT" (old_name, 1) <> '/') + if (DB.DBA.DAV_WHAT (old_name) <> 'C') old_name := old_name || '/'; - if ("RIGHT" (new_name, 1) <> '/') + if (DB.DBA.DAV_WHAT (new_name) <> 'C') new_name := new_name || '/'; } @@ -696,7 +695,7 @@ create procedure FTP_RETR ( in auth_pwd varchar, inout r_pos integer) { - dbg_obj_princ ('FTP_RETR (', in_str, d_addr, f_name, wanted_faile, listen, auth_uid, auth_pwd, r_pos, ')'); + --dbg_obj_princ ('FTP_RETR (', in_str, d_addr, f_name, wanted_faile, listen, auth_uid, auth_pwd, r_pos, ')'); declare full_cont, sub_cont, data_ses any; declare id any; declare scrc, rc, uid, int_res, len, writen_size integer; @@ -1599,8 +1598,10 @@ create procedure FTP_MAKE_PORT_COMMAND ( { declare _ip, _port1, _port2 varchar; - _ip := identify_self(); - _ip := _ip[2]; + _ip := sys_connected_server_address (1); + _ip := split_and_decode (_ip,0,'\0\0:'); + _ip := _ip[0]; + _ip := tcpip_gethostbyname (_ip); _ip := replace (_ip, '.', ','); _port1 := cast (mod (_port, 256) as varchar); @@ -1609,7 +1610,7 @@ create procedure FTP_MAKE_PORT_COMMAND ( if (mode) return 'PORT ' || _ip || ',' || _port2 || ',' || _port1; - return '227 (' || _ip || ',' || _port2 || ',' || _port1 || ')'; + return '227 (' || _ip || ',' || _port2 || ',' || _port1 || ')'; } ; diff --git a/libsrc/Wi/gate.c b/libsrc/Wi/gate.c index 1fb5a4c9f4..adec6d63f2 100644 --- a/libsrc/Wi/gate.c +++ b/libsrc/Wi/gate.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/geo.c b/libsrc/Wi/geo.c index e04bffeea7..32e897bebf 100644 --- a/libsrc/Wi/geo.c +++ b/libsrc/Wi/geo.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -97,8 +97,7 @@ cmpf_geo (buffer_desc_t * buf, int irow, it_cursor_t * itc) geo_t *g = (geo_t *) itc->itc_search_params[0]; geo_t *g_shape = g; int gs_op; - if (rv) - GPF_T1 ("a geo inx col is supposed to have 0 rv"); + if (rv) GPF_T1 ("a geo inx col is supposed to have 0 rv"); if (GEO_GSOP == GEO_TYPE_CORE (g->geo_flags)) { gs_op = itc->itc_geo_op; @@ -165,7 +164,8 @@ cmpf_geo (buffer_desc_t * buf, int irow, it_cursor_t * itc) err = thr_get_error_code (THREAD_CURRENT_THREAD); sqlr_resignal (err); } - END_QR_RESET if (rc) + END_QR_RESET + if (rc) return DVC_MATCH; else return DVC_LESS; @@ -211,8 +211,7 @@ itc_geo_invalidate (it_cursor_t * itc) a = MAX (x2 - x, FLT_SQ_EPSILON) * MAX (y2 - y, FLT_SQ_EPSILON) void -rd_box_union (it_cursor_t * itc, buffer_desc_t * buf, db_buf_t row, int row_no, row_delta_t * rd, double *min_growth, - double *min_area, double *mg_area, int *mg_row, int *ma_row) +rd_box_union (it_cursor_t * itc, buffer_desc_t * buf, db_buf_t row, int row_no, row_delta_t * rd, double * min_growth, double * min_area, double * mg_area, int * mg_row, int * ma_row) { /* see how much the row would grow in area if rd were unioned with it. Get the area after the intersect */ dbe_key_t *key = itc->itc_insert_key; @@ -233,14 +232,10 @@ rd_box_union (it_cursor_t * itc, buffer_desc_t * buf, db_buf_t row, int row_no, MIN_F (dy, ry, iy, y_changes); MAX_F (dy2, ry2, iy2, y_changes); #if 0 - if (dx < rx && !x_changes) - GPF_T1 ("no change"); - if (dy < ry && !y_changes) - GPF_T1 ("no change"); - if (dx2 > rx2 && !x_changes) - GPF_T1 ("no change"); - if (dy2 > ry2 && !y_changes) - GPF_T1 ("no change"); + if (dx < rx && !x_changes) GPF_T1 ("no change"); + if (dy < ry && !y_changes) GPF_T1 ("no change"); + if (dx2 > rx2 && !x_changes) GPF_T1 ("no change"); + if (dy2 > ry2 && !y_changes) GPF_T1 ("no change"); #endif if (x_changes || y_changes) { @@ -299,8 +294,8 @@ page_geo_split (it_cursor_t * itc, buffer_desc_t * buf, int n_right, int *right, pf_fill_registered (&pf, buf); { row_delta_t *rd = &paf->paf_rd; - memset (rd, 0, sizeof (row_delta_t)); - rd->rd_temp = &paf->paf_rd_temp[0]; + memset (rd, 0, sizeof (row_delta_t)); \ + rd->rd_temp = &paf->paf_rd_temp[0]; \ rd->rd_temp_max = sizeof (paf->paf_rd_temp); rd->rd_values = paf->paf_rd_values; rd->rd_allocated = RD_AUTO; @@ -365,8 +360,7 @@ page_geo_split (it_cursor_t * itc, buffer_desc_t * buf, int n_right, int *right, END_DO_SET (); itc_split_lock_waits (pf.pf_itc, buf, pf.pf_current); } - if (t_buf->bd_registered) - GPF_T1 ("registrations are not supposed to go to the temp buf"); + if (t_buf->bd_registered) GPF_T1 ("registrations are not supposed to go to the temp buf"); first_affected = 0; dk_set_free (pf.pf_left); itc_geo_invalidate (itc); @@ -384,10 +378,7 @@ incbox (bbox_t * b, double x, double y, double x2, double y2) { if (!b->inited) { - b->x = x; - b->y = y; - b->x2 = x2; - b->y2 = y2; + b->x = x; b->y = y; b->x2 = x2; b->y2 = y2; b->inited = 1; } else @@ -471,8 +462,7 @@ itc_geo_row (it_cursor_t * itc, buffer_desc_t * buf, db_buf_t row, double *x, do { dbe_key_t *key = itc->itc_insert_key; row_ver_t rv = IE_ROW_VERSION (row); - if (rv) - GPF_T1 ("geo inx row is supposed to have 0 rv"); + if (rv) GPF_T1 ("geo inx row is supposed to have 0 rv"); ROW_DBL_COL (x, buf, row, key->key_key_fixed[RD_X]); ROW_DBL_COL (y, buf, row, key->key_key_fixed[RD_Y]); ROW_DBL_COL (x2, buf, row, key->key_key_fixed[RD_X2]); @@ -605,7 +595,8 @@ geo_uneven_split (int left_x, int left_y, int n, float *x_ratio, float *y_ratio) /* if more than 80% on one side with both x and y splits */ *x_ratio = (float) left_x / (float) n; *y_ratio = (float) left_y / (float) n; - return ((*x_ratio < 0.2 || *x_ratio > 0.8) && (*y_ratio < 0.2 || *y_ratio > 0.8)); + return ((*x_ratio < 0.2 || *x_ratio > 0.8) + && (*y_ratio < 0.2 || *y_ratio > 0.8)); } long tc_geo_x_split; @@ -675,8 +666,7 @@ itc_geo_split (it_cursor_t * itc, buffer_desc_t * buf, row_delta_t * rd) if (cny < cy) { incbox (&ybox_left, x[inx], y[inx], x2[inx], y2[inx]); - if (ybox_left.y2 < y2[inx]) - GPF_T1 ("incbox bad"); + if (ybox_left.y2 < y2[inx]) GPF_T1 ("incbox bad"); n_left_by_y++; } else @@ -1166,12 +1156,14 @@ geo_t * bif_geo_arg (caddr_t * qst, state_slot_t ** args, int inx, const char *f, int tp) { geo_t *g; - caddr_t v = bif_arg_unrdf (qst, args, inx, f); + caddr_t v = ((GEO_ARG_NEVER_UNRDF & tp) ? bif_arg (qst, args, inx, f) : bif_arg_unrdf (qst, args, inx, f)); dtp_t v_dtp = DV_TYPE_OF (v); if (DV_GEO != v_dtp) { if ((GEO_ARG_NULLABLE & tp) && (DV_DB_NULL == v_dtp)) return NULL; + if (GEO_ARG_NONGEO_AS_IS & tp) + return (geo_t*)v; /* An intentionally wrong cast, yes */ sqlr_new_error ("22032", "GEO..", "Function %s() expects a geometry%s as argument %d", f, ((GEO_ARG_NULLABLE == (tp & GEO_ARG_MASK)) ? " or NULL" : ""), inx); } @@ -1343,8 +1335,7 @@ caddr_t geo_parse_wkt (char *text, caddr_t * err_ret) { geo_t *g; - do - { + do { char *par = text, ns1[30], ns2[30]; double x, y; if (strncmp (text, "point(", 6) && strncmp (text, "POINT(", 6)) @@ -1358,8 +1349,7 @@ geo_parse_wkt (char *text, caddr_t * err_ret) g->geo_flags |= GEO_IS_FLOAT; *err_ret = NULL; return (caddr_t) g; - } - while (0); + } while (0); g = ewkt_parse (text, err_ret); return (caddr_t)g; } diff --git a/libsrc/Wi/geo.h b/libsrc/Wi/geo.h index 712226d01f..b6be236cd6 100644 --- a/libsrc/Wi/geo.h +++ b/libsrc/Wi/geo.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -107,7 +107,9 @@ typedef unsigned short geo_flags_t; /*!< Type for flags of a shape (type + seria #define GEO_ARG_CHECK_ZM 0x20000000 /*!< Special value for use in bif_geo_arg to indicate that the argument should have Z and/or M dimensions specified by the argument. It does not fit into \c geo_flags_t shortint! */ #define GEO_ARG_ANY_NULLABLE (GEO_ARG_NULLABLE | GEO_UNDEFTYPE) /*!< Special value for use in bif_geo_arg to indicate that the argument can be of any shapetype or a NULL. It does not fit into \c geo_flags_t shortint! */ #define GEO_ARG_ANY_NONNULL (GEO_ARG_NONNULL | GEO_UNDEFTYPE) /*!< Special value for use in bif_geo_arg to indicate that the argument can be of any shapetype but not NULL. It does not fit into \c geo_flags_t shortint! */ -#define GEO_ARG_MASK 0x70000000 /*!< Mask for GEO_ARG_xxx values. It does not fit into \c geo_flags_t shortint! */ +#define GEO_ARG_NEVER_UNRDF 0x01000000 /*!< Special value for use in bif_geo_arg to indicate that the argument should not be unrdf-ed. It does not fit into \c geo_flags_t shortint! */ +#define GEO_ARG_NONGEO_AS_IS 0x02000000 /*!< Special value for use in bif_geo_arg to indicate that the argument can be of any type, but if it's not a geo then it is passed unchanged, no error. It does not fit into \c geo_flags_t shortint! */ +#define GEO_ARG_MASK 0x73000000 /*!< Mask for GEO_ARG_xxx values. It does not fit into \c geo_flags_t shortint! */ typedef double geoc; /*!< Type of geographical coordinate */ typedef double geo_measure_t; /*!< Type of M coordinate */ @@ -272,12 +274,15 @@ typedef struct geo_s #define EARTH_RADIUS_GEOM_MEAN_KM 6367.43568 #define EARTH_RADIUS_EQUATOR_KM 6378.137 +EXE_EXPORT (boxint, geo_sr_iri_to_srid, (caddr_t sr_iri)); +EXE_EXPORT (caddr_t, geo_sr_srid_to_iri, (boxint srid)); -extern double haversine_deg_km (double long1, double lat1, double long2, double lat2); +EXE_EXPORT (double, haversine_deg_km, (double long1, double lat1, double long2, double lat2)); +EXE_EXPORT (double, haversine_deg_deg, (double long1, double lat1, double long2, double lat2)); extern double dist_from_point_to_line_segment (double xP, double yP, double xL1, double yL1, double xL2, double yL2); extern double geo_distance (geo_srcode_t srcode, double x1, double y1, double x2, double y2); -extern int geo_pred (geo_t * g1, geo_t * g2, int op, double prec); +EXE_EXPORT (int, geo_pred, (geo_t * g1, geo_t * g2, int op, double prec)); struct dbe_table_s; extern int64 geo_estimate (struct dbe_table_s * tb, geo_t * g, int op, double prec, slice_id_t slice); @@ -307,18 +312,19 @@ EXE_EXPORT (void, geo_print_as_dxf_entity, (geo_t *g, caddr_t *attrs, dk_session extern int geo_calc_length_of_serialization (geo_t *g, int is_topmost); extern int geo_serial_length (geo_t *g); -extern int geo_looks_fine_or_null (geo_t * geo); +int geo_looks_fine_or_null (geo_t * geo); /* EWKT Reader */ -#define EWKT_NUM -1 -#define EWKT_NUM_BAD -2 -#define EWKT_KWD_GEO_TYPE -3 -#define EWKT_KWD_MODIF -4 -#define EWKT_KWD_EXT -5 -#define EWKT_KWD_BAD -6 -#define EWKT_BAD -7 -#define EWKT_KWD_SRID -10 +#define EWKT_NUM -1 /*!< Valid number */ +#define EWKT_NUM_BAD -2 /*!< Invalid number, quite naturally */ +#define EWKT_KWD_GEO_TYPE -3 /*!< Keyword like "POINT", "POLYGON" etc. */ +#define EWKT_KWD_MODIF -4 /*!< Dimention modifier, "M", "Z" or "ZM" (but not "MZ") */ +#define EWKT_KWD_EXT -5 /*!< WKT extension keyword, now only "SRID" is specified */ +#define EWKT_IRI -6 /*!< Angle-bracketed IRI, may appear only at the very beginning */ +#define EWKT_KWD_BAD -7 /*!< An unknown word, most likely a type in a keyword */ +#define EWKT_BAD -8 /*!< Something totally wrong */ +#define EWKT_KWD_SRID -100 /*!< Subtype of EWKT_KWD_EXT token for "SRID" keyword, may appear only at the very beginning */ typedef struct ewkt_kwd_metas_s @@ -334,9 +340,13 @@ typedef struct ewkt_kwd_metas_s } ewkt_kwd_metas_t; EXE_EXPORT (ewkt_kwd_metas_t *, ewkt_find_metas_by_geotype, (int geotype)); +EXE_EXPORT (id_hash_iterator_t **, get_sr_iri_to_srid_iter, (void)); +EXE_EXPORT (id_hash_iterator_t **, get_sr_srid_to_iri_iter, (void)); EXE_EXPORT (geo_t *, ewkt_parse, (const char *strg, caddr_t *err_ret)); -EXE_EXPORT (geo_t *, ewkt_parse_2, (const char *strg, int dflt_srid, caddr_t *err_ret)); +EXE_EXPORT (geo_t *, ewkt_parse_2, (const char *strg, int dflt_srcode, caddr_t *err_ret)); EXE_EXPORT (void, ewkt_print_sf12, (geo_t *g, dk_session_t *ses)); +EXE_EXPORT (geo_t *, wkb_read_ses, (dk_session_t *ses, int srid, int basic_wkb_only)); +EXE_EXPORT (void, wkb_print, (geo_t *g, dk_session_t *ses, int basic_wkb_only, char set_byte_order)); EXE_EXPORT (geo_t *, bif_geo_arg, (caddr_t * qst, struct state_slot_s ** args, int inx, const char *fname, int geotype)); @@ -354,6 +364,7 @@ EXE_EXPORT (int, geo_long360add, (geo_t * g)); EXE_EXPORT (int, geo_calc_bounding, (geo_t * g, int flags)); EXE_EXPORT (void, geo_get_bounding_XYbox, (geo_t * g, geo_t * box, double prec_x, double prec_y)); EXE_EXPORT (geo_ZMbox_t *, geo_get_ZMbox_field, (geo_t * g)); +EXE_EXPORT (caddr_t, bif_st_get_bounding_box_impl, (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, int get_prec_args, const char *fname, int geotype)); extern geo_t *geo_parse_ewkt (const char *text); extern geo_t *geo_parse_ewkt_sub (const char *text, int expected_type); extern void dks_print_ewkt (dk_session_t *ses, geo_t *sg); @@ -375,8 +386,21 @@ EXE_EXPORT (void, geo_modify_by_transscale, (geo_t *g, geoc dX, geoc dY, geoc Xf EXE_EXPORT (void, geo_modify_by_affine2d, (geo_t *g, geoc XXa, geoc XYb, geoc YXd, geoc YYe, geoc Xoff, geoc Yoff)); typedef geo_t *geo_srid_transform_cbk_t (caddr_t *qst, geo_t *g, int dest_srid, caddr_t *err_ret); -EXE_EXPORT (void, geo_set_default_srid_transform_cbk, (geo_srid_transform_cbk_t *cbk)); extern geo_srid_transform_cbk_t *geo_default_srid_transform_cbk; +EXE_EXPORT (void, geo_set_default_srid_transform_cbk, (geo_srid_transform_cbk_t *cbk)); +EXE_EXPORT (geo_srid_transform_cbk_t *, geo_get_default_srid_transform_cbk, (void)); + +typedef void *geo_pj_by_srid_or_string_cbk_t (caddr_t * qst, caddr_t *err_ret, int srid, caddr_t strg_or_null, const char *bifname, const char *argname); +extern geo_pj_by_srid_or_string_cbk_t *geo_default_pj_by_srid_or_string_cbk; +EXE_EXPORT (void, geo_set_default_pj_by_srid_or_string_cbk, (geo_pj_by_srid_or_string_cbk_t *cbk)); +EXE_EXPORT (geo_pj_by_srid_or_string_cbk_t *, geo_get_default_pj_by_srid_or_string_cbk, (void)); + +typedef int geo_pj_yn_cbk_t (void *pj); +extern geo_pj_yn_cbk_t *geo_default_pj_is_latlong_cbk; +extern geo_pj_yn_cbk_t *geo_default_pj_is_geocent_cbk; +EXE_EXPORT (void, geo_set_default_pj_yn_cbks, (geo_pj_yn_cbk_t *is_latlong_cbk, geo_pj_yn_cbk_t *is_geocent_cbk)); +EXE_EXPORT (geo_pj_yn_cbk_t *, geo_get_default_pj_is_latlong_cbk, (void)); +EXE_EXPORT (geo_pj_yn_cbk_t *, geo_get_default_pj_is_geocent_cbk, (void)); /*! Map projection callback that gets pointer to projection, longitude and latitude of a point, fills in X and Y of corresponding point on map and returns NULL on success or error message otherwise. */ typedef const char *geo_proj_point_cbk_t (void *geo_proj, geoc longP, geoc latP, double *retX, double *retY); diff --git a/libsrc/Wi/geo_de9im.c b/libsrc/Wi/geo_de9im.c index 42cdc05fe1..0248e4b539 100644 --- a/libsrc/Wi/geo_de9im.c +++ b/libsrc/Wi/geo_de9im.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/geo_shapes.c b/libsrc/Wi/geo_shapes.c index bab63adae4..d62bf1df4a 100644 --- a/libsrc/Wi/geo_shapes.c +++ b/libsrc/Wi/geo_shapes.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -26,8 +26,6 @@ #endif #include #include "Dk.h" -#include "Dk/Dkalloc.h" -#include "Dk/Dkbox.h" #include "geo.h" #include "widv.h" #include "sqlfn.h" @@ -126,7 +124,7 @@ geo_t * geo_alloc_safe (geo_flags_t geo_flags_, int len_, int srcode_, dk_session_t * ses) { geo_t *res = NULL; - int head_sz, gcb_bcount, gcb_sz, full_sz; + size_t head_sz, gcb_bcount, gcb_sz, full_sz; switch (GEO_TYPE (geo_flags_)) { case GEO_NULL_SHAPE: GEO_ALLOC_POINT(XYbox); break; @@ -148,7 +146,7 @@ geo_alloc_safe (geo_flags_t geo_flags_, int len_, int srcode_, dk_session_t * se case GEO_RING_Z: GEO_ALLOC_PLINE(_.pline.pline_ZMbox.Zmax, 3, 0, 0x80, 0x20, 1); GEO_SET_CVECT(_.pline.Zs); break; case GEO_RING_M: GEO_ALLOC_PLINE(_.pline.Ms , 2, 1, 0x80, 0x20, 1); GEO_SET_MVECT(_.pline.Ms); break; case GEO_RING_Z_M: GEO_ALLOC_PLINE(_.pline.Ms , 3, 1, 0x80, 0x20, 1); GEO_SET_CVECT(_.pline.Zs); GEO_SET_MVECT(_.pline.Ms); break; - case GEO_POINTLIST: GEO_ALLOC_PLINE(_.pline.Ys , 2, 0, 0x200, 0x20, 0); + case GEO_POINTLIST: GEO_ALLOC_PLINE(_.pline.Ys , 2, 0, 0x200, 0x20, 0); break; case GEO_POINTLIST_Z: GEO_ALLOC_PLINE(_.pline.pline_ZMbox.Zmax, 3, 0, 0x200, 0x20, 0); GEO_SET_CVECT(_.pline.Zs); break; case GEO_POINTLIST_M: GEO_ALLOC_PLINE(_.pline.Ms , 2, 1, 0x200, 0x20, 0); GEO_SET_MVECT(_.pline.Ms); break; case GEO_POINTLIST_Z_M: GEO_ALLOC_PLINE(_.pline.Ms , 3, 1, 0x200, 0x20, 0); GEO_SET_CVECT(_.pline.Zs); GEO_SET_MVECT(_.pline.Ms); break; @@ -330,7 +328,7 @@ geo_copy (geo_t *src) case GEO_RING_Z: GEO_COPY_PLINE(_.pline.pline_ZMbox.Zmax, 3, 0); GEO_RESET_CVECT(_.pline.Zs); break; case GEO_RING_M: GEO_COPY_PLINE(_.pline.Ms, 2, 1); GEO_RESET_MVECT(_.pline.Ms); break; case GEO_RING_Z_M: GEO_COPY_PLINE(_.pline.Ms, 3, 1); GEO_RESET_CVECT(_.pline.Zs); GEO_RESET_MVECT(_.pline.Ms); break; - case GEO_POINTLIST: GEO_COPY_PLINE(_.pline.Ys, 2, 0); + case GEO_POINTLIST: GEO_COPY_PLINE(_.pline.Ys, 2, 0); break; case GEO_POINTLIST_Z: GEO_COPY_PLINE(_.pline.pline_ZMbox.Zmax, 3, 0); GEO_RESET_CVECT(_.pline.Zs); break; case GEO_POINTLIST_M: GEO_COPY_PLINE(_.pline.Ms, 2, 1); GEO_RESET_MVECT(_.pline.Ms); break; case GEO_POINTLIST_Z_M: GEO_COPY_PLINE(_.pline.Ms, 3, 1); GEO_RESET_CVECT(_.pline.Zs); GEO_RESET_MVECT(_.pline.Ms); break; @@ -371,7 +369,7 @@ geo_copy (geo_t *src) GEO_RESET_CVECT(_.pline.Ys); #define GEO_MP_COPY_PARTS(lastfld) do { int ctr; \ - GEO_RESET_GCB(_.pline.pline_gcb); \ + GEO_RESET_GCB(_.parts.parts_gcb); \ res->_.parts.items = (geo_t **)((void *)(((char *)res) + (((char *)(src->_.parts.items)) - (char *)src))); \ for (ctr = res->_.parts.len; ctr--; /* no step */) \ res->_.parts.items[ctr] = mp_geo_copy (mp, src->_.parts.items[ctr]); \ @@ -404,7 +402,7 @@ mp_geo_copy (mem_pool_t * mp, geo_t *src) case GEO_RING_Z: GEO_MP_COPY_PLINE(_.pline.pline_ZMbox.Zmax, 3, 0); GEO_RESET_CVECT(_.pline.Zs); break; case GEO_RING_M: GEO_MP_COPY_PLINE(_.pline.Ms, 2, 1); GEO_RESET_MVECT(_.pline.Ms); break; case GEO_RING_Z_M: GEO_MP_COPY_PLINE(_.pline.Ms, 3, 1); GEO_RESET_CVECT(_.pline.Zs); GEO_RESET_MVECT(_.pline.Ms); break; - case GEO_POINTLIST: GEO_MP_COPY_PLINE(_.pline.Ys, 2, 0); + case GEO_POINTLIST: GEO_MP_COPY_PLINE(_.pline.Ys, 2, 0); break; case GEO_POINTLIST_Z: GEO_MP_COPY_PLINE(_.pline.pline_ZMbox.Zmax, 3, 0); GEO_RESET_CVECT(_.pline.Zs); break; case GEO_POINTLIST_M: GEO_MP_COPY_PLINE(_.pline.Ms, 2, 1); GEO_RESET_MVECT(_.pline.Ms); break; case GEO_POINTLIST_Z_M: GEO_MP_COPY_PLINE(_.pline.Ms, 3, 1); GEO_RESET_CVECT(_.pline.Zs); GEO_RESET_MVECT(_.pline.Ms); break; @@ -821,6 +819,9 @@ geo_calc_bounding (geo_t * g, int flags) int res = 0; switch (GEO_TYPE_NO_ZM (g->geo_flags)) { + case GEO_NULL_SHAPE: + GEO_XYBOX_SET_EMPTY(g->XYbox); + return GEO_LONG360ADD_NO_CHANGE; case GEO_POINT: case GEO_BOX: return GEO_LONG360ADD_NO_CHANGE; case GEO_POINTLIST: @@ -1089,7 +1090,7 @@ geo_calc_bounding (geo_t * g, int flags) geo_ZMbox_t bbox; switch (GEO_TYPE_NO_ZM (g->geo_flags)) { - /* case GEO_POINT: case GEO_BOX: --- note the "return" above, in the first switch */ + /* case GEO_NULL_SHAPE: case GEO_POINT: case GEO_BOX: --- note the "return" above, in the first switch */ case GEO_LINESTRING: case GEO_RING: case GEO_POINTLIST: case GEO_ARCSTRING: case GEO_ARCSTRING | GEO_A_CLOSED: { @@ -1171,7 +1172,7 @@ geo_get_ZMbox_field (geo_t * g) { switch (GEO_TYPE_NO_ZM (g->geo_flags)) { - case GEO_POINT: case GEO_BOX: + case GEO_NULL_SHAPE: case GEO_POINT: case GEO_BOX: return &(g->_.point.point_ZMbox); case GEO_LINESTRING: case GEO_RING: case GEO_POINTLIST: case GEO_ARCSTRING: case GEO_ARCSTRING | GEO_A_CLOSED: @@ -1192,6 +1193,8 @@ geo_get_bounding_XYbox (geo_t * g, geo_t * box, geoc prec_x, geoc prec_y) box->geo_flags = GEO_BOX; switch (GEO_TYPE_NO_ZM (g->geo_flags)) { + case GEO_NULL_SHAPE: + goto faraway; /* see below */ case GEO_POINT: if (geoc_FARAWAY == Xkey (g)) goto faraway; /* see below */ @@ -1251,17 +1254,20 @@ geo_get_bounding_XYbox (geo_t * g, geo_t * box, geoc prec_x, geoc prec_y) typedef struct ewkt_input_s { - const unsigned char *ewkt_source; - const unsigned char *ewkt_tail; - int ewkt_row_no; - const unsigned char *ewkt_row_begin; + const unsigned char * ewkt_source; /*!< EWKT string being read */ + const unsigned char * ewkt_tail; /*!< Not-yet-scanned end of \c ewkt_source */ + int ewkt_row_no; /*!< Zero-based row number of current position, add 1 when print it in report like error message */ + const unsigned char * ewkt_row_begin; /*!< Pointer to the first character of current row in \c ewkt_source */ + int ewkt_error_point_idx1; /*!< 1-based index of point with wrong coordinate */ + int ewkt_error_dim_idx1; /*!< 1-based index of dimension with wrong coordinate */ const char *ewkt_error; geo_srid_t ewkt_srid; geo_srcode_t ewkt_srcode; geoc *ekwt_Cs[4]; + int ewkt_swap_latlong_to_longlat; /*!< Swap X and Y when read and geo:wktLiteral-s */ int ekwt_point_count, ekwt_point_max; dk_set_t ekwt_cuts, ekwt_rings, ekwt_childs, ekwt_members; - jmp_buf ewkt_error_ctx; + jmp_buf ewkt_error_ctx; /*!< Context for longjmp() to in case of error */ } ewkt_input_t; #define ewkt_ws_skip(in) for (;;) { \ @@ -1279,97 +1285,114 @@ typedef struct ewkt_input_s typedef union ewkt_token_val_s { geoc v_geoc; + const unsigned char * v_iri_begin_and_end[2]; ewkt_kwd_metas_t *v_kwd; } ewkt_token_val_t; ewkt_kwd_metas_t ewkt_keyword_metas[] = { /* Name | Serial| Type | Subtype | (...( |minnums|maxnums|alias */ - {"BOX" , 0 , EWKT_KWD_GEO_TYPE , GEO_BOX , 1 , 2 , 3 , 0 }, - {"BOX2D" , 1 , EWKT_KWD_GEO_TYPE , GEO_BOX , 1 , 2 , 2 , 1 }, - {"BOX3D" , 2 , EWKT_KWD_GEO_TYPE , GEO_BOX_Z , 1 , 3 , 3 , 0 }, - {"BOXM" , 3 , EWKT_KWD_GEO_TYPE , GEO_BOX_M , 1 , 3 , 4 , 0 }, - {"BOXZ" , 4 , EWKT_KWD_GEO_TYPE , GEO_BOX_Z , 1 , 3 , 4 , 1 }, - {"BOXZM" , 5 , EWKT_KWD_GEO_TYPE , GEO_BOX_Z_M , 1 , 4 , 4 , 0 }, - {"CIRCULARSTRING" , 6 , EWKT_KWD_GEO_TYPE , GEO_ARCSTRING , 1 , 2 , 2 , 0 }, - {"CIRCULARSTRINGM" , 7 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"CIRCULARSTRINGZ" , 8 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"CIRCULARSTRINGZM" , 9 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"COMPOUNDCURVE" , 10 , EWKT_KWD_GEO_TYPE , GEO_CURVE , 1 , 2 , 2 , 0 }, - {"COMPOUNDCURVEM" , 11 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"COMPOUNDCURVEZ" , 12 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"COMPOUNDCURVEZM" , 13 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"CURVE" , 14 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"CURVEM" , 15 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"CURVEPOLYGON" , 16 , EWKT_KWD_GEO_TYPE , GEO_CURVEPOLYGON , 2 , -1 , -1 , 0 }, - {"CURVEPOLYGONM" , 17 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"CURVEPOLYGONZ" , 18 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"CURVEPOLYGONZM" , 19 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"CURVEZ" , 20 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"CURVEZM" , 21 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"EMPTY" , 22 , EWKT_KWD_GEO_TYPE , GEO_NULL_SHAPE , 0 , 0 , 0 , 0 }, - {"GEOMETRYCOLLECTION" , 23 , EWKT_KWD_GEO_TYPE , GEO_COLLECTION , -1 , -1 , -1 , 0 }, - {"GEOMETRYCOLLECTIONM" , 24 , EWKT_KWD_GEO_TYPE , GEO_COLLECTION_M , -1 , -1 , -1 , 0 }, - {"GEOMETRYCOLLECTIONZ" , 25 , EWKT_KWD_GEO_TYPE , GEO_COLLECTION_Z , -1 , -1 , -1 , 0 }, - {"GEOMETRYCOLLECTIONZM" , 26 , EWKT_KWD_GEO_TYPE , GEO_COLLECTION_Z_M , -1 , -1 , -1 , 0 }, - {"GEOMETRY" , 27 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"GEOMETRYZ" , 28 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"GEOMETRYZM" , 29 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"LINESTRING" , 30 , EWKT_KWD_GEO_TYPE , GEO_LINESTRING , 1 , 2 , 3 , 0 }, - {"LINESTRINGM" , 31 , EWKT_KWD_GEO_TYPE , GEO_LINESTRING_M , 1 , 3 , 4 , 0 }, - {"LINESTRINGZ" , 32 , EWKT_KWD_GEO_TYPE , GEO_LINESTRING_Z , 1 , 3 , 4 , 0 }, - {"LINESTRINGZM" , 33 , EWKT_KWD_GEO_TYPE , GEO_LINESTRING_Z_M , 1 , 4 , 4 , 0 }, - {"M" , 34 , EWKT_KWD_MODIF , GEO_A_M , 0 , 0 , 0 , 0 }, - {"MULTICURVE" , 35 , EWKT_KWD_GEO_TYPE , GEO_MULTI_CURVE , 2 , 2 , 2 , 0 }, - {"MULTICURVEM" , 36 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"MULTICURVEZ" , 37 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"MULTICURVEZM" , 38 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"MULTILINESTRING" , 39 , EWKT_KWD_GEO_TYPE , GEO_MULTI_LINESTRING , 2 , 2 , 3 , 0 }, - {"MULTILINESTRINGM" , 40 , EWKT_KWD_GEO_TYPE , GEO_MULTI_LINESTRING_M, 2 , 3 , 4 , 0 }, - {"MULTILINESTRINGZ" , 41 , EWKT_KWD_GEO_TYPE , GEO_MULTI_LINESTRING_Z, 2 , 3 , 4 , 0 }, - {"MULTILINESTRINGZM" , 42 , EWKT_KWD_GEO_TYPE , GEO_MULTI_LINESTRING_Z_M, 2 , 4 , 4 , 0 }, - {"MULTIPATCH" , 43 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"MULTIPOINT" , 44 , EWKT_KWD_GEO_TYPE , GEO_POINTLIST , 1 , 2 , 3 , 0 }, - {"MULTIPOINTM" , 45 , EWKT_KWD_GEO_TYPE , GEO_POINTLIST_M , 1 , 3 , 4 , 0 }, - {"MULTIPOINTZ" , 46 , EWKT_KWD_GEO_TYPE , GEO_POINTLIST_Z , 1 , 3 , 4 , 0 }, - {"MULTIPOINTZM" , 47 , EWKT_KWD_GEO_TYPE , GEO_POINTLIST_Z_M , 1 , 4 , 4 , 0 }, - {"MULTIPOLYGON" , 48 , EWKT_KWD_GEO_TYPE , GEO_MULTI_POLYGON , 3 , 2 , 3 , 0 }, - {"MULTIPOLYGONM" , 49 , EWKT_KWD_GEO_TYPE , GEO_MULTI_POLYGON_M , 3 , 3 , 4 , 0 }, - {"MULTIPOLYGONZ" , 50 , EWKT_KWD_GEO_TYPE , GEO_MULTI_POLYGON_Z , 3 , 3 , 4 , 0 }, - {"MULTIPOLYGONZM" , 51 , EWKT_KWD_GEO_TYPE , GEO_MULTI_POLYGON_Z_M , 3 , 4 , 4 , 0 }, - {"MULTISURFACE" , 52 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"MULTISURFACEM" , 53 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"MULTISURFACEZ" , 54 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"MULTISURFACEZM" , 55 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"POINT" , 56 , EWKT_KWD_GEO_TYPE , GEO_POINT , 1 , 2 , 3 , 0 }, - {"POINTM" , 57 , EWKT_KWD_GEO_TYPE , GEO_POINT_M , 1 , 3 , 4 , 0 }, - {"POINTZ" , 58 , EWKT_KWD_GEO_TYPE , GEO_POINT_Z , 1 , 3 , 4 , 0 }, - {"POINTZM" , 59 , EWKT_KWD_GEO_TYPE , GEO_POINT_Z_M , 1 , 4 , 4 , 0 }, - {"POLYGON" , 60 , EWKT_KWD_GEO_TYPE , GEO_POLYGON , 2 , 2 , 3 , 0 }, - {"POLYGONM" , 61 , EWKT_KWD_GEO_TYPE , GEO_POLYGON_M , 2 , 3 , 4 , 0 }, - {"POLYGONZ" , 62 , EWKT_KWD_GEO_TYPE , GEO_POLYGON_Z , 2 , 3 , 4 , 0 }, - {"POLYGONZM" , 63 , EWKT_KWD_GEO_TYPE , GEO_POLYGON_Z_M , 2 , 4 , 4 , 0 }, - {"POLYHEDRALSURFACE" , 64 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"POLYHEDRALSURFACEM" , 65 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"POLYHEDRALSURFACEZ" , 66 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"POLYHEDRALSURFACEZM" , 67 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"POLYLINE" , 68 , EWKT_KWD_GEO_TYPE , GEO_MULTI_LINESTRING , 2 , 2 , 3 , 1 }, - {"POLYLINEM" , 69 , EWKT_KWD_GEO_TYPE , -1 , 2 , 2 , 2 , 1 }, - {"POLYLINEZ" , 70 , EWKT_KWD_GEO_TYPE , GEO_MULTI_LINESTRING_Z, 2 , 3 , 3 , 1 }, - {"RING" , 71 , EWKT_KWD_GEO_TYPE , GEO_RING , 1 , 2 , 3 , 0 }, - {"RINGM" , 72 , EWKT_KWD_GEO_TYPE , GEO_RING_M , 1 , 3 , 4 , 0 }, - {"RINGZ" , 73 , EWKT_KWD_GEO_TYPE , GEO_RING_Z , 1 , 3 , 4 , 0 }, - {"RINGZM" , 74 , EWKT_KWD_GEO_TYPE , GEO_RING_Z_M , 1 , 4 , 4 , 0 }, - {"SRID" , 75 , EWKT_KWD_EXT , EWKT_KWD_SRID , 0 , 0 , 0 , 0 }, - {"SURFACE" , 76 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"SURFACEM" , 77 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"SURFACEZ" , 78 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"SURFACEZM" , 79 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"TIN" , 80 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"TINM" , 81 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"TINZ" , 82 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"TINZM" , 83 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, - {"Z" , 84 , EWKT_KWD_MODIF , GEO_A_Z , 0 , 0 , 0 , 0 }, - {"ZM" , 85 , EWKT_KWD_MODIF , GEO_A_Z | GEO_A_M , 0 , 0 , 0 , 0 } }; + {"BBOX" , 0 , EWKT_KWD_GEO_TYPE , GEO_BOX , 1 , 2 , 3 , 1 }, + {"BBOX2D" , 1 , EWKT_KWD_GEO_TYPE , GEO_BOX , 1 , 2 , 2 , 1 }, + {"BBOX3D" , 2 , EWKT_KWD_GEO_TYPE , GEO_BOX_Z , 1 , 3 , 3 , 1 }, + {"BBOXM" , 3 , EWKT_KWD_GEO_TYPE , GEO_BOX_M , 1 , 3 , 4 , 1 }, + {"BBOXZ" , 4 , EWKT_KWD_GEO_TYPE , GEO_BOX_Z , 1 , 3 , 4 , 1 }, + {"BBOXZM" , 5 , EWKT_KWD_GEO_TYPE , GEO_BOX_Z_M , 1 , 4 , 4 , 1 }, + {"BOX" , 6 , EWKT_KWD_GEO_TYPE , GEO_BOX , 1 , 2 , 3 , 0 }, + {"BOX2D" , 7 , EWKT_KWD_GEO_TYPE , GEO_BOX , 1 , 2 , 2 , 1 }, + {"BOX3D" , 8 , EWKT_KWD_GEO_TYPE , GEO_BOX_Z , 1 , 3 , 3 , 0 }, + {"BOXM" , 9 , EWKT_KWD_GEO_TYPE , GEO_BOX_M , 1 , 3 , 4 , 0 }, + {"BOXZ" , 10 , EWKT_KWD_GEO_TYPE , GEO_BOX_Z , 1 , 3 , 4 , 1 }, + {"BOXZM" , 11 , EWKT_KWD_GEO_TYPE , GEO_BOX_Z_M , 1 , 4 , 4 , 0 }, + {"CIRCULARSTRING" , 12 , EWKT_KWD_GEO_TYPE , GEO_ARCSTRING , 1 , 2 , 2 , 0 }, + {"CIRCULARSTRINGM" , 13 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"CIRCULARSTRINGZ" , 14 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"CIRCULARSTRINGZM" , 15 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"COMPOUNDCURVE" , 16 , EWKT_KWD_GEO_TYPE , GEO_CURVE , 1 , 2 , 2 , 0 }, + {"COMPOUNDCURVEM" , 17 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"COMPOUNDCURVEZ" , 18 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"COMPOUNDCURVEZM" , 19 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"CURVE" , 20 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"CURVEM" , 21 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"CURVEPOLYGON" , 22 , EWKT_KWD_GEO_TYPE , GEO_CURVEPOLYGON , 2 , -1 , -1 , 0 }, + {"CURVEPOLYGONM" , 27 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"CURVEPOLYGONZ" , 23 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"CURVEPOLYGONZM" , 24 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"CURVEZ" , 25 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"CURVEZM" , 26 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"EMPTY" , 28 , EWKT_KWD_GEO_TYPE , GEO_NULL_SHAPE , 0 , 0 , 0 , 0 }, + {"ENVELOPE" , 29 , EWKT_KWD_GEO_TYPE , GEO_BOX , 1 , 2 , 3 , 1 }, + {"ENVELOPE2D" , 30 , EWKT_KWD_GEO_TYPE , GEO_BOX , 1 , 2 , 2 , 1 }, + {"ENVELOPE3D" , 31 , EWKT_KWD_GEO_TYPE , GEO_BOX_Z , 1 , 3 , 3 , 1 }, + {"ENVELOPEM" , 32 , EWKT_KWD_GEO_TYPE , GEO_BOX_M , 1 , 3 , 4 , 1 }, + {"ENVELOPEZ" , 33 , EWKT_KWD_GEO_TYPE , GEO_BOX_Z , 1 , 3 , 4 , 1 }, + {"ENVELOPEZM" , 34 , EWKT_KWD_GEO_TYPE , GEO_BOX_Z_M , 1 , 4 , 4 , 1 }, + {"GEOMETRY" , 35 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"GEOMETRYCOLLECTION" , 36 , EWKT_KWD_GEO_TYPE , GEO_COLLECTION , -1 , -1 , -1 , 0 }, + {"GEOMETRYCOLLECTIONM" , 37 , EWKT_KWD_GEO_TYPE , GEO_COLLECTION_M , -1 , -1 , -1 , 0 }, + {"GEOMETRYCOLLECTIONZ" , 38 , EWKT_KWD_GEO_TYPE , GEO_COLLECTION_Z , -1 , -1 , -1 , 0 }, + {"GEOMETRYCOLLECTIONZM" , 39 , EWKT_KWD_GEO_TYPE , GEO_COLLECTION_Z_M , -1 , -1 , -1 , 0 }, + {"GEOMETRYZ" , 40 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"GEOMETRYZM" , 41 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"LINEARRING" , 42 , EWKT_KWD_GEO_TYPE , GEO_RING , 1 , 2 , 3 , 1 }, /* LINEARRING[Z][M] is a non-standard tag introduced by com.vividsolutions.jts.io.WKTWriter and then migrated to GEOS */ + {"LINEARRINGM" , 43 , EWKT_KWD_GEO_TYPE , GEO_RING_M , 1 , 3 , 4 , 1 }, + {"LINEARRINGZ" , 44 , EWKT_KWD_GEO_TYPE , GEO_RING_Z , 1 , 3 , 4 , 1 }, + {"LINEARRINGZM" , 45 , EWKT_KWD_GEO_TYPE , GEO_RING_Z_M , 1 , 4 , 4 , 1 }, + {"LINESTRING" , 46 , EWKT_KWD_GEO_TYPE , GEO_LINESTRING , 1 , 2 , 3 , 0 }, + {"LINESTRINGM" , 47 , EWKT_KWD_GEO_TYPE , GEO_LINESTRING_M , 1 , 3 , 4 , 0 }, + {"LINESTRINGZ" , 48 , EWKT_KWD_GEO_TYPE , GEO_LINESTRING_Z , 1 , 3 , 4 , 0 }, + {"LINESTRINGZM" , 49 , EWKT_KWD_GEO_TYPE , GEO_LINESTRING_Z_M , 1 , 4 , 4 , 0 }, + {"M" , 50 , EWKT_KWD_MODIF , GEO_A_M , 0 , 0 , 0 , 0 }, + {"MULTICURVE" , 51 , EWKT_KWD_GEO_TYPE , GEO_MULTI_CURVE , 2 , 2 , 2 , 0 }, + {"MULTICURVEM" , 52 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"MULTICURVEZ" , 53 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"MULTICURVEZM" , 54 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"MULTILINESTRING" , 55 , EWKT_KWD_GEO_TYPE , GEO_MULTI_LINESTRING , 2 , 2 , 3 , 0 }, + {"MULTILINESTRINGM" , 56 , EWKT_KWD_GEO_TYPE , GEO_MULTI_LINESTRING_M, 2 , 3 , 4 , 0 }, + {"MULTILINESTRINGZ" , 57 , EWKT_KWD_GEO_TYPE , GEO_MULTI_LINESTRING_Z, 2 , 3 , 4 , 0 }, + {"MULTILINESTRINGZM" , 58 , EWKT_KWD_GEO_TYPE , GEO_MULTI_LINESTRING_Z_M, 2 , 4 , 4 , 0 }, + {"MULTIPATCH" , 59 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"MULTIPOINT" , 60 , EWKT_KWD_GEO_TYPE , GEO_POINTLIST , 1 , 2 , 3 , 0 }, + {"MULTIPOINTM" , 61 , EWKT_KWD_GEO_TYPE , GEO_POINTLIST_M , 1 , 3 , 4 , 0 }, + {"MULTIPOINTZ" , 62 , EWKT_KWD_GEO_TYPE , GEO_POINTLIST_Z , 1 , 3 , 4 , 0 }, + {"MULTIPOINTZM" , 63 , EWKT_KWD_GEO_TYPE , GEO_POINTLIST_Z_M , 1 , 4 , 4 , 0 }, + {"MULTIPOLYGON" , 64 , EWKT_KWD_GEO_TYPE , GEO_MULTI_POLYGON , 3 , 2 , 3 , 0 }, + {"MULTIPOLYGONM" , 65 , EWKT_KWD_GEO_TYPE , GEO_MULTI_POLYGON_M , 3 , 3 , 4 , 0 }, + {"MULTIPOLYGONZ" , 66 , EWKT_KWD_GEO_TYPE , GEO_MULTI_POLYGON_Z , 3 , 3 , 4 , 0 }, + {"MULTIPOLYGONZM" , 67 , EWKT_KWD_GEO_TYPE , GEO_MULTI_POLYGON_Z_M , 3 , 4 , 4 , 0 }, + {"MULTISURFACE" , 68 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"MULTISURFACEM" , 69 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"MULTISURFACEZ" , 70 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"MULTISURFACEZM" , 71 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"POINT" , 72 , EWKT_KWD_GEO_TYPE , GEO_POINT , 1 , 2 , 3 , 0 }, + {"POINTM" , 73 , EWKT_KWD_GEO_TYPE , GEO_POINT_M , 1 , 3 , 4 , 0 }, + {"POINTZ" , 74 , EWKT_KWD_GEO_TYPE , GEO_POINT_Z , 1 , 3 , 4 , 0 }, + {"POINTZM" , 75 , EWKT_KWD_GEO_TYPE , GEO_POINT_Z_M , 1 , 4 , 4 , 0 }, + {"POLYGON" , 76 , EWKT_KWD_GEO_TYPE , GEO_POLYGON , 2 , 2 , 3 , 0 }, + {"POLYGONM" , 77 , EWKT_KWD_GEO_TYPE , GEO_POLYGON_M , 2 , 3 , 4 , 0 }, + {"POLYGONZ" , 78 , EWKT_KWD_GEO_TYPE , GEO_POLYGON_Z , 2 , 3 , 4 , 0 }, + {"POLYGONZM" , 79 , EWKT_KWD_GEO_TYPE , GEO_POLYGON_Z_M , 2 , 4 , 4 , 0 }, + {"POLYHEDRALSURFACE" , 80 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"POLYHEDRALSURFACEM" , 81 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"POLYHEDRALSURFACEZ" , 82 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"POLYHEDRALSURFACEZM" , 83 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"POLYLINE" , 84 , EWKT_KWD_GEO_TYPE , GEO_MULTI_LINESTRING , 2 , 2 , 3 , 1 }, + {"POLYLINEM" , 85 , EWKT_KWD_GEO_TYPE , -1 , 2 , 2 , 2 , 1 }, + {"POLYLINEZ" , 86 , EWKT_KWD_GEO_TYPE , GEO_MULTI_LINESTRING_Z, 2 , 3 , 3 , 1 }, + {"RING" , 87 , EWKT_KWD_GEO_TYPE , GEO_RING , 1 , 2 , 3 , 0 }, + {"RINGM" , 88 , EWKT_KWD_GEO_TYPE , GEO_RING_M , 1 , 3 , 4 , 0 }, + {"RINGZ" , 89 , EWKT_KWD_GEO_TYPE , GEO_RING_Z , 1 , 3 , 4 , 0 }, + {"RINGZM" , 90 , EWKT_KWD_GEO_TYPE , GEO_RING_Z_M , 1 , 4 , 4 , 0 }, + {"SRID" , 91 , EWKT_KWD_EXT , EWKT_KWD_SRID , 0 , 0 , 0 , 0 }, + {"SURFACE" , 92 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"SURFACEM" , 93 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"SURFACEZ" , 94 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"SURFACEZM" , 95 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"TIN" , 96 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"TINM" , 97 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"TINZ" , 98 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"TINZM" , 99 , EWKT_KWD_GEO_TYPE , -1 , 1 , 2 , 2 , 0 }, + {"Z" ,100 , EWKT_KWD_MODIF , GEO_A_Z , 0 , 0 , 0 , 0 }, + {"ZM" ,101 , EWKT_KWD_MODIF , GEO_A_Z | GEO_A_M , 0 , 0 , 0 , 0 } }; dk_hash_t *ewkt_geotype_metas = NULL; @@ -1388,7 +1411,7 @@ ewkt_find_metas_by_geotype (int geotype) continue; if (0 > ptr->kwd_subtype) continue; - old = gethash (((void *) ((ptrlong) (ptr->kwd_subtype))), ewkt_geotype_metas); + old = (ewkt_kwd_metas_t *)gethash (((void *)((ptrlong)(ptr->kwd_subtype))), ewkt_geotype_metas); if (NULL != old) { if (ptr->kwd_is_alias) @@ -1422,6 +1445,19 @@ ewkt_get_token (ewkt_input_t * in, ewkt_token_val_t * val) } res = EWKT_NUM_BAD; break; } + case '<': + { + in->ewkt_tail++; + val->v_iri_begin_and_end[0] = in->ewkt_tail; + while (NULL == strchr ("> \t\r\n", in->ewkt_tail[0])) in->ewkt_tail++; + if ('>' == in->ewkt_tail[0]) + { + val->v_iri_begin_and_end[1] = in->ewkt_tail; + in->ewkt_tail++; res = EWKT_IRI; break; + } + val->v_kwd = NULL; + return EWKT_BAD; + } default: if (isalpha (in->ewkt_tail[0])) { @@ -1452,6 +1488,15 @@ ewkt_signal (ewkt_input_t * in, const char *error) longjmp (in->ewkt_error_ctx, 1); } +NORETURN void +ewkt_signal_coord (ewkt_input_t *in, const char *error, int point_idx1, int dim_idx1) +{ + in->ewkt_error_point_idx1 = point_idx1; + in->ewkt_error_dim_idx1 = dim_idx1; + in->ewkt_error = error; + longjmp (in->ewkt_error_ctx, 1); +} + void ewkt_expect_token (ewkt_input_t * in, int expected) { @@ -1466,8 +1511,10 @@ ewkt_get_points (ewkt_input_t * in, ewkt_kwd_metas_t * head_metas) { int coretype = GEO_TYPE_CORE (head_metas->kwd_subtype); int tkn, dim = 0, dim_idx = 0; - int lpar_before_point = 0; + int lpar_before_point = 0; /* nonzero if we believe that the point is enclosed in (). That may be not true if a whole list is enclosed in redundand () so if lpar_before_list then lpar_before_point is never 1 */ + int lpar_before_list = 0; /* nonzero if we believe that the list of points is enclosed in (). lpar_before_point() is replaced with lpar_before_list if ',' is found the point instead of ')' */ ewkt_token_val_t val; + int check_ctr; in->ekwt_point_count = 0; for (;;) { @@ -1496,36 +1543,18 @@ ewkt_get_points (ewkt_input_t * in, ewkt_kwd_metas_t * head_metas) switch (tkn) { case EWKT_NUM: - if (3 < dim_idx) + { + int final_dim_idx = dim_idx; + if ((in->ewkt_swap_latlong_to_longlat) && (2 > final_dim_idx)) + final_dim_idx = 1 - final_dim_idx; + if (4 < final_dim_idx) ewkt_signal (in, "Too many coordinates are listed for a point"); - if (dim_idx >= head_metas->kwd_max_nums) + if (final_dim_idx >= head_metas->kwd_max_nums) ewkt_signal (in, "The point has more coordinates than permitted by the spatial type"); - if (GEO_SR_SPHEROID_DEGREES (in->ewkt_srcode)) - { - switch (dim_idx) - { - case 0: - if ((val.v_geoc < -270.0) || (val.v_geoc > 450.0)) - ewkt_signal (in, "The point coordinates are spherical degrees and the longitude is out of range -270..450"); - break; - case 1: - if ((val.v_geoc < -90.0) || (val.v_geoc > 90.0)) - { - geo_flags_t core_type = GEO_TYPE_CORE (head_metas->kwd_subtype); - if ((GEO_BOX != core_type) || ((val.v_geoc < -181.0) || (val.v_geoc > 181.0))) - ewkt_signal (in, "The point coordinates are spherical degrees and the latitude is out of range -90..90"); - val.v_geoc = ((val.v_geoc < 0) ? -90 : 90.0); /* Special case for bounding boxes calculated by ill algorithms */ - } - break; - } - } - else - { - if ((val.v_geoc <= -0.5 * geoc_FARAWAY) || (val.v_geoc >= 0.5 * geoc_FARAWAY)) - ewkt_signal (in, "The point coordinate is out of range -5E37..+5E37"); - } - in->ekwt_Cs[dim_idx++][in->ekwt_point_count] = val.v_geoc; + in->ekwt_Cs[final_dim_idx][in->ekwt_point_count] = val.v_geoc; + dim_idx++; continue; + } case EWKT_NUM_BAD: ewkt_signal (in, "Syntax error in numeric value"); break; @@ -1535,7 +1564,7 @@ ewkt_get_points (ewkt_input_t * in, ewkt_kwd_metas_t * head_metas) if (0 < dim_idx) ewkt_signal (in, "EMPTY keyword can not be mixed with other coordinates of the point"); if ((GEO_LINESTRING == coretype) || (GEO_ARCSTRING == coretype)) - ewkt_signal (in, "EMPTY coordinates can be assigned to a point, but not to vertex of a LINE- or ARC-string."); + ewkt_signal (in, "EMPTY coordinates can be assigned to a point, but not to vertex of a polygon, LINE- or ARC-string."); in->ekwt_Cs[0][in->ekwt_point_count] = in->ekwt_Cs[1][in->ekwt_point_count] = in->ekwt_Cs[2][in->ekwt_point_count] = @@ -1545,24 +1574,68 @@ ewkt_get_points (ewkt_input_t * in, ewkt_kwd_metas_t * head_metas) case '(': if (0 != dim_idx) ewkt_signal (in, "Unexpected '(' in the middle of a point"); - if (lpar_before_point) + if (lpar_before_point || lpar_before_list) ewkt_signal (in, "Too many '(' before coordinates of a point"); lpar_before_point = 1; continue; case ')': - if (!lpar_before_point) - break; + if (lpar_before_point) lpar_before_point = 0; + else if (lpar_before_list) + lpar_before_list = 0; + else break; continue; case ',': if (lpar_before_point) + { + if (0 != in->ekwt_point_count) ewkt_signal (in, "Unexpected ',' in the middle of a point, the point begins with '(' but not ended with ')'"); + else + { + lpar_before_point = 0; + lpar_before_list = 1; + } + } break; } if (0xFF != dim_idx) { if (dim_idx < head_metas->kwd_min_nums) + { + if ((GEO_BOX == GEO_TYPE (head_metas->kwd_subtype)) && (1 == dim_idx) && (0 == in->ekwt_point_count++)) + { /* This is special case of BOX (min_long, max_long, max_lat, min_lat), prehistoric non-Postgres WKT syntax +Note that the order of values is neither one for two points not Windows-style LaTRouB */ + geoc corners[4]; + int corner_idx; + corners[0] = in->ekwt_Cs[in->ewkt_swap_latlong_to_longlat ? 1 : 0][0]; + for (corner_idx = 1; corner_idx < 4; corner_idx++) + { + tkn = ewkt_get_token (in, &val); + if (EWKT_NUM != tkn) + ewkt_signal (in, "The BOX '(l,r,t,b)' notation requires number after comma"); + corners[corner_idx] = val.v_geoc; + tkn = ewkt_get_token (in, &val); + if (3 == corner_idx) + { + if (')' != tkn) + ewkt_signal (in, "The BOX '(l,r,t,b)' notation requires closing ')'"); + } + else + { + if (',' != tkn) + ewkt_signal (in, "The BOX '(l,r,t,b)' notation requires comma after number"); + } + } + in->ekwt_Cs[0][0] = corners[0]; + in->ekwt_Cs[0][1] = corners[1]; + in->ekwt_Cs[1][1] = corners[2]; + in->ekwt_Cs[1][0] = corners[3]; + dim = 2; + in->ekwt_point_count = 2; + goto final_checks; /* see below */ + } ewkt_signal (in, "The point has less coordinates than permitted by the spatial type"); + } if ((0 == in->ekwt_point_count) || (0 == dim)) dim = dim_idx; else if (dim != dim_idx) @@ -1580,11 +1653,51 @@ ewkt_get_points (ewkt_input_t * in, ewkt_kwd_metas_t * head_metas) ewkt_signal (in, "Points with unspecified coordinates are not allowed"); in->ekwt_point_count = 0; } - return dim; + goto final_checks /* see below */; } ewkt_signal (in, "Syntax error in the list of points"); } } + +final_checks: + for (check_ctr = 0; check_ctr < in->ekwt_point_count; check_ctr++) + { + geoc c = in->ekwt_Cs[0][check_ctr]; + if (geoc_FARAWAY == c) + continue; + if (GEO_SR_SPHEROID_DEGREES (in->ewkt_srcode)) + { + if ((c < -270.0) || (c > 450.0)) + ewkt_signal_coord (in, "The point coordinates are spherical degrees and the longitude is out of range -270..450", check_ctr+1, 1); + c = in->ekwt_Cs[1][check_ctr]; + if ((c < -90.0) || (c > 90.0)) + { + if (GEO_BOX == coretype) + { + if ((c < -181.0) || (c > 181.0)) + ewkt_signal_coord (in, "The bounding box latitude is out of range -90..90 and even out of stretched range -181..181", check_ctr+1, 2); + in->ekwt_Cs[1][check_ctr] = ((c < 0) ? -90 : 90.0); /* Special case for bounding boxes calculated by ill algorithms */ + } + else + ewkt_signal_coord (in, "The point coordinates are spherical degrees and the latitude is out of range -90..90", check_ctr+1, 2); + } + dim_idx = 2; + } + else + dim_idx = 0; + for (/* no init */; dim_idx < dim; dim_idx++) + { + c = in->ekwt_Cs[dim_idx][check_ctr]; + if ((c <= -0.5 * geoc_FARAWAY) || (c >= 0.5 * geoc_FARAWAY)) + ewkt_signal_coord (in, "The point coordinate is out of range -5E37..+5E37", check_ctr+1, dim_idx+1); + } + } + if (GEO_BOX == coretype) + { + for (dim_idx = 0; dim_idx < dim; dim_idx++) + if (in->ekwt_Cs[dim_idx][0] > in->ekwt_Cs[dim_idx][1]) + ewkt_signal_coord (in, "The \"minimum\" coordinate of a bounding box is greater than the \"maximum\" one", 0, dim_idx+1); + } if (GEO_ARCSTRING == coretype) { int p_idx; @@ -1594,7 +1707,7 @@ ewkt_get_points (ewkt_input_t * in, ewkt_kwd_metas_t * head_metas) { if ((fabs (in->ekwt_Cs[0][p_idx - 1] - in->ekwt_Cs[0][p_idx]) + fabs (in->ekwt_Cs[1][p_idx - 1] - in->ekwt_Cs[1][p_idx])) <= 2 * geoc_EPSILON) - ewkt_signal (in, "Neighbor points of an ARCSTRING are too close to each other"); + ewkt_signal_coord (in, "Neighbor points of an ARCSTRING are too close to each other", p_idx, 0); } } if (head_metas->kwd_subtype & GEO_A_CLOSED) @@ -1603,10 +1716,19 @@ ewkt_get_points (ewkt_input_t * in, ewkt_kwd_metas_t * head_metas) ewkt_signal (in, "Closed ring contains too few points"); for (dim_idx = dim; dim_idx--; /* no step */ ) { - if (fabs (in->ekwt_Cs[dim_idx][in->ekwt_point_count - 1] - in->ekwt_Cs[dim_idx][0]) >= geoc_EPSILON) + geoc last_c = in->ekwt_Cs[dim_idx][in->ekwt_point_count-1]; + geoc first_c = in->ekwt_Cs[dim_idx][0]; + if (fabs (last_c - first_c) < geoc_EPSILON) + continue; + if ((dim_idx == (dim-1)) && (head_metas->kwd_subtype & GEO_A_Z)) + { /* Mileage of a closed ring is an exception: points can have mileage from 0 to max or in reverse order, so M of endpoint may be 0 and non-0 */ + if ((fabs (first_c) < geoc_EPSILON) || (fabs (last_c) < geoc_EPSILON)) + continue; + } ewkt_signal (in, "The distance between ends of a closed ring is too big"); } } + return dim; } int @@ -1913,24 +2035,46 @@ ewkt_destroy_input (ewkt_input_t * in) geo_t * ewkt_parse (const char *strg, caddr_t * err_ret) { - return ewkt_parse_2 (strg, SRID_DEFAULT, err_ret); + return ewkt_parse_2 (strg, GEO_SRCODE_OF_SRID (SRID_DEFAULT), err_ret); } geo_t * -ewkt_parse_2 (const char *strg, int dflt_srid, caddr_t * err_ret) +ewkt_parse_2 (const char *strg, int dflt_srcode, caddr_t *err_ret) { geo_t *res; ewkt_input_t in; int tkn; ewkt_token_val_t val; memset (&in, 0, sizeof (ewkt_input_t)); - in.ewkt_srid = dflt_srid; - in.ewkt_srcode = GEO_SRCODE_OF_SRID (dflt_srid); + in.ewkt_srid = GEO_SRID(dflt_srcode); + in.ewkt_srcode = dflt_srcode; in.ewkt_source = in.ewkt_tail = in.ewkt_row_begin = (const unsigned char *) strg; if (0 == setjmp (in.ewkt_error_ctx)) { ewkt_ws_skip (&in); tkn = ewkt_get_token (&in, &val); + if (EWKT_IRI == tkn) + { + caddr_t sr_iri = box_dv_short_nchars ((const char *)(val.v_iri_begin_and_end[0]), val.v_iri_begin_and_end[1] - val.v_iri_begin_and_end[0]); + boxint srid = geo_sr_iri_to_srid (sr_iri); + if ((SRID_WGS84 == srid) && !strcmp (sr_iri, "http://www.opengis.net/def/crs/EPSG/0/4326")) + in.ewkt_swap_latlong_to_longlat = 1; + else if ((-1 == srid) && !strcmp (sr_iri, "http://www.opengis.net/def/crs/EPSG/0/4979")) + srid = 4979; + dk_free_box (sr_iri); + if (-1 == srid) + ewkt_signal (&in, "IRI is not known, consider registring it via DB.DBA.SYS_PROJ4_SR_IRIS"); + else if (0 > srid) + ewkt_signal (&in, "IRI is known but can not be used for parsing geometries"); + else if (4979 == srid) + { + srid = SRID_WGS84; + in.ewkt_swap_latlong_to_longlat = 1; + } + in.ewkt_srid = srid; + in.ewkt_srcode = GEO_SRCODE_OF_SRID(in.ewkt_srid); + tkn = ewkt_get_token (&in, &val); + } while (EWKT_KWD_EXT == tkn) { if (EWKT_KWD_SRID == val.v_kwd->kwd_subtype) @@ -1959,8 +2103,26 @@ ewkt_parse_2 (const char *strg, int dflt_srid, caddr_t * err_ret) else { if (err_ret != NULL) - err_ret[0] = srv_make_new_error ("22023", "GEO11", "%s (near row %d col %d of '%.200s')", - in.ewkt_error, 1 + in.ewkt_row_no, (int) (1 + (in.ewkt_tail - in.ewkt_row_begin)), strg); + { + char point_buf[50]; + const char *dim_text = ""; + if (in.ewkt_error_point_idx1 && (1 < in.ekwt_point_count)) + sprintf (point_buf, "point %d of %d ", in.ewkt_error_point_idx1, in.ekwt_point_count); + else + point_buf[0] = '\0'; + if (in.ewkt_error_dim_idx1 && !strstr (in.ewkt_error, "latitude") && !strstr (in.ewkt_error, "longitude")) + { + switch (in.ewkt_error_dim_idx1) + { + case 0: dim_text = (GEO_SR_SPHEROID_DEGREES (in.ewkt_srcode) ? "longitude, " : "X coordinate, "); break; + case 1: dim_text = (GEO_SR_SPHEROID_DEGREES (in.ewkt_srcode) ? "latitude, " : "Y coordinate, "); break; + case 2: dim_text = "3rd coordinate, "; break; + case 3: dim_text = "M coordinate, "; break; + } + } + err_ret[0] = srv_make_new_error ("22023", "GEO11", "%s (%s%snear row %d col %d of '%.200s')", + in.ewkt_error, dim_text, point_buf, 1 + in.ewkt_row_no, (int)(1 + (in.ewkt_tail - in.ewkt_row_begin)), strg ); + } res = NULL; } ewkt_destroy_input (&in); @@ -2018,6 +2180,8 @@ ewkt_print_sf12_one (geo_t * g, dk_session_t * ses, int named) } switch (GEO_TYPE_NO_ZM (g->geo_flags)) { + case GEO_NULL_SHAPE: + return; case GEO_POINT: ewkt_print_sf12_points (ses, g->geo_flags, ((geoc_FARAWAY == g->XYbox.Xmin) ? 0 : 1), &(g->XYbox.Xmin), &(g->XYbox.Ymin), &(g->_.point.point_ZMbox.Zmin), &(g->_.point.point_ZMbox.Mmin)); @@ -2071,6 +2235,309 @@ ewkt_print_sf12 (geo_t * g, dk_session_t * ses) ewkt_print_sf12_one (g, ses, 1); } +/* WKB printer */ +#ifndef DISABLE_WKB +#ifndef _IEEE_FLOATS +#error "WKB is implemented only for systems with IEEE doubles, sorry (_IEEE_FLOATS should be defined). To build the rest of Virtuoso, put DISABLE_WKB define in compilation options, and/or file the support request to authors" +#endif +#if 0 +#if 8 != sizeof (double) +#error "WKB is implemented only for systems with 8-bit doubles, sorry. To build the rest of Virtuoso, put DISABLE_WKB define in compilation options, and/or file the support request to authors" +#endif +#endif + +#define WKB_PRINT_BYTE(ses,n) do { session_buffered_write_char (n, ses); } while (0) +#define WKB_PRINT_INT32(ses,n) do { uint32 d=(n); session_buffered_write (ses, (char *)(&d), 4); } while (0) +#define WKB_PRINT_DOUBLE(ses,n) do { double d=(n); session_buffered_write (ses, (char *)(&d), 8); } while (0) +#if __BYTE_ORDER == __BIG_ENDIAN +#define WKB_PRINT_BOM(ses) WKB_PRINT_BYTE (ses, 0) +#elif __BYTE_ORDER == __LITTLE_ENDIAN +#define WKB_PRINT_BOM(ses) WKB_PRINT_BYTE (ses, 1) +#else +#error "WKB is implemented only for big-endian and little-endian systems, sorry. To build the rest of Virtuoso, put DISABLE_WKB define in compilation options, and/or file the support request to authors" +#endif + + +void +wkb_print_pcount_and_points (dk_session_t *ses, int geo_flags, int pcount, geoc *Xs, geoc *Ys, geoc *Zs, geo_measure_t *Ms) +{ + int inx; + WKB_PRINT_INT32 (ses, pcount); + for (inx = 0; inx < pcount; inx++) + { + WKB_PRINT_DOUBLE (ses, Xs[inx]); + WKB_PRINT_DOUBLE (ses, Ys[inx]); + if (geo_flags & GEO_A_Z) + WKB_PRINT_DOUBLE (ses, Zs[inx]); + if (geo_flags & GEO_A_M) + WKB_PRINT_DOUBLE (ses, Ms[inx]); + } +} + +#define WKB_POINT 1 +#define WKB_LINESTRING 2 +#define WKB_POLYGON 3 +#define WKB_MULTIPOINT 4 +#define WKB_MULTILINESTRING 5 +#define WKB_MULTIPOLYGON 6 +#define WKB_GEOMETRYCOLLECTION 7 + +#define WKB_TYPE_WITH_ZM(base,flags) (base + (((flags) & GEO_A_Z) ? 1000 : 0) + (((flags) & GEO_A_M) ? 2000 : 0)) + +void +wkb_print_box_as_polygon (dk_session_t *ses, geo_t *g) +{ + WKB_PRINT_INT32 (ses, WKB_POLYGON); + WKB_PRINT_INT32 (ses, 1); + WKB_PRINT_INT32 (ses, 5); + WKB_PRINT_DOUBLE (ses, g->XYbox.Xmin); WKB_PRINT_DOUBLE (ses, g->XYbox.Ymin); + WKB_PRINT_DOUBLE (ses, g->XYbox.Xmax); WKB_PRINT_DOUBLE (ses, g->XYbox.Ymin); + WKB_PRINT_DOUBLE (ses, g->XYbox.Xmax); WKB_PRINT_DOUBLE (ses, g->XYbox.Ymax); + WKB_PRINT_DOUBLE (ses, g->XYbox.Xmin); WKB_PRINT_DOUBLE (ses, g->XYbox.Ymax); + WKB_PRINT_DOUBLE (ses, g->XYbox.Xmin); WKB_PRINT_DOUBLE (ses, g->XYbox.Ymin); +} + +void +wkb_print (geo_t *g, dk_session_t *ses, int basic_wkb_only, char set_byte_order) +{ + int g_type_no_zm = GEO_TYPE_NO_ZM (g->geo_flags); + WKB_PRINT_BOM(ses); + switch (g_type_no_zm) + { + case GEO_NULL_SHAPE: + WKB_PRINT_INT32 (ses, WKB_TYPE_WITH_ZM (WKB_POLYGON, 0)); + WKB_PRINT_INT32 (ses, 0); + return; + case GEO_POINT: + WKB_PRINT_INT32 (ses, WKB_TYPE_WITH_ZM (WKB_POINT, g->geo_flags)); + WKB_PRINT_DOUBLE (ses, g->XYbox.Xmin); + WKB_PRINT_DOUBLE (ses, g->XYbox.Ymin); + if (g->geo_flags & GEO_A_Z) + WKB_PRINT_DOUBLE (ses, g->_.point.point_ZMbox.Zmin); + if (g->geo_flags & GEO_A_M) + WKB_PRINT_DOUBLE (ses, g->_.point.point_ZMbox.Mmin); + return; + case GEO_BOX: + if (!(g->geo_flags & (GEO_A_Z | GEO_A_M))) + { + wkb_print_box_as_polygon (ses, g); + return; + } + sqlr_new_error ("22023", "GEO13", "BOXZ, BOXM and BOXZM geometries can not be represented as (E)WKB and BOX is only emulated by a rectangular polygon"); + case GEO_LINESTRING: case GEO_RING: + WKB_PRINT_INT32 (ses, WKB_TYPE_WITH_ZM (WKB_LINESTRING, g->geo_flags)); + wkb_print_pcount_and_points (ses, g->geo_flags, g->_.pline.len, g->_.pline.Xs, g->_.pline.Ys, g->_.pline.Zs, g->_.pline.Ms); + return; + case GEO_POLYGON: + { + int inx, len = g->_.parts.len; + WKB_PRINT_INT32 (ses, WKB_TYPE_WITH_ZM (WKB_POLYGON, g->geo_flags)); + WKB_PRINT_INT32 (ses, len); + for (inx=0; inx < len; inx++) + { + geo_t *itm = g->_.parts.items[inx]; + if (GEO_TYPE (itm->geo_flags) != (GEO_RING | (g->geo_flags & (GEO_A_Z | GEO_A_M)))) + sqlr_new_error ("22023", "GEO12", "(E)WKB serialization does not support weird polygons with non-ring internals"); + wkb_print_pcount_and_points (ses, itm->geo_flags, itm->_.pline.len, itm->_.pline.Xs, itm->_.pline.Ys, itm->_.pline.Zs, itm->_.pline.Ms); + } + return; + } + case GEO_POINTLIST: + { + int inx, len = g->_.pline.len; + WKB_PRINT_INT32 (ses, WKB_TYPE_WITH_ZM (WKB_MULTIPOINT, g->geo_flags)); + WKB_PRINT_INT32 (ses, len); + for (inx=0; inx < len; inx++) + { + WKB_PRINT_BOM(ses); + WKB_PRINT_INT32 (ses, WKB_TYPE_WITH_ZM (WKB_POINT, g->geo_flags)); + WKB_PRINT_DOUBLE (ses, g->_.pline.Xs[inx]); + WKB_PRINT_DOUBLE (ses, g->_.pline.Ys[inx]); + if (g->geo_flags & GEO_A_Z) + WKB_PRINT_DOUBLE (ses, g->_.pline.Zs[inx]); + if (g->geo_flags & GEO_A_M) + WKB_PRINT_DOUBLE (ses, g->_.pline.Ms[inx]); + } + return; + } + case GEO_MULTI_LINESTRING: case GEO_MULTI_POLYGON: case GEO_COLLECTION: + { + int inx, len = g->_.parts.len; + int wkb_type_base = ( + (GEO_MULTI_LINESTRING == g_type_no_zm) ? WKB_MULTILINESTRING : ( + (GEO_MULTI_POLYGON == g_type_no_zm) ? WKB_MULTIPOLYGON : WKB_GEOMETRYCOLLECTION ) ); + WKB_PRINT_INT32 (ses, WKB_TYPE_WITH_ZM (wkb_type_base, g->geo_flags)); + WKB_PRINT_INT32 (ses, len); + for (inx=0; inx < len; inx++) + { + geo_t *itm = g->_.parts.items[inx]; + wkb_print (itm, ses, basic_wkb_only, set_byte_order); + } + return; + } + default: + sqlr_new_error ("22023", "GEO13", "(E)WKB serialization of geometries of type %d is not supported", GEO_TYPE (g->geo_flags)); + } +} + +/* WKB reader */ + +#define UINT32_SWAP_ENDIAN(x) ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) +#define WKB_READ_BYTE(ses,n) do { (n) = session_buffered_read_char (ses); } while (0) +#define WKB_READ_INT32(ses,n) do { \ + uint32 res; \ + if (ses->dks_in_fill - ses->dks_in_read >= 4) \ + { \ + res = ((int32 *)((void *)(ses->dks_in_buffer + ses->dks_in_read)))[0]; \ + ses->dks_in_read += 4; \ + } \ + else \ + session_buffered_read (ses, (caddr_t) (& res), 4); \ + if (!bom_eq_our) \ + res = UINT32_SWAP_ENDIAN(res); \ + (n) = res; \ +} while (0) + +#define WKB_READ_DOUBLE(ses,n) do { \ + union \ + { \ + uint32 l[2]; \ + double d; \ + } ds, ds2; \ + if (ses->dks_in_fill - ses->dks_in_read >= 8) \ + { \ + ds.d = ((double *)((void *)(ses->dks_in_buffer + ses->dks_in_read)))[0]; \ + ses->dks_in_read += 8; \ + } \ + else \ + session_buffered_read (ses, (caddr_t) (&(ds.d)), 8); \ + if (bom_eq_our) \ + (n) = ds.d; \ + else \ + { \ + ds2.l[0] = UINT32_SWAP_ENDIAN(ds.l[1]); \ + ds2.l[1] = UINT32_SWAP_ENDIAN(ds.l[0]); \ + (n) = ds2.d; \ + } \ + } while (0) +#if __BYTE_ORDER == __BIG_ENDIAN +#define WKB_READ_BOM(ses) do { bom_eq_our = (0 == session_buffered_read_char (ses)); } while (0) +#else +#define WKB_READ_BOM(ses) do { bom_eq_our = (1 == session_buffered_read_char (ses)); } while (0) +#endif + + +void +wkb_read_ses_points (dk_session_t *ses, int bom_eq_our, int geo_flags, int pcount, geoc *Xs, geoc *Ys, geoc *Zs, geo_measure_t *Ms) +{ + int inx; + for (inx = 0; inx < pcount; inx++) + { + WKB_READ_DOUBLE (ses, Xs[inx]); + WKB_READ_DOUBLE (ses, Ys[inx]); + if (geo_flags & GEO_A_Z) + WKB_READ_DOUBLE (ses, Zs[inx]); + if (geo_flags & GEO_A_M) + WKB_READ_DOUBLE (ses, Ms[inx]); + } +} + +#define ZM_OF_WKB_TYPE(type) ((((type)/2000) ? GEO_A_M : 0) | ((((type) % 2000) / 1000) ? GEO_A_Z : 0)) +#define BASE_OF_WKB_TYPE(type) ((type)%1000) + +geo_t * +wkb_read_ses (dk_session_t *ses, int srcode, int basic_wkb_only) +{ + geo_t *g; + int bom_eq_our, wkb_type, wkb_base_type, expected_wkb_subtype, g_zm, inx, len; + WKB_READ_BOM(ses); + WKB_READ_INT32(ses, wkb_type); + g_zm = ZM_OF_WKB_TYPE(wkb_type); + wkb_base_type = BASE_OF_WKB_TYPE(wkb_type); + switch (wkb_base_type) + { + case WKB_POINT: + g = geo_alloc (GEO_POINT | g_zm, 0, srcode); + WKB_READ_DOUBLE (ses, g->XYbox.Xmin); + WKB_READ_DOUBLE (ses, g->XYbox.Ymin); + if (g->geo_flags & GEO_A_Z) + WKB_READ_DOUBLE (ses, g->_.point.point_ZMbox.Zmin); + if (g->geo_flags & GEO_A_M) + WKB_READ_DOUBLE (ses, g->_.point.point_ZMbox.Mmin); + return g; + case WKB_LINESTRING: + WKB_READ_INT32 (ses, len); + g = geo_alloc (GEO_LINESTRING | g_zm, len, srcode); + wkb_read_ses_points (ses, bom_eq_our, g->geo_flags, len, g->_.pline.Xs, g->_.pline.Ys, g->_.pline.Zs, g->_.pline.Ms); + return g; + case WKB_POLYGON: + WKB_READ_INT32 (ses, len); + g = geo_alloc (GEO_POLYGON | g_zm, len, srcode); + for (inx=0; inx < len; inx++) + { + int ring_len; + geo_t *itm; + WKB_READ_INT32 (ses, ring_len); + itm = g->_.parts.items[inx] = geo_alloc (GEO_RING | g_zm, ring_len, srcode); + wkb_read_ses_points (ses, bom_eq_our, itm->geo_flags, itm->_.pline.len, itm->_.pline.Xs, itm->_.pline.Ys, itm->_.pline.Zs, itm->_.pline.Ms); + } + return g; + case WKB_MULTIPOINT: + WKB_READ_INT32 (ses, len); + g = geo_alloc (GEO_POINTLIST | g_zm, len, srcode); + expected_wkb_subtype = WKB_TYPE_WITH_ZM (WKB_POINT, g_zm); + for (inx=0; inx < len; inx++) + { + int wkb_subtype; + WKB_READ_BOM(ses); + WKB_READ_INT32 (ses, wkb_subtype); + if (wkb_subtype != expected_wkb_subtype) + { + dk_free_box ((caddr_t)g); + sqlr_new_error ("22023", "GEO14", "WKB multipoint (type %d) contains sub-geometry of type %d, expected type is %d", wkb_type, wkb_subtype, expected_wkb_subtype); + } + WKB_READ_DOUBLE (ses, g->_.pline.Xs[inx]); + WKB_READ_DOUBLE (ses, g->_.pline.Ys[inx]); + if (g->geo_flags & GEO_A_Z) + WKB_READ_DOUBLE (ses, g->_.pline.Zs[inx]); + if (g->geo_flags & GEO_A_M) + WKB_READ_DOUBLE (ses, g->_.pline.Ms[inx]); + } + return g; + case WKB_MULTILINESTRING: case WKB_MULTIPOLYGON: case WKB_GEOMETRYCOLLECTION: + { + int g_type_no_zm = ( + (WKB_MULTILINESTRING == wkb_base_type) ? GEO_MULTI_LINESTRING : ( + (WKB_MULTIPOLYGON == wkb_base_type) ? GEO_MULTI_POLYGON : GEO_COLLECTION ) ); + WKB_READ_INT32 (ses, len); + g = geo_alloc (g_type_no_zm | g_zm, len, srcode); + QR_RESET_CTX + { + for (inx=0; inx < len; inx++) + { + g->_.parts.items[inx] = wkb_read_ses (ses, srcode, basic_wkb_only); + } + } + QR_RESET_CODE + { + caddr_t err = thr_get_error_code (THREAD_CURRENT_THREAD); + dk_free_box ((caddr_t)g); + POP_QR_RESET; + sqlr_resignal (err); + } + END_QR_RESET + return g; + } + default: + sqlr_new_error ("22023", "GEO15", "WKB contains unsupported geometry type %d", wkb_type); + } + return NULL; +} + +#endif /* DISABLE_WKB */ + +/* DXF printer */ + #define SES_DXF_REAL(ses,mark,v) do { char tmpbuf[60]; snprintf (tmpbuf, sizeof(tmpbuf), "\n%3d\n" GEOC_DXF_STAR_FMT, (mark), GEOC_DXF_PREC, (double)(v)); SES_PRINT ((ses), tmpbuf); } while (0) #define SES_DXF_INTEGER(ses,mark,v) do { char tmpbuf[50]; snprintf (tmpbuf, sizeof(tmpbuf), "\n%3d\n%d", (mark), (int)(v)); SES_PRINT ((ses), tmpbuf); } while (0) @@ -2118,6 +2585,8 @@ geo_print_as_dxf_entity (geo_t *g, caddr_t *attrs, dk_session_t *ses) int flags_no_zm = GEO_TYPE_NO_ZM (g->geo_flags); switch (flags_no_zm) { + case GEO_NULL_SHAPE: + break; case GEO_POINT: SES_DXF_ID (ses, 0, "POINT"); SES_DXF_XYZ (ses, 10, g->XYbox.Xmin, g->XYbox.Ymin, g->_.point.point_ZMbox.Zmin, g->geo_flags); @@ -2184,14 +2653,14 @@ Old types: GEO_NULL_SHAPE: 1b flags, 2b? SRID GEO_POINT: 1b flags, 2b? SRID, 2coords GEO_BOX: 1b flags, 2b? SRID, 4 coords - GEO_LINESTRING: 1b flags, 2b? SRID, 2|5b len, 2*len coords + GEO_LINESTRING: 1b flags, 2b? SRID, 2|5b (1+len*2), 2*len coords New types: (Note that more significant byte 0xNN00 is AFTER less significant byte 0X00NN !) point/box types: 2b flags, 2b? SRID, coords as listed in the structure (2 to 8 coords) linestring and arcstring types: 2b flags, 2b? SRID, - 2|5b len, XYbbox?, chainboxes?, ZMbbox?, coords as listed in the structure (2 to 4 coords) + 2|5b (1+len*2), XYbbox?, chainboxes?, ZMbbox?, coords as listed in the structure (2 to 4 coords) any collections and groups of items: 2b flags, 2b? SRID (recorded only at top level), 2|5b total len of the serialization (with all subchildren but without the leading DV_GEO and the length of the "length of the serialization" itself, recorded only at top level), @@ -2253,6 +2722,7 @@ dv_geo_length (db_buf_t dv, long *hl, long *l) if (GEO_A_M & flags) dims++; switch (GEO_TYPE_CORE (flags)) { + case GEO_NULL_SHAPE: *l = len; return; case GEO_POINT: *l = len + dims * coord_len; return; case GEO_BOX: *l = len + 2 * dims * coord_len; return; case GEO_LINESTRING: case GEO_POINTLIST: case GEO_ARCSTRING: @@ -2323,9 +2793,18 @@ geo_calc_length_of_serialization (geo_t * g, int is_topmost) len += (2 * dims * coord_len); /* bbox */ switch (GEO_TYPE_CORE (flags)) { + case GEO_NULL_SHAPE: return len; case GEO_POINT: return len + dims * coord_len; case GEO_BOX: return len + 2 * dims * coord_len; - case GEO_LINESTRING: case GEO_POINTLIST: case GEO_ARCSTRING: + case GEO_LINESTRING: + /* Bug 18355: God only knows why the length of plain old non-chainboxes GEO_LINESTRING is stored as (1 + (g->_.pline.len * 2)) */ + if (GEO_LINESTRING == (g->geo_flags & (GEO_TYPE_MASK | GEO_IS_CHAINBOXED))) + { + ct = g->_.pline.len; + return len + DV_INT_SERIALIZATION_LENGTH(1 + ct*2) + ct * dims * coord_len; + } + /* no break */ + case GEO_POINTLIST: case GEO_ARCSTRING: ct = g->_.pline.len; return len + DV_INT_SERIALIZATION_LENGTH (ct) + ct * dims * coord_len; } @@ -2894,7 +3373,7 @@ geo_XY_inoutside_ring (geoc pX, geoc pY, geo_t * ring) geoc *Ys = ring->_.pline.Ys; if ((ring->geo_flags & GEO_IS_CHAINBOXED) && ring->_.pline.pline_gcb->gcb_is_set) { - geo_XYbox_t *gcb_ptr = gcb_ptr = ring->_.pline.pline_gcb->gcb_boxes; + geo_XYbox_t *gcb_ptr = ring->_.pline.pline_gcb->gcb_boxes; int inx; int gcb_next_stop; int gcb_step = MIN ((len - 1), ring->_.pline.pline_gcb->gcb_step); @@ -3284,7 +3763,9 @@ geo_modify_by_projection (geo_t *g, void *geo_proj) } switch (GEO_TYPE_CORE (flags)) { - case GEO_NULL_SHAPE: case GEO_BOX: + case GEO_NULL_SHAPE: + return NULL; + case GEO_BOX: XYBOX_PROJECT(g->XYbox); return NULL; case GEO_POINT: diff --git a/libsrc/Wi/hash.c b/libsrc/Wi/hash.c index b01588537e..e515aca72f 100644 --- a/libsrc/Wi/hash.c +++ b/libsrc/Wi/hash.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/hosting.c b/libsrc/Wi/hosting.c index 5c6bf9692f..5921ccd096 100644 --- a/libsrc/Wi/hosting.c +++ b/libsrc/Wi/hosting.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -36,7 +36,6 @@ #include "sqlbif.h" #include "security.h" -extern int _gate_export (void *tgt); #undef free #ifndef __NO_LIBDK diff --git a/libsrc/Wi/hosting.h b/libsrc/Wi/hosting.h index b000c1e836..716de5d9bd 100644 --- a/libsrc/Wi/hosting.h +++ b/libsrc/Wi/hosting.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/hosting.sql b/libsrc/Wi/hosting.sql index 2bbe7ed122..4d4b324c8f 100644 --- a/libsrc/Wi/hosting.sql +++ b/libsrc/Wi/hosting.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/http.c b/libsrc/Wi/http.c index a4339a6288..810f54ae06 100644 --- a/libsrc/Wi/http.c +++ b/libsrc/Wi/http.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -208,6 +208,8 @@ void * tcpses_get_sslctx (session_t * ses); void tcpses_set_sslctx (session_t * ses, void * ssl_ctx); extern int ssl_ctx_set_cipher_list (SSL_CTX *ctx, char *cipher_list); extern int ssl_ctx_set_protocol_options (SSL_CTX *ctx, char *protocols); +extern int ssl_ctx_set_dhparam (SSL_CTX *ctx, char *dhparam); +extern int ssl_ctx_set_ecdh_curve (SSL_CTX *ctx, char *curve); #endif #ifdef _IMSG @@ -242,6 +244,10 @@ caddr_t ws_get_packed_hf (ws_connection_t * ws, const char * fld, char * deflt); #define ws_get_packed_hf(ws,path1,deflt) NULL #endif +#define WS_NOT_HDR(ws,h) \ + (!(ws)->ws_header || \ + (NULL == nc_strstr ((unsigned char *) (ws)->ws_header, (unsigned char *)h))) + caddr_t ws_gethostbyaddr (const char * ip) { @@ -1397,7 +1403,8 @@ ws_check_caps (ws_connection_t * ws) return 1; end = expect + strlen (expect) - 1; while (isspace (*expect)) expect++; - while (isspace (*end)) end--; end ++; + while (isspace (*end)) end--; + end ++; /* 100 continue is supported */ if ((end - expect) == 12 && 0 == strnicmp (expect, "100-continue", 12)) return 1; @@ -1920,6 +1927,16 @@ char http_server_id_string_buf [1024]; char *http_server_id_string = NULL; char *http_client_id_string = "Mozilla/4.0 (compatible; OpenLink Virtuoso)"; +static char hsts_header_buf[128]; + +static char * +hsts_header_line (ws_connection_t * ws) +{ + if (https_hsts_max_age >= 0 && tcpses_get_ssl (ws->ws_session->dks_session) != NULL) + return hsts_header_buf; + return ""; +} + #define IS_CHUNKED_OUTPUT(ws) \ ((ws) && strses_is_ws_chunked_output ((ws)->ws_strses)) @@ -2038,7 +2055,7 @@ ws_get_mime_variant (char * mime, char ** found) static const char * -ws_check_accept (ws_connection_t * ws, char * mime, const char * code, int check_only, OFF_T clen, const char * charset) +ws_check_accept (ws_connection_t * ws, const char * mime, const char * code, int check_only, OFF_T clen, const char * charset) { static char *fmt = "\n" @@ -2231,13 +2248,14 @@ ws_cors_check (ws_connection_t * ws, char * buf, size_t buf_len) ach[strlen (ach) - 1] = 0; strcat_ck (ach, "\r\n"); } - if (!ws->ws_header || (NULL == nc_strstr ((unsigned char *) ws->ws_header, (unsigned char *) "Access-Control-Allow-Headers:"))) + if (WS_NOT_HDR (ws, "Access-Control-Allow-Headers:")) { strcat_ck (ach, "Access-Control-Allow-Headers: Accept, Authorization, Slug, Link, Origin, Content-type"); strcat_ck (ach, "\r\n"); } snprintf (buf, buf_len, "Access-Control-Allow-Origin: %s\r\n%s%s", - ret_origin ? ret_origin : "*", ret_origin ? "Access-Control-Allow-Credentials: true\r\n" : "", ach); + ret_origin ? ret_origin : "*", + (ret_origin && WS_NOT_HDR (ws, "Access-Control-Allow-Credentials:")) ? "Access-Control-Allow-Credentials: true\r\n" : "", ach); } if (orgs != WS_CORS_STAR) dk_free_tree (orgs); @@ -2408,7 +2426,7 @@ ws_strses_reply (ws_connection_t * ws, const char * volatile code) } /* fprintf (stdout, "\nREPLY-----\n%s", tmp); */ /* mime type */ - if (ws->ws_status_code != 101 && (!ws->ws_header || (NULL == nc_strstr ((unsigned char *) ws->ws_header, (unsigned char *) "Content-Type:")))) + if (ws->ws_status_code != 101 && WS_NOT_HDR (ws, "Content-Type:")) { #ifdef BIF_XML if (media_type) @@ -2451,7 +2469,7 @@ ws_strses_reply (ws_connection_t * ws, const char * volatile code) } /* timestamp */ - if (!ws->ws_header || NULL == nc_strstr ((unsigned char *) ws->ws_header, (unsigned char *) "Date:")) + if (WS_NOT_HDR (ws, "Date:")) { char dt [DT_LENGTH]; char last_modify[100]; @@ -2463,7 +2481,7 @@ ws_strses_reply (ws_connection_t * ws, const char * volatile code) SES_PRINT (ws->ws_session, "\r\n"); } - if (!ws->ws_header || NULL == nc_strstr ((unsigned char *) ws->ws_header, (unsigned char *) "Access-Control-Allow-Origin:")) + if (WS_NOT_HDR (ws, "Access-Control-Allow-Origin:")) { tmp[0] = 0; if (0 == ws_cors_check (ws, tmp, sizeof (tmp))) @@ -2478,6 +2496,8 @@ ws_strses_reply (ws_connection_t * ws, const char * volatile code) if (ws->ws_status_code != 101) SES_PRINT (ws->ws_session, "Accept-Ranges: bytes\r\n"); + SES_PRINT (ws->ws_session, hsts_header_line(ws)); + if (ws->ws_header) /* user-defined headers */ { SES_PRINT (ws->ws_session, ws->ws_header); @@ -2491,7 +2511,7 @@ ws_strses_reply (ws_connection_t * ws, const char * volatile code) snprintf (tmp, sizeof (tmp), "Transfer-Encoding: chunked\r\nContent-Encoding: gzip\r\n"); SES_PRINT (ws->ws_session, tmp); } - else if (ws->ws_status_code != 101 && (!ws->ws_header || (NULL == nc_strstr ((unsigned char *) ws->ws_header, (unsigned char *) "Content-Length:")))) /* plain body */ + else if (ws->ws_status_code != 101 && WS_NOT_HDR(ws, "Content-Length:")) /* plain body */ { snprintf (tmp, sizeof (tmp), "Content-Length: %ld\r\n", len); SES_PRINT (ws->ws_session, tmp); @@ -2517,7 +2537,7 @@ ws_strses_reply (ws_connection_t * ws, const char * volatile code) { strses_write_out_gz (ws->ws_strses, ws->ws_session, &gzctx); } - else if (!ws->ws_header || (NULL == nc_strstr ((unsigned char *) ws->ws_header, (unsigned char *) "Content-Length:"))) + else if (WS_NOT_HDR (ws, "Content-Length:")) { strses_write_out (ws->ws_strses, ws->ws_session); } @@ -2826,6 +2846,7 @@ send_multipart_byteranges (ws_connection_t *ws, int fd, "Date: %s\r\n" "Server: %.1000s\r\n" "Connection: %s\r\n" + "%s" "\r\n" "--THIS_STRING_SEPARATES\r\n" , @@ -2834,7 +2855,8 @@ send_multipart_byteranges (ws_connection_t *ws, int fd, last_modify, date_now, http_server_id_string, - ws->ws_try_pipeline ? "Keep-Alive" : "close"); + ws->ws_try_pipeline ? "Keep-Alive" : "close", + hsts_header_line (ws)); SES_PRINT (ws->ws_session, head); fprintf (stdout, "Head_mp = %s\n", head); @@ -3114,6 +3136,7 @@ ws_file (ws_connection_t * ws) "Connection: %s\r\n" "%s" "%s" + "%s" "%s", head_beg, (OFF_T_PRINTF_DTP) off, @@ -3123,6 +3146,7 @@ ws_file (ws_connection_t * ws) date_now, http_server_id_string, ws->ws_try_pipeline ? "Keep-Alive" : "close", + hsts_header_line(ws), (MAINTENANCE) ? "Retry-After: 1800\r\n" : "", ws->ws_header ? ws->ws_header : "", ranges_buffer @@ -4348,8 +4372,7 @@ void http_set_client_address (ws_connection_t * ws) { caddr_t xfwd; - if (!IS_GATEWAY_PROXY (ws)) - return; + if (ws && ws->ws_lines && NULL != (xfwd = ws_mime_header_field (ws->ws_lines, "X-Forwarded-For", NULL, 1))) { dk_free_box (ws->ws_client_ip); @@ -8128,7 +8151,7 @@ char * ws_def_2 = " declare p_len, slash integer;\n" " p1 := '';\n" " --dbg_obj_print (lines);\n" -" if (__tag (path) = 193)\n" +" if (__tag (path) = __tag of vector)\n" " p_len := length (path);\n" " else p_len := 0;\n" #ifndef VIRTUAL_DIR @@ -8199,8 +8222,8 @@ char * ws_def_2 = " p3 := concat (substring (p1, 1, dot), \'.vsp\'); \n" " if (0 = file_stat (concat (http_root (), p2))) \n" " goto err_exit; \n" -" _doc_uri := concat (\'file://\', p1); \n" -" _xslt_uri := WS.WS.EXPAND_URL (_doc_uri, p2); \n" +" _doc_uri := concat (\'file:/\', p1); \n" +" _xslt_uri := concat (\'file:/\', p2); \n" " _xml := DB.DBA.XML_URI_GET (\'\', _doc_uri); \n" " result := xslt (_xslt_uri, xml_tree_doc (_xml, _doc_uri)); \n" " http_output_flush (); \n" @@ -8933,6 +8956,8 @@ http_set_ssl_listen (dk_session_t * listening, caddr_t * https_opts) char *skey = NULL; char *ciphers = https_cipher_list; char *protocols = https_protocols; + char *curve = https_ecdh_curve; + char *dhparam = https_dhparam; long https_cvdepth = -1; int i, len, https_client_verify = -1; ssl_meth = SSLv23_server_method (); @@ -8966,6 +8991,10 @@ http_set_ssl_listen (dk_session_t * listening, caddr_t * https_opts) https_client_verify = unbox (https_opts[i + 1]); else if (!stricmp (https_opts [i], "https_extra_chain_certificates") && DV_STRINGP (https_opts [i + 1])) /* private key */ extra = https_opts [i + 1]; + else if (!stricmp (https_opts [i], "https_dhparam") && DV_STRINGP (https_opts [i + 1])) /* DH param */ + dhparam = https_opts [i + 1]; + else if (!stricmp (https_opts [i], "https_ecdh_curve") && DV_STRINGP (https_opts [i + 1])) /* ECDH curve */ + curve = https_opts [i + 1]; else if (!stricmp (https_opts [i], "https_cipher_list") && DV_STRINGP (https_opts [i + 1])) /* Ciphers */ ciphers = https_opts [i + 1]; else if (!stricmp (https_opts [i], "https_protocols") && DV_STRINGP (https_opts [i + 1])) /* Protocols */ @@ -8989,13 +9018,28 @@ http_set_ssl_listen (dk_session_t * listening, caddr_t * https_opts) if (!ssl_ctx_set_protocol_options (ssl_ctx, protocols)) { cli_ssl_get_error_string (err_buf, sizeof (err_buf)); - log_error ("HTTPS: Error setting SSL Protocols options: %s", err_buf); + log_error ("HTTPS: Error setting SSL Protocols [%s]: %s", protocols, err_buf); goto err_exit; } + if (!ssl_ctx_set_cipher_list (ssl_ctx, ciphers)) { cli_ssl_get_error_string (err_buf, sizeof (err_buf)); - log_error ("HTTPS: Error settings SSL Cipher list : %s", err_buf); + log_error ("HTTPS: Error setting SSL Cipher list [%s]: %s", ciphers, err_buf); + goto err_exit; + } + + if (!ssl_ctx_set_dhparam (ssl_ctx, dhparam)) + { + cli_ssl_get_error_string (err_buf, sizeof (err_buf)); + log_error ("HTTPS: Error setting SSL DH param [%s]: %s", dhparam, err_buf); + goto err_exit; + } + + if (!ssl_ctx_set_ecdh_curve (ssl_ctx, curve)) + { + cli_ssl_get_error_string (err_buf, sizeof (err_buf)); + log_error ("HTTPS: Error setting SSL ECDH curve [%s]: %s", curve, err_buf); goto err_exit; } @@ -9949,7 +9993,7 @@ bif_https_renegotiate (caddr_t *qst, caddr_t * err_ret, state_slot_t **args) cli_ssl_get_error_string (err_buf, sizeof (err_buf)); sqlr_new_error ("42000", "..002", "SSL_do_handshake failed %s", err_buf); } - ssl->state = SSL_ST_ACCEPT; + SSL_in_accept_init (ssl); while (SSL_renegotiate_pending (ssl) && ctr < 1000) { timeout_t to = { 0, 1000 }; @@ -11468,6 +11512,8 @@ http_init_part_one () http_server_id_string = http_server_id_string_buf; } + snprintf (hsts_header_buf, sizeof (hsts_header_buf), "Strict-Transport-Security: max-age=%d\r\n", https_hsts_max_age); + dns_host_name = get_qualified_host_name (); return 1; } @@ -11651,7 +11697,21 @@ http_init_part_two () if (!ssl_ctx_set_cipher_list (ssl_ctx, https_cipher_list)) { cli_ssl_get_error_string (err_buf, sizeof (err_buf)); - log_error ("HTTPS: Error settings SSL Cipher list : %s", err_buf); + log_error ("HTTPS: Error setting SSL Cipher list : %s", err_buf); + goto init_ssl_exit; + } + + if (!ssl_ctx_set_dhparam (ssl_ctx, https_dhparam)) + { + cli_ssl_get_error_string (err_buf, sizeof (err_buf)); + log_error ("HTTPS: Error setting SSL DH param [%s]: %s", https_dhparam, err_buf); + goto init_ssl_exit; + } + + if (!ssl_ctx_set_ecdh_curve (ssl_ctx, https_ecdh_curve)) + { + cli_ssl_get_error_string (err_buf, sizeof (err_buf)); + log_error ("HTTPS: Error setting SSL ECDH curve [%s]: %s", https_ecdh_curve, err_buf); goto init_ssl_exit; } @@ -11957,19 +12017,22 @@ is_internal_user (client_connection_t *cli) } -char * srv_http_port () +char * +srv_http_port () { return http_port; } -char * srv_www_root () +const char * +srv_www_root () { return www_root; } -caddr_t srv_dns_host_name () +caddr_t +srv_dns_host_name () { return dns_host_name; } diff --git a/libsrc/Wi/http.h b/libsrc/Wi/http.h index e179e26264..f73b266caf 100644 --- a/libsrc/Wi/http.h +++ b/libsrc/Wi/http.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -227,6 +227,9 @@ extern char * https_port; extern char * https_cert; extern char * https_key; extern char * https_extra; +extern char * https_dhparam; +extern char * https_ecdh_curve; +extern int32 https_hsts_max_age; extern int32 https_client_verify; extern int32 https_client_verify_depth; extern char * https_client_verify_file; diff --git a/libsrc/Wi/http_auth.sql b/libsrc/Wi/http_auth.sql index 56ff6200c4..b74afb9c5f 100644 --- a/libsrc/Wi/http_auth.sql +++ b/libsrc/Wi/http_auth.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/http_client.c b/libsrc/Wi/http_client.c index 91c309437d..1923171289 100644 --- a/libsrc/Wi/http_client.c +++ b/libsrc/Wi/http_client.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -69,6 +69,11 @@ int last_errno; #include "http.h" #include "xmlenc.h" +#ifdef _SSL +int ssl_client_use_pkcs12 (SSL *ssl, char *pkcs12file, char *passwd, char * ca); +int ssl_client_use_db_key (SSL * ssl, char *key, char *ca, caddr_t * err_ret); +#endif + #define XML_VERSION "1.0" /*#define _USE_CACHED_SES from http.h */ @@ -658,6 +663,8 @@ http_cli_ssl_cert (http_cli_ctx * ctx, caddr_t val) return (HC_RET_ERR_ABORT); ctx->hcctx_pkcs12_file = val; + if (NULL != val && 1 == strlen (val) && 1 == atoi (val)) + ctx->hcctx_ssl_insecure = '\1'; return (HC_RET_OK); } @@ -817,7 +824,7 @@ http_cli_set_proxy (http_cli_ctx * ctx, caddr_t target) } HC_RET -http_cli_set_ua_id (http_cli_ctx * ctx, caddr_t ua_id) +http_cli_set_ua_id (http_cli_ctx * ctx, ccaddr_t ua_id) { if (ctx) { @@ -841,8 +848,46 @@ http_cli_get_err (http_cli_ctx * ctx) /* XXX: TODO: proxies, proxy auth, http redirect */ #ifdef _SSL -int ssl_client_use_pkcs12 (SSL *ssl, char *pkcs12file, char *passwd, char * ca); -int ssl_client_use_db_key (SSL * ssl, char *key, caddr_t * err_ret) +static void +http_client_load_ssl_ca_certs (SSL * ssl, const char *certs_pem) +{ + BIO *in = NULL; + int i; + STACK_OF (X509_INFO) * ca_list = NULL; + SSL_CTX *ssl_ctx = SSL_get_SSL_CTX (ssl); + + if (NULL == certs_pem) /* no CA list is given */ + goto end; + + if ((in = BIO_new (BIO_s_mem())) == NULL) + goto end; + + if (BIO_write (in, certs_pem, strlen (certs_pem)) <= 0) + goto end; + + ca_list = sk_X509_INFO_new_null (); + if (!ca_list) + goto end; + + ca_list = PEM_X509_INFO_read_bio (in, NULL, (pem_password_cb *) NULL, NULL); + for (i = 0; i < sk_X509_INFO_num (ca_list); i++) + { + X509_INFO *ca = (X509_INFO *) sk_X509_INFO_value (ca_list, i); + if (ca->x509) + { + SSL_add_client_CA (ssl, ca->x509); + X509_STORE_add_cert (SSL_CTX_get_cert_store (ssl_ctx), ca->x509); + } + } +end: + if (ca_list) + sk_X509_INFO_pop_free (ca_list, X509_INFO_free); + if (in != NULL) + BIO_free (in); + return; +} + +int ssl_client_use_db_key (SSL * ssl, char *key, char *ca, caddr_t * err_ret) { char err_buf [1024]; if (strstr (key, "db:") == key) @@ -877,6 +922,7 @@ int ssl_client_use_db_key (SSL * ssl, char *key, caddr_t * err_ret) *err_ret = srv_make_new_error ("22023", "HTS03", "Invalid X509 private key file %s : %s", key, err_buf); return -1; } + http_client_load_ssl_ca_certs (ssl, ca); return 1; } return 0; @@ -945,10 +991,15 @@ http_cli_connect (http_cli_ctx * ctx) session_set_control (ctx->hcctx_http_out->dks_session, SC_TIMEOUT, (char *)(&to), sizeof (timeout_t)); SSL_set_fd (ctx->hcctx_ssl, dst); - if (pkcs12_file && 0 == atoi(pkcs12_file)) + if (ctx->hcctx_ssl_insecure) + SSL_set_verify (ctx->hcctx_ssl, SSL_VERIFY_NONE, NULL); + else + SSL_set_verify (ctx->hcctx_ssl, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL); + + if (NULL != pkcs12_file && 0 == atoi (pkcs12_file)) { int session_id_context = 12; - if (0 != ssl_client_use_db_key (ctx->hcctx_ssl, pkcs12_file, &(ctx->hcctx_err))) + if (0 != ssl_client_use_db_key (ctx->hcctx_ssl, pkcs12_file, ctx->hcctx_ca_certs, &(ctx->hcctx_err))) { if (ctx->hcctx_err != NULL) goto error_in_ssl; @@ -959,10 +1010,6 @@ http_cli_connect (http_cli_ctx * ctx) goto error_in_ssl; } - if (ctx->hcctx_ssl_insecure) - SSL_set_verify (ctx->hcctx_ssl, SSL_VERIFY_NONE, NULL); - else - SSL_set_verify (ctx->hcctx_ssl, SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, NULL); SSL_set_verify_depth (ctx->hcctx_ssl, -1); SSL_CTX_set_session_id_context(ctx->hcctx_ssl_ctx, (const unsigned char *)&session_id_context, sizeof session_id_context); @@ -1004,7 +1051,7 @@ http_cli_set_method (http_cli_ctx * ctx, int method) return (HC_RET_OK); } -char* +const char* http_cli_get_method_string (http_cli_ctx * ctx) { return (http_get_method_string (ctx->hcctx_method)); @@ -2382,14 +2429,14 @@ All arguments except the URL can be db NULLs in bif call, NULL pointers in _impl */ caddr_t -bif_http_client_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, char * me, +bif_http_client_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, const char * me, caddr_t url, caddr_t uid, caddr_t pwd, caddr_t method, caddr_t http_hdr, caddr_t body, caddr_t cert, caddr_t pk_pass, uint32 time_out, int time_out_is_null, caddr_t proxy, caddr_t ca_certs, int insecure, int ret_arg_index, int follow_redirects) { http_cli_ctx * ctx; - char* ua_id = http_client_id_string; + const char* ua_id = http_client_id_string; caddr_t ret = NULL; caddr_t _err_ret; int meth = HC_METHOD_GET; @@ -2448,13 +2495,16 @@ bif_http_client_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, ch http_cli_ssl_cert (ctx, cert); http_cli_ssl_cert_pass (ctx, pk_pass); http_cli_ssl_ca_certs (ctx, ca_certs); + if (1 == strlen (cert) && 1 == atoi (cert)) + ctx->hcctx_ssl_insecure = '\1'; + else ctx->hcctx_ssl_insecure = (char) insecure; RELEASE (ctx->hcctx_proxy.hcp_proxy); } else if (!strnicmp (url, "https://", 8)) { http_cli_ssl_cert (ctx, (caddr_t)"1"); - ctx->hcctx_ssl_insecure = (char) insecure; + ctx->hcctx_ssl_insecure = '\1'; RELEASE (ctx->hcctx_proxy.hcp_proxy); } #endif diff --git a/libsrc/Wi/http_client.h b/libsrc/Wi/http_client.h index 61f1f9e57f..d66e8e430e 100644 --- a/libsrc/Wi/http_client.h +++ b/libsrc/Wi/http_client.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -196,7 +196,7 @@ typedef struct http_cli_ctx_s #ifdef _SSL SSL * hcctx_ssl; SSL_CTX * hcctx_ssl_ctx; - SSL_METHOD * hcctx_ssl_method; + const SSL_METHOD * hcctx_ssl_method; caddr_t hcctx_pkcs12_file; caddr_t hcctx_cert_pass; caddr_t hcctx_ca_certs; @@ -242,7 +242,7 @@ http_cli_ctx * http_cli_ctx_init (void); HC_RET http_cli_ctx_free (http_cli_ctx *); void http_cli_inst_hook (http_cli_ctx *, int, http_cli_handler_frame_t *); void http_cli_push_resp_evt (http_cli_ctx *, int, http_cli_handler_frame_t *); -char* http_cli_get_method_string (http_cli_ctx *); +const char* http_cli_get_method_string (http_cli_ctx *); char* http_cli_get_resp_hdr (http_cli_ctx *, char *); HC_RET http_cli_connect (http_cli_ctx *); HC_RET http_cli_send_req (http_cli_ctx *); @@ -273,7 +273,7 @@ HC_RET http_cli_set_auth (http_cli_ctx *, caddr_t, caddr_t); HC_RET http_cli_set_target_host (http_cli_ctx *, caddr_t); HC_RET http_cli_set_req_content_type (http_cli_ctx *, caddr_t); HC_RET http_cli_set_retries (http_cli_ctx *, int); -HC_RET http_cli_set_ua_id (http_cli_ctx *, caddr_t); +HC_RET http_cli_set_ua_id (http_cli_ctx *, ccaddr_t); HC_RET http_cli_set_authtype (http_cli_ctx *, int); HC_RET http_cli_set_method (http_cli_ctx *, int); caddr_t http_cli_get_err (http_cli_ctx *); @@ -282,7 +282,7 @@ HC_RET http_cli_ssl_cert_pass (http_cli_ctx *, caddr_t); int http_cli_target_is_proxy_exception (char *); extern caddr_t -bif_http_client_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, char * me, +bif_http_client_impl (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args, const char * me, caddr_t url, caddr_t uid, caddr_t pwd, caddr_t method, caddr_t http_hdr, caddr_t body, caddr_t cert, caddr_t pk_pass, uint32 time_out, int time_out_is_null, caddr_t proxy, caddr_t ca_certs, int insecure, int ret_arg_index, diff --git a/libsrc/Wi/information_schema.sql b/libsrc/Wi/information_schema.sql index 798b7fe3be..85b7d38db6 100644 --- a/libsrc/Wi/information_schema.sql +++ b/libsrc/Wi/information_schema.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -25,28 +25,6 @@ -- -- ---#IF VER=5 -create procedure INFORMATION_SCHEMA_UPGRADE () -{ - if (registry_get ('INFORMATION_SCHEMA_VERSION') = '3') - return; - if (exists (select 1 from SYS_VIEWS where V_NAME = 'DB.INFORMATION_SCHEMA.COLUMNS')) - { - log_message ('Upgrading INFORMATION SCHEMA'); - EXEC_STMT ('drop view DB.INFORMATION_SCHEMA.COLUMNS', 0); - EXEC_STMT ('drop view DB.INFORMATION_SCHEMA.KEY_COLUMN_USAGE', 0); - EXEC_STMT ('drop view DB.INFORMATION_SCHEMA.PARAMETERS', 0); - EXEC_STMT ('drop view DB.INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS', 0); - EXEC_STMT ('drop view DB.INFORMATION_SCHEMA.ROUTINES', 0); - EXEC_STMT ('drop view DB.INFORMATION_SCHEMA.VIEWS', 0); - } - registry_set ('INFORMATION_SCHEMA_VERSION', '3'); -} -; - -INFORMATION_SCHEMA_UPGRADE () -; ---#ENDIF create view INFORMATION_SCHEMA.TABLES as select diff --git a/libsrc/Wi/insert.c b/libsrc/Wi/insert.c index a009573205..4b4418cf55 100644 --- a/libsrc/Wi/insert.c +++ b/libsrc/Wi/insert.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/inxop.c b/libsrc/Wi/inxop.c index b24ed81c43..f234fcd53e 100644 --- a/libsrc/Wi/inxop.c +++ b/libsrc/Wi/inxop.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/iodbcinst.c b/libsrc/Wi/iodbcinst.c index 7158b8d863..4fb9d0247d 100644 --- a/libsrc/Wi/iodbcinst.c +++ b/libsrc/Wi/iodbcinst.c @@ -9,7 +9,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/iodbcinst.h b/libsrc/Wi/iodbcinst.h index 8c33b691b9..367ae04216 100644 --- a/libsrc/Wi/iodbcinst.h +++ b/libsrc/Wi/iodbcinst.h @@ -7,7 +7,7 @@ * * The iODBC driver manager. * - * Copyright (C) 1996-2018 OpenLink Software + * Copyright (C) 1996-2019 OpenLink Software * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff --git a/libsrc/Wi/jso.c b/libsrc/Wi/jso.c index dae140bf18..a8874b4e73 100644 --- a/libsrc/Wi/jso.c +++ b/libsrc/Wi/jso.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/jso.h b/libsrc/Wi/jso.h index 1088b2be58..8443a28a1c 100644 --- a/libsrc/Wi/jso.h +++ b/libsrc/Wi/jso.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/jso_reformat.awk b/libsrc/Wi/jso_reformat.awk index 0d2b4746c8..4695d48e6d 100644 --- a/libsrc/Wi/jso_reformat.awk +++ b/libsrc/Wi/jso_reformat.awk @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/json.l b/libsrc/Wi/json.l index 9b3e0ae358..54354a0e9c 100644 --- a/libsrc/Wi/json.l +++ b/libsrc/Wi/json.l @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -23,6 +23,7 @@ %option 8bit %option never-interactive +%option noyywrap %option nounput %{ #include @@ -39,7 +40,10 @@ int jsonyy_string_input (char *buf, int max); #define jsonyyerror(str) jsonyyerror_impl(str) struct sparp_s; /* forward */ -extern caddr_t spar_strliteral (struct sparp_s *sparp, const char *strg, int strg_is_long, int is_json); +#define SPAR_STRLITERAL_SPARQL_STRING 0 +#define SPAR_STRLITERAL_JSON_STRING 1 +#define SPAR_STRLITERAL_SPARQL_QNAME 2 +extern caddr_t spar_unescape_strliteral (struct sparp_s *sparp, const char *strg, int count_of_quotes, int mode); extern int json_line; %} @@ -72,7 +76,7 @@ HEX ([0-9A-Fa-f]) [^\\\"\n\r\t]*"\"" { BEGIN(INITIAL); - jsonyylval.box = spar_strliteral (NULL /* no sparp for JSON_LITERAL */, jsonyytext, 0, 1); + jsonyylval.box = spar_unescape_strliteral (NULL /* no sparp for JSON_LITERAL */, jsonyytext, 1, SPAR_STRLITERAL_JSON_STRING); return STRING; } diff --git a/libsrc/Wi/json.y b/libsrc/Wi/json.y index f325a0a81e..1169756e20 100644 --- a/libsrc/Wi/json.y +++ b/libsrc/Wi/json.y @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/ksrvext.h b/libsrc/Wi/ksrvext.h index 00958d0775..1bb46215c2 100644 --- a/libsrc/Wi/ksrvext.h +++ b/libsrc/Wi/ksrvext.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -57,6 +57,21 @@ #define VIRTVARCLASS extern #endif +#ifdef MALLOC_DEBUG +#define DBG_NAME(nm) dbg_##nm +#define DBG_PARAMS char *file, int line, +#define DBG_ARGS file, line, +#define DK_ALLOC(SIZE) dbg_malloc(DBG_ARGS (SIZE)) +#define DK_FREE(BOX,SIZE) dbg_free(DBG_ARGS (BOX)) +#else +#define DBG_NAME(nm) nm +#define DBG_PARAMS +#define DBG_ARGS +#define DK_ALLOC dk_alloc +#define DK_FREE dk_free +#endif + + #define timer_t opl_timer_t typedef unsigned char * db_buf_t; @@ -618,20 +633,6 @@ thread_t * thread_current (void); void * thread_setattr (thread_t *self, void *key, void *value); int strnicmp (const char *s1, const char *s2, size_t n); -#ifdef MALLOC_DEBUG -#define DBG_NAME(nm) dbg_##nm -#define DBG_PARAMS char *file, int line, -#define DBG_ARGS file, line, -#define DK_ALLOC(SIZE) dbg_malloc(DBG_ARGS (SIZE)) -#define DK_FREE(BOX,SIZE) dbg_free(DBG_ARGS (BOX)) -#else -#define DBG_NAME(nm) nm -#define DBG_PARAMS -#define DBG_ARGS -#define DK_ALLOC dk_alloc -#define DK_FREE dk_free -#endif - typedef struct s_node_s s_node_t, *dk_set_t; struct s_node_s { diff --git a/libsrc/Wi/ksrvextphp.h b/libsrc/Wi/ksrvextphp.h index 9ca1c8e6bd..e2d938fee5 100644 --- a/libsrc/Wi/ksrvextphp.h +++ b/libsrc/Wi/ksrvextphp.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -47,7 +47,7 @@ char lines_0[2048] = ""; char server_signature[2048] = ""; char *php_ini_admin; char * srv_http_port (); -char * srv_www_root (); +const char * srv_www_root (); caddr_t srv_dns_host_name (); char * srv_st_dbms_name (); char * srv_st_dbms_ver (); diff --git a/libsrc/Wi/lisprdr.c b/libsrc/Wi/lisprdr.c index ea67898a67..89a0175852 100644 --- a/libsrc/Wi/lisprdr.c +++ b/libsrc/Wi/lisprdr.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/lisprdr.h b/libsrc/Wi/lisprdr.h index d755413d99..cdfd43698d 100644 --- a/libsrc/Wi/lisprdr.h +++ b/libsrc/Wi/lisprdr.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/list2.h b/libsrc/Wi/list2.h index fbd88646fc..7867e53dc1 100644 --- a/libsrc/Wi/list2.h +++ b/libsrc/Wi/list2.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/list_lex_props.sh b/libsrc/Wi/list_lex_props.sh index 28399523b1..cfa9bb4def 100755 --- a/libsrc/Wi/list_lex_props.sh +++ b/libsrc/Wi/list_lex_props.sh @@ -5,7 +5,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/lock.c b/libsrc/Wi/lock.c index 5f1b72db55..3eb1d33b4f 100644 --- a/libsrc/Wi/lock.c +++ b/libsrc/Wi/lock.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/log.c b/libsrc/Wi/log.c index e53bec8587..590b48837b 100644 --- a/libsrc/Wi/log.c +++ b/libsrc/Wi/log.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/log.h b/libsrc/Wi/log.h index 769d5ad6c9..03a8fe5529 100644 --- a/libsrc/Wi/log.h +++ b/libsrc/Wi/log.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/ltrx.h b/libsrc/Wi/ltrx.h index 77ee9cd386..b5dafe98b9 100644 --- a/libsrc/Wi/ltrx.h +++ b/libsrc/Wi/ltrx.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/mail_cli.sql b/libsrc/Wi/mail_cli.sql index 3007aa70e0..9427687d27 100644 --- a/libsrc/Wi/mail_cli.sql +++ b/libsrc/Wi/mail_cli.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -61,41 +61,7 @@ create table MAIL_ATTACHMENT ( ) ; ---#IF VER=5 ---!AFTER -alter table MAIL_ATTACHMENT add MA_BLOG_ID varchar -; - -create procedure DB.DBA.UPGRADE_MAIL_MSG () -{ - declare id integer; - - if (not exists (select 1 from SYS_COLS where "COLUMN" = 'MM_BODY_ID' and "TABLE" = 'DB.DBA.MAIL_MESSAGE')) - exec ('alter table DB.DBA.MAIL_MESSAGE add MM_BODY_ID integer identity'); - - id := sequence_set ('DB.DBA.DB.DBA.MAIL_MESSAGE.MM_BODY_ID',0,2); - if (id = 0) - sequence_set ('DB.DBA.DB.DBA.MAIL_MESSAGE.MM_BODY_ID',1,1); -} -; - ---!AFTER -DB.DBA.UPGRADE_MAIL_MSG () -; - ---!AFTER -alter table MAIL_MESSAGE add MM_MOBLOG varchar(50) default NULL -; - ---!AFTER -alter table MAIL_MESSAGE add MM_MSG_ID varchar default NULL -; ---#ENDIF - ---#IF VER=5 ---!AFTER_AND_BEFORE DB.DBA.MAIL_MESSAGE MM_MSG_ID ! ---#ENDIF create trigger MAIL_MESSAGE_I after insert on DB.DBA.MAIL_MESSAGE { if (__proc_exists ('BLOG.DBA.BLOG_MOBLOG_PROCESS_MSG')) @@ -103,9 +69,6 @@ create trigger MAIL_MESSAGE_I after insert on DB.DBA.MAIL_MESSAGE } ; ---#IF VER=5 ---!AFTER_AND_BEFORE DB.DBA.MAIL_MESSAGE MM_MSG_ID ! ---#ENDIF create trigger MAIL_MESSAGE_U after update on DB.DBA.MAIL_MESSAGE referencing old as O, new as N { if (__proc_exists ('BLOG.DBA.BLOG_MOBLOG_PROCESS_MSG')) @@ -225,15 +188,9 @@ MM_FEED_PART (inout vb any, inout mb any, inout body varchar, inout id integer, ; ---#IF VER=5 ---!AFTER __PROCEDURE__ DB.DBA.VT_CREATE_TEXT_INDEX ! ---#ENDIF DB.DBA.vt_create_text_index ('DB.DBA.MAIL_MESSAGE', 'MM_BODY', 'MM_BODY_ID', 2, 0, null, 1, '*ini*', '*ini*') ; ---#IF VER=5 ---!AFTER ---#ENDIF DB.DBA.vt_create_ftt ('DB.DBA.MAIL_MESSAGE', null, null, 2) ; @@ -291,7 +248,7 @@ create procedure MIME_BODY (in _parts any) declare _part any; _bnd := concat ('-','-','-','-', md5 (cast (now () as varchar))); - if (__tag (_parts) = 193) + if (__tag (_parts) = __tag of vector) _c_type := sprintf ('multipart/mixed; boundary="%s"', _bnd); else if (isstring (_parts)) _c_type := 'text/plain'; @@ -333,9 +290,6 @@ create procedure MIME_BODY (in _parts any) } ; ---#IF VER=5 ---!AFTER_AND_BEFORE DB.DBA.MAIL_MESSAGE MM_MSG_ID ! ---#ENDIF create procedure NEW_MAIL (in _uid varchar, in __msg any) { declare _id, dummy integer; diff --git a/libsrc/Wi/map_schema.c b/libsrc/Wi/map_schema.c index 1077cf4a6f..5104ba291f 100644 --- a/libsrc/Wi/map_schema.c +++ b/libsrc/Wi/map_schema.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/map_schema.h b/libsrc/Wi/map_schema.h index 170e806e89..2e4b82be7c 100644 --- a/libsrc/Wi/map_schema.h +++ b/libsrc/Wi/map_schema.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/meta.c b/libsrc/Wi/meta.c index be91513afe..3af7e7c201 100644 --- a/libsrc/Wi/meta.c +++ b/libsrc/Wi/meta.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -1321,13 +1321,13 @@ key_part_in_layout_order (dbe_key_t * key) { dbe_col_loc_t * cl = key_find_cl (key, col->col_id); if (!key->key_n_significant) - break; - if (dtp_is_fixed (col->col_sqt.sqt_dtp)) - arr[inx] = cl - key->key_key_fixed; - else - arr[inx] = key_n_fixed + (cl - key->key_key_var); + break; + if (dtp_is_fixed (col->col_sqt.sqt_dtp)) + arr[inx] = cl - key->key_key_fixed; + else + arr[inx] = key_n_fixed + (cl - key->key_key_var); if (++inx == key->key_n_significant) - break; + break; } END_DO_SET(); inx = 0; diff --git a/libsrc/Wi/mhash.h b/libsrc/Wi/mhash.h index 5ae1d89976..edbff76302 100644 --- a/libsrc/Wi/mhash.h +++ b/libsrc/Wi/mhash.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/monitor.c b/libsrc/Wi/monitor.c index be24b5d0fb..c6c6f88610 100644 --- a/libsrc/Wi/monitor.c +++ b/libsrc/Wi/monitor.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -25,6 +25,15 @@ #include "sqlfn.h" #include "monitor.h" +#ifdef WIN32 +#include +#endif + +#if defined(__APPLE__) || defined(WIN32) +#define MEM_RSS_UNITS (1024*1024) /* These operating systems report value in bytes */ +#else +#define MEM_RSS_UNITS (1024) /* Most modern operating systems report value in kilobytes */ +#endif #define DIMENSION_OF_STATISTICS 60 static monitor_t statistics[DIMENSION_OF_STATISTICS]; @@ -34,6 +43,7 @@ int mon_is_inited; int32 mon_enable = 1; int mon_max_cpu_pct; double curr_cpu_pct = 0.0; +unsigned long curr_mem_rss = 0; extern timeout_t time_now; extern long disk_reads; @@ -107,11 +117,14 @@ mon_get_next (int n_threads, int n_vdb_threads, int n_lw_threads, const monitor_ next->mon_cpu_time = (ru.ru_utime.tv_sec * 1000 + ru.ru_utime.tv_usec / 1000) + (ru.ru_stime.tv_sec * 1000 + ru.ru_stime.tv_usec / 1000); curr_cpu_pct = next->mon_cpu_pct = (next->mon_cpu_time - prev->mon_cpu_time) / (double)(next->mon_time_now - prev->mon_time_now) * 100; next->mon_pageflts = ru.ru_majflt - prev->mon_pageflts; + curr_mem_rss = ru.ru_maxrss / MEM_RSS_UNITS; #elif defined (WIN32) { FILETIME ftime, fsys, fuser; ULARGE_INTEGER now, sys, user; double percent; + HANDLE hProcess = GetCurrentProcess (); + PROCESS_MEMORY_COUNTERS pmc; GetSystemTimeAsFileTime (&ftime); memcpy (&now, &ftime, sizeof (FILETIME)); @@ -125,6 +138,9 @@ mon_get_next (int n_threads, int n_vdb_threads, int n_lw_threads, const monitor_ lastUserCPU = user; lastSysCPU = sys; curr_cpu_pct = next->mon_cpu_pct = percent * 100; + + if (GetProcessMemoryInfo (hProcess, &pmc, sizeof(pmc))) + curr_mem_rss = pmc.WorkingSetSize / MEM_RSS_UNITS; } #endif /* thread counts */ diff --git a/libsrc/Wi/monitor.h b/libsrc/Wi/monitor.h index 9234a4f611..4d647b6896 100644 --- a/libsrc/Wi/monitor.h +++ b/libsrc/Wi/monitor.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/msdtc.h b/libsrc/Wi/msdtc.h index 1867493b12..066fff90eb 100644 --- a/libsrc/Wi/msdtc.h +++ b/libsrc/Wi/msdtc.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/mts.h b/libsrc/Wi/mts.h index ece386220f..b347c4ecd5 100644 --- a/libsrc/Wi/mts.h +++ b/libsrc/Wi/mts.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/mts_client.c b/libsrc/Wi/mts_client.c index 806e1bd537..6e325c2418 100644 --- a/libsrc/Wi/mts_client.c +++ b/libsrc/Wi/mts_client.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/mts_client.h b/libsrc/Wi/mts_client.h index 1151dc4caa..1f726af31c 100644 --- a/libsrc/Wi/mts_client.h +++ b/libsrc/Wi/mts_client.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/mts_com.cpp b/libsrc/Wi/mts_com.cpp index 409eb4181a..b07ddbf120 100644 --- a/libsrc/Wi/mts_com.cpp +++ b/libsrc/Wi/mts_com.cpp @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/mts_com.h b/libsrc/Wi/mts_com.h index 044eb5c920..344f47c299 100644 --- a/libsrc/Wi/mts_com.h +++ b/libsrc/Wi/mts_com.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/mtwrite.c b/libsrc/Wi/mtwrite.c index bcb8e3d083..f973ddc548 100644 --- a/libsrc/Wi/mtwrite.c +++ b/libsrc/Wi/mtwrite.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/mtx.cpp b/libsrc/Wi/mtx.cpp index b08a67656a..c6bbdef3ee 100644 --- a/libsrc/Wi/mtx.cpp +++ b/libsrc/Wi/mtx.cpp @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/multibyte.c b/libsrc/Wi/multibyte.c index 8a0c711fba..023f4c83b2 100644 --- a/libsrc/Wi/multibyte.c +++ b/libsrc/Wi/multibyte.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -59,7 +59,7 @@ box_utf8_as_wide_char (ccaddr_t _utf8, caddr_t _wide_dest, size_t utf8_len, size utf8work = utf8; memset (&state, 0, sizeof (virt_mbstate_t)); - wide_len = virt_mbsnrtowcs (NULL, &utf8work, utf8_len, 0, &state); + wide_len = virt_mbsnrtowcs (NULL, (const unsigned char **)&utf8work, utf8_len, 0, &state); if (((long) wide_len) < 0) return _wide_dest ? ((caddr_t) wide_len) : NULL; if (max_wide_len && max_wide_len < wide_len) @@ -75,7 +75,7 @@ box_utf8_as_wide_char (ccaddr_t _utf8, caddr_t _wide_dest, size_t utf8_len, size } utf8work = utf8; memset (&state, 0, sizeof (virt_mbstate_t)); - if (wide_len != virt_mbsnrtowcs ((wchar_t *) dest, &utf8work, utf8_len, wide_len, &state)) + if (wide_len != virt_mbsnrtowcs ((wchar_t *) dest, (const unsigned char **)&utf8work, utf8_len, wide_len, &state)) GPF_T1("non consistent multi-byte to wide char translation of a buffer"); ((wchar_t *)dest)[wide_len] = L'\0'; @@ -100,20 +100,85 @@ DBG_NAME(box_wide_as_utf8_char) (DBG_PARAMS ccaddr_t _wide, size_t wide_len, dtp #endif wide_work = wide; memset (&state, 0, sizeof (virt_mbstate_t)); - utf8_len = virt_wcsnrtombs (NULL, &wide_work, wide_len, 0, &state); + utf8_len = virt_wcsnrtombs (NULL, (const wchar_t **)&wide_work, wide_len, 0, &state); if (((long) utf8_len) < 0) return NULL; dest = DBG_NAME (dk_alloc_box) (DBG_ARGS utf8_len + 1, dtp); wide_work = wide; memset (&state, 0, sizeof (virt_mbstate_t)); - if (utf8_len != virt_wcsnrtombs ((unsigned char *) dest, &wide_work, wide_len, utf8_len + 1, &state)) + if (utf8_len != virt_wcsnrtombs ((unsigned char *) dest, (const wchar_t **)&wide_work, wide_len, utf8_len + 1, &state)) GPF_T1("non consistent wide char to multi-byte translation of a buffer"); dest[utf8_len] = '\0'; return dest; } +caddr_t +DBG_NAME(box_utf16_as_utf8_char) (DBG_PARAMS ccaddr_t _wide, size_t wide_len, dtp_t dtp) +{ + char *dest, *utf8; + size_t utf8_len, rc, dest_len; + virt_mbstate_t state; + char *us; + char *us_end; + wchar_t wc; + unsigned char mbs[VIRT_MB_CUR_MAX]; + + +#ifdef DEBUG + if (wide_len & ~0xFFFFFF) + GPF_T1 ("bad wide_len in cast wide as UTF8"); +#endif + us = (char *) _wide; + us_end = (char *) (_wide + (wide_len * sizeof(uint16))); + memset (&state, 0, sizeof (virt_mbstate_t)); + utf8_len = 0; + while (1) + { +#ifdef WORDS_BIGENDIAN + wc = eh_decode_char__UTF16BE((__constcharptr *) &us, us_end); +#else + wc = eh_decode_char__UTF16LE((__constcharptr *) &us, us_end); +#endif + if (wc == UNICHAR_EOD || wc == UNICHAR_NO_DATA || wc == UNICHAR_BAD_ENCODING) + break; + + rc = virt_wcrtomb (mbs, wc, &state); + if (((long) rc) < 0) + return NULL; + utf8_len += rc; + } + + utf8 = dest = DBG_NAME (dk_alloc_box) (DBG_ARGS utf8_len + 1, dtp); + + us = (char *) _wide; + us_end = (char *) (_wide + (wide_len * sizeof(uint16))); + memset (&state, 0, sizeof (virt_mbstate_t)); + dest_len = utf8_len; + while (utf8_len > 0) + { +#ifdef WORDS_BIGENDIAN + wc = eh_decode_char__UTF16BE((__constcharptr *) &us, us_end); +#else + wc = eh_decode_char__UTF16LE((__constcharptr *) &us, us_end); +#endif + if (wc == UNICHAR_EOD || wc == UNICHAR_NO_DATA || wc == UNICHAR_BAD_ENCODING) + break; + + rc = virt_wcrtomb ((unsigned char *)utf8, wc, &state); + if (((long) rc) < 0) + { + dk_free_box (dest); + return NULL; + } + utf8_len -= rc; + utf8 += rc; + } + dest[dest_len] = '\0'; + return dest; +} + caddr_t mp_box_wide_as_utf8_char (mem_pool_t * mp, ccaddr_t _wide, size_t wide_len, dtp_t dtp) { @@ -128,14 +193,14 @@ mp_box_wide_as_utf8_char (mem_pool_t * mp, ccaddr_t _wide, size_t wide_len, dtp_ #endif wide_work = wide; memset (&state, 0, sizeof (virt_mbstate_t)); - utf8_len = virt_wcsnrtombs (NULL, &wide_work, wide_len, 0, &state); + utf8_len = virt_wcsnrtombs (NULL, (const wchar_t **)&wide_work, wide_len, 0, &state); if (((long) utf8_len) < 0) return NULL; dest = mp_alloc_box (mp, utf8_len + 1, dtp); wide_work = wide; memset (&state, 0, sizeof (virt_mbstate_t)); - if (utf8_len != virt_wcsnrtombs ((unsigned char *) dest, &wide_work, wide_len, utf8_len + 1, &state)) + if (utf8_len != virt_wcsnrtombs ((unsigned char *) dest, (const wchar_t **)&wide_work, wide_len, utf8_len + 1, &state)) GPF_T1("non consistent wide char to multi-byte translation of a buffer"); dest[utf8_len] = '\0'; @@ -153,7 +218,7 @@ wide_serialize (caddr_t wide_data, dk_session_t *ses) wide_work = wstr; memset (&state, 0, sizeof (virt_mbstate_t)); - utf8_len = virt_wcsnrtombs (NULL, &wide_work, wide_len, 0, &state); + utf8_len = virt_wcsnrtombs (NULL, (const wchar_t **)&wide_work, wide_len, 0, &state); if (((long) utf8_len) < 0) GPF_T1("non consistent wide char to multi-byte translation of a buffer"); @@ -279,7 +344,7 @@ wide_char_length_of_utf8_string (const unsigned char *str, size_t utf8_length) { virt_mbstate_t state; memset (&state, 0, sizeof (virt_mbstate_t)); - return virt_mbsnrtowcs (NULL, (unsigned char **)&str, utf8_length, 0, &state); + return virt_mbsnrtowcs (NULL, &str, utf8_length, 0, &state); } @@ -327,6 +392,19 @@ virt_wcslen (const wchar_t *wcs) } +size_t +virt_ucs2len (const uint16 *wcs) +{ + size_t len = 0; + while (wcs && *wcs) + { + wcs++; + len++; + } + return len; +} + + int virt_wcsncmp (const wchar_t *from, const wchar_t *to, size_t len) { @@ -471,6 +549,121 @@ cli_wide_to_narrow (wcharset_t * charset, int flags, const wchar_t *src, size_t } +size_t +cli_utf16_to_narrow (wcharset_t * charset, int flags, const uint16 *src, size_t max_wides, + unsigned char *dest, size_t max_len, char *default_char, int *default_used) +{ + size_t n = 0; + char *us = (char *) src; + char *us_end = (((char *)src) + max_wides * sizeof(uint16)); + wchar_t wc; + + if (!*src) + return 0; + + while (n < max_len) + { +#ifdef WORDS_BIGENDIAN + wc = eh_decode_char__UTF16BE((__constcharptr *) &us, us_end); +#else + wc = eh_decode_char__UTF16LE((__constcharptr *) &us, us_end); +#endif + if (wc == UNICHAR_EOD || wc == UNICHAR_NO_DATA || wc == UNICHAR_BAD_ENCODING) + break; + + if (charset) + { + if (charset == CHARSET_UTF8) + { + char temp[VIRT_MB_CUR_MAX]; + virt_mbstate_t st; + size_t len, len_written = 0; + memset (&st, 0, sizeof (st)); + len = virt_wcrtomb ((unsigned char *) temp, wc, &st); + if (((long) len) > 0) + { + len_written = MIN (len, max_len - n); + memcpy (dest, temp, len_written); + n += len_written - 1; + dest += len_written - 1; + } + else + *dest = '?'; + } + else + { + *dest = (unsigned char) ((ptrlong) gethash ((void *)((ptrlong)wc), charset->chrs_ht)); + if (!*dest) + *dest = '?'; + } + } + else if (((unsigned long) wc) < 0x100L) + *dest = (unsigned char) wc; + else + *dest = '?'; + n++; + dest++; + } + return n; +} + + +size_t +cli_wide_to_utf16 (int flags, const wchar_t *src, size_t max_wides, + unsigned char *dest, size_t max_len) +{ + size_t n = 0; + char *rc; + char *us = (char*) dest; + char *us_end = (char*) (dest + max_len); + + while (n < max_len && us < us_end) + { +#ifdef WORDS_BIGENDIAN + rc = eh_encode_char__UTF16BE (*src, us, us_end); +#else + rc = eh_encode_char__UTF16LE (*src, us, us_end); +#endif + if ((char *)UNICHAR_NO_ROOM == rc) + break; + + us = rc; + n++; + if (!*src) + break; + src++; + } + return (us - (char *)dest) / sizeof(uint16); +} + + +size_t +cli_utf16_to_wide (int flags, const char *src, size_t max_len, + wchar_t *dest, size_t max_wides) +{ + size_t n = 0; + char *us = (char *) src; + char *us_end = (char *)(src + max_len); + wchar_t wc; + + while(n < max_wides) + { +#ifdef WORDS_BIGENDIAN + wc = eh_decode_char__UTF16BE((__constcharptr *) &us, us_end); +#else + wc = eh_decode_char__UTF16LE((__constcharptr *) &us, us_end); +#endif + if (wc == UNICHAR_EOD || wc == UNICHAR_NO_DATA || wc == UNICHAR_BAD_ENCODING) + break; + + *dest = wc; + n++; + dest++; + } + return n; +} + + char * cli_box_wide_to_narrow (const wchar_t * in) { @@ -521,6 +714,53 @@ cli_narrow_to_wide (wcharset_t * charset, int flags, const unsigned char *src, s } +size_t +cli_narrow_to_utf16 (wcharset_t * charset, int flags, const unsigned char *src, size_t max_len, + uint16 *dest, size_t max_wides) +{ + size_t n = 0; + wchar_t wc; + char *rc; + char *us = (char*) dest; + char *us_end = (((char *)dest) + max_wides * sizeof(uint16)); + + while (n < max_len && us < us_end) + { + if (charset == CHARSET_UTF8) + { + virt_mbstate_t st; + size_t len; + memset (&st, 0, sizeof (st)); + len = virt_mbrtowc (&wc, src, max_len - n, &st); + if (((long) len) > 0) + { + n += len - 1; + src += len - 1; + } + } + else + { + wc = charset ? charset->chrs_table[*src] : (wchar_t) *src; + } + +#ifdef WORDS_BIGENDIAN + rc = eh_encode_char__UTF16BE (wc, us, us_end); +#else + rc = eh_encode_char__UTF16LE (wc, us, us_end); +#endif + if ((char *)UNICHAR_NO_ROOM == rc) + break; + + us = rc; + n++; + if (!*src) + break; + src++; + } + return (us - (char *)dest) / sizeof(uint16); +} + + wchar_t * cli_box_narrow_to_wide (const char * in) { @@ -547,7 +787,7 @@ cli_utf8_to_narrow (wcharset_t * charset, const unsigned char *_str, size_t max_ unsigned char *str = (unsigned char *) _str, *src = (unsigned char *) _str; caddr_t box; memset (&state, 0, sizeof (virt_mbstate_t)); - len = virt_mbsnrtowcs (NULL, &src, max_len, 0, &state); + len = virt_mbsnrtowcs (NULL, (const unsigned char **)&src, max_len, 0, &state); if (max_narrows > 0 && len > max_narrows) len = max_narrows; if (((long) len) <= 0) @@ -661,6 +901,69 @@ cli_wide_to_escaped (wcharset_t * charset, int flags, const wchar_t *src, size_t } +size_t +cli_utf16_to_escaped (wcharset_t * charset, int flags, const uint16 *src, size_t max_wides, + unsigned char *dest, size_t max_len, char *default_char, int *default_used) +{ + size_t n = 0; + unsigned char *initial_dest = dest; + char *us = (char *) src; + char *us_end = (((char *)src) + max_wides * sizeof(uint16)); + wchar_t wc; + + while (n < max_len) + { +#ifdef WORDS_BIGENDIAN + wc = eh_decode_char__UTF16BE((__constcharptr *) &us, us_end); +#else + wc = eh_decode_char__UTF16LE((__constcharptr *) &us, us_end); +#endif + if (wc == UNICHAR_EOD || wc == UNICHAR_NO_DATA || wc == UNICHAR_BAD_ENCODING) + break; + + if (charset && charset != CHARSET_UTF8 && *src) + { + *dest = (unsigned char) ((ptrlong) gethash ((void *)((ptrlong)wc), charset->chrs_ht)); + if (!*dest) + { + char buf[15]; + int len; + snprintf (buf, sizeof (buf), "\\x%lX", (unsigned long)wc); + len = (int) strlen (buf); + if (len + n < max_len) + { + strcpy_size_ck ((char *) dest, buf, max_len - (dest - initial_dest)); + n += len - 1; + dest += len - 1; + } + else + *dest = '?'; + } + } + else if (((unsigned long)wc) < 0x100L) + *dest = (unsigned char) wc; + else + { + char buf[15]; + int len; + snprintf (buf, sizeof (buf), "\\x%lX", (unsigned long)wc); + len = (int) strlen (buf); + if (len + n < max_len) + { + strcpy_size_ck ((char *) dest, buf, max_len - (dest - initial_dest)); + n += len - 1; + dest += len - 1; + } + else + *dest = '?'; + } + n++; + dest++; + } + return n; +} + + wcharset_t * wide_charset_create (char *name, wchar_t *ltable, int table_len, caddr_t *aliases) { @@ -701,7 +1004,7 @@ wide_as_utf8_len (caddr_t _wide) virt_mbstate_t state; memset (&state, 0, sizeof (virt_mbstate_t)); - _utf8_len = virt_wcsnrtombs (NULL, ((wchar_t **)(&_wide)), _n / sizeof (wchar_t) - 1, 0, &state); + _utf8_len = virt_wcsnrtombs (NULL, ((const wchar_t **)(&_wide)), _n / sizeof (wchar_t) - 1, 0, &state); if (((long) _utf8_len) < 0) GPF_T1 ("Obscure wide string in wide_as_utf8_len"); return _utf8_len; diff --git a/libsrc/Wi/multibyte.h b/libsrc/Wi/multibyte.h index f7de44a5b1..e2d77c73b1 100644 --- a/libsrc/Wi/multibyte.h +++ b/libsrc/Wi/multibyte.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -55,6 +55,7 @@ extern const wchar_t *virt_wcsstr (const wchar_t *__wcs, const wchar_t *__wc); extern const wchar_t *virt_wcsrstr (const wchar_t *__wcs, const wchar_t *__wc); extern const wchar_t *virt_wmemmem (const wchar_t *haystack, size_t haystacklen, const wchar_t *needle, size_t needlelen); size_t virt_wcslen (const wchar_t *__wcs); +size_t virt_ucs2len (const uint16 *__wcs); int virt_wcsncmp (const wchar_t *wcs1, const wchar_t *wcs2, size_t len); #define virt_wmemcmp(ptr1,ptr2,num) memcmp ((ptr1), (ptr2), (num) * sizeof(wchar_t)) @@ -65,6 +66,13 @@ extern caddr_t DBG_NAME (box_wide_as_utf8_char) (DBG_PARAMS ccaddr_t _wide, size #ifdef MALLOC_DEBUG #define box_wide_as_utf8_char(w,l,d) dbg_box_wide_as_utf8_char (__FILE__,__LINE__,(w),(l),(d)) #endif + +extern caddr_t DBG_NAME (box_utf16_as_utf8_char) (DBG_PARAMS ccaddr_t _wide, size_t wide_len, dtp_t dtp); +#ifdef MALLOC_DEBUG +#define box_utf16_as_utf8_char(w,l,d) dbg_box_utf16_as_utf8_char (__FILE__,__LINE__,(w),(l),(d)) +#endif + + extern caddr_t mp_box_wide_as_utf8_char (mem_pool_t * mp, ccaddr_t _wide, size_t wide_len, dtp_t dtp); wchar_t CHAR_TO_WCHAR (unsigned char uchar, wcharset_t *charset); unsigned char WCHAR_TO_CHAR (wchar_t wchar, wcharset_t *charset); @@ -88,10 +96,22 @@ void wide_charset_free (wcharset_t *charset); size_t cli_wide_to_narrow (wcharset_t * charset, int flags, const wchar_t *src, size_t max_wides, unsigned char *dest, size_t max_len, char *default_char, int *default_used); +size_t cli_utf16_to_narrow (wcharset_t * charset, int flags, const uint16 *src, size_t max_wides, + unsigned char *dest, size_t max_len, char *default_char, int *default_used); +size_t cli_wide_to_utf16 (int flags, const wchar_t *src, size_t max_wides, + unsigned char *dest, size_t max_len); +size_t cli_utf16_to_wide (int flags, const char *src, size_t max_len, + wchar_t *dest, size_t max_wides); + size_t cli_narrow_to_wide (wcharset_t *charset, int flags, const unsigned char *src, size_t max_wides, wchar_t *dest, size_t max_len); +size_t cli_narrow_to_utf16 (wcharset_t * charset, int flags, const unsigned char *src, size_t max_len, + uint16 *dest, size_t max_wides); + size_t cli_wide_to_escaped (wcharset_t *charset, int flags, const wchar_t *src, size_t max_wides, unsigned char *dest, size_t max_len, char *default_char, int *default_used); +size_t cli_utf16_to_escaped (wcharset_t * charset, int flags, const uint16 *src, size_t max_wides, + unsigned char *dest, size_t max_len, char *default_char, int *default_used); char *cli_box_wide_to_narrow (const wchar_t * in); wchar_t *cli_box_narrow_to_wide (const char * in); diff --git a/libsrc/Wi/name.c b/libsrc/Wi/name.c index 1328105fc2..63c0aa636e 100644 --- a/libsrc/Wi/name.c +++ b/libsrc/Wi/name.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/neodisk.c b/libsrc/Wi/neodisk.c index 366d04df41..f0196cae9f 100644 --- a/libsrc/Wi/neodisk.c +++ b/libsrc/Wi/neodisk.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/nn_svr.sql b/libsrc/Wi/nn_svr.sql index 455382e9a7..e9f01bcfe1 100644 --- a/libsrc/Wi/nn_svr.sql +++ b/libsrc/Wi/nn_svr.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -23,24 +23,6 @@ -- Upgrade code for NNTP using a view ---#IF VER=5 -create procedure NEWS_MSG_UPGRADE () -{ - if (exists (select 1 from SYS_KEYS where KEY_TABLE = 'DB.DBA.NEWS_MSG') - and not exists (select 1 from SYS_VIEWS where V_NAME = 'DB.DBA.NEWS_MSG')) - { - exec ('drop table DB.DBA.NEWS_MSG_NM_BODY_WORDS'); - exec ('alter table DB.DBA.NEWS_MULTI_MSG drop FOREIGN KEY (NM_KEY_ID) REFERENCES DB.DBA.NEWS_MSG'); - exec ('alter table DB.DBA.NEWS_MSG rename DB.DBA.NEWS_MSG_NNTP'); - exec ('alter table DB.DBA.NEWS_MULTI_MSG modify primary key (NM_GROUP, NM_KEY_ID)'); - } - return; -} -; - -NEWS_MSG_UPGRADE () -; ---#ENDIF create table NEWS_MSG_NNTP ( NM_ID varchar not null, -- Message-ID (unique) @@ -170,22 +152,6 @@ create trigger NEWS_MSG_D instead of delete on NEWS_MSG referencing old as O ; ---#IF VER=5 -create procedure DB.DBA.UPGRADE_NEWS_MSG () -{ - declare id integer; - id := sequence_set ('DB.DBA.DB.DBA.NEWS_MSG_NNTP.NM_BODY_ID',0,2); - if (id = 0) - sequence_set ('DB.DBA.DB.DBA.NEWS_MSG_NNTP.NM_BODY_ID',1,1); - registry_set ('NNTP_SERVER_ID', uuid ()); -} -; - - ---!AFTER -DB.DBA.UPGRADE_NEWS_MSG () -; ---#ENDIF create procedure NN_FEED_PART (inout vb any, inout mb any, inout body varchar, inout id integer) @@ -294,15 +260,9 @@ err_exit: } ; ---#IF VER=5 ---!AFTER __PROCEDURE__ DB.DBA.VT_CREATE_TEXT_INDEX ! ---#ENDIF DB.DBA.vt_create_text_index ('DB.DBA.NEWS_MSG_NNTP', 'NM_BODY', 'NM_BODY_ID', 2, 0, null, 1, '*ini*', '*ini*') ; ---#IF VER=5 ---!AFTER ---#ENDIF DB.DBA.vt_create_ftt ('DB.DBA.NEWS_MSG_NNTP', null, null, 2) ; @@ -331,15 +291,6 @@ create table NEWS_GROUPS ( PRIMARY KEY (NG_GROUP)) ; ---#IF VER=5 ---!AFTER -alter table NEWS_GROUPS add NG_NEXT_NUM integer -; - ---!AFTER -alter table NEWS_GROUPS add NG_TYPE varchar default 'NNTP' -; ---#ENDIF create table NEWS_SERVERS ( NS_ID integer identity, -- News server ID @@ -365,10 +316,6 @@ create view NEWS_MESSAGES as select * from DB.DBA.NEWS_MSG, DB.DBA.NEWS_MULTI_MS where NM_ID = NM_KEY_ID ; ---#IF VER=5 -update DB.DBA.NEWS_GROUPS set NG_AUTO = 1 where NG_UP_INT > 0 -; ---#ENDIF -- NNTP server start @@ -567,9 +514,6 @@ create procedure ns_add_msg (in _in_art any, in _group integer, inout my_last in ; ---#IF VER=5 ---!AFTER ---#ENDIF create procedure ns_mirror_news (in _server varchar, in _out_name varchar, in _group integer, inout my_last integer, in _end integer, in _begin integer, in _user varchar, in _pass varchar) @@ -705,9 +649,6 @@ create procedure ns_mirror_news ; ---#IF VER=5 ---!AFTER ---#ENDIF create procedure new_news (in _group_in any, in _scheduler_grop integer := 0) { @@ -809,9 +750,6 @@ new_news (in _group_in any, in _scheduler_grop integer := 0) ; ---#IF VER=5 ---!AFTER ---#ENDIF create procedure ns_up_num (in gr_n integer) { @@ -1279,7 +1217,7 @@ ns_xover (in arg varchar, in activ integer, in cur integer, in grp_type varchar) { fetch cr into _body, _head, _id, _nm_num_group; _head := deserialize (blob_to_string (_head)); - if (__tag (_head) <> 193) + if (__tag (_head) <> __tag of vector) _head := mime_tree (blob_to_string (_body)); _head := aref (_head, 0); _subj := coalesce (get_keyword_ucase ('Subject', _head), ''); @@ -1365,9 +1303,6 @@ ns_post_write_out (in _text varchar) ; ---#IF VER=5 ---!AFTER ---#ENDIF create procedure ns_post (in _message any) { @@ -1682,7 +1617,7 @@ ns_xover_group (in _group varchar) { fetch cr into _body, _head, _nm_id, _nm_read; _head := deserialize (_head); - if (__tag (_head) <> 193) + if (__tag (_head) <> __tag of vector) _head := mime_tree (blob_to_string (_body)); _head := aref (_head, 0); _subj := coalesce (get_keyword_ucase ('Subject', _head), ''); @@ -1811,7 +1746,7 @@ ns_delete_message (in id varchar, in del_out any := NULL) if (isinteger (del_out)) { _head := deserialize (_head); - if (__tag (_head) <> 193) + if (__tag (_head) <> __tag of vector) _head := mime_tree (blob_to_string (_body)); _head := aref (_head, 0); _subj := coalesce (get_keyword_ucase ('Subject', _head), ''); @@ -1948,9 +1883,6 @@ create trigger scheduled_event_delete_new_newsgroup after delete on DB.DBA.NEWS_ } ; ---#IF VER=5 ---!AFTER ---#ENDIF create procedure news_acl_insert (in ng_group integer, in mask varchar, in allow integer, in _mode integer, in _rate double precision := 0) { @@ -1992,28 +1924,6 @@ nntp_update_org_path_header () ; ---#IF VER=5 ---!AFTER -create procedure -ns_update_ng_next_num () -{ - declare max_num integer; - - if (exists (select 1 from DB.DBA.NEWS_GROUPS where NG_NEXT_NUM is NULL)) - { - for (select NG_GROUP as NG_LOOP from DB.DBA.NEWS_GROUPS) do - { - select max (NM_NUM_GROUP) into max_num from DB.DBA.NEWS_MULTI_MSG where NM_GROUP = NG_LOOP; - update DB.DBA.NEWS_GROUPS set NG_NEXT_NUM = max_num where NG_GROUP = NG_LOOP; - } - } -} -; - ---!AFTER -ns_update_ng_next_num () -; ---#ENDIF create procedure diff --git a/libsrc/Wi/nquad_p.y b/libsrc/Wi/nquad_p.y index b8c9c9ed81..ee0fcb8dee 100644 --- a/libsrc/Wi/nquad_p.y +++ b/libsrc/Wi/nquad_p.y @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/numeric.c b/libsrc/Wi/numeric.c index f419cdf4df..007e1c2051 100644 --- a/libsrc/Wi/numeric.c +++ b/libsrc/Wi/numeric.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/numeric.h b/libsrc/Wi/numeric.h index ae1201e920..3993659b13 100644 --- a/libsrc/Wi/numeric.h +++ b/libsrc/Wi/numeric.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/obackup.c b/libsrc/Wi/obackup.c index a26842389a..fa5ac457f0 100644 --- a/libsrc/Wi/obackup.c +++ b/libsrc/Wi/obackup.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/odbccat.c b/libsrc/Wi/odbccat.c index 9dbb5f1c86..81cda20724 100644 --- a/libsrc/Wi/odbccat.c +++ b/libsrc/Wi/odbccat.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/odbccat.sql b/libsrc/Wi/odbccat.sql index 262b6e3db5..002b2a081b 100644 --- a/libsrc/Wi/odbccat.sql +++ b/libsrc/Wi/odbccat.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/odbcinc.h b/libsrc/Wi/odbcinc.h index dfdbd3465d..eb7291d574 100644 --- a/libsrc/Wi/odbcinc.h +++ b/libsrc/Wi/odbcinc.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -45,7 +45,7 @@ # include # define ERR_STRING "[OpenLink][Virtuoso ODBC Driver]" # else -# define ERR_STRING "[OpenLink][Virtuoso iODBC Driver]" +# define ERR_STRING "[OpenLink][Virtuoso ODBC Driver]" # endif # ifndef SQL_COPT_SS_BASE @@ -163,7 +163,6 @@ typedef void * SQLHANDLE; #define IS_ORACLE_NATIVE_DRIVER(rcon) (IS_ORACLE(rcon) && \ ((0 == strncmp(rcon->rc_driver_name, "SQORA", 5)) || \ (0 == strncmp(rcon->rc_driver_name, "SQOCI", 5)))) -#endif /* @@ -178,3 +177,19 @@ typedef void * SQLHANDLE; #define SQL_DESC_COL_LITERAL_LANG 1061L #define SQL_DESC_COL_LITERAL_TYPE 1062L #endif + + +/* + * Extension for setting size of SQLWCHAR (iodbcext.h) + */ +#ifndef SQL_ATTR_APP_WCHAR_ID +#define SQL_ATTR_APP_WCHAR_ID 1061 +#define SQL_ATTR_APP_UNICODE_ID 1064 +#define SQL_ATTR_DRIVER_UNICODE_ID 1065 + +#define SQL_DM_CP_UCS4 0 +#define SQL_DM_CP_UTF16 1 +#define SQL_DM_CP_UTF8 2 +#endif + +#endif /* __V_ODBCINC_H */ diff --git a/libsrc/Wi/oledb.sql b/libsrc/Wi/oledb.sql index 45f06aa0c7..2062b689ca 100644 --- a/libsrc/Wi/oledb.sql +++ b/libsrc/Wi/oledb.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -217,10 +217,10 @@ create procedure oledb_get_types (in type integer, in best_match_restrict intege create function oledb_dbtype(in dv integer) returns smallint { - if (dv = 188) -- DV_SHORT_INT + if (dv = __tag of smallint) -- DV_SHORT_INT return 2; -- DBTYPE_I2 - if (dv = 189) -- DV_LONG_INT + if (dv = __tag of integer) -- DV_LONG_INT return 3; -- DBTYPE_I4 if (dv = 190) -- DV_SINGLE_FLOAT @@ -229,13 +229,13 @@ create function oledb_dbtype(in dv integer) returns smallint if (dv = 191) -- DV_DOUBLE_FLOAT return 5; -- DBTYPE_R8 - if (dv = 219) -- DV_NUMERIC + if (dv = __tag of decimal) -- DV_NUMERIC return 131; -- DBTYPE_NUMERIC - if (dv = 181 or dv = 182 or dv = 238 or dv = 125) -- DV_SHORT_STRING, DV_LONG_STRING, DV_STRICT_STRING, DV_BLOB + if (dv = 181 or dv = __tag of varchar or dv = 238 or dv = 125) -- DV_SHORT_STRING, DV_LONG_STRING, DV_STRICT_STRING, DV_BLOB return 129; -- DBTYPE_STR - if (dv = 225 or dv = 226 or dv = 132) -- DV_WIDE, DV_LONG_WIDE, DV_BLOB_WIDE + if (dv = __tag of nvarchar or dv = 226 or dv = 132) -- DV_WIDE, DV_LONG_WIDE, DV_BLOB_WIDE return 130; -- DBTYPE_WSTR if (dv = 222 or dv = 131) -- DV_BIN, DV_BLOB_BIN @@ -269,8 +269,8 @@ create function oledb_dbflags(in dv integer, in nullable integer) returns intege } else { - if (dv = 188 or dv = 189 or dv = 190 or -- DV_SHORT_INT, DV_LONG_INT, DV_SINGLE_FLOAT - dv = 191 or dv = 219 or dv = 129 or -- DV_DOUBLE_FLOAT, DV_NUMERIC, DV_DATE + if (dv = __tag of smallint or dv = __tag of integer or dv = 190 or -- DV_SHORT_INT, DV_LONG_INT, DV_SINGLE_FLOAT + dv = 191 or dv = __tag of decimal or dv = 129 or -- DV_DOUBLE_FLOAT, DV_NUMERIC, DV_DATE dv = 210 or dv = 211) -- DV_TIME, DV_DATETIME flags := 16 + 4; -- DBCOLUMNFLAGS_ISFIXEDLENGTH, DBCOLUMNFLAGS_WRITE else if (dv = 125 or dv = 132 or dv = 131) -- DV_BLOB, DV_BLOB_WIDE, DV_BLOB_BIN @@ -288,11 +288,11 @@ create function oledb_dbflags(in dv integer, in nullable integer) returns intege create function oledb_char_max_len(in dv integer, in prec integer) returns integer { - if (dv = 188 or dv = 189 or dv = 190 or -- DV_SHORT_INT, DV_LONG_INT, DV_SINGLE_FLOAT - dv = 191 or dv = 219 or dv = 129 or -- DV_DOUBLE_FLOAT, DV_NUMERIC, DV_DATE + if (dv = __tag of smallint or dv = __tag of integer or dv = 190 or -- DV_SHORT_INT, DV_LONG_INT, DV_SINGLE_FLOAT + dv = 191 or dv = __tag of decimal or dv = 129 or -- DV_DOUBLE_FLOAT, DV_NUMERIC, DV_DATE dv = 210 or dv = 211) -- DV_TIME, DV_DATETIME return null; - if (dv = 225 or dv = 226 or dv = 132) -- DV_WIDE, DV_LONG_WIDE, DV_BLOB_WIDE + if (dv = __tag of nvarchar or dv = 226 or dv = 132) -- DV_WIDE, DV_LONG_WIDE, DV_BLOB_WIDE { if (prec < 1073741823) return prec; @@ -304,11 +304,11 @@ create function oledb_char_max_len(in dv integer, in prec integer) returns integ create function oledb_char_oct_len(in dv integer, in prec integer) returns integer { - if (dv = 188 or dv = 189 or dv = 190 or -- DV_SHORT_INT, DV_LONG_INT, DV_SINGLE_FLOAT - dv = 191 or dv = 219 or dv = 129 or -- DV_DOUBLE_FLOAT, DV_NUMERIC, DV_DATE + if (dv = __tag of smallint or dv = __tag of integer or dv = 190 or -- DV_SHORT_INT, DV_LONG_INT, DV_SINGLE_FLOAT + dv = 191 or dv = __tag of decimal or dv = 129 or -- DV_DOUBLE_FLOAT, DV_NUMERIC, DV_DATE dv = 210 or dv = 211) -- DV_TIME, DV_DATETIME return null; - if (dv = 225 or dv = 226 or dv = 132) -- DV_WIDE, DV_LONG_WIDE, DV_BLOB_WIDE + if (dv = __tag of nvarchar or dv = 226 or dv = 132) -- DV_WIDE, DV_LONG_WIDE, DV_BLOB_WIDE { if (prec < 1073741823) return prec * 2; @@ -320,15 +320,15 @@ create function oledb_char_oct_len(in dv integer, in prec integer) returns integ create function oledb_num_prec(in dv integer, in prec integer) returns smallint { - if (dv = 188) -- DV_SHORT_INT + if (dv = __tag of smallint) -- DV_SHORT_INT return 5; - if (dv = 189) -- DV_LONG_INT + if (dv = __tag of integer) -- DV_LONG_INT return 10; if (dv = 190) -- DV_SINGLE_FLOAT return 7; if (dv = 191) -- DV_DOUBLE_FLOAT return 15; - if (dv = 219) -- DV_NUMERIC + if (dv = __tag of decimal) -- DV_NUMERIC { if (prec < 40) return prec; @@ -340,7 +340,7 @@ create function oledb_num_prec(in dv integer, in prec integer) returns smallint create function oledb_num_scale(in dv integer, in scale integer) returns smallint { - if (dv = 219) -- DV_NUMERIC + if (dv = __tag of decimal) -- DV_NUMERIC return scale; return null; } diff --git a/libsrc/Wi/openxml.sql b/libsrc/Wi/openxml.sql index 3ccecd6bd7..1a90f23090 100644 --- a/libsrc/Wi/openxml.sql +++ b/libsrc/Wi/openxml.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/page.c b/libsrc/Wi/page.c index f26713df9f..be29b42f08 100644 --- a/libsrc/Wi/page.c +++ b/libsrc/Wi/page.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/phrasematch.sql b/libsrc/Wi/phrasematch.sql index 9e3b9b1a35..3183708fb8 100644 --- a/libsrc/Wi/phrasematch.sql +++ b/libsrc/Wi/phrasematch.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -57,10 +57,6 @@ alter index SYS_ANN_PHRASE_SET on DB.DBA.SYS_ANN_PHRASE_SET partition cluster re create unique index SYS_ANN_PHRASE_SET_APS_NAME on DB.DBA.SYS_ANN_PHRASE_SET (APS_NAME) partition cluster replicated ; ---#IF VER=5 -alter table DB.DBA.SYS_ANN_PHRASE_SET add APS_LOAD_AT_BOOT integer not null -; ---#ENDIF create table DB.DBA.SYS_ANN_PHRASE ( @@ -74,10 +70,6 @@ create table DB.DBA.SYS_ANN_PHRASE alter index SYS_ANN_PHRASE on DB.DBA.SYS_ANN_PHRASE partition cluster replicated ; ---#IF VER=5 -alter table DB.DBA.SYS_ANN_PHRASE add AP_LINK_DATA_LONG long varchar -; ---#ENDIF create table DB.DBA.SYS_ANN_AD_ACCOUNT ( AAA_ID integer not null primary key, @@ -116,35 +108,6 @@ create table DB.DBA.SYS_ANN_AD_RULE ( alter index SYS_ANN_AD_RULE on DB.DBA.SYS_ANN_AD_RULE partition cluster replicated ; ---#IF VER=5 -delete from SYS_TRIGGERS where T_NAME in ( - fix_identifier_case ('DBA.SYS_ANN_PHRASE_CLASS_I'), - fix_identifier_case ('DBA.SYS_ANN_PHRASE_CLASS_U'), - fix_identifier_case ('DBA.SYS_ANN_PHRASE_CLASS_BD'), - fix_identifier_case ('DBA.SYS_ANN_PHRASE_SET_I'), - fix_identifier_case ('DBA.SYS_ANN_PHRASE_SET_U'), - fix_identifier_case ('DBA.SYS_ANN_PHRASE_SET_BD') ) -; - -delete from SYS_PROCEDURES where P_NAME in ( - fix_identifier_case ('DB.DBA.AP_EXEC_NO_ERROR'), - fix_identifier_case ('DB.DBA.ANN_BOOT'), - fix_identifier_case ('DB.DBA.ANN_ZAP'), - fix_identifier_case ('DB.DBA.ANN_AUTHENTICATE'), - fix_identifier_case ('DB.DBA.ANN_GETID'), - fix_identifier_case ('DB.DBA.ANN_PHRASE_CLASS_ADD'), - fix_identifier_case ('DB.DBA.ANN_PHRASE_CLASS_ADD_INT'), - fix_identifier_case ('DB.DBA.ANN_PHRASE_CLASS_DEL'), - fix_identifier_case ('DB.DBA.ANN_PHRASE_SET_ADD'), - fix_identifier_case ('DB.DBA.ANN_PHRASE_SET_ADD_INT'), - fix_identifier_case ('DB.DBA.ANN_PHRASE_SET_DEL'), - fix_identifier_case ('DB.DBA.ANN_LINK_ADD'), - fix_identifier_case ('DB.DBA.ANN_LINK_MODIFY'), - fix_identifier_case ('DB.DBA.ANN_LINK_DEL'), - fix_identifier_case ('DB.DBA.ANN_AD_RULE_ADD'), - fix_identifier_case ('DB.DBA.ANN_AD_RULE_DEL') ) -; ---#ENDIF create trigger SYS_ANN_PHRASE_CLASS_I after insert on DB.DBA.SYS_ANN_PHRASE_CLASS referencing new as N { diff --git a/libsrc/Wi/pldbgcli.c b/libsrc/Wi/pldbgcli.c index 461f693417..5bfc542c78 100644 --- a/libsrc/Wi/pldbgcli.c +++ b/libsrc/Wi/pldbgcli.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/pldebug.c b/libsrc/Wi/pldebug.c index d689b38ce6..bf0e1fef88 100644 --- a/libsrc/Wi/pldebug.c +++ b/libsrc/Wi/pldebug.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/pldebug.h b/libsrc/Wi/pldebug.h index 1f49c0fe9d..cef6d57fb9 100644 --- a/libsrc/Wi/pldebug.h +++ b/libsrc/Wi/pldebug.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/plugin_gate.c b/libsrc/Wi/plugin_gate.c index 12013d7d40..ae77a6f389 100644 --- a/libsrc/Wi/plugin_gate.c +++ b/libsrc/Wi/plugin_gate.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/plugin_loader.c b/libsrc/Wi/plugin_loader.c index 21237dbdac..ab833af5c6 100644 --- a/libsrc/Wi/plugin_loader.c +++ b/libsrc/Wi/plugin_loader.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/pop3_svr.sql b/libsrc/Wi/pop3_svr.sql index 1508e75dbe..2dc04e91f5 100644 --- a/libsrc/Wi/pop3_svr.sql +++ b/libsrc/Wi/pop3_svr.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/qlog.sql b/libsrc/Wi/qlog.sql index 973e84a052..ac3d9121b4 100644 --- a/libsrc/Wi/qlog.sql +++ b/libsrc/Wi/qlog.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/qncache.c b/libsrc/Wi/qncache.c index b54e13215e..ba060796e2 100644 --- a/libsrc/Wi/qncache.c +++ b/libsrc/Wi/qncache.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/qncache.h b/libsrc/Wi/qncache.h index f916f00143..44fd166f63 100644 --- a/libsrc/Wi/qncache.h +++ b/libsrc/Wi/qncache.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/rdf_core.c b/libsrc/Wi/rdf_core.c index 2bea3725d5..e2b47cebe2 100644 --- a/libsrc/Wi/rdf_core.c +++ b/libsrc/Wi/rdf_core.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -3453,6 +3453,11 @@ bif_iri_to_rdf_prefix_and_local (caddr_t * qst, caddr_t * err_ret, state_slot_t return NEW_DB_NULL; } +caddr_t +bif_default_geo_type (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ + return uname_virtrdf_ns_uri_Geometry; +} caddr_t rdf_cache_id (query_instance_t * qi, caddr_t mode, caddr_t pref, boxint new_id, int is_set, int is_txn) @@ -4396,6 +4401,8 @@ rdf_core_init (void) bif_define_ex ("id_to_iri_nosignal" , bif_id_to_iri_nosignal , BMD_ALIAS, "__id2in" , BMD_VECTOR_IMPL, bif_id2i_vec_ns, BMD_RET_TYPE, &bt_any /* was &bt_varchar */, BMD_USES_INDEX, BMD_OUT_OF_PARTITION, BMD_DONE); bif_define ("iri_to_rdf_prefix_and_local", bif_iri_to_rdf_prefix_and_local); bif_define_ex ("iri_from_pref_name", bif_iri_from_pref_name, BMD_RET_TYPE, &bt_any, BMD_IS_PURE, BMD_DONE); + bif_define_ex ("default_geo_type" , bif_default_geo_type , BMD_RET_TYPE, &bt_any_box, BMD_IS_PURE, BMD_DONE); + bif_define ("rdf_cache_id", bif_rdf_cache_id); bif_set_vectored (bif_rdf_cache_id, bif_rdf_cache_id_vec); bif_define ("rdf_cache_id_to_name", bif_rdf_cache_id_to_name); diff --git a/libsrc/Wi/rdf_core.h b/libsrc/Wi/rdf_core.h index 5c67fc1f83..e44bef971e 100644 --- a/libsrc/Wi/rdf_core.h +++ b/libsrc/Wi/rdf_core.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -36,13 +36,16 @@ #define IRI_TO_ID_IF_CACHED 2 /*!< Return IRI_ID if known and is in cache, integer zero (NULL) if not known or known but not cached or error is not NULL */ #define IRI_TO_ID_GPF 3 /*!< The conversion must be avoided at all, GPF is signalled if the value is tried */ +/*!< Parses tail of "nodeID://..." IRI and returns the numeric value of IRI_ID. In case of error, 0 is returned and \c error_fmt_ret is set to printf format string for reporting an error */ +extern int64 iri_nodeid_to_iid (unsigned char *nodeid_tail, const char **error_fmt_ret); /*!< returns 0 for NULL or non-cached rdf box or error, 1 for ready to use iri_id, 2 for URI string */ extern int iri_canonicalize (query_instance_t *qi, caddr_t name, int mode, caddr_t *res_ret, caddr_t *err_ret); -extern caddr_t iri_to_id (caddr_t *qst, caddr_t name, int mode, caddr_t *err_ret); -extern caddr_t key_id_to_canonicalized_iri (query_instance_t * qi, iri_id_t iri_id_no); -extern caddr_t key_id_to_canonicalized_iri_if_cached (iri_id_t iri_id_no); -extern caddr_t key_id_to_iri (query_instance_t * qi, iri_id_t iri_id_no); -extern int key_id_to_namespace_and_local (query_instance_t *qi, iri_id_t iid, caddr_t *subj_ns_ret, caddr_t *subj_loc_ret); +EXE_EXPORT (void, rdf_handle_invalid_iri_id, (caddr_t * qst, const char *msg, iri_id_t iid)); +EXE_EXPORT (caddr_t, iri_to_id, (caddr_t *qst, caddr_t name, int mode, caddr_t *err_ret)); +EXE_EXPORT (caddr_t, key_id_to_canonicalized_iri, (query_instance_t * qi, iri_id_t iri_id_no)); +EXE_EXPORT (caddr_t, key_id_to_canonicalized_iri_if_cached, (iri_id_t iri_id_no)); +EXE_EXPORT (caddr_t, key_id_to_iri, (query_instance_t * qi, iri_id_t iri_id_no)); +EXE_EXPORT (int, key_id_to_namespace_and_local, (query_instance_t *qi, iri_id_t iid, caddr_t *subj_ns_ret, caddr_t *subj_loc_ret)); #define rdf_type_twobyte_to_iri(twobyte) nic_id_name (rdf_type_cache, (twobyte)) #define rdf_lang_twobyte_to_string(twobyte) nic_id_name (rdf_lang_cache, (twobyte)) #define RDF_TYPE_PARSEABLE 0x1 diff --git a/libsrc/Wi/rdf_mapping.jso b/libsrc/Wi/rdf_mapping.jso index 7bef811126..2d7bca605d 100644 --- a/libsrc/Wi/rdf_mapping.jso +++ b/libsrc/Wi/rdf_mapping.jso @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/rdf_net.sql b/libsrc/Wi/rdf_net.sql index 1d88d915a3..d0454c71ab 100644 --- a/libsrc/Wi/rdf_net.sql +++ b/libsrc/Wi/rdf_net.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/rdf_schema_objects.sql b/libsrc/Wi/rdf_schema_objects.sql index 2fee7e0bef..2d435d85f1 100644 --- a/libsrc/Wi/rdf_schema_objects.sql +++ b/libsrc/Wi/rdf_schema_objects.sql @@ -6,7 +6,7 @@ -- -- RDF Schema objects, generator of RDF Views -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -76,7 +76,7 @@ RDF_VIEW_TBL_PK_COLS (inout tbls any, out pkcols any) { for (i := 0; i < l; i := i + 2) { - if (__tag (tbls[i+1]) = 193) + if (__tag (tbls[i+1]) = __tag of vector) mixed := 1; } } @@ -90,7 +90,7 @@ RDF_VIEW_TBL_PK_COLS (inout tbls any, out pkcols any) declare cols any; declare j int; newtb[i/2] := tbls[i]; - if (__tag (tbls [i + 1]) = 193) + if (__tag (tbls [i + 1]) = __tag of vector) { cols := make_array (length (tbls [i + 1]), 'any'); j := 0; @@ -677,17 +677,17 @@ RDF_VIEW_GET_PK_FK_REL (in pref varchar, in suffix varchar, in tbl varchar, in t create procedure RDF_VIEW_DV_TO_PRINTF_STR_TYPE (in _dv varchar, in sc int) { - if (_dv = 189 or _dv = 188) return '%d'; - if (_dv = 247) return '%ld'; + if (_dv = __tag of integer or _dv = __tag of smallint) return '%d'; + if (_dv = __tag of bigint) return '%ld'; if (_dv in (__tag of double precision, __tag of numeric) and sc = 0) return '%d'; - if (_dv = 182 or _dv = 225) return '%U'; + if (_dv = __tag of varchar or _dv = __tag of nvarchar) return '%U'; if (__tag of double precision = _dv) return '%g'; if (__tag of real = _dv) return '%f'; if (__tag of numeric = _dv) return '%g'; if (__tag of date = _dv) return '%1D'; if (__tag of time = _dv) return '%1D'; if (__tag of datetime = _dv or __tag of timestamp = _dv) return '%1D'; - if (_dv in (__tag of IRI_ID, 244)) return '%s'; + if (_dv in (__tag of IRI_ID, __tag of IRI_ID_8)) return '%s'; signal ('42000', sprintf ('The current implementation does no support data type %s (%i) for IRI classes', dv_type_title (_dv), _dv)); } ; @@ -695,8 +695,8 @@ RDF_VIEW_DV_TO_PRINTF_STR_TYPE (in _dv varchar, in sc int) create procedure RDF_VIEW_DV_TO_SQL_STR_TYPE (in _dv varchar) { - if (_dv = 189 or _dv = 188 or _dv = 247) return 'integer'; - if (_dv = 182 or _dv = 125 or _dv = 131 or _dv = 222) return 'varchar'; + if (_dv = __tag of integer or _dv = __tag of smallint or _dv = __tag of bigint) return 'integer'; + if (_dv = __tag of varchar or _dv = 125 or _dv = 131 or _dv = 222) return 'varchar'; if (__tag of double precision = _dv) return 'numeric'; if (__tag of real = _dv) return 'float'; if (__tag of numeric = _dv) return 'numeric'; @@ -705,7 +705,7 @@ RDF_VIEW_DV_TO_SQL_STR_TYPE (in _dv varchar) if (__tag of datetime = _dv) return 'datetime'; if (__tag of timestamp = _dv) return 'timestamp'; if (__tag of nvarchar = _dv) return 'nvarchar'; - if (_dv in (__tag of IRI_ID, 244)) return 'IRI_ID'; + if (_dv in (__tag of IRI_ID, __tag of IRI_ID_8)) return 'IRI_ID'; signal ('42000', sprintf ('The current implementation does no support data type %s (%i) for IRI classes', dv_type_title (_dv), _dv)); } ; @@ -713,8 +713,8 @@ RDF_VIEW_DV_TO_SQL_STR_TYPE (in _dv varchar) create procedure DB.DBA.RDF_VIEW_DV_TO_XSD_STR_TYPE (in _dv varchar) { - if (_dv = 189 or _dv = 188 or _dv = 247) return 'int'; - if (_dv = 182 or _dv = 125 or _dv = 131 or _dv = 132 or _dv = 222) return 'string'; + if (_dv = __tag of integer or _dv = __tag of smallint or _dv = __tag of bigint) return 'int'; + if (_dv = __tag of varchar or _dv = 125 or _dv = 131 or _dv = 132 or _dv = 222) return 'string'; if (__tag of double precision = _dv) return 'numeric'; if (__tag of real = _dv) return 'float'; if (__tag of numeric = _dv) return 'numeric'; @@ -723,7 +723,7 @@ DB.DBA.RDF_VIEW_DV_TO_XSD_STR_TYPE (in _dv varchar) if (__tag of datetime = _dv) return 'dateTime'; if (__tag of timestamp = _dv) return 'dateTime'; if (__tag of nvarchar = _dv) return 'string'; - if (_dv in (__tag of IRI_ID, 244)) return 'anyURI'; + if (_dv in (__tag of IRI_ID, __tag of IRI_ID_8)) return 'anyURI'; signal ('42000', sprintf ('The current implementation does no support data type %s (%i) for IRI classes', dv_type_title (_dv), _dv)); } ; diff --git a/libsrc/Wi/rdf_sponge.sql b/libsrc/Wi/rdf_sponge.sql index 7a7db816b3..8621c7b274 100644 --- a/libsrc/Wi/rdf_sponge.sql +++ b/libsrc/Wi/rdf_sponge.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -664,11 +664,6 @@ create table DB.DBA.SYS_HTTP_SPONGE_REFRESH_DEFAULTS ( ) ; ---#IF VER=5 ---!AFTER -alter table DB.DBA.SYS_HTTP_SPONGE add HS_FROM_IRI varchar -; ---#ENDIF create table DB.DBA.RDF_WEBID_ACL_GROUPS ( AG_WEBID varchar, @@ -759,9 +754,6 @@ create procedure DB.DBA.SYS_HTTP_SPONGE_GET_CACHE_PARAMS } ; ---#IF VER=5 ---!AFTER_AND_BEFORE DB.DBA.SYS_HTTP_SPONGE HS_FROM_IRI ! ---#ENDIF create procedure DB.DBA.SYS_HTTP_SPONGE_DEP_URL_NOT_CHANGED (in local_iri varchar, in parser varchar, in explicit_refresh int) { @@ -1103,7 +1095,7 @@ resp_received: signal ('RDFXX', sprintf ('Content length %d is over the limit %d', new_download_size, max_sz)); } - --if (__tag (ret_body) = 185) + --if (__tag (ret_body) = __tag of stream) -- ret_body := string_output_string (subseq (ret_body, 0, 10000000)); { @@ -1120,7 +1112,7 @@ resp_received: if (parser_rc is not null) { new_last_etag := ret_etag; - if (__tag (parser_rc) = 193 and eraser is not null and ret_content_type like '%html') + if (__tag (parser_rc) = __tag of vector and eraser is not null and ret_content_type like '%html') { declare sa any; sa := get_keyword ('seeAlso', parser_rc); @@ -1374,39 +1366,6 @@ create index SYS_RDF_MAPPERS_I1 on DB.DBA.SYS_RDF_MAPPERS (RM_ID) partition clus create index SYS_RDF_MAPPERS_I2 on DB.DBA.SYS_RDF_MAPPERS (RM_PID) partition cluster replicated ; ---#IF VER=5 ---!AFTER -alter table DB.DBA.SYS_RDF_MAPPERS add RM_ENABLED integer default 1 -; - ---!AFTER -alter table DB.DBA.SYS_RDF_MAPPERS add RM_OPTIONS any -; - ---!AFTER -alter table DB.DBA.SYS_RDF_MAPPERS add RM_PID integer identity -; - ---!AFTER -alter table DB.DBA.SYS_RDF_MAPPERS add RM_PID integer identity -; - ---!AFTER -create procedure DB.DBA.SYS_RDF_MAPPERS_UPGRADE () -{ - declare id int; - update DB.DBA.SYS_RDF_MAPPERS set RM_PID = RM_ID where RM_PID is null; - if (row_count() = 0) - return; - id := (select max (RM_PID) from DB.DBA.SYS_RDF_MAPPERS) + 1; - DB.DBA.SET_IDENTITY_COLUMN ('DB.DBA.SYS_RDF_MAPPERS', 'RM_PID', id); -} -; - ---!AFTER -DB.DBA.SYS_RDF_MAPPERS_UPGRADE () -; ---#ENDIF create procedure DB.DBA.RDF_HTTP_URL_GET (inout url any, in base any, inout hdr any, in meth any := 'GET', in req_hdr varchar := null, in cnt any := null, in proxy any := null, in sig int := 1) @@ -1975,14 +1934,14 @@ load_grddl:; if (registry_get ('__sparql_mappers_debug') = '1') { dbg_obj_prin1 ('Return ', rc, RM_HOOK); - if (__tag(rc) = 193 or rc < 0 or rc > 0) + if (__tag(rc) = __tag of vector or rc < 0 or rc > 0) dbg_obj_prin1 ('END of mappings'); } - if (__tag(rc) = 193 or rc < 0 or rc > 0) + if (__tag(rc) = __tag of vector or rc < 0 or rc > 0) { if (rc > 0 and __proc_exists ('DB.DBA.RDF_LOAD_POST_PROCESS')) -- optional step, by default skip - call ('DB.DBA.RDF_LOAD_POST_PROCESS') (graph_iri, new_origin_uri, dest, ret_body, ret_content_type, options); - if (__tag(rc) = 193) + call ('DB.DBA.RDF_LOAD_POST_PROCESS') (graph_iri, new_origin_uri, dest, ret_body, ret_content_type, options); + if (__tag(rc) = __tag of vector) return rc; return (case when rc < 0 then 0 else 1 end); } diff --git a/libsrc/Wi/rdf_void.sql b/libsrc/Wi/rdf_void.sql index ca7c7c5d72..1cfc032725 100644 --- a/libsrc/Wi/rdf_void.sql +++ b/libsrc/Wi/rdf_void.sql @@ -6,7 +6,7 @@ -- -- RDF Schema objects, generator of RDF Views -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/rdfbox.c b/libsrc/Wi/rdfbox.c index fb5efbd39d..e47dcb0b1f 100644 --- a/libsrc/Wi/rdfbox.c +++ b/libsrc/Wi/rdfbox.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -5403,6 +5403,7 @@ bif_http_ld_json_triple_batch (caddr_t * qst, caddr_t * err_ret, state_slot_t ** int triple_ctr; ptrlong nesting = 0; int n_args = BOX_ELEMENTS (args); + int e2_wrlocked; id_hash_iterator_t *bnode_usage_iter = ((5 < n_args) ? bif_dict_iterator_arg (qst, args, 5, "http_ld_json_triple_batch", 0) : NULL); ld_json_env_t *env = (ld_json_env_t *)bif_arg (qst, args, 0, "http_ld_json_triple_batch"); memset (&e2, 0, sizeof (ld_json_env2_t)); @@ -5423,11 +5424,10 @@ bif_http_ld_json_triple_batch (caddr_t * qst, caddr_t * err_ret, state_slot_t ** } if ((NULL != e2.printed_triples_mask) && (e2.triple_count != box_length (e2.printed_triples_mask) - 1)) sqlr_new_error ("22023", "SR607", "Argument 5 of http_ld_json_triple_batch() should be a mask string with length matching to the vector of triples"); - if ((NULL != e2.bnode_usage) && (e2.bnode_usage->ht_mutex)) - mutex_enter (e2.bnode_usage->ht_mutex); + if (NULL != e2.bnode_usage) + HT_WRLOCK_COND(e2.bnode_usage,e2_wrlocked); nesting = bif_http_ld_json_triple_batch_impl (env, &e2); - if ((NULL != e2.bnode_usage) && (e2.bnode_usage->ht_mutex)) - mutex_leave (e2.bnode_usage->ht_mutex); + HT_UNLOCK_COND(e2.bnode_usage,e2_wrlocked); return box_num (nesting); } @@ -6088,9 +6088,9 @@ rdf_graph_specific_perms_of_user (user_t *u, iri_id_t g_iid) return 0; if (NULL == u->usr_rdf_graph_perms) return 0; - mutex_enter (u->usr_rdf_graph_perms->ht_mutex); + rwlock_rdlock (u->usr_rdf_graph_perms->ht_rwlock); gethash_64 (res, (boxint)g_iid, u->usr_rdf_graph_perms); - mutex_leave (u->usr_rdf_graph_perms->ht_mutex); + rwlock_unlock (u->usr_rdf_graph_perms->ht_rwlock); return res; } @@ -6188,9 +6188,9 @@ rdf_graph_specific_perms_of_user_set_impl (iri_id_t g_iid, oid_t u_id, boxint pe { if (NULL != u->usr_rdf_graph_perms) { - mutex_enter (u->usr_rdf_graph_perms->ht_mutex); + rwlock_wrlock (u->usr_rdf_graph_perms->ht_rwlock); remhash_64 (g_iid, u->usr_rdf_graph_perms); - mutex_leave (u->usr_rdf_graph_perms->ht_mutex); + rwlock_unlock (u->usr_rdf_graph_perms->ht_rwlock); } } else @@ -6198,12 +6198,12 @@ rdf_graph_specific_perms_of_user_set_impl (iri_id_t g_iid, oid_t u_id, boxint pe if (NULL == u->usr_rdf_graph_perms) { dk_hash_64_t *ht = hash_table_allocate_64 (97); - ht->ht_mutex = mutex_allocate (); + ht->ht_rwlock = rwlock_allocate (); u->usr_rdf_graph_perms = ht; } - mutex_enter (u->usr_rdf_graph_perms->ht_mutex); + rwlock_wrlock (u->usr_rdf_graph_perms->ht_rwlock); sethash_64 (g_iid, u->usr_rdf_graph_perms, perms); - mutex_leave (u->usr_rdf_graph_perms->ht_mutex); + rwlock_unlock (u->usr_rdf_graph_perms->ht_rwlock); } return 1; } @@ -7009,7 +7009,7 @@ caddr_t boxed_nobody_uid = NULL; name##_htable = (id_hash_t *)box_dv_dict_hashtable (31); \ name##_htable->ht_rehash_threshold = 120; \ name##_htable->ht_dict_refctr = ID_HASH_LOCK_REFCOUNT; \ - name##_htable->ht_mutex = mutex_allocate (); \ + name##_htable->ht_rwlock = rwlock_allocate (); \ name##_hit = (id_hash_iterator_t *)box_dv_dict_iterator ((caddr_t)name##_htable); \ } while (0) diff --git a/libsrc/Wi/rdfcol.sql b/libsrc/Wi/rdfcol.sql index 5b7993e416..37f03a1aa1 100644 --- a/libsrc/Wi/rdfcol.sql +++ b/libsrc/Wi/rdfcol.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/rdfinf.c b/libsrc/Wi/rdfinf.c index 0a91eb4058..27d1dae2b6 100644 --- a/libsrc/Wi/rdfinf.c +++ b/libsrc/Wi/rdfinf.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/rdfinf.h b/libsrc/Wi/rdfinf.h index fb01222441..bcef35f18d 100644 --- a/libsrc/Wi/rdfinf.h +++ b/libsrc/Wi/rdfinf.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/rdfld.c b/libsrc/Wi/rdfld.c index ba92f4fa1b..1d4e755f43 100644 --- a/libsrc/Wi/rdfld.c +++ b/libsrc/Wi/rdfld.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/rdflddir2.sql b/libsrc/Wi/rdflddir2.sql index fc2dbf151e..a6205b92ae 100644 --- a/libsrc/Wi/rdflddir2.sql +++ b/libsrc/Wi/rdflddir2.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -301,11 +301,17 @@ rdf_loader_run (in max_files integer := null, in log_enable int := 2) if (log_enable = 2 and cl_this_host () = 1) { cl_exec ('checkpoint_interval (0)'); + cl_exec ('scheduler_interval (0)'); cl_exec ('__dbf_set (''cl_non_logged_write_mode'', 1)'); } if (cl_this_host () = 1) cl_exec('__dbf_set(''cl_max_keep_alives_missed'',3000)'); } + else + { + checkpoint_interval(0); + scheduler_interval(0); + } tx_mode := bit_and (1, log_enable); log_message ('Loader started'); diff --git a/libsrc/Wi/rdfxml_parser.c b/libsrc/Wi/rdfxml_parser.c index 0de33e4723..6787014b72 100644 --- a/libsrc/Wi/rdfxml_parser.c +++ b/libsrc/Wi/rdfxml_parser.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/read.c b/libsrc/Wi/read.c index 726f4343aa..43835379a7 100644 --- a/libsrc/Wi/read.c +++ b/libsrc/Wi/read.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/recovery.c b/libsrc/Wi/recovery.c index 08748455cb..5d1613f663 100644 --- a/libsrc/Wi/recovery.c +++ b/libsrc/Wi/recovery.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/recovery.h b/libsrc/Wi/recovery.h index a19b203860..5a0f7caeb4 100644 --- a/libsrc/Wi/recovery.h +++ b/libsrc/Wi/recovery.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/regist.c b/libsrc/Wi/regist.c index 1e95676dff..9222924442 100644 --- a/libsrc/Wi/regist.c +++ b/libsrc/Wi/regist.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/remote.h b/libsrc/Wi/remote.h index 3c8c0a4c27..5f3af0f176 100644 --- a/libsrc/Wi/remote.h +++ b/libsrc/Wi/remote.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/rendezvous.c b/libsrc/Wi/rendezvous.c index c8cf38bda8..2f47166af9 100644 --- a/libsrc/Wi/rendezvous.c +++ b/libsrc/Wi/rendezvous.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/rendezvous.h b/libsrc/Wi/rendezvous.h index 31f3a5b9e0..5730cd4a15 100644 --- a/libsrc/Wi/rendezvous.h +++ b/libsrc/Wi/rendezvous.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/repl.h b/libsrc/Wi/repl.h index 2792acc207..bfe6e83a58 100644 --- a/libsrc/Wi/repl.h +++ b/libsrc/Wi/repl.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/repl.sql b/libsrc/Wi/repl.sql index f3896dd543..094d40923e 100644 --- a/libsrc/Wi/repl.sql +++ b/libsrc/Wi/repl.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -811,7 +811,7 @@ create procedure DAV_COL_I (in _name varchar, in _path varchar, in _cr_time date declare _p_id, _p_path any; declare _own, _grp integer; -- dbg_obj_print ('COL INS: ', _path); - if (not isstring (_path) and __tag (_path) <> 193) + if (not isstring (_path) and __tag (_path) <> __tag of vector) signal ('22023', 'Function DAV_COL_I needs string or array as path', 'TR020'); if (isstring (_path)) @@ -919,7 +919,7 @@ create procedure DAV_RES_I (in _ppath varchar, in _time datetime, in __own varch if (isstring (_content)) _ses := _content; - else if (__tag (_content) = 193) + else if (__tag (_content) = __tag of vector) { _len := length (_content); _ses := string_output (); @@ -934,7 +934,7 @@ create procedure DAV_RES_I (in _ppath varchar, in _time datetime, in __own varch _ses := null; -- dbg_obj_print ('RES INS: ', _ppath); - if (not isstring (_ppath) and __tag (_ppath) <> 193) + if (not isstring (_ppath) and __tag (_ppath) <> __tag of vector) signal ('22023', 'Function DAV_RES_I needs string or array as path', 'TR031'); if (isstring (_ppath)) _path := WS.WS.HREF_TO_ARRAY (_ppath, ''); @@ -1158,7 +1158,7 @@ create procedure REPL_PUB_TBL (in _pub varchar, in tbl varchar, in _is_updatable sprintf ('The table ''%s'' does not have primary key', src_table), 'TR127'); } - _pk_cols := vector (vector ('_IDN', 182, NULL, 10)); + _pk_cols := vector (vector ('_IDN', __tag of varchar, NULL, 10)); _len := length (_pk_cols); } while (_ix < _len) @@ -1219,7 +1219,7 @@ create procedure REPL_PUB_TBL (in _pub varchar, in tbl varchar, in _is_updatable _all_cols:= concat (_all_cols, sprintf ('"%I"', _col_name)); if (_col_dtp in (125, 131, 132, 134, -- DV_BLOB, DV_BLOB_BIN, DV_BLOB_WIDE, DV_BLOB_XPER - 126, 133, 135)) -- DV_BLOB_HANDLE, DV_BLOB_WIDE_HANDLE, DV_BLOB_XPER_HANDLE + __tag of long varchar handle, __tag of long nvarchar handle, 135)) -- DV_BLOB_HANDLE, DV_BLOB_WIDE_HANDLE, DV_BLOB_XPER_HANDLE _nall_cols:= concat (_nall_cols, sprintf ('blob_to_string_output (_N."%I")', _col_name)); else _nall_cols:= concat (_nall_cols, sprintf ('_N."%I"', _col_name)); diff --git a/libsrc/Wi/replddk.sql b/libsrc/Wi/replddk.sql index 20b438ed1e..b4f55cb832 100644 --- a/libsrc/Wi/replddk.sql +++ b/libsrc/Wi/replddk.sql @@ -8,7 +8,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -45,25 +45,6 @@ create view TP_ITEM as select * from SYS_TP_ITEM where TI_SERVER = repl_this_ser exec ('grant select on TP_ITEM to PUBLIC') ; ---#IF VER=5 -alter table SYS_REPL_ACCOUNTS add IS_UPDATEABLE integer -; - -alter table SYS_REPL_ACCOUNTS add SYNC_USER varchar -; - -alter table SYS_REPL_ACCOUNTS add P_MONTH integer -; - -alter table SYS_REPL_ACCOUNTS add P_DAY integer -; - -alter table SYS_REPL_ACCOUNTS add P_WDAY integer -; - -alter table SYS_REPL_ACCOUNTS add P_TIME time -; ---#ENDIF create view REPL_ACCOUNTS as select SERVER, ACCOUNT from SYS_REPL_ACCOUNTS where SERVER = repl_this_server () and ACCOUNT <> repl_this_server () diff --git a/libsrc/Wi/replsr.h b/libsrc/Wi/replsr.h index be92964448..e5be1b45b0 100644 --- a/libsrc/Wi/replsr.h +++ b/libsrc/Wi/replsr.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/rltrx.c b/libsrc/Wi/rltrx.c index a97eb7bb86..3c942a7a64 100644 --- a/libsrc/Wi/rltrx.c +++ b/libsrc/Wi/rltrx.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/row.c b/libsrc/Wi/row.c index 6a2fdc1679..71a5570cfd 100644 --- a/libsrc/Wi/row.c +++ b/libsrc/Wi/row.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/schspace.c b/libsrc/Wi/schspace.c index 6d3ab92771..1be218c0b1 100644 --- a/libsrc/Wi/schspace.c +++ b/libsrc/Wi/schspace.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/schspace.h b/libsrc/Wi/schspace.h index 6e81ba5a6d..6e470939e4 100644 --- a/libsrc/Wi/schspace.h +++ b/libsrc/Wi/schspace.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/scn3.l b/libsrc/Wi/scn3.l index 8a8d64851f..30f6c2d4d9 100644 --- a/libsrc/Wi/scn3.l +++ b/libsrc/Wi/scn3.l @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -391,16 +391,21 @@ extern int yylex (YYSTYPE *yylval, yyscan_t yyscanner); S_NL (\r\n|\n|\r) SPAR_SQ_PLAIN ([^\\''\r\n]) SPAR_DQ_PLAIN ([^\\""\r\n]) -SPAR_ECHAR ([\\]([atbvnrf\\""'']|("u"{HEX}{HEX}{HEX}{HEX})|("U"{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}))) -HEX ([0-9A-Fa-f]) - -SPAR_NCCHAR1p ([A-Za-z]) -SPAR_NCCHAR1 ([A-Za-z_]) -SPAR_VARNAME ([A-Za-z0-9_]+) -SPAR_NCCHAR ([A-Za-z0-9_-]) -SPAR_NCNAME_PREFIX ({SPAR_NCCHAR1p}([A-Za-z0-9_.-]*{SPAR_NCCHAR})?) -SPAR_NCNAME ({SPAR_NCCHAR1}([A-Za-z0-9_.-]*{SPAR_NCCHAR})?) - +SPAR_UCHAR ([\\](("u"{HEX}{HEX}{HEX}{HEX})|("U"{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}))) +SPAR_ECHAR (([\\][atbvnrf\\""''])|{SPAR_UCHAR}) +HEX ([0-9A-Fa-f]) + +SPAR_VARNAME ([A-Za-z0-9_][A-Za-z0-9_\x7f-\xfe]*) + +PN_LOCAL_ESC ([\\][_~.!$&''()*+,;=/?#@%-]) +PN_LOCAL_ESC_X ({PN_LOCAL_ESC}|([%]{HEX}{HEX})) +PN_CHARS_BASE ([A-Za-z\x7f-\xfe]|{SPAR_UCHAR}) +PN_CHARS_U_09 ([A-Za-z0-9_\x7f-\xfe]|{SPAR_UCHAR}) +PN_CHARS_U_09_C_PLX ([A-Za-z0-9_\x7f-\xfe:]|{SPAR_UCHAR}|{PN_LOCAL_ESC_X}) +PN_CHARS ([A-Za-z0-9_\x7f-\xfe-]|{SPAR_UCHAR}) +PN_CHARS_C_PLX ([A-Za-z0-9_\x7f-\xfe:-]|{SPAR_UCHAR}|{PN_LOCAL_ESC_X}) +PN_PREFIX ({PN_CHARS_BASE}(([.]*{PN_CHARS})*)) +PN_LOCAL ({PN_CHARS_U_09_C_PLX}(([.]*{PN_CHARS_C_PLX})*)) %% @@ -873,7 +878,7 @@ EXEC[ \t]+SQL { sqlp_bin_op_serial = 0; BEGIN SQL; } t_set_push (&global_scs->scs_scn3c.namespaces, NULL); RETURN_WS(WS_PRAGMA_PREFIX_1); } -({SPAR_NCNAME_PREFIX}?)":" { +({PN_PREFIX}?)":" { BEGIN(PRAGMA_PREFIX_2); global_scs->scs_scn3c.namespaces->data = t_box_dv_uname_nchars (yytext, strlen (yytext) - 1); RETURN_WS(WS_PRAGMA_PREFIX_2); } @@ -882,7 +887,7 @@ EXEC[ \t]+SQL { sqlp_bin_op_serial = 0; BEGIN SQL; } const char *langl = strchr (yytext, '<'); BEGIN(SQL); global_scs->scs_scn3c.namespaces->next->data = t_box_dv_uname_nchars (langl + 1, (yytext + yyleng - 2) - langl); - RETURN_WS(WS_PRAGMA_PREFIX_3); } + RETURN_WS(WS_PRAGMA_PREFIX_3); } . { scn3yyerror ("Ill formed namespace prefix in #pragma prefix"); } <> { scn3yyerror ("Unexpected end of text in #pragma prefix"); } @@ -1016,6 +1021,7 @@ EXEC[ \t]+SQL { sqlp_bin_op_serial = 0; BEGIN SQL; } "}" TOKCLOSE_SKIP ('}','}'); "[" TOKOPEN_SKIP ('[',']'); "]" TOKCLOSE_SKIP (']',']'); + "<"([^<>"{}|^`\001-\040\\])*">" { TOK_SKIP; } ([""][^""\\\n]*[""])|([''][^''\\\n]*['']) { TOK_SKIP; } @@ -1048,7 +1054,11 @@ EXEC[ \t]+SQL { sqlp_bin_op_serial = 0; BEGIN SQL; } <> { scn3yyerror ("Unterminated SPARQL short single-quoted string"); } <> { scn3yyerror ("Unterminated SPARQL short double-quoted string"); } -[^#''""\\\n\r(){}\[\];<>]+ TOK_SKIP; +({PN_PREFIX}?)":"{PN_LOCAL} TOK_SKIP; +({PN_PREFIX}?)":" TOK_SKIP; +"_:"{PN_LOCAL} TOK_SKIP; +[^#''""\\\n\r(){}\[\];:<>]+ TOK_SKIP; + <> { #ifndef SCN3SPLIT scn3_include_fragment_t *outer = global_scs->scs_scn3c.include_stack + global_scs->scs_scn3c.include_depth; diff --git a/libsrc/Wi/search.c b/libsrc/Wi/search.c index a178daab73..c4656eb7a9 100644 --- a/libsrc/Wi/search.c +++ b/libsrc/Wi/search.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -3732,16 +3732,16 @@ itc_page_split_search_1 (it_cursor_t * it, buffer_desc_t * buf, case DVC_MATCH: case DVC_LESS: { - row = page + map->pm_entries[at_or_above]; - it->itc_map_pos = at_or_above; - kv = IE_KEY_VERSION (row); - if (KV_LEAF_PTR == kv) - *leaf_ret = LONG_REF (row + it->itc_insert_key->key_key_leaf[IE_ROW_VERSION (row)]); - else if (KV_LEFT_DUMMY == kv) - *leaf_ret = LONG_REF (row + LD_LEAF); - else - *leaf_ret = 0; - return at_or_above_res; + row = page + map->pm_entries[at_or_above]; + it->itc_map_pos = at_or_above; + kv = IE_KEY_VERSION (row); + if (KV_LEAF_PTR == kv) + *leaf_ret = LONG_REF (row + it->itc_insert_key->key_key_leaf[IE_ROW_VERSION (row)]); + else if (KV_LEFT_DUMMY == kv) + *leaf_ret = LONG_REF (row + LD_LEAF); + else + *leaf_ret = 0; + return at_or_above_res; } case DVC_GREATER: { diff --git a/libsrc/Wi/search_in.c b/libsrc/Wi/search_in.c index 76963c3351..e9e96ad257 100644 --- a/libsrc/Wi/search_in.c +++ b/libsrc/Wi/search_in.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/security.c b/libsrc/Wi/security.c index e42a6b622a..474d50fc5b 100644 --- a/libsrc/Wi/security.c +++ b/libsrc/Wi/security.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/security.h b/libsrc/Wi/security.h index b9e8e53065..46ec3c63c8 100644 --- a/libsrc/Wi/security.h +++ b/libsrc/Wi/security.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/shcompo.c b/libsrc/Wi/shcompo.c index e706ab4d4e..edbbd46bf4 100644 --- a/libsrc/Wi/shcompo.c +++ b/libsrc/Wi/shcompo.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/shcompo.h b/libsrc/Wi/shcompo.h index 1d4388e69f..6a53900e09 100644 --- a/libsrc/Wi/shcompo.h +++ b/libsrc/Wi/shcompo.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/shuric.c b/libsrc/Wi/shuric.c index c005f8107e..3315005cb6 100644 --- a/libsrc/Wi/shuric.c +++ b/libsrc/Wi/shuric.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/shuric.h b/libsrc/Wi/shuric.h index 829060394e..8ce0ce9acc 100644 --- a/libsrc/Wi/shuric.h +++ b/libsrc/Wi/shuric.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/simd.h b/libsrc/Wi/simd.h index 5a3b79f79d..08ebf2138f 100644 --- a/libsrc/Wi/simd.h +++ b/libsrc/Wi/simd.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/simile.sql b/libsrc/Wi/simile.sql index 12c26cb6db..5c98c840a6 100644 --- a/libsrc/Wi/simile.sql +++ b/libsrc/Wi/simile.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/snapshot_repl.sql b/libsrc/Wi/snapshot_repl.sql index 2fea6e8466..5638065f8d 100644 --- a/libsrc/Wi/snapshot_repl.sql +++ b/libsrc/Wi/snapshot_repl.sql @@ -6,7 +6,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/soap.h b/libsrc/Wi/soap.h index fa85495c78..2032cee1b3 100644 --- a/libsrc/Wi/soap.h +++ b/libsrc/Wi/soap.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/soap.sql b/libsrc/Wi/soap.sql index 0d841a08f7..bd8a656deb 100644 --- a/libsrc/Wi/soap.sql +++ b/libsrc/Wi/soap.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -2324,7 +2324,7 @@ err:; ?>

    • - - - - -
    - - - - - - - - -
    - - - - - - - - -   -
    - - - - -
    - - - - - - - -
    - - - - - - -   - - -
    -     - Results for ', host,'')); - if (exists (select 1 from WS.WS.VFS_QUEUE where VQ_ROOT = root and VQ_HOST = host and VQ_STAT = 'pending')) - { - http(''); - for (select top 10 VQ_URL, VQ_TS, VQ_STAT - from WS.WS.VFS_QUEUE - where VQ_HOST = host and VQ_ROOT = root and VQ_STAT in ('waiting', 'pending') - order by VQ_HOST, VQ_ROOT, VQ_TS) do - { - ?> - - - - - - - '); - - http ('
    Top pending URLs
    URLRegistered onState
    - - - -
    '); - http(''); - for (select VQ_STAT, count(*) as cnt from WS.WS.VFS_QUEUE where VQ_HOST = host and VQ_ROOT = root) do - { - ?> - - '); - } - else - { - if (exists (select 1 from WS.WS.VFS_QUEUE where VQ_HOST = host and VQ_ROOT = root and VQ_STAT = 'error')) - http (concat ('

    errors while retrieving target. Select "reset" to return initial state

    ')); - ?> -

    - Total URLs processed : -

    -

    - Download finished -

    - - - -
    StatusCount
    -
    -
    - - - diff --git a/binsrc/yacutia/robot_urls_list.vspx b/binsrc/yacutia/robot_urls_list.vspx deleted file mode 100644 index 57834b098e..0000000000 --- a/binsrc/yacutia/robot_urls_list.vspx +++ /dev/null @@ -1,206 +0,0 @@ - - - - WebDAV Content Management - - - - - - - - - - - - - - - -
    - - - - -
    - - - - - - - - -
    - - - - - - - - -   -
    - - - - -
    - - - - -
    - - - - - - - -
    - - - - - - - - - - - - - - - - - -
    -     -
    - get_keyword ('host', params)) - { - _host := get_keyword ('host', params); - _root := get_keyword ('root', params); - } - if ('yes' = get_keyword ('DELETE', params)) - { - _url := get_keyword ('url', params); - delete from WS.WS.VFS_URL where VU_HOST = _host and VU_ROOT = _root and VU_URL = _url; - } - set isolation='uncommitted'; - ?> -

    Current downloads for

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    URLEtagRetrievedAction
    There are no URLs
    - - - if (not self.vc_is_valid) - return; - - delete from WS.WS.VFS_URL where VU_HOST = self.host and VU_ROOT = self.root and VU_URL = (control.vc_parent as vspx_row_template).te_rowset[0]; - self.data_set1.vc_data_bind (e); - - -
    - -
    -
    -
    -
    -
    -     -     -     diff --git a/binsrc/yacutia/sec_pki_val.vspx b/binsrc/yacutia/sec_pki_val.vspx deleted file mode 100644 index b5abf13095..0000000000 --- a/binsrc/yacutia/sec_pki_val.vspx +++ /dev/null @@ -1,265 +0,0 @@ - - - - Public Key Infrastructure - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - -
    - - - - - - -
    - Public Key Infrastructure - - - -
    - - - - -
    -

    Configure Virtuoso Authentication Layer (VAL) Endpoints

    -

    VAL provides OpenID, BrowserID (aka Mozilla Persona), and OAuth authentication support to Virtuoso, the Sponger, and ODS. Some of these authentication systems require an https callback URL (for example Box.com). - To this end VAL requires a mapping between an http and an https virtual directory. This mapping can be setup here.

    - - - - - - - - - - - - - - - - - - - - - - - - - - - ', case when mod (self.r_count, 2) then 'listing_row_odd' else 'listing_row_even' end)); - ?> - - - - '); - ?> - - - -
    HTTP Virtual DirectoryHTTPS Virtual DirectoryActions
    - No VAL Virtual Directory mappings have been created yet -
    - - - - - - - - - - - - - -
    -
    - - - '*sslini*' or server_https_port () is not null) - { - if (not strcontains (host, ':')) - host := host || ':443'; - self.sslHostLabels := vector_concat (self.sslHostLabels, vector (host)); - self.sslHosts := vector_concat (self.sslHosts, vector (HP_HOST || '|' || HP_LISTEN_HOST)); - } - } - } - ]]> - - -
    -

    Add a new VAL SSL host mapping:

    - -

    Create or update a mapping from HTTP host - - - - - - - to HTTPS host - - - - - - - - - - - - - -

    -     -
    - - - - -
    - -
    -
    -
    - -     -     -     -     - diff --git a/binsrc/yacutia/sparql_filters.vspx b/binsrc/yacutia/sparql_filters.vspx deleted file mode 100644 index 3b1f932ec8..0000000000 --- a/binsrc/yacutia/sparql_filters.vspx +++ /dev/null @@ -1,269 +0,0 @@ - - - - GRDDL filters for XHTML - - - - - - - - - - - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - -
    - - - - - Stylesheets - - - - - - - - - - - -
    -
    -
    - - - - -
    - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    ProfileProfile URIAction
    - - - ' || (control.vc_parent as vspx_row_template).te_rowset[0]; - ]]> - - - - - - - - - - -   - - - Delete'; - ]]> - - - - - -
    -     - -
    -
    - - - -
    - - -
    - - - -
    - - - - - - - - - - - - - -
    -
    -     -     -
    -
    -
    - -
    -     -     -     diff --git a/binsrc/yacutia/vad_version b/binsrc/yacutia/vad_version deleted file mode 100644 index a56a396d62..0000000000 --- a/binsrc/yacutia/vad_version +++ /dev/null @@ -1 +0,0 @@ -1.00.8783 diff --git a/binsrc/yacutia/wsdl_services.vspx b/binsrc/yacutia/wsdl_services.vspx deleted file mode 100644 index 961e0da28b..0000000000 --- a/binsrc/yacutia/wsdl_services.vspx +++ /dev/null @@ -1,90 +0,0 @@ - - - - Virtuoso WSDL Services - - - - - - - - - - - - - -
    - - - - -
    - - - - - - - - - - - - - -
    - Import - - - - &npsp; - - - - Export - - &npsp; -
    - - - - -
    - - - - - - -
    -
    -
    -     -     -     diff --git a/configure.ac b/configure.ac index 7cf945447f..4b4c67c440 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,11 @@ AC_PREREQ(2.59) -AC_REVISION($Id$) # # configure.ac # # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -32,7 +31,7 @@ AC_REVISION($Id$) m4_define(vos_major, [7]) m4_define(vos_minor, [2]) m4_define(vos_patch, [6]) -m4_define(vos_devel, [-dev]) +m4_define(vos_devel, [-rc1]) AC_INIT([Virtuoso Open Source Edition (Column Store)], vos_major.vos_minor.vos_patch[]vos_devel, @@ -338,6 +337,7 @@ AC_SUBST(INCDIR) ########################################################################## AC_PROG_CC +AC_PROG_CXX AC_PROG_CC_C_O AC_LANG_C AC_PROG_LD @@ -589,6 +589,7 @@ AC_CHECK_FUNCS(strerror) AC_CHECK_FUNCS(strdup) AC_CHECK_FUNCS(getrusage) AC_CHECK_FUNCS(memmove memmem memcpy) +AC_CHECK_FUNCS(mkstemp64 mkstemp) AC_CHECK_FUNCS(strftime stpcpy) AC_CHECK_FUNCS(clock_gettime gethrtime) @@ -884,7 +885,9 @@ AC_MSG_CHECKING([OpenSSL version]) AC_TRY_COMPILE([ #include ],[ -#if OPENSSL_VERSION_NUMBER >= 0x1010000fL +#ifdef LIBRESSL_VERSION_NUMBER +/* LibreSSL defines OPENSSL_VERSION_NUMBER 0x20000000L but uses a compatible API to OpenSSL v1.0.x */ +#elif OPENSSL_VERSION_NUMBER >= 0x1010000fL #error OpenSSL version too new #endif ],[ @@ -1227,6 +1230,222 @@ AC_CHECK_PROGS(MCS, mcs gmcs csc, notfound) AM_CONDITIONAL(HAVE_MCS, test "x$MCS" != "xnotfound") +########################################################################## +# # +# Proj4 # +# # +########################################################################## +AC_ARG_ENABLE(proj4, [dnl +AC_HELP_STRING([--enable-proj4(=DIR)], [enable the proj4 plugin (default)]) +AC_HELP_STRING([--disable-proj4], [disable the proj4 plugin])dnl +], [ + case "${enableval}" in + yes) with_proj4="yes" ;; + no) with_proj4="no" ;; + /*) with_proj4="${enableval}" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-proj4) ;; + esac + ], + [ with_proj4="yes" ] +) + +if test "x$with_proj4" != "xno" +then + AC_MSG_CHECKING([proj4 library usability]) + + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + save_LD_LIBRARY_PATH="$LD_LIBRARY_PATH" + + if test "x$with_proj4" = "xyes" + then + PROJ4_CPPFLAGS="" + PROJ4_LDFLAGS="" + else + PROJ4_CPPFLAGS="-I$with_proj4/include" + PROJ4_LDFLAGS="-L$with_proj4/lib" + fi + PROJ4_LIBS="-lproj" + + CPPFLAGS="$CPPFLAGS $PROJ4_CPPFLAGS" + LIBS="$LIBS $PROJ4_LDFLAGS $PROJ4_LIBS -lpthread -lm" + + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$with_proj4/lib" + export LD_LIBRARY_PATH + + AC_TRY_RUN([ +#include +#include +#include +int +main () +{ + projPJ pj_merc; + + if (!(pj_merc = pj_init_plus("+proj=merc +ellps=clrk66 +lat_ts=33")) ) + exit(1); + + exit (0); +}], +[ + BUILD_OPTS="$BUILD_OPTS proj" + AC_MSG_RESULT(good) +], +[ + AC_MSG_RESULT([bad. Check config.log for details]) + with_proj4="no" + AC_MSG_WARN([The proj4 plugin will not be build]) +]) + + LIBS="$save_LIBS" + CPPFLAGS="$save_CPPFLAGS" + LD_LIBRARY_PATH="$save_LD_LIBRARY_PATH" +fi + +AM_CONDITIONAL(WITH_PROJ4, test "x$with_proj4" != "xno" ) +AC_SUBST(PROJ4_CPPFLAGS) +AC_SUBST(PROJ4_LDFLAGS) +AC_SUBST(PROJ4_LIBS) + + +########################################################################## +# # +# Geos # +# # +########################################################################## +AC_ARG_ENABLE(geos, [dnl +AC_HELP_STRING([--enable-geos(=DIR)], [enable the geos plugin (default)]) +AC_HELP_STRING([--disable-geos], [disable the geos plugin])dnl +], [ + case "${enableval}" in + yes) with_geos="yes" ;; + no) with_geos="no" ;; + /*) with_geos="${enableval}" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-geos) ;; + esac + ], + [ with_geos="yes" ] +) + +if test "x$with_geos" != "xno" +then + AC_MSG_CHECKING([geos library usability]) + + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + save_LD_LIBRARY_PATH="$LD_LIBRARY_PATH" + + if test "x$with_geos" = "xyes" + then + GEOS_CPPFLAGS="" + GEOS_LDFLAGS="" + else + GEOS_CPPFLAGS="-I$with_geos/include" + GEOS_LDFLAGS="-L$with_geos/lib" + fi + GEOS_LIBS="-lgeos" + + CPPFLAGS="$CPPFLAGS $GEOS_CPPFLAGS" + LIBS="$LIBS $GEOS_LDFLAGS -lgeos_c -lgeos -lstdc++ -lm" + + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$with_geos/lib" + export LD_LIBRARY_PATH + + AC_TRY_RUN([ +#include +#include +#include +int +main () +{ + GEOSWKBReader GEOS_DLL *reader; + + initGEOS(NULL, NULL); + + reader = GEOSWKBReader_create(); + if (!reader) + exit (1); + + exit (0); +}], +[ + BUILD_OPTS="$BUILD_OPTS geos" + AC_MSG_RESULT(good) +], +[ + AC_MSG_RESULT([bad. Check config.log for details]) + with_geos="no" + AC_MSG_WARN([The geos plugin will not be build]) +]) + + LIBS="$save_LIBS" + CPPFLAGS="$save_CPPFLAGS" + LD_LIBRARY_PATH="$save_LD_LIBRARY_PATH" +fi + +AM_CONDITIONAL(WITH_GEOS, test "x$with_geos" != "xno" ) +AC_SUBST(GEOS_CPPFLAGS) +AC_SUBST(GEOS_LDFLAGS) +AC_SUBST(GEOS_LIBS) + + +########################################################################## +# # +# shapefileio # +# # +########################################################################## +AC_ARG_ENABLE(shapefileio, [dnl +AC_HELP_STRING([--enable-shapefileio(=DIR)], [enable the shapefileio plugin (default)]) +AC_HELP_STRING([--disable-shapefileio], [disable the shapefileio plugin])dnl +], [ + case "${enableval}" in + yes) with_shapefileio="yes" ;; + no) with_shapefileio="no" ;; + /*) with_shapefileio="${enableval}" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-shapefileio) ;; + esac + ], + [ with_shapefileio="yes" ] +) + +if test "x$with_shapefileio" != "xno" +then + AC_MSG_CHECKING([shapefileio library usability]) + + save_CPPFLAGS="$CPPFLAGS" + save_LIBS="$LIBS" + save_LD_LIBRARY_PATH="$LD_LIBRARY_PATH" + + if test "x$with_shapefileio" = "xyes" + then + SHAPEFILEIO_CPPFLAGS="" + SHAPEFILEIO_LDFLAGS="" + else + SHAPEFILEIO_CPPFLAGS="-I$with_shapefileio/include" + SHAPEFILEIO_LDFLAGS="-L$with_shapefileio/lib" + fi + SHAPEFILEIO_LIBS="-lshapefileio" + + CPPFLAGS="$CPPFLAGS $SHAPEFILEIO_CPPFLAGS" + LIBS="$LIBS $SHAPEFILEIO_LDFLAGS -lshapefileio_c -lshapefileio -lc++" + + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$with_shapefileio/lib" + export LD_LIBRARY_PATH + + BUILD_OPTS="$BUILD_OPTS shapefileio" + AC_MSG_RESULT(using internal library) + + LIBS="$save_LIBS" + CPPFLAGS="$save_CPPFLAGS" + LD_LIBRARY_PATH="$save_LD_LIBRARY_PATH" +fi + +AM_CONDITIONAL(WITH_SHAPEFILEIO, test "x$with_shapefileio" != "xno" ) +AC_SUBST(SHAPEFILEIO_CPPFLAGS) +AC_SUBST(SHAPEFILEIO_LDFLAGS) +AC_SUBST(SHAPEFILEIO_LIBS) + + ########################################################################## # # # HSLookup # @@ -1296,6 +1515,7 @@ main () exit (1); }], [ + BUILD_OPTS="$BUILD_OPTS hslookup" AC_MSG_RESULT(good) ], [ @@ -1359,7 +1579,7 @@ then save_LD_LIBRARY_PATH="$LD_LIBRARY_PATH" CFLAGS="$CFLAGS $IM_CFLAGS" - LIBS="$LIBS $IM_LIBS" + LIBS="$LIBS $IM_LIBS -lpthread" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$with_im/lib" export LD_LIBRARY_PATH @@ -1378,6 +1598,7 @@ main () return 0; }], [ + BUILD_OPTS="$BUILD_OPTS im" AC_MSG_RESULT(good) ], [ @@ -1450,6 +1671,7 @@ main () return 0; }], [ + BUILD_OPTS="$BUILD_OPTS wbxml2" AC_MSG_RESULT(good) ], [ @@ -1656,7 +1878,7 @@ then ;; *) LZMA_CFLAGS="-I$with_lzma/include" - LZMA_LDFLAGS="-L$with_lzma/lib -llzma" + LZMA_LDFLAGS="-L$with_lzma/lib -llzma -lpthread" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$with_lzma/lib" export LD_LIBRARY_PATH ;; @@ -1954,6 +2176,7 @@ AC_HELP_STRING([--with-libs='lib1 ...'], [link against additional libs])dnl ########################################################################## LIBRDL="" +RDLFLAGS="" _save_LIBS=$LIBS AC_MSG_CHECKING(for --with-editline) @@ -1962,34 +2185,34 @@ AC_HELP_STRING([--with-editline(=DIR)], [use editline library])dnl ], [ AC_MSG_RESULT($withval) AC_DEFINE(WITH_EDITLINE, 1, [editline]) - if test -d "$withval" + if test -d "$withval/lib" then - LDFLAGS="$LDFLAGS -L$withval" + RDLFLAGS="-L$withval/lib" fi # first check if we can compile without lib termcap AC_MSG_CHECKING(for -ledit without -ltermcap) # check if libedit exists - LIBS="$LIBS -ledit" + LIBS="$RDLFLAGS -ledit" AC_TRY_LINK(extern char *readline();,char *line=readline();, [ BUILD_OPTS="$BUILD_OPTS editline" - LIBRDL="-ledit" + LIBRDL="$RDLFLAGS -ledit" AC_MSG_RESULT(yes) ], [ AC_MSG_RESULT(no) AC_CHECKING(for -ledit that needs -ltermcap) termcap= - AC_CHECK_LIB(termcap, tgetent, [termcap=termcap], [ + AC_CHECK_LIB(ncurses, tgetent, [termcap=ncurses], [ AC_CHECK_LIB(termlib, tgetent, [termcap=termlib], [ + AC_CHECK_LIB(termcap, tgetent, [termcap=termcap], [ AC_CHECK_LIB(curses, tgetent, [termcap=curses], [ - AC_CHECK_LIB(ncurses, tgetent, [termcap=ncurses], [ AC_ERROR(no working -ltermcap/termlib found -- do not use --with-editline)])])])]) LIBS="$LIBS -l$termcap" AC_MSG_CHECKING(for -ledit) AC_TRY_LINK(extern char *readline();, char *line=readline();, [ BUILD_OPTS="$BUILD_OPTS editline" - LIBRDL="-ledit -l$termcap" + LIBRDL="$RDLFLAGS -ledit -l$termcap" AC_MSG_RESULT(yes) ], [ AC_ERROR(no working editline library found -- do not use --with-editline) @@ -2193,54 +2416,6 @@ AM_CONDITIONAL(WITH_IODBC, test "x$virt_with_iodbc" = "xyes" ) AC_MSG_CHECKING(for Java options) -ac_jdk2_path="none" -AC_ARG_WITH(jdk2, [dnl -AC_HELP_STRING([--with-jdk2=DIR], [use the Sun JDK 1.3.x at the specified location]) -], [ - case "${withval}" in - yes) - AC_MSG_ERROR("You need to specify a directory") - ;; - - no) - ac_jdk2_path="none" - ;; - - *) - if test -d "${withval}" ; then - ac_jdk2_path="${withval}" - else - AC_MSG_ERROR("Directory specified with --with-jdk2 does not exist") - fi - ;; - esac -]) - -ac_jdk3_path="none" -AC_ARG_WITH(jdk3, [dnl -AC_HELP_STRING([--with-jdk3=DIR], [use the Sun JDK 1.4.x or 1.5.x at the specified location])dnl -], [ - case "${withval}" in - yes) - AC_MSG_ERROR("You need to specify a directory") - ;; - - no) - ac_jdk3_path="none" - ;; - - *) - if test -d "${withval}" ; then - ac_jdk3_path="${withval}" - else - AC_MSG_ERROR("Directory specified with --with-jdk3 does not exist") - fi - ;; - esac - ]) -AC_MSG_RESULT(done) - - ac_jdk4_path="none" AC_ARG_WITH(jdk4, [dnl AC_HELP_STRING([--with-jdk4=DIR], [use the Sun JDK 1.6.x at the specified location])dnl @@ -2369,17 +2544,11 @@ EOF fi ]) -AC_PROG_JAVA_WORKS($ac_jdk2_path, 3, 3) -ac_jdk2_works="$ac_cv_prog_java_works" -ac_jdk2_path="$ac_jw_jdk" -AM_CONDITIONAL(WITH_JDK2, test "x$ac_jdk2_works" = "xyes") -AC_SUBST(ac_jdk2_path) - -AC_PROG_JAVA_WORKS($ac_jdk3_path, 4, 5) -ac_jdk3_works="$ac_cv_prog_java_works" -ac_jdk3_path="$ac_jw_jdk" -AM_CONDITIONAL(WITH_JDK3, test "x$ac_jdk3_works" = "xyes") -AC_SUBST(ac_jdk3_path) +# +# Removed support for JDK1.2 - JDK1.5 +# +AM_CONDITIONAL(WITH_JDK2, false) +AM_CONDITIONAL(WITH_JDK3, false) AC_PROG_JAVA_WORKS($ac_jdk4_path, 6, 6) ac_jdk4_works="$ac_cv_prog_java_works" @@ -2406,10 +2575,6 @@ elif test "x$ac_jdk4_1_works" = "xyes" ; then ac_integ_jdk="$ac_jdk4_1_path/.." elif test "x$ac_jdk4_works" = "xyes" ; then ac_integ_jdk="$ac_jdk4_path/.." -elif test "x$ac_jdk3_works" = "xyes" ; then - ac_integ_jdk="$ac_jdk3_path/.." -elif test "x$ac_jdk2_works" = "xyes"; then - ac_integ_jdk="ac_jdk2_path/.." fi if test "x$ac_integ_jdk" != "x" ; then @@ -2925,19 +3090,22 @@ AC_CONFIG_FILES([ docsrc/Makefile libsrc/Makefile binsrc/bpel/Makefile - binsrc/b3s/Makefile binsrc/cached_resources/Makefile binsrc/dav/Makefile binsrc/dbpedia/Makefile binsrc/driver/Makefile + binsrc/fct/Makefile binsrc/hibernate/Makefile binsrc/hosting/Makefile binsrc/hosting/mono/Makefile binsrc/hosting/mono/tests/Makefile + binsrc/hosting/geos/Makefile binsrc/hosting/perl/Makefile binsrc/hosting/php/Makefile + binsrc/hosting/proj4/Makefile binsrc/hosting/python/Makefile binsrc/hosting/ruby/Makefile + binsrc/hosting/shapefileio/Makefile binsrc/isparql/Makefile binsrc/jena/Makefile binsrc/jena2/Makefile @@ -2994,7 +3162,7 @@ AC_CONFIG_FILES([ binsrc/ws/Makefile binsrc/ws/wsrm/Makefile binsrc/xddl/Makefile - binsrc/yacutia/Makefile + binsrc/conductor/Makefile docsrc/chm/Makefile docsrc/docwiki/Makefile docsrc/html_virt/Makefile @@ -3006,10 +3174,8 @@ AC_CONFIG_FILES([ docsrc/xmlsource/Makefile libsrc/Dk/Makefile libsrc/JDBCDriverType4/Makefile - libsrc/JDBCDriverType4/testsuite_2.0/Makefile - libsrc/JDBCDriverType4/testsuite_3.0/Makefile libsrc/JDBCDriverType4/testsuite_4.0/Makefile - libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile + libsrc/JDBCDriverType4/virtuoso/jdbc/Makefile libsrc/JDBCDriverType4/virtuoso/Makefile libsrc/langfunc/Makefile libsrc/odbcsdk/Makefile diff --git a/debian/copyright b/debian/copyright index 87fc6e5be2..9e83942397 100644 --- a/debian/copyright +++ b/debian/copyright @@ -12,7 +12,7 @@ Upstream Authors: Copyright: - Copyright (C) 1998-2018 OpenLink Software + Copyright (C) 1998-2019 OpenLink Software License: @@ -1402,7 +1402,7 @@ Additional copyrights: The Debian packaging is: - Copyright (C) 2008-2018 OpenLink Sofware + Copyright (C) 2008-2019 OpenLink Sofware and builds on work by: diff --git a/docsrc/Makefile.am b/docsrc/Makefile.am index bf0fdb1c1c..7751c316a9 100644 --- a/docsrc/Makefile.am +++ b/docsrc/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/docsrc/chm/Makefile.am b/docsrc/chm/Makefile.am index 702bb00a55..7553f5d4bd 100644 --- a/docsrc/chm/Makefile.am +++ b/docsrc/chm/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/docsrc/docwiki/Makefile.am b/docsrc/docwiki/Makefile.am index 68d3f5c91f..656e490f59 100644 --- a/docsrc/docwiki/Makefile.am +++ b/docsrc/docwiki/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/docsrc/docwiki/VirtDocPlugin.pm b/docsrc/docwiki/VirtDocPlugin.pm index 153d67a406..87368fbe6f 100644 --- a/docsrc/docwiki/VirtDocPlugin.pm +++ b/docsrc/docwiki/VirtDocPlugin.pm @@ -2,7 +2,7 @@ # # Copyright (C) 2000-2003 Andrea Sterbini, a.sterbini@flashnet.it # Copyright (C) 2001-2003 Peter Thoeny, peter@thoeny.com -# Copyright (C) 2005-2018 OpenLink Software +# Copyright (C) 2005-2019 OpenLink Software # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License diff --git a/docsrc/docwiki/wiki.sql b/docsrc/docwiki/wiki.sql index 7aab26e076..7967b81c0c 100644 --- a/docsrc/docwiki/wiki.sql +++ b/docsrc/docwiki/wiki.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/docsrc/docwiki/wiki.xsl b/docsrc/docwiki/wiki.xsl index 005971fed2..dd485f2199 100644 --- a/docsrc/docwiki/wiki.xsl +++ b/docsrc/docwiki/wiki.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/docwiki/wiki_contents.xsl b/docsrc/docwiki/wiki_contents.xsl index 10a0dd620e..179dd06898 100644 --- a/docsrc/docwiki/wiki_contents.xsl +++ b/docsrc/docwiki/wiki_contents.xsl @@ -6,7 +6,7 @@ - This file is part of the OpenLink Software Virtuoso Open-Source (VOS) - project. - - - Copyright (C) 1998-2018 OpenLink Software + - Copyright (C) 1998-2019 OpenLink Software - - This project is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the diff --git a/docsrc/html_virt/Makefile.am b/docsrc/html_virt/Makefile.am index 1f37151fa0..adb30e67c5 100644 --- a/docsrc/html_virt/Makefile.am +++ b/docsrc/html_virt/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/docsrc/images/Makefile.am b/docsrc/images/Makefile.am index 42cb3534c6..de0a7766ab 100644 --- a/docsrc/images/Makefile.am +++ b/docsrc/images/Makefile.am @@ -2,7 +2,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the diff --git a/docsrc/index.html b/docsrc/index.html index 08b10bea88..77817e111a 100644 --- a/docsrc/index.html +++ b/docsrc/index.html @@ -71,7 +71,7 @@

    Virtuoso Documentation

    PDF requires Adobe Acrobat 3.0 or above.


    -
    Copyright © 1998-2018 OpenLink Software
    +
    Copyright © 1998-2019 OpenLink Software
    -
    Virtuoso Universal Server - Copyright© 1998-2018 OpenLink Software.
    +
    Virtuoso Universal Server - Copyright© 1998-2019 OpenLink Software.
    bd_buffer + DP_FLAGS) - && IT_CHECK_FAST != mode) + if (dbs_cache_check_enable && (DPF_INDEX == SHORT_REF (buf->bd_buffer + DP_FLAGS)) && (IT_CHECK_FAST != mode)) pg_check_map_1 (buf); - if (buf->bd_is_dirty && !gethash (DP_ADDR2VOID (buf->bd_page), &itm->itm_remap)) - { - log_error ("Buffer %p dirty but no remap, tree %s", buf, it->it_key ? it->it_key->key_name : "no key"); - dbg_page_map_log (buf, "missed_flush.txt", "Dirty page with no remap"); - } + if (buf->bd_is_dirty && !gethash (DP_ADDR2VOID (buf->bd_page), &itm->itm_remap)) + { + log_error ("Buffer %p dirty but no remap, tree %s", buf, it->it_key ? it->it_key->key_name : "no key"); + dbg_page_map_log (buf, "missed_flush.txt", "Dirty page with no remap"); + } if (((dp_addr_t) dp) != buf->bd_page) { log_error ("*** Buffer %p cache dp %ld buf dp %ld \n", diff --git a/libsrc/Wi/sparql.h b/libsrc/Wi/sparql.h index 92987dfeb7..ff3e68610c 100644 --- a/libsrc/Wi/sparql.h +++ b/libsrc/Wi/sparql.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -828,6 +828,9 @@ extern int sparyyparse (sparp_t *sparp_arg); The search for associated macro lib is disabled if the statement contains CREATE MACRO LIBRARY clause */ extern void sparp_configure_storage_and_macro_libs (sparp_t *sparp); extern void sparp_compile_smllist (sparp_t *sparp, caddr_t sml_iri_uname, void /* actually struct sparql_macro_library_t */ *smlib); +extern int sparp_sql_function_name_is_unsafe (const char *buf); +extern int sparp_bif_function_name_is_unsafe (const char *buf); + extern const char *spart_dump_opname (ptrlong opname, int is_op); extern void spart_dump (const void *tree_arg, dk_session_t *ses, int indent, const char *title, int hint); @@ -931,7 +934,10 @@ extern caddr_t sparp_graph_sec_id_to_iri_nosignal (sparp_t *sparp, iri_id_t iid) extern caddr_t sparp_iri_to_id_nosignal (sparp_t *sparp, ccaddr_t qname); /*!< returns t_boxed IRI_ID or plain NULL pointer */ extern ccaddr_t sparp_id_to_iri (sparp_t *sparp, iri_id_t iid); /*!< returns t_boxed string or plain NULL pointer */ -extern caddr_t spar_strliteral (sparp_t *sparp, const char *sparyytext, int strg_is_long, int is_json); +#define SPAR_STRLITERAL_SPARQL_STRING 0 +#define SPAR_STRLITERAL_JSON_STRING 1 +#define SPAR_STRLITERAL_SPARQL_QNAME 2 +extern caddr_t spar_unescape_strliteral (sparp_t *sparp, const char *sparyytext, int count_of_quotes, int mode); extern caddr_t spar_mkid (sparp_t * sparp, const char *prefix); extern void spar_change_sign (caddr_t *lit_ptr); diff --git a/libsrc/Wi/sparql.sql b/libsrc/Wi/sparql.sql index c5bad908ba..2fa1d2b9a5 100644 --- a/libsrc/Wi/sparql.sql +++ b/libsrc/Wi/sparql.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -1090,7 +1090,7 @@ create function DB.DBA.RDF_OBJ_ADD (in dt_twobyte integeR, in v varchar, in lang else ro_id_dict := null; } - if (126 = __tag (v)) + if (__tag of long varchar handle = __tag (v)) v := blob_to_string (v); if (isstring (rdf_box_data (v))) need_digest := rdf_box_needs_digest (v, ro_id_dict); @@ -1352,7 +1352,7 @@ create function DB.DBA.RDF_FIND_RO_DIGEST (in dt_twobyte integeR, in v varchar, declare llong, dt_and_lang int; declare dt_s, lang_s, chksm, sum64 varchar; declare digest, old_digest any; - if (126 = __tag (v)) + if (__tag of long varchar handle = __tag (v)) v := blob_to_string (v); dt_and_lang := bit_or (bit_shift (dt_twobyte, 16), lang_twobyte); if (not (isstring (v))) @@ -1396,7 +1396,7 @@ create function DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL (in v any) returns any array { declare t int; t := __tag (v); - if (not (t in (126, __tag of varchar, __tag of UNAME, __tag of nvarchar, __tag of XML, __tag of rdf_box))) + if (not (t in (__tag of long varchar handle, __tag of varchar, __tag of UNAME, __tag of nvarchar, __tag of XML, __tag of rdf_box))) return v; if (__tag of UNAME = t) return __i2id (v); @@ -1413,7 +1413,7 @@ create function DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL_FT (in v any, in g_iid IRI_ID, in declare t int; -- dbg_obj_princ ('DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL_FT (', v, g_iid, p_iid, ro_id_dict, ')'); t := __tag (v); - if (not (t in (126, __tag of varchar, __tag of UNAME, __tag of nvarchar, __tag of XML, __tag of rdf_box))) + if (not (t in (__tag of long varchar handle, __tag of varchar, __tag of UNAME, __tag of nvarchar, __tag of XML, __tag of rdf_box))) return v; if (__tag of UNAME = t) return __i2id (v); @@ -1421,7 +1421,7 @@ create function DB.DBA.RDF_MAKE_OBJ_OF_SQLVAL_FT (in v any, in g_iid IRI_ID, in return __i2id (v); if (__tag of nvarchar = t) v := charset_recode (v, '_WIDE_', 'UTF-8'); - else if (t = 126) + else if (t = __tag of long varchar handle) v := cast (v as varchar); if (not __rdf_obj_ft_rule_check (g_iid, p_iid)) ro_id_dict := null; @@ -1446,7 +1446,7 @@ create function DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL (in v any, in dt_iid IRI_ID, -- dbg_obj_princ ('DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL (', v, dt_iid, lang, ')'); retry_unrdf: t := __tag (v); - if (not (t in (126, __tag of varchar, __tag of UNAME, __tag of nvarchar, __tag of XML))) + if (not (t in (__tag of long varchar handle, __tag of varchar, __tag of UNAME, __tag of nvarchar, __tag of XML))) { if (__tag of rdf_box = t) { @@ -1458,7 +1458,7 @@ retry_unrdf: } if (__tag of nvarchar = t) v := charset_recode (v, '_WIDE_', 'UTF-8'); - else if (126 = t) + else if (__tag of long varchar handle = t) v := cast (v as varchar); if (dt_iid is not null) dt_twobyte := DB.DBA.RDF_TWOBYTE_OF_DATATYPE (dt_iid); @@ -1479,7 +1479,7 @@ create function DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL_FT (in v any, in dt_iid IRI_I -- dbg_obj_princ ('DB.DBA.RDF_MAKE_OBJ_OF_TYPEDSQLVAL_FT (', v, dt_iid, lang, g_iid, p_iid, ro_id_dict, ')'); retry_unrdf: t := __tag (v); - if (not (t in (126, __tag of varchar, __tag of UNAME, __tag of nvarchar, __tag of XML))) + if (not (t in (__tag of long varchar handle, __tag of varchar, __tag of UNAME, __tag of nvarchar, __tag of XML))) { if (__tag of rdf_box = t) { @@ -1491,7 +1491,7 @@ retry_unrdf: } if (__tag of nvarchar = t) v := charset_recode (v, '_WIDE_', 'UTF-8'); - else if (__tag of UNAME = t or 126 = t) + else if (t in (__tag of UNAME, __tag of long varchar handle)) v := cast (v as varchar); if (dt_iid is not null) dt_twobyte := DB.DBA.RDF_TWOBYTE_OF_DATATYPE (dt_iid); @@ -1656,16 +1656,16 @@ create function DB.DBA.RDF_OBJ_OF_LONG (in longobj any) returns any t := __tag (longobj); if (__tag of rdf_box <> t) { - if (not (t in (__tag of varchar, 126, __tag of UNAME, __tag of nvarchar, 133, 226))) + if (not (t in (__tag of varchar, __tag of long varchar handle, __tag of UNAME, __tag of nvarchar, __tag of long nvarchar handle, 226))) return longobj; - if (t = 133) + if (t = __tag of long nvarchar handle) { longobj := cast (longobj as nvarchar); t := __tag (longobj); } if (__tag of nvarchar = t or t = 226) longobj := charset_recode (longobj, '_WIDE_', 'UTF-8'); - else if (t = 126) + else if (t = __tag of long varchar handle) longobj := cast (longobj as varchar); else if (__tag of UNAME = t) return __i2id (longobj); @@ -1683,7 +1683,7 @@ create function DB.DBA.RDF_OBJ_OF_SQLVAL (in v any) returns any array { declare t int; t := __tag (v); - if (not (t in (__tag of varchar, 126, __tag of UNAME, __tag of nvarchar))) + if (not (t in (__tag of varchar, __tag of long varchar handle, __tag of UNAME, __tag of nvarchar))) { if (__tag of rdf_box = __tag(v) and 0 = rdf_box_ro_id (v)) return DB.DBA.RDF_OBJ_ADD (257, v, 257); @@ -1695,7 +1695,7 @@ create function DB.DBA.RDF_OBJ_OF_SQLVAL (in v any) returns any array return __i2id (v); if (__tag of nvarchar = t) v := charset_recode (v, '_WIDE_', 'UTF-8'); - else if (t = 126) + else if (t = __tag of long varchar handle) v := cast (v as varchar); return DB.DBA.RDF_OBJ_ADD (257, v, 257); } @@ -1709,7 +1709,7 @@ create function DB.DBA.RDF_MAKE_LONG_OF_SQLVAL (in v any) returns any declare t int; declare res any; t := __tag (v); - if (not (t in (126, __tag of varchar, __tag of UNAME, __tag of nvarchar, __tag of XML))) + if (not (t in (__tag of long varchar handle, __tag of varchar, __tag of UNAME, __tag of nvarchar, __tag of XML))) return v; if (__tag of UNAME = t) return __i2id (v); @@ -1717,7 +1717,7 @@ create function DB.DBA.RDF_MAKE_LONG_OF_SQLVAL (in v any) returns any return __i2id (v); if (__tag of nvarchar = t) v := charset_recode (v, '_WIDE_', 'UTF-8'); - else if (126 = t) + else if (__tag of long varchar handle = t) v := cast (v as varchar); res := rdf_box (v, 257, 257, 0, 1); return res; @@ -2014,7 +2014,7 @@ create function DB.DBA.RDF_LONG_OF_SQLVAL (in v varchar) returns any { declare t int; t := __tag (v); - if (not (t in (126, __tag of varchar, __tag of UNAME, __tag of nvarchar))) + if (not (t in (__tag of long varchar handle, __tag of varchar, __tag of UNAME, __tag of nvarchar))) return v; if (__tag of UNAME = t) return __i2id (v); @@ -2022,7 +2022,7 @@ create function DB.DBA.RDF_LONG_OF_SQLVAL (in v varchar) returns any return __i2id (v); if (__tag of nvarchar = t) v := charset_recode (v, '_WIDE_', 'UTF-8'); - else if (t = 126) + else if (t = __tag of long varchar handle) v := cast (v as varchar); -- if ((t = __tag of varchar) and (v like 'http://%')) -- { @@ -2103,7 +2103,7 @@ create function DB.DBA.RDF_IS_BLANK_REF (in v any) returns any return 0; return 1; } - if (__tag (v) = 243) + if (__tag (v) = __tag of IRI_ID) { if (v < min_bnode_iri_id ()) return 0; @@ -2122,7 +2122,7 @@ create function DB.DBA.RDF_IS_URI_REF (in v any) returns any return 1; return 0; } - if (__tag (v) = 243) + if (__tag (v) = __tag of IRI_ID) { if (v < min_bnode_iri_id ()) return 1; @@ -2135,7 +2135,7 @@ create function DB.DBA.RDF_IS_URI_REF (in v any) returns any --!AWK PUBLIC create function DB.DBA.RDF_IS_REF (in v any) returns any { - if (__tag (v) in (__tag of UNAME, 243)) + if (__tag (v) in (__tag of UNAME, __tag of IRI_ID)) return 1; if ((__tag of varchar = __tag (v)) and bit_and (1, __box_flags (v))) return 1; @@ -2146,7 +2146,7 @@ create function DB.DBA.RDF_IS_REF (in v any) returns any --!AWK PUBLIC create function DB.DBA.RDF_IS_LITERAL (in v any) returns any { - if (__tag (v) in (__tag of UNAME, 243)) + if (__tag (v) in (__tag of UNAME, __tag of IRI_ID)) return 0; if ((__tag of varchar = __tag (v)) and bit_and (1, __box_flags (v))) return 0; @@ -2577,18 +2577,18 @@ create procedure DB.DBA.RDF_QUAD_L_RDB2RDF (in g_iid varchar, in s_iid varchar, t := __tag (o_val); if (__tag of rdf_box <> t) { - if (not (t in (__tag of varchar, 126, 133, __tag of UNAME, __tag of nvarchar, 226))) + if (not (t in (__tag of varchar, __tag of long varchar handle, __tag of long nvarchar handle, __tag of UNAME, __tag of nvarchar, 226))) { goto o_val_done; } - if (t = 133) + if (t = __tag of long nvarchar handle) { o_val := cast (o_val as nvarchar); t := __tag (o_val); } if (__tag of nvarchar = t or t = 226) o_val := charset_recode (o_val, '_WIDE_', 'UTF-8'); - else if (t = 126) + else if (t = __tag of long varchar handle) o_val := cast (o_val as varchar); else if (t = __tag of UNAME) { @@ -2843,7 +2843,7 @@ create procedure DB.DBA.TTLP (in strg varchar, in base varchar, in graph varchar DB.DBA.TTLP_CL (strg, 0, base, graph, flags); return; } - if (126 = __tag (strg)) + if (__tag of long varchar handle = __tag (strg)) strg := cast (strg as varchar); app_env := vector (flags, null, __max (length (strg) / 100, 100000), null); ret := rdf_load_turtle (strg, base, graph, flags, @@ -2891,7 +2891,7 @@ create procedure DB.DBA.TTLP_WITH_IRI_TRANSLATION (in strg varchar, in base varc DB.DBA.TTLP_CL (strg, 0, base, graph, flags); return; } - if (126 = __tag (strg)) + if (__tag of long varchar handle = __tag (strg)) strg := cast (strg as varchar); app_env := vector (flags, null, __max (length (strg) / 100, 100000), null, iri_xlate_cbk, iri_xlate_env); return rdf_load_turtle (strg, base, graph, flags, @@ -2911,7 +2911,7 @@ create procedure DB.DBA.TTLP_VALIDATE (in strg varchar, in base varchar, in grap { declare app_env any; declare old_log_mode int; - if (126 = __tag (strg)) + if (__tag of long varchar handle = __tag (strg)) strg := cast (strg as varchar); return rdf_load_turtle (strg, base, graph, flags, vector ('', '', '', '', '', '', report_cbk), @@ -2923,8 +2923,8 @@ create procedure DB.DBA.TTLP_VALIDATE_LOCAL_FILE (in strg varchar, in base varch { declare app_env any; declare old_log_mode int; - if (126 = __tag (strg)) - strg := cast (strg as varchar); + if (__tag of long varchar handle = __tag (strg)) + strg := cast (strg as varchar); return rdf_load_turtle_local_file (strg, base, graph, flags, vector ('', '', '', '', '', '', report_cbk), app_env); @@ -3051,7 +3051,7 @@ create function DB.DBA.RDF_TTL2HASH (in strg varchar, in base varchar, in graph { declare res any; res := dict_new (); - if (126 = __tag (strg)) + if (__tag of long varchar handle = __tag (strg)) strg := cast (strg as varchar); res := dict_new (length (strg) / 100); rdf_load_turtle (strg, base, graph, flags, @@ -3070,9 +3070,9 @@ create function DB.DBA.RDF_TTL2HASH (in strg varchar, in base varchar, in graph create function DB.DBA.RDF_TTL_LOAD_DICT (in strg varchar, in base varchar, in graph varchar, in dict any, in flags integer := 0) returns any { - if (__tag (dict) <> 214) + if (__tag (dict) <> __tag of dictionary reference) signal ('22023', 'RDFXX', 'The dict argument must be of type dictionary'); - if (126 = __tag (strg)) + if (__tag of long varchar handle = __tag (strg)) strg := cast (strg as varchar); rdf_load_turtle (strg, base, graph, flags, vector ( @@ -3129,7 +3129,7 @@ create function DB.DBA.RDF_TTL2SQLHASH (in strg varchar, in base varchar, in gra { declare res any; res := dict_new (); - if (126 = __tag (strg)) + if (__tag of long varchar handle = __tag (strg)) strg := cast (strg as varchar); res := dict_new (length (strg) / 100); rdf_load_turtle (strg, base, graph, flags, @@ -3226,7 +3226,7 @@ create procedure DB.DBA.RDF_RDFXML_TO_DICT (in strg varchar, in base varchar, in create procedure DB.DBA.RDF_RDFXML_LOAD_DICT (in strg varchar, in base varchar, in graph varchar, inout dict any, in flag int := 0, in xml_parse_mode int := 0) { - if (__tag (dict) <> 214) + if (__tag (dict) <> __tag of dictionary reference) signal ('22023', 'RDFXX', 'The dict argument must be of type dictionary'); if (flag = 0) xml_parse_mode := 0; @@ -3248,7 +3248,7 @@ create procedure DB.DBA.RDF_RDFXML_LOAD_DICT (in strg varchar, in base varchar, create procedure DB.DBA.RDFA_LOAD_DICT (in strg varchar, in base varchar, in graph varchar, inout dict any, in xml_parse_mode int := 0) { declare app_env any; - if (__tag (dict) <> 214) + if (__tag (dict) <> __tag of dictionary reference) signal ('22023', 'RDFXX', 'The dict argument must be of type dictionary'); rdf_load_rdfxml (strg, bit_or (2, bit_shift (xml_parse_mode, 8)), -- 0 rdfxml, 2 rdfa graph, @@ -3269,7 +3269,7 @@ create procedure DB.DBA.RDFA_LOAD_DICT (in strg varchar, in base varchar, in gra create procedure DB.DBA.RDFA_LOAD_DICT_XLAT (in strg varchar, in base varchar, in graph varchar, inout dict any, in xml_parse_mode int := 0, in iri_xlate_cbk varchar, in iri_xlate_env any) { declare app_env any; - if (__tag (dict) <> 214) + if (__tag (dict) <> __tag of dictionary reference) signal ('22023', 'RDFXX', 'The dict argument must be of type dictionary'); rdf_load_rdfxml (strg, bit_or (2, bit_shift (xml_parse_mode, 8)), -- 0 rdfxml, 2 rdfa graph, @@ -4426,7 +4426,7 @@ create procedure DB.DBA.RDF_TRIPLES_TO_JSON_LD_CTX (inout triples any, inout ses return; } env := vector (0, 0, 0, null); - if (214 <> __tag (ctx_dict)) + if (__tag of dictionary reference <> __tag (ctx_dict)) { if (bit_and (ctx_mode, 1)) ctx_dict := dict_new (31); @@ -4506,7 +4506,7 @@ create procedure DB.DBA.RDF_TRIPLES_TO_JSON_LD_CTX (inout triples any, inout ses skip_shortcut_calc: ; } } - if (214 <> __tag (ctx_dict)) + if (__tag of dictionary reference <> __tag (ctx_dict)) http ('{ "@graph": [\n ', ses); else { @@ -5759,7 +5759,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_ATOM_XML (inout triples_dict an { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -5800,7 +5800,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_ODATA_JSON (inout triples_dict { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -6123,7 +6123,7 @@ create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_ACC (inout _env any, inout { declare col_ctr, col_count integer; declare blank_ids any; - if (185 <> __tag(_env)) + if (__tag of stream <> __tag(_env)) DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_INIT (_env); http ('\n rs:result [', _env); col_count := length (colnames); @@ -6168,7 +6168,7 @@ end_of_binding: ; create function DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_FIN (inout _env any) returns long varchar { - if (185 <> __tag(_env)) + if (__tag of stream <> __tag(_env)) DB.DBA.RDF_FORMAT_RESULT_SET_AS_TTL_INIT (_env); http ('\n ] .', _env); @@ -6203,7 +6203,7 @@ create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_ACC (inout _env any, inout c { declare col_buf any; col_count := length (colnames); - if (185 <> __tag(_env)) + if (__tag of stream <> __tag(_env)) DB.DBA.RDF_FORMAT_RESULT_SET_AS_NT_INIT (_env); col_buf := make_array (col_count * 7, 'any'); for (col_ctr := 0; col_ctr < col_count; col_ctr := col_ctr + 1) @@ -6244,7 +6244,7 @@ create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_ACC (inout _env any, in declare sol_id varchar; declare col_ctr, col_count integer; declare blank_ids any; - if (185 <> __tag(_env)) + if (__tag of stream <> __tag(_env)) DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_INIT (_env); sol_id := cast (length (_env) as varchar); http ('\n ', _env); @@ -6310,7 +6310,7 @@ end_of_binding: ; create function DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_FIN (inout _env any) returns long varchar { - if (185 <> __tag(_env)) + if (__tag of stream <> __tag(_env)) DB.DBA.RDF_FORMAT_RESULT_SET_AS_RDF_XML_INIT (_env); http ('\n \n', _env); @@ -6335,7 +6335,7 @@ create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_ACC (inout _env any, inout declare col_ctr, col_count, need_comma integer; declare blank_ids any; col_count := length (colnames); - if (185 <> __tag(_env)) + if (__tag of stream <> __tag(_env)) { _env := string_output (); http ('\n{ "head": { "link": [], "vars": [', _env); @@ -6372,7 +6372,7 @@ end_of_val_print: ; create function DB.DBA.RDF_FORMAT_RESULT_SET_AS_JSON_FIN (inout _env any) returns long varchar { - if (185 <> __tag(_env)) + if (__tag of stream <> __tag(_env)) { _env := string_output (); http ('\n{ "head": { "link": [], "vars": [] },\n "results": { "distinct": false, "ordered": true, "bindings": [', _env); @@ -6430,7 +6430,7 @@ create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_ACC (inout _env any, inout declare col_ctr, col_count integer; declare blank_ids any; col_count := length (colnames); - if (185 <> __tag(_env)) + if (__tag of stream <> __tag(_env)) { _env := string_output (); for (col_ctr := 0; col_ctr < col_count; col_ctr := col_ctr + 1) @@ -6456,7 +6456,7 @@ create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_ACC (inout _env any, inout create function DB.DBA.RDF_FORMAT_RESULT_SET_AS_CSV_FIN (inout _env any) returns long varchar { - if (185 <> __tag(_env)) + if (__tag of stream <> __tag(_env)) return ''; return string_output_string (_env); } @@ -6473,7 +6473,7 @@ create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_TSV_ACC (inout _env any, inout declare col_ctr, col_count integer; declare blank_ids any; col_count := length (colnames); - if (185 <> __tag(_env)) + if (__tag of stream <> __tag(_env)) { _env := string_output (); for (col_ctr := 0; col_ctr < col_count; col_ctr := col_ctr + 1) @@ -6575,7 +6575,7 @@ create procedure DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_ACC (inout _env any, i DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT (_env); if (isinteger (_env[1])) { - if (185 <> __tag(_env)) + if (__tag of stream <> __tag(_env)) DB.DBA.RDF_FORMAT_RESULT_SET_AS_BINDINGS_INIT (_env); _env[1] := colnames; ses := aref_set_0 (_env, 2); @@ -6624,7 +6624,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TTL (inout triples_dict any) re { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -6641,7 +6641,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_NICE_TTL (inout triples_dict an if (2666 < dict_size (triples_dict)) -- The "nice" algorithm is too slow to be applied to large outputs. There's also a limit for 8000 namespace prefixes. return DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TTL (triples_dict); ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) triples := vector (); else triples := dict_list_keys (triples_dict, 1); @@ -6836,7 +6836,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TRIG (inout triples_dict any) r { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -6851,7 +6851,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_NT (inout triples_dict any) ret { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -6866,7 +6866,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDF_XML (inout triples_dict any { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -6881,7 +6881,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TALIS_JSON (inout triples_dict { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -6896,7 +6896,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_LD (inout triples_dict any { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -6911,7 +6911,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_LD_CTX (inout triples_dict { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -6926,7 +6926,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_UL (inout triples_dict any { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -6941,7 +6941,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_TR (inout triples_dict any { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -6956,7 +6956,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_MICRODATA (inout triples_d { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -6971,7 +6971,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_NICE_MICRODATA (inout trip { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -6986,7 +6986,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_NICE_TTL (inout triples_di { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) triples := vector (); else triples := dict_list_keys (triples_dict, 1); @@ -6999,7 +6999,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_SCRIPT_LD_JSON (inout trip { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) triples := vector (); else triples := dict_list_keys (triples_dict, 1); @@ -7012,7 +7012,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_HTML_SCRIPT_TTL (inout triples_ { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) triples := vector (); else triples := dict_list_keys (triples_dict, 1); @@ -7087,7 +7087,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_JSON_MICRODATA (inout triples_d { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -7102,7 +7102,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CSV (inout triples_dict any) re { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -7117,7 +7117,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_TSV (inout triples_dict any) re { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -7132,7 +7132,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_RDFA_XHTML (inout triples_dict { declare triples, ses any; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -7150,7 +7150,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML (inout triples_dict any) r declare add_http_headers integer; add_http_headers := 0; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -7168,7 +7168,7 @@ create function DB.DBA.RDF_FORMAT_TRIPLE_DICT_AS_CXML_QRCODE (inout triples_dict declare add_http_headers integer; add_http_headers := 0; ses := string_output (); - if (214 <> __tag (triples_dict)) + if (__tag of dictionary reference <> __tag (triples_dict)) { triples := vector (); } @@ -8003,9 +8003,6 @@ create procedure DB.DBA.RDF_REPL_DEL (inout rquads any) } ; ---#IF VER=5 ---!AFTER ---#ENDIF create function DB.DBA.SPARUL_CLEAR (in graph_iris any, in inside_sponge integer, in uid integer := 0, in log_mode integer := null, in compose_report integer := 0, in options any := null, in silent integer := 0) returns any { declare g_iid IRI_ID; @@ -9002,7 +8999,7 @@ create procedure DB.DBA.SPARQL_CONSTRUCT_ACC (inout _env any, in opcodes any, in { declare triple_ctr integer; declare blank_ids any; - if (214 <> __tag(_env)) + if (__tag of dictionary reference <> __tag(_env)) { if (use_dict_limit) _env := dict_new (31, sys_stat ('sparql_result_set_max_rows'), sys_stat ('sparql_max_mem_in_use')); @@ -9105,7 +9102,7 @@ end_of_adding_triple: ; --!AWK PUBLIC create procedure DB.DBA.SPARQL_CONSTRUCT_FIN (inout _env any) { - if (214 <> __tag(_env)) + if (__tag of dictionary reference <> __tag(_env)) _env := dict_new (); return _env; } @@ -9129,7 +9126,7 @@ create procedure DB.DBA.SPARQL_DESC_AGG_ACC (inout _env any, in vars any) { declare var_ctr integer; declare blank_ids any; - if (214 <> __tag(_env)) + if (__tag of dictionary reference <> __tag(_env)) { _env := dict_new (31, sys_stat ('sparql_result_set_max_rows'), sys_stat ('sparql_max_mem_in_use')); } @@ -9147,7 +9144,7 @@ create procedure DB.DBA.SPARQL_DESC_AGG_FIN (inout _env any) { declare subjects, options, res any; declare subj_ctr integer; - if (214 <> __tag(_env)) + if (__tag of dictionary reference <> __tag(_env)) return dict_new (); return _env; } @@ -10725,7 +10722,7 @@ next_batch: return; } DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples); --- exec_result_names (vector (vector ('S', 182, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0), vector ('P', 182, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0), vector ('O', 125, 0, 2147483647, 1, 0, 0, 0, 0, 0, 0, 0))); +-- exec_result_names (vector (vector ('S', __tag of varchar, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0), vector ('P', __tag of varchar, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0), vector ('O', 125, 0, 2147483647, 1, 0, 0, 0, 0, 0, 0, 0))); len := length (triples); for (ctr := 0; ctr < len; ctr := ctr+1) { @@ -10771,7 +10768,7 @@ create procedure DB.DBA.RDF_DICT_OF_TRIPLES_TO_FOUR_COLS (in dict any, in destru declare O_IS_IRI, dt_twobyte, lang_twobyte integer; triples := dict_list_keys (dict, destructive); DB.DBA.RDF_TRIPLES_BATCH_COMPLETE (triples); - exec_result_names (vector (vector ('S', 182, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0), vector ('P', 182, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0), vector ('O', 182, 0, 2147483647, 1, 0, 0, 0, 0, 0, 0, 0), vector ('O_TYPE', 182, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0))); + exec_result_names (vector (vector ('S', __tag of varchar, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0), vector ('P', __tag of varchar, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0), vector ('O', __tag of varchar, 0, 2147483647, 1, 0, 0, 0, 0, 0, 0, 0), vector ('O_TYPE', 182, 0, 4072, 1, 0, 1, 0, 0, 0, 0, 0))); len := length (triples); for (ctr := 0; ctr < len; ctr := ctr+1) { @@ -11398,7 +11395,7 @@ create function DB.DBA.JSO_DUMP_FLD (in v any, inout ses any) v_tag := __tag(v); if (v_tag = __tag of UNAME) DB.DBA.JSO_DUMP_IRI (cast (v as varchar), ses); - else if (v_tag = 243) + else if (v_tag = __tag of IRI_ID) DB.DBA.JSO_DUMP_IRI (id_to_iri (v), ses); else if (v_tag = 203) http (jso_dbg_dump_rtti (v), ses); @@ -17358,7 +17355,7 @@ create procedure DB.DBA.RDF_QUAD_AUDIT () and exists (select top 1 1 from DB.DBA.SYS_COLS where "TABLE" = fix_identifier_case ('DB.DBA.RDF_OBJ') and "COLUMN" = fix_identifier_case ('RO_FLAGS') - and COL_DTP = 188 ) ) + and COL_DTP = __tag of smallint ) ) goto check_new_style; err_dict := dict_new (); if (isstring (registry_get ('DB.DBA.RDF_QUAD_FT_UPGRADE'))) @@ -17645,7 +17642,7 @@ create procedure DB.DBA.RDF_QUAD_FT_UPGRADE () commit work; if (1 <> sys_stat ('cl_run_local_only')) goto final_qm_reload; - if (244 = coalesce ((select COL_DTP from SYS_COLS where "TABLE" = 'DB.DBA.RDF_QUAD' and "COLUMN"='G'), 0)) + if (__tag of IRI_ID_8 = coalesce ((select COL_DTP from SYS_COLS where "TABLE" = 'DB.DBA.RDF_QUAD' and "COLUMN"='G'), 0)) { __set_64bit_min_bnode_iri_id(); sequence_set ('RDF_URL_IID_BLANK', iri_id_num (min_bnode_iri_id ()), 1); @@ -17657,7 +17654,7 @@ create procedure DB.DBA.RDF_QUAD_FT_UPGRADE () and exists (select top 1 1 from DB.DBA.SYS_COLS where "TABLE" = fix_identifier_case ('DB.DBA.RDF_OBJ') and "COLUMN" = fix_identifier_case ('RO_FLAGS') - and COL_DTP = 188 ) ) + and COL_DTP = __tag of smallint ) ) goto final_qm_reload; exec ('DB.DBA.vt_create_text_index ( fix_identifier_case (''DB.DBA.RDF_OBJ''), @@ -17681,9 +17678,6 @@ final_qm_reload: DB.DBA.RDF_QUAD_FT_UPGRADE () ; ---#IF VER=5 ---!AFTER __PROCEDURE__ DB.DBA.USER_CREATE ! ---#ENDIF DB.DBA.RDF_CREATE_SPARQL_ROLES () ; diff --git a/libsrc/Wi/sparql2sql.c b/libsrc/Wi/sparql2sql.c index 1be268e92f..be59cf3ea1 100644 --- a/libsrc/Wi/sparql2sql.c +++ b/libsrc/Wi/sparql2sql.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sparql2sql.h b/libsrc/Wi/sparql2sql.h index b08dbc1750..fc6a718843 100644 --- a/libsrc/Wi/sparql2sql.h +++ b/libsrc/Wi/sparql2sql.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sparql2sqltext.c b/libsrc/Wi/sparql2sqltext.c index eb470aba43..8031fea928 100644 --- a/libsrc/Wi/sparql2sqltext.c +++ b/libsrc/Wi/sparql2sqltext.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sparql_core.c b/libsrc/Wi/sparql_core.c index 901c71ba7b..d8224cc07f 100644 --- a/libsrc/Wi/sparql_core.c +++ b/libsrc/Wi/sparql_core.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -743,10 +743,10 @@ caddr_t sparp_graph_sec_iri_to_id_nosignal (sparp_t *sparp, ccaddr_t qname) { caddr_t *place, res; - mutex_enter (rdf_graph_iri2id_dict_htable->ht_mutex); + rwlock_rdlock (rdf_graph_iri2id_dict_htable->ht_rwlock); place = (caddr_t *)id_hash_get (rdf_graph_iri2id_dict_htable, (caddr_t)(&qname)); res = (NULL == place) ? NULL : box_copy_tree (place[0]); - mutex_leave (rdf_graph_iri2id_dict_htable->ht_mutex); + rwlock_unlock (rdf_graph_iri2id_dict_htable->ht_rwlock); return res; } @@ -757,10 +757,10 @@ sparp_graph_sec_id_to_iri_nosignal (sparp_t *sparp, iri_id_t iid) caddr_t boxed_iid, *place, res; BOX_AUTO (boxed_iid, iid_box_buf, sizeof (iri_id_t), DV_IRI_ID); ((iri_id_t *)boxed_iid)[0] = iid; - mutex_enter (rdf_graph_id2iri_dict_htable->ht_mutex); + rwlock_rdlock (rdf_graph_id2iri_dict_htable->ht_rwlock); place = (caddr_t *)id_hash_get (rdf_graph_id2iri_dict_htable, (caddr_t)(&iid)); res = (NULL == place) ? NULL : box_copy_tree (place[0]); - mutex_leave (rdf_graph_id2iri_dict_htable->ht_mutex); + rwlock_unlock (rdf_graph_id2iri_dict_htable->ht_rwlock); return res; } @@ -827,15 +827,15 @@ sparp_id_to_iri (sparp_t *sparp, iri_id_t iid) return NULL; /* to keep compiler happy */ } -caddr_t spar_strliteral (sparp_t *sparp, const char *strg, int strg_is_long, int is_json) +caddr_t spar_unescape_strliteral (sparp_t *sparp, const char *strg, int count_of_quotes, int mode) { caddr_t tmp_buf; caddr_t res; const char *err_msg; const char *src_tail, *src_end; char *tgt_tail; - src_tail = strg + (strg_is_long ? 3 : 1); - src_end = strg + strlen (strg) - (strg_is_long ? 3 : 1); + src_tail = strg + count_of_quotes; + src_end = strg + strlen (strg) - count_of_quotes; tgt_tail = tmp_buf = dk_alloc_box ((src_end - src_tail) + 1, DV_SHORT_STRING); while (src_tail < src_end) { @@ -843,16 +843,16 @@ caddr_t spar_strliteral (sparp_t *sparp, const char *strg, int strg_is_long, int { case '\\': { - const char *bs_src = "abfnrtv/\\\'\"uU"; - const char *bs_trans = "\a\b\f\n\r\t\v/\\\'\"\0\0"; - const char *bs_lengths = "\2\2\2\2\2\2\2\2\2\2\2\6\012"; + const char *bs_src = ((SPAR_STRLITERAL_SPARQL_QNAME == mode) ? "_~.-!$&()*+,:=/?#@%\'uU" : "abfnrtv/\\\'\"uU" ); + const char *bs_trans = ((SPAR_STRLITERAL_SPARQL_QNAME == mode) ? "_~.-!$&()*+,:=/?#@%\'\0\0" : "\a\b\f\n\r\t\v/\\\'\"\0\0" ); + const char *bs_lengths = ((SPAR_STRLITERAL_SPARQL_QNAME == mode) ? "\2\2\2\2\2\2\2\2\2\2\2\2\2\2\2\2\2\2\2\2\6\012" : "\2\2\2\2\2\2\2\2\2\2\2\6\012" ); const char *hit = strchr (bs_src, src_tail[1]); char bs_len, bs_tran; const char *nextchr; if (NULL == hit) { - err_msg = "Unsupported escape sequence after '\'"; - goto err; + err_msg = "Unsupported escape sequence after '\'"; + goto err; } bs_len = bs_lengths [hit - bs_src]; bs_tran = bs_trans [hit - bs_src]; @@ -904,7 +904,7 @@ caddr_t spar_strliteral (sparp_t *sparp, const char *strg, int strg_is_long, int goto err; } } - else if (is_json && (6 == bs_len) && (acc >= 0xD800) && (acc <= 0xDFFF)) + else if ((SPAR_STRLITERAL_JSON_STRING == mode) && (6 == bs_len) && (acc >= 0xD800) && (acc <= 0xDFFF)) { if (acc >= 0xDC00) { @@ -931,14 +931,17 @@ caddr_t spar_strliteral (sparp_t *sparp, const char *strg, int strg_is_long, int default: (tgt_tail++)[0] = (src_tail++)[0]; } } - res = t_box_dv_short_nchars (tmp_buf, tgt_tail - tmp_buf); + if (SPAR_STRLITERAL_SPARQL_QNAME == mode) + res = t_box_dv_uname_nchars (tmp_buf, tgt_tail - tmp_buf); + else + res = t_box_dv_short_nchars (tmp_buf, tgt_tail - tmp_buf); box_flags (res) = BF_UTF8; dk_free_box (tmp_buf); return res; err: dk_free_box (tmp_buf); - if (is_json) + if (SPAR_STRLITERAL_JSON_STRING == mode) jsonyyerror_impl (err_msg); else sparyyerror_impl (sparp, NULL, err_msg); @@ -4398,9 +4401,9 @@ sparp_make_and_push_new_graph_source (sparp_t *sparp, ptrlong subtype, SPART *ir caddr_t iid = sparp_graph_sec_iri_to_id_nosignal (sparp, iri); if (NULL != iid) { - mutex_enter (rdf_graph_group_dict_htable->ht_mutex); + rwlock_rdlock (rdf_graph_group_dict_htable->ht_rwlock); group_members_ptr = (caddr_t **)id_hash_get (rdf_graph_group_dict_htable, (caddr_t)(&iid)); - mutex_leave (rdf_graph_group_dict_htable->ht_mutex); + rwlock_unlock (rdf_graph_group_dict_htable->ht_rwlock); dk_free_tree (iid); } } @@ -4611,72 +4614,132 @@ spar_make_regex_or_like_or_eq (sparp_t *sparp, SPART *strg, SPART *regexpn) return sparp_make_builtin_call (sparp, SPAR_BIF_REGEX, (SPART **)t_list (2, strg, regexpn)); } + extern id_hash_t *name_to_pl_name; -static const char *unsafe_sql_names[] = { - "RDF_INSERT_TRIPLES", - "RDF_INSERT_TRIPLES", - "RDF_DELETE_TRIPLES", - "RDF_GLOBAL_RESET", - "RDF_GRAPH_GROUP_LIST_GET", - "RDF_LOAD_RDFXML", - "RDF_LOAD_RDFXML_MT", - "RDF_MODIFY_TRIPLES", - "RDF_REPL_DELETE_TRIPLES", - "RDF_REPL_GRAPH_DEL", - "RDF_REPL_GRAPH_INS", - "RDF_REPL_INSERT_TRIPLES", - "RDF_REPL_START", - "RDF_REPL_STOP", - "RDF_REPL_SYNC", - "RDF_SPONGE_UP", - "SPARQL_INSERT_DICT_CONTENT", - "SPARQL_INSERT_QUAD_DICT_CONTENT", - "SPARQL_DELETE_DICT_CONTENT", - "SPARQL_DELETE_QUAD_DICT_CONTENT", - "SPARQL_DESC_AGG", - "SPARQL_DESC_AGG_ACC", - "SPARQL_DESC_AGG_INIT", - "SPARQL_DESC_AGG_FIN", - "SPARQL_DESC_DICT", - "SPARQL_DESC_DICT_CBD", - "SPARQL_DESC_DICT_CBD_PHYSICAL", - "SPARQL_DESC_DICT_SPO", - "SPARQL_DESC_DICT_SPO_PHYSICAL", - "SPARQL_MODIFY_BY_DICT_CONTENTS", - "SPARQL_MODIFY_BY_QUAD_DICT_CONTENTS", - "SPARQL_SELECT_KNOWN_GRAPHS", - "SPARUL_ADD", - "SPARUL_CLEAR", - "SPARUL_COPY", - "SPARUL_CREATE", - "SPARUL_DROP", - "SPARUL_LOAD", - "SPARUL_MOVE", - "SPARUL_RUN", - "TTLP", - "TTLP_EV_GET_IID", - "TTLP_EV_NEW_BLANK", - "TTLP_EV_NEW_GRAPH", - "TTLP_EV_NEW_GRAPH_A", - "TTLP_EV_TRIPLE", - "TTLP_EV_TRIPLE_A", - "TTLP_EV_TRIPLE_W", - "TTLP_EV_TRIPLE_L", - "TTLP_EV_TRIPLE_L_A", - "TTLP_EV_TRIPLE_L_W", - "TTLP_MT", - "TTLP_MT_LOCAL_FILE" }; - -static const char *unsafe_bif_names[] = { - "CONNECTION_SET", - "FILE_TO_STRING", - "FILE_TO_STRING_OUTPUT", - "EXEC", - "REGISTRY_SET", - "REGISTRY_SET_ALL", - "STRING_TO_FILE", - "SYSTEM" }; +/* Note dirty hack in sqlpfn.c, sqlp_proc_name(): the function expectes that unsafe names begins with "RDF_", "SPARQL", "SPARUL" or "TTLP". +Add more prefixes there if needed */ +static const char *spar_unsafe_sql_names[] = { + "RDF_DELETE_TRIPLES", + "RDF_DELETE_TRIPLES_AGG", + "RDF_GLOBAL_RESET", + "RDF_GRAPH_GROUP_LIST_GET", + "RDF_INSERT_TRIPLES", + "RDF_LOAD_RDFXML", + "RDF_LOAD_RDFXML_MT", + "RDF_MODIFY_TRIPLES", + "RDF_QM_ADD_MAPPING_TO_STORAGE", + "RDF_QM_APPLY_CHANGES", + "RDF_QM_ASSERT_JSO_TYPE", + "RDF_QM_ASSERT_STORAGE_CONTAINS_MAPPING", + "RDF_QM_ASSERT_STORAGE_FLAG", + "RDF_QM_ATTACH_MACRO_LIBRARY", + "RDF_QM_ATTACH_MAPPING", + "RDF_QM_ATTACH_SPIN_LIBRARY", + "RDF_QM_BEGIN_ALTER_QUAD_STORAGE", + "RDF_QM_CBD_OF_IRI_CLASS", + "RDF_QM_CHANGE", + "RDF_QM_CHANGE_OPT", + "RDF_QM_CHECK_CLASS_FUNCTION_HEADERS", + "RDF_QM_CHECK_COLUMNS_FORM_KEY", + "RDF_QM_DEFINE_IRI_CLASS_FORMAT", + "RDF_QM_DEFINE_IRI_CLASS_FUNCTIONS", + "RDF_QM_DEFINE_LITERAL_CLASS_FORMAT", + "RDF_QM_DEFINE_LITERAL_CLASS_FUNCTIONS", + "RDF_QM_DEFINE_LITERAL_CLASS_WITH_FIXED_LANG", + "RDF_QM_DEFINE_MAPPING", + "RDF_QM_DEFINE_MAP_VALUE", + "RDF_QM_DEFINE_QUAD_STORAGE", + "RDF_QM_DEFINE_SUBCLASS", + "RDF_QM_DELETE_MAPPING_FROM_STORAGE", + "RDF_QM_DETACH_MACRO_LIBRARY", + "RDF_QM_DETACH_SPIN_LIBRARY", + "RDF_QM_DROP_CLASS", + "RDF_QM_DROP_MAPPING", + "RDF_QM_DROP_QUAD_STORAGE", + "RDF_QM_DROP_SUBJ", + "RDF_QM_END_ALTER_QUAD_STORAGE", + "RDF_QM_FT_USAGE", + "RDF_QM_GC_MAPPING_SUBTREE", + "RDF_QM_GC_SUBTREE", + "RDF_QM_MACROEXPAND_TEMPLATE", + "RDF_QM_NN_PUT_VECTOR", + "RDF_QM_NORMALIZE_QMV", + "RDF_QM_SET_DEFAULT_MAPPING", + "RDF_QM_STORE_ATABLES", + "RDF_REPL_DELETE_TRIPLES", + "RDF_REPL_GRAPH_DEL", + "RDF_REPL_GRAPH_INS", + "RDF_REPL_INSERT_TRIPLES", + "RDF_REPL_START", + "RDF_REPL_STOP", + "RDF_REPL_SYNC", + "RDF_SPONGE_UP", + "SPARQL_DELETE_CTOR", + "SPARQL_DELETE_DICT_CONTENT", + "SPARQL_DELETE_QUAD_DICT_CONTENT", + "SPARQL_DESC_AGG", + "SPARQL_DESC_AGG_ACC", + "SPARQL_DESC_AGG_FIN", + "SPARQL_DESC_AGG_INIT", + "SPARQL_DESC_DICT", + "SPARQL_DESC_DICT_CBD", + "SPARQL_DESC_DICT_CBD_PHYSICAL", + "SPARQL_DESC_DICT_SPO", + "SPARQL_DESC_DICT_SPO_PHYSICAL", + "SPARQL_INSERT_CTOR", + "SPARQL_INSERT_DICT_CONTENT", + "SPARQL_INSERT_QUAD_DICT_CONTENT", + "SPARQL_MODIFY_BY_DICT_CONTENTS", + "SPARQL_MODIFY_BY_QUAD_DICT_CONTENTS", + "SPARQL_SELECT_KNOWN_GRAPHS", + "SPARUL_ADD", + "SPARUL_CLEAR", + "SPARUL_COPY", + "SPARUL_CREATE", + "SPARUL_DROP", + "SPARUL_LOAD", + "SPARUL_MOVE", + "SPARUL_RUN", + "TTLP", + "TTLP_EV_CL_GS_TRIPLE", + "TTLP_EV_CL_GS_TRIPLE_L", + "TTLP_EV_CL_TRIPLE", + "TTLP_EV_CL_TRIPLE_L", + "TTLP_EV_COMMIT", + "TTLP_EV_GET_IID", + "TTLP_EV_NEW_BLANK", + "TTLP_EV_NEW_GRAPH", + "TTLP_EV_NEW_GRAPH_A", + "TTLP_EV_TRIPLE", + "TTLP_EV_TRIPLE_A", + "TTLP_EV_TRIPLE_L", + "TTLP_EV_TRIPLE_L_A", + "TTLP_EV_TRIPLE_L_W", + "TTLP_EV_TRIPLE_W", + "TTLP_EV_TRIPLE_XLAT", + "TTLP_EV_TRIPLE_XLAT_L", + "TTLP_MT", + "TTLP_MT_LOCAL_FILE" +}; + +static const int spar_unsafe_sql_names__count = sizeof (spar_unsafe_sql_names)/sizeof(spar_unsafe_sql_names[0]); + +static const char *spar_unsafe_bif_names[] = { + "BACKUP", + "CONNECTION_SET", + "CONNECTION_SWAP", + "CONNECTION_VARS_SET", + "EXEC", + "FILE_TO_STRING", + "FILE_TO_STRING_OUTPUT", + "REGISTRY_SET", + "REGISTRY_SET_ALL", + "STRING_TO_FILE", + "SYSTEM" +}; + +static const int spar_unsafe_bif_names__count = sizeof (spar_unsafe_bif_names)/sizeof(spar_unsafe_bif_names[0]); static const char *sparql11_agg_names[] = { "AVG", "SPECIAL::bif:AVG", @@ -4687,14 +4750,30 @@ static const char *sparql11_agg_names[] = { "SAMPLE", "sql:SAMPLE", "SUM", "SPECIAL::bif:SUM" }; + +int +sparp_sql_function_name_is_unsafe (const char *buf) +{ + return (ECM_MEM_NOT_FOUND != ecm_find_name (buf, spar_unsafe_sql_names, spar_unsafe_sql_names__count, sizeof (caddr_t))); +} + + +int +sparp_bif_function_name_is_unsafe (const char *buf) +{ + return (ECM_MEM_NOT_FOUND != ecm_find_name (buf, spar_unsafe_bif_names, spar_unsafe_bif_names__count, sizeof (caddr_t))); +} + + void spar_verify_funcall_security (sparp_t *sparp, int *is_agg_ret, const char **fname_ptr, SPART **args) { ccaddr_t fname = fname_ptr[0]; - int uid, need_check_for_sparql11_agg = 0, need_check_for_infection_chars = 0; - const char *tail; + int uid, need_check_for_sparql11_agg = 0; + const char *tail, *tail_to_check_for_infection_chars = NULL; const char *c; - char buf[30]; + char buf[100]; + int is_bif = 0, is_sql = 0; tail = strstr (fname, "::"); if (NULL == tail) tail = fname; @@ -4705,26 +4784,41 @@ spar_verify_funcall_security (sparp_t *sparp, int *is_agg_ret, const char **fnam uid = unbox (sparp->sparp_boxed_exec_uid); if (!strncmp (tail, "sql:", 4)) { - strncpy (buf, tail+4, sizeof(buf)-1); + tail_to_check_for_infection_chars = tail + 4; + is_sql = 1; + } + else if (!strncmp (tail, "bif:", 4)) + { + tail_to_check_for_infection_chars = tail + 4; + is_bif = 1; + } + else if (!strncmp (tail, OPENLINKSW_SQL_NS_URI, OPENLINKSW_SQL_NS_URI_LEN)) + { + tail_to_check_for_infection_chars = tail + OPENLINKSW_SQL_NS_URI_LEN; + is_sql = 1; + } + else if (!strncmp (tail, OPENLINKSW_BIF_NS_URI, OPENLINKSW_BIF_NS_URI_LEN)) + { + tail_to_check_for_infection_chars = tail + OPENLINKSW_SQL_NS_URI_LEN; + is_bif = 1; + } + if (is_sql || is_bif) + { + strncpy (buf, tail_to_check_for_infection_chars, sizeof(buf)-1); buf[sizeof(buf)-1] = '\0'; strupr (buf); - if ((U_ID_DBA != uid) && (ECM_MEM_NOT_FOUND != ecm_find_name (buf, unsafe_sql_names, - sizeof (unsafe_sql_names)/sizeof(unsafe_sql_names[0]), sizeof (caddr_t) ) ) ) + } + if (is_sql) + { + if ((U_ID_DBA != uid) && sparp_sql_function_name_is_unsafe (buf)) goto restricted; /* see below */ need_check_for_sparql11_agg = 1; - need_check_for_infection_chars = 1; } - else - if (!strncmp (tail, "bif:", 4)) + else if (is_bif) { - strncpy (buf, tail+4, sizeof(buf)-1); - buf[sizeof(buf)-1] = '\0'; - strupr (buf); - if ((U_ID_DBA != uid) && (ECM_MEM_NOT_FOUND != ecm_find_name (buf, unsafe_sql_names, - sizeof (unsafe_sql_names)/sizeof(unsafe_sql_names[0]), sizeof (caddr_t) ) ) ) + if ((U_ID_DBA != uid) && sparp_sql_function_name_is_unsafe (buf)) goto restricted; /* see below */ - if ((U_ID_DBA != uid) && (ECM_MEM_NOT_FOUND != ecm_find_name (buf, unsafe_bif_names, - sizeof (unsafe_bif_names)/sizeof(unsafe_bif_names[0]), sizeof (caddr_t) ) ) ) + if ((U_ID_DBA != uid) && sparp_bif_function_name_is_unsafe (buf)) goto restricted; /* see below */ if (NULL != name_to_pl_name) { @@ -4737,8 +4831,7 @@ spar_verify_funcall_security (sparp_t *sparp, int *is_agg_ret, const char **fnam strncpy (buf, full_sql_name_ptr[0]+7, sizeof(buf)-1); buf[sizeof(buf)-1] = '\0'; strupr (buf); - if ((U_ID_DBA != uid) && (ECM_MEM_NOT_FOUND != ecm_find_name (buf, unsafe_sql_names, - sizeof (unsafe_sql_names)/sizeof(unsafe_sql_names[0]), sizeof (caddr_t) ) ) ) + if ((U_ID_DBA != uid) && sparp_sql_function_name_is_unsafe (buf)) goto restricted; /* see below */ strcpy (buf, "sql:"); strncpy (buf+4, full_sql_name_ptr[0]+7, sizeof(buf)-5); @@ -4748,7 +4841,6 @@ spar_verify_funcall_security (sparp_t *sparp, int *is_agg_ret, const char **fnam } } need_check_for_sparql11_agg = 1; - need_check_for_infection_chars = 1; } if (need_check_for_sparql11_agg) { @@ -4761,8 +4853,8 @@ spar_verify_funcall_security (sparp_t *sparp, int *is_agg_ret, const char **fnam return; } } - if (need_check_for_infection_chars) - for (c = tail+4; '\0' != c[0]; c++) + if (NULL != tail_to_check_for_infection_chars) + for (c = tail_to_check_for_infection_chars; '\0' != c[0]; c++) if (strchr ("\'\"\\().,+/*|\t\n\r", c[0])) spar_error (sparp, "Function name \"%.200s\" contains invalid characters; this may be an attempt to bypass security restrictions", fname); return; @@ -4845,9 +4937,25 @@ spar_make_funcall (sparp_t *sparp, int aggregate_mode, const char *funname, SPAR caddr_t proc_full_name; query_t *proc; int argcount; + const char *funname_to_store = funname; + const char *bare_bif_name = NULL; + bif_metadata_t *bmd = NULL; if (NULL == args) args = (SPART **)t_list (0); argcount = BOX_ELEMENTS (args); + if ('h' == funname[0]) /* It's kond of strange to begin function name name with 'h', right? 99% of them are bif:... or sql:... */ + { + if (!strncmp (funname, OPENLINKSW_BIF_NS_URI, OPENLINKSW_BIF_NS_URI_LEN)) + return spar_make_funcall (sparp, aggregate_mode, t_box_dv_short_strconcat ("bif:", funname + OPENLINKSW_BIF_NS_URI_LEN), args); + if (!strncmp (funname, OPENLINKSW_SQL_NS_URI, OPENLINKSW_SQL_NS_URI_LEN)) + return spar_make_funcall (sparp, aggregate_mode, t_box_dv_short_strconcat ("sql:", funname + OPENLINKSW_SQL_NS_URI_LEN), args); + if (!strncmp (funname, OPENGIS_NS_URI, OPENGIS_NS_URI_LEN)) + { + funname_to_store = t_box_dv_short_strconcat ("bif:", funname); + bare_bif_name = funname; + goto bare_bif_name_found; /* see below */ + } + } if (0 != aggregate_mode) goto aggr_checked; /* see below */ sql_colon = strstr (funname, "sql:"); @@ -4868,8 +4976,11 @@ spar_make_funcall (sparp_t *sparp, int aggregate_mode, const char *funname, SPAR spar_error (sparp, "Aggregate function %.100s() is not allowed outside result-set expressions", funname); aggr_checked: if (!strncmp (funname, "bif:", 4)) + bare_bif_name = funname + 4; +bare_bif_name_found: + if (NULL != bare_bif_name) { - bif_metadata_t *bmd = find_bif_metadata_by_raw_name (funname+4); + bmd = find_bif_metadata_by_raw_name (bare_bif_name); if (NULL == bmd) spar_error (sparp, "Unknown function %.100s()", funname); if (bmd->bmd_is_pure) @@ -4920,9 +5031,10 @@ spar_make_funcall (sparp_t *sparp, int aggregate_mode, const char *funname, SPAR else sparp->sparp_query_uses_aggregates++; } - return spartlist (sparp, 5, SPAR_FUNCALL, t_box_dv_uname_string (funname), args, (ptrlong)aggregate_mode, (ptrlong)0); + return spartlist (sparp, 5, SPAR_FUNCALL, t_box_dv_uname_string (funname_to_store), args, (ptrlong)aggregate_mode, (ptrlong)0); } + const sparp_bif_desc_t sparp_bif_descs[] = { /* sbd_name | sbd_subtype , impl | sbd_required_syntax | min-/maxargs | ret_valmode | sbd_arg_valmodes | sbd_result_restr_bits */ { "" , 0 , '-' , 0 , 0 , 0 , NULL , { SSG_VALMODE_SQLVAL, NULL, NULL} , 0 }, @@ -5448,18 +5560,18 @@ static caddr_t boxed_8192_iid = NULL; caddr_t boxed_graph_iid = sparp_graph_sec_iri_to_id_nosignal (sparp, graph_iri); if (NULL != boxed_graph_iid) { - mutex_enter (rdf_graph_group_of_privates_dict_htable->ht_mutex); + rwlock_rdlock (rdf_graph_group_of_privates_dict_htable->ht_rwlock); if (NULL != id_hash_get (rdf_graph_group_of_privates_dict_htable, (caddr_t)(&(boxed_graph_iid)))) { graph_is_private = 1; dflt_perms_of_user = rdf_graph_default_private_perms_of_user_dict_htable; dflt_other_perms_of_user = rdf_graph_default_world_perms_of_user_dict_htable; } - mutex_leave (rdf_graph_group_of_privates_dict_htable->ht_mutex); + rwlock_unlock (rdf_graph_group_of_privates_dict_htable->ht_rwlock); /*!!! maybe TBD: add retrieval of permissions of specific user on specific graph */ - mutex_enter (dflt_perms_of_user->ht_mutex); + rwlock_rdlock (dflt_perms_of_user->ht_rwlock); hit = (caddr_t *)id_hash_get (dflt_perms_of_user, (caddr_t)(&(boxed_uid /* not boxed_graph_iid */))); - mutex_leave (dflt_perms_of_user->ht_mutex); + rwlock_unlock (dflt_perms_of_user->ht_rwlock); dk_free_tree (boxed_graph_iid); } if (NULL != hit) @@ -5472,9 +5584,9 @@ static caddr_t boxed_8192_iid = NULL; return unbox (hit[0]); } } - mutex_enter (dflt_perms_of_user->ht_mutex); + rwlock_rdlock (dflt_perms_of_user->ht_rwlock); hit = (caddr_t *)id_hash_get (dflt_perms_of_user, (caddr_t)(&(boxed_uid))); - mutex_leave (dflt_perms_of_user->ht_mutex); + rwlock_unlock (dflt_perms_of_user->ht_rwlock); if ((NULL != query_with_deps) || (NULL == graph_iri)) { potential_hit = (caddr_t *)id_hash_get (dflt_other_perms_of_user, (caddr_t)(&(boxed_uid))); @@ -5501,9 +5613,9 @@ static caddr_t boxed_8192_iid = NULL; return res; return res & potential_res; } - mutex_enter (rdf_graph_public_perms_dict_htable->ht_mutex); + rwlock_rdlock (rdf_graph_public_perms_dict_htable->ht_rwlock); hit = (caddr_t *)id_hash_get (rdf_graph_public_perms_dict_htable, (caddr_t)(graph_is_private ? &boxed_8192_iid : &boxed_zero_iid)); - mutex_leave (rdf_graph_public_perms_dict_htable->ht_mutex); + rwlock_unlock (rdf_graph_public_perms_dict_htable->ht_rwlock); if (NULL != hit) res = unbox (hit[0]); else res = RDF_GRAPH_PERM_DEFAULT; diff --git a/libsrc/Wi/sparql_init.sql b/libsrc/Wi/sparql_init.sql index 03ef2df432..a9c780f27d 100644 --- a/libsrc/Wi/sparql_init.sql +++ b/libsrc/Wi/sparql_init.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sparql_io.sql b/libsrc/Wi/sparql_io.sql index aefcc4ddd7..7527d1b879 100644 --- a/libsrc/Wi/sparql_io.sql +++ b/libsrc/Wi/sparql_io.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -1089,14 +1089,14 @@ create procedure DB.DBA.SPARQL_RESULTS_XML_WRITE_ROW (inout ses any, in mdta any declare lang, dt varchar; declare is_xml_lit int; declare sql_val any; - if (__tag (_val) = 185) -- string output + if (__tag (_val) = __tag of stream) { http (sprintf ('\n ', _name), ses); http_value (_val, 0, ses); http ('', ses); goto end_of_binding; } - if (__tag (_val) = 230) -- XML entity + if (__tag (_val) = __tag of XML) { http (sprintf ('\n ', _name), ses); http_value (_val, 0, ses); @@ -1239,14 +1239,14 @@ create procedure DB.DBA.SPARQL_RESULTS_RDFXML_WRITE_ROW (inout ses any, in mdta declare lang, dt varchar; declare val_tag integer; val_tag := __tag (_val); - if (val_tag = 185) -- string output + if (val_tag = __tag of stream) { http ('>', ses); http_value (_val, 0, ses); http ('', ses); goto end_of_binding; } - if (val_tag = 230) -- XML entity + if (val_tag = __tag of XML) { http (' rdf:parseType="Literal">', ses); http_value (_val, 0, ses); @@ -1477,13 +1477,13 @@ create procedure DB.DBA.SPARQL_RESULTS_JAVASCRIPT_HTML_WRITE (inout ses any, ino http_escape (val, esc_mode, ses, 1, 1); http ('', ses); } - else if (185 = __tag (val)) -- string output + else if (__tag of stream = __tag (val)) { http ('
    ', ses);
               http_escape (cast (val as varchar), esc_mode, ses, 1, 1);
               http ('
    ', ses); } - else if (__tag of XML = rdf_box_data_tag (val)) -- string output + else if (__tag of XML = rdf_box_data_tag (val)) { --if (is_js) --{ @@ -1602,12 +1602,12 @@ create procedure DB.DBA.SPARQL_RESULTS_JSON_WRITE_BINDING (inout ses any, in col http ('"type": "literal", "value": "', ses); http_escape (val, 14, ses, 0, 0); } - else if (185 = __tag (val)) + else if (__tag of stream = __tag (val)) { http ('"type": "literal", "value": "', ses); http_escape (cast (val as varchar), 14, ses, 1, 1); } - else if (230 = __tag (val)) + else if (__tag of XML = __tag (val)) { http ('"type": "literal", "value": "', ses); http_escape (serialize_to_UTF8_xml (val), 14, ses, 1, 1); @@ -1793,13 +1793,13 @@ create procedure DB.DBA.SPARQL_RESULTS_HTML_TR_WRITE (inout ses any, inout metas http_escape (val, 1, ses, 1, 1); http ('', ses); } - else if (185 = __tag (val)) -- string output + else if (__tag of stream = __tag (val)) { http ('
    ', ses);
               http_escape (cast (val as varchar), 1, ses, 1, 1);
               http ('
    ', ses); } - else if (__tag of XML = rdf_box_data_tag (val)) -- string output + else if (__tag of XML = rdf_box_data_tag (val)) { declare tmpses any; tmpses := string_output(); @@ -1976,7 +1976,7 @@ create function DB.DBA.SPARQL_RESULTS_WRITE (inout ses any, inout metas any, ino } if ((1 = length (rset)) and (1 = length (rset[0])) and - (214 = __tag (rset[0][0])) ) + (__tag of dictionary reference = __tag (rset[0][0])) ) { declare triples any; triples := dict_list_keys (rset[0][0], 1); @@ -3130,10 +3130,10 @@ create procedure WS.WS.SPARQL_ENDPOINT_GENERATE_FORM( http('
    \n'); http(' \n'); http(' \n'); - http('
    \n'); + http('
    \n'); http(' \n'); http(' \n'); - http('
    \n'); + http('
    \n'); http(' \n'); http(' \n'); @@ -3230,7 +3230,7 @@ create procedure WS.WS."/!sparql/" (inout path varchar, inout params any, inout { if (isstring (params[i+1])) dbg_printf ('%s=%s',params[i],params[i+1]); - else if (__tag (params[i+1]) = 185) + else if (__tag (params[i+1]) = __tag of stream) dbg_printf ('%s=%s',params[i],''); else dbg_printf ('%s=%s',params[i],''); diff --git a/libsrc/Wi/sparql_l.l b/libsrc/Wi/sparql_l.l index 1a9d6c38bd..2547687efc 100644 --- a/libsrc/Wi/sparql_l.l +++ b/libsrc/Wi/sparql_l.l @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -188,8 +188,11 @@ void sparyyerror_if_long_qname (caddr_t box, const char *lex_type_descr, struct sparyyerror_if_long_qname (yylval->box, lex_type_descr, yyg); \ return (name); -#define TOKBOX_Q(n,name,lex_type_descr) { \ - yylval->box = t_box_dv_uname_string (yytext+(n)); \ +#define TOKBOX_Q_ESC(name,lex_type_descr) { \ + if (strchr (yytext, '\\')) \ + yylval->box = spar_unescape_strliteral (yyextra, yytext, 0, SPAR_STRLITERAL_SPARQL_QNAME); \ + else \ + yylval->box = t_box_dv_uname_string (yytext); \ TOKBOX_Q_FINAL(name,lex_type_descr) } #define TOKBOX_Q2(n1,n2,name,lex_type_descr) { \ @@ -216,7 +219,7 @@ sparyyalloc (yy_size_t size, yyscan_t yyscanner) } void * -sparyyrealloc (void * ptr, yy_size_t sz , yyscan_t yyscanner) +sparyyrealloc (void * ptr, yy_size_t sz, yyscan_t yyscanner) { int old_sz = ((NULL == ptr) ? 0 : box_length (ptr)); if (old_sz < sz) @@ -303,26 +306,31 @@ X ([Xx]) Y ([Yy]) Z ([Zz]) -INTEGER_LITERAL ([0-9]+) -DECIMAL_LITERAL (([0-9]+"."[0-9]*)|("."[0-9]+)) -DOUBLE_LITERAL (({INTEGER_LITERAL}|{DECIMAL_LITERAL})[eE][+-]?[0-9]+) - -SPAR_SQ_PLAIN ([^\\''\r\n]) -SPAR_DQ_PLAIN ([^\\""\r\n]) -SPAR_ECHAR ([\\]([atbvnrf\\""'']|("u"{HEX}{HEX}{HEX}{HEX})|("U"{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}))) -S_NL ((\r\n)|(\n\r)|\n|\r) -HEX ([0-9A-Fa-f]) - -PN_CHARS_BASE ([A-Za-z\x7f-\xfe]) -PN_CHARS_U_09 ([A-Za-z0-9_\x7f-\xfe]) -PN_CHARS ([A-Za-z0-9_\x7f-\xfe-]) -PN_PREFIX ({PN_CHARS_BASE}(([.]*{PN_CHARS})*)) -PN_LOCAL ({PN_CHARS_U_09}(([.]*{PN_CHARS})*)) -SPAR_VARNAME ([A-Za-z0-9_][A-Za-z0-9_\x7f-\xfe]*) +INTEGER_LITERAL ([0-9]+) +DECIMAL_LITERAL (([0-9]+"."[0-9]*)|("."[0-9]+)) +DOUBLE_LITERAL (({INTEGER_LITERAL}|{DECIMAL_LITERAL})[eE][+-]?[0-9]+) + +SPAR_SQ_PLAIN ([^\\''\r\n]) +SPAR_DQ_PLAIN ([^\\""\r\n]) +SPAR_UCHAR ([\\](("u"{HEX}{HEX}{HEX}{HEX})|("U"{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}{HEX}))) +SPAR_ECHAR (([\\][atbvnrf\\""''])|{SPAR_UCHAR}) +S_NL ((\r\n)|(\n\r)|\n|\r) +HEX ([0-9A-Fa-f]) + +PN_LOCAL_ESC ([\\][_~.!$&''()*+,;=/?#@%-]) +PN_LOCAL_ESC_X ({PN_LOCAL_ESC}|([%]{HEX}{HEX})) +PN_CHARS_BASE ([A-Za-z\x7f-\xfe]|{SPAR_UCHAR}) +PN_CHARS_U_09 ([A-Za-z0-9_\x7f-\xfe]|{SPAR_UCHAR}) +PN_CHARS_U_09_C_PLX ([A-Za-z0-9_\x7f-\xfe:]|{SPAR_UCHAR}|{PN_LOCAL_ESC_X}) +PN_CHARS ([A-Za-z0-9_\x7f-\xfe-]|{SPAR_UCHAR}) +PN_CHARS_C_PLX ([A-Za-z0-9_\x7f-\xfe:-]|{SPAR_UCHAR}|{PN_LOCAL_ESC_X}) +PN_PREFIX ({PN_CHARS_BASE}(([.]*{PN_CHARS})*)) +PN_LOCAL ({PN_CHARS_U_09_C_PLX}(([.]*{PN_CHARS_C_PLX})*)) +SPAR_VARNAME ([A-Za-z0-9_][A-Za-z0-9_\x7f-\xfe]*) SPAR_PLAIN_SQLNAME ([A-Za-z_][A-Za-z0-9_]*) SPAR_DQ_SQLNAME ([""][^""\\\r\n]*[""]) SPAR_SQLNAME (([A-Za-z_][A-Za-z0-9_]*)|([""][^""\\\r\n]*[""])) -SPAR_PARAMNAME (([A-Z]+"::")?(({SPAR_SQLNAME}("."{SPAR_SQLNAME})?)|(":"{SPAR_SQLNAME})|(":"[0-9]+))) +SPAR_PARAMNAME (([A-Z]+"::")?(({SPAR_SQLNAME}("."{SPAR_SQLNAME})?)|(":"{SPAR_SQLNAME})|(":"[0-9]+))) %% @@ -372,9 +380,9 @@ SPAR_PARAMNAME (([A-Z]+"::")?(({SPAR_SQLNAME}("."{SPAR_SQLNAME})?)|(":"{SPAR_SQL return Q_IRI_REF; } -({PN_PREFIX}?)":"{PN_LOCAL} { TOKBOX_Q(0,QNAME,"qualified URI"); } -({PN_PREFIX}?)":" { TOKBOX_Q(0,QNAME_NS,"namespace"); } -"_:"{PN_LOCAL} { TOKBOX_Q(0,BLANK_NODE_LABEL,"blank node label"); } +({PN_PREFIX}?)":"{PN_LOCAL} { TOKBOX_Q_ESC(QNAME,"qualified URI"); } +({PN_PREFIX}?)":" { TOKBOX_Q_ESC(QNAME_NS,"namespace"); } +"_:"{PN_LOCAL} { TOKBOX_Q_ESC(BLANK_NODE_LABEL,"blank node label"); } [?$]{SPAR_VARNAME} { yylval->box = t_box_dv_uname_nchars (yytext + 1, yyleng - 1); @@ -434,8 +442,8 @@ SPAR_PARAMNAME (([A-Z]+"::")?(({SPAR_SQLNAME}("."{SPAR_SQLNAME})?)|(":"{SPAR_SQL [''][''][''] { yymore(); SET_INNER_BEGIN(SPARQL_SSSQ); BEGIN_INNER; } [""][""][""] { yymore(); SET_INNER_BEGIN(SPARQL_DDDQ); BEGIN_INNER; } -[''][''][''] { yylval->box = spar_strliteral (yyextra, yytext, 1, 0); BEGIN_OUTER; return SPARQL_STRING; } -[""][""][""] { yylval->box = spar_strliteral (yyextra, yytext, 1, 0); BEGIN_OUTER; return SPARQL_STRING; } +[''][''][''] { yylval->box = spar_unescape_strliteral (yyextra, yytext, 3, SPAR_STRLITERAL_SPARQL_STRING); BEGIN_OUTER; return SPARQL_STRING; } +[""][""][""] { yylval->box = spar_unescape_strliteral (yyextra, yytext, 3, SPAR_STRLITERAL_SPARQL_STRING); BEGIN_OUTER; return SPARQL_STRING; } (([''](['']?))?{S_NL}) { yyextra->sparp_lexlineno++; yymore(); } (([""]([""]?))?{S_NL}) { yyextra->sparp_lexlineno++; yymore(); } ((([''](['']?))?({SPAR_SQ_PLAIN}|{SPAR_ECHAR}))+) { yymore(); } @@ -450,8 +458,8 @@ SPAR_PARAMNAME (([A-Z]+"::")?(({SPAR_SQLNAME}("."{SPAR_SQLNAME})?)|(":"{SPAR_SQL [''] { yymore(); SET_INNER_BEGIN(SPARQL_SQ); BEGIN_INNER; } [""] { yymore(); SET_INNER_BEGIN(SPARQL_DQ); BEGIN_INNER; } -[''] { yylval->box = spar_strliteral (yyextra, yytext, 0, 0); BEGIN_OUTER; return SPARQL_STRING; } -[""] { yylval->box = spar_strliteral (yyextra, yytext, 0, 0); BEGIN_OUTER; return SPARQL_STRING; } +[''] { yylval->box = spar_unescape_strliteral (yyextra, yytext, 1, SPAR_STRLITERAL_SPARQL_STRING); BEGIN_OUTER; return SPARQL_STRING; } +[""] { yylval->box = spar_unescape_strliteral (yyextra, yytext, 1, SPAR_STRLITERAL_SPARQL_STRING); BEGIN_OUTER; return SPARQL_STRING; } {S_NL} { sparyyerror ("End-of-line in a short single-quoted string"); yymore(); } {S_NL} { sparyyerror ("End-of-line in a short double-quoted string"); yymore(); } (({SPAR_SQ_PLAIN}|{SPAR_ECHAR})+) { yymore(); } diff --git a/libsrc/Wi/sparql_p.y b/libsrc/Wi/sparql_p.y index e59060939e..60735c9443 100644 --- a/libsrc/Wi/sparql_p.y +++ b/libsrc/Wi/sparql_p.y @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -698,7 +698,8 @@ spar_prefix_decls_opt /* ::= PrefixDecl* */ spar_prefix_decl /* [4] PrefixDecl ::= 'PREFIX' QNAME_NS Q_IRI_REF */ : PREFIX_L QNAME_NS Q_IRI_REF { - if ((!strcmp ("sql:", $2) && strcmp ("sql:", $3)) || (!strcmp ("bif:", $2) && strcmp ("bif:", $3))) + if ((!strcmp ("sql:", $2) && strcmp ("sql:", $3) && strcmp (OPENLINKSW_SQL_NS_URI, $3)) + || (!strcmp ("bif:", $2) && strcmp ("bif:", $3) && strcmp (OPENLINKSW_BIF_NS_URI, $3))) sparyyerror (sparp_arg, "Prefixes 'sql:' and 'bif:' are reserved for SQL names"); t_set_push (&(sparp_env()->spare_namespace_prefixes), sparp_expand_q_iri_ref (sparp_arg, $3)); t_set_push (&(sparp_env()->spare_namespace_prefixes), t_box_dv_short_nchars ($2, box_length ($2)-2)); } diff --git a/libsrc/Wi/sparql_qm.c b/libsrc/Wi/sparql_qm.c index 74baf8b592..8662e1acd6 100644 --- a/libsrc/Wi/sparql_qm.c +++ b/libsrc/Wi/sparql_qm.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sparql_rdb2rdf.c b/libsrc/Wi/sparql_rdb2rdf.c index 3c60a489e3..263faac1c7 100644 --- a/libsrc/Wi/sparql_rdb2rdf.c +++ b/libsrc/Wi/sparql_rdb2rdf.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sparql_sff.c b/libsrc/Wi/sparql_sff.c index 6d10bad26a..2a32287dbe 100644 --- a/libsrc/Wi/sparql_sff.c +++ b/libsrc/Wi/sparql_sff.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sparql_tree.c b/libsrc/Wi/sparql_tree.c index 0f39ee68a0..1cf23d3fd8 100644 --- a/libsrc/Wi/sparql_tree.c +++ b/libsrc/Wi/sparql_tree.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sparqld.c b/libsrc/Wi/sparqld.c index aaf6f92917..2a3c796cd2 100644 --- a/libsrc/Wi/sparqld.c +++ b/libsrc/Wi/sparqld.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -308,7 +308,7 @@ ssg_assert_sd_flags (spar_sqlgen_t *ssg, int sd_needed_flags, const char *featur } int -ssg_fields_are_equal (SPART *tree1, SPART *tree2) +ssg_fields_are_equal (sparp_t *sparp, SPART *tree1, SPART *tree2) { int type1, type2; if (tree1 == tree2) @@ -325,8 +325,27 @@ ssg_fields_are_equal (SPART *tree1, SPART *tree2) return !strcmp (tree1->_.qname.val, tree2->_.qname.val); case SPAR_LIT: return box_hash ((caddr_t)tree1) == box_hash ((caddr_t)tree2); + case SPAR_PPATH: + { + int partctr, partcount; + if (tree1->_.ppath.subtype != tree2->_.ppath.subtype) + return 0; + if (tree1->_.ppath.num_of_invs != tree2->_.ppath.num_of_invs) + return 0; + if (tree1->_.ppath.minrepeat != tree2->_.ppath.minrepeat) + return 0; + if (tree1->_.ppath.maxrepeat != tree2->_.ppath.maxrepeat) + return 0; + partcount = BOX_ELEMENTS (tree1->_.ppath.parts); + if (partcount != BOX_ELEMENTS (tree2->_.ppath.parts)) + return 0; + for (partctr = 0; partctr < partcount; partctr++) + if (!ssg_fields_are_equal (sparp, tree1->_.ppath.parts[partctr], tree2->_.ppath.parts[partctr])) + return 0; + return 1; + } } - GPF_T1 ("ssg_" "fields_are_equal: unsupported tree type"); + spar_internal_error (sparp, "ssg_" "fields_are_equal(): unsupported tree type"); return 0; } @@ -1202,7 +1221,7 @@ static const char *sparql11aggregates[] = { "AVG", "COUNT", "GROUP_CONCAT", "MAX need_new_graph = 0; } else - should_close_graph = need_new_graph = !ssg_fields_are_equal (ssg->ssg_sd_prev_graph, curr_graph); + should_close_graph = need_new_graph = !ssg_fields_are_equal (ssg->ssg_sparp, ssg->ssg_sd_prev_graph, curr_graph); } else { @@ -1218,7 +1237,7 @@ static const char *sparql11aggregates[] = { "AVG", "COUNT", "GROUP_CONCAT", "MAX { if ((OPTIONAL_L == tree->_.triple.subtype) || place_qm || should_close_graph || need_new_graph || - !ssg_fields_are_equal (ssg->ssg_sd_prev_subj, tree->_.triple.tr_subject) ) + !ssg_fields_are_equal (ssg->ssg_sparp, ssg->ssg_sd_prev_subj, tree->_.triple.tr_subject) ) { ssg_puts (" ."); ssg->ssg_indent -= 4; @@ -1273,7 +1292,7 @@ static const char *sparql11aggregates[] = { "AVG", "COUNT", "GROUP_CONCAT", "MAX ssg->ssg_sd_prev_pred = tree->_.triple.tr_predicate; ssg->ssg_indent += 2; } - else if (!ssg_fields_are_equal (ssg->ssg_sd_prev_pred, tree->_.triple.tr_predicate)) + else if (!ssg_fields_are_equal (ssg->ssg_sparp, ssg->ssg_sd_prev_pred, tree->_.triple.tr_predicate)) { ssg_puts (" ;"); ssg->ssg_indent -= 2; diff --git a/libsrc/Wi/sparqlwords.gperf b/libsrc/Wi/sparqlwords.gperf index 8f82fb76a7..3b660752ff 100644 --- a/libsrc/Wi/sparqlwords.gperf +++ b/libsrc/Wi/sparqlwords.gperf @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free softwareyou can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sparul2sql.c b/libsrc/Wi/sparul2sql.c index 9b5a9575d4..c80983d42e 100644 --- a/libsrc/Wi/sparul2sql.c +++ b/libsrc/Wi/sparul2sql.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sql3.y b/libsrc/Wi/sql3.y index 5f7adf92d5..b2f33a4993 100644 --- a/libsrc/Wi/sql3.y +++ b/libsrc/Wi/sql3.y @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -30,7 +30,7 @@ %lex-param {yyscan_t scanner} /*%parse-param {sql_comp_context_t* scs_arg}*/ /*%lex-param {sql_comp_context_t* scs_arg}*/ -%expect 18 +%expect 19 %{ @@ -81,7 +81,6 @@ sqlp_join_t join; } -%expect 18 %token NAME %token STRING %token WSTRING @@ -176,6 +175,7 @@ %type cursor %type literal %type signed_literal +%type tail_of_tag_of %type column_ref %type aggregate_ref @@ -550,7 +550,7 @@ %token MODIFIES INPUT CALLED ADA C_L3 COBOL FORTRAN MUMPS PASCAL_L PLI NAME_L TEXT_L JAVA INOUT_L REMOTE KEYSET VALUE PARAMETER VARIABLE ADMIN_L ROLE_L TEMPORARY CLR ATTRIBUTE %token __SOAP_DOC __SOAP_DOCW __SOAP_HEADER __SOAP_HTTP __SOAP_NAME __SOAP_TYPE __SOAP_XML_TYPE __SOAP_FAULT __SOAP_DIME_ENC __SOAP_ENC_MIME __SOAP_OPTIONS FOREACH POSITION_L %token ARE REF STATIC_L SPECIFIC DYNAMIC COLUMN START_L -%token __LOCK __TAG_L RDF_BOX_L VECTOR_L VECTORED FOR_VECTORED FOR_ROWS NOT_VECTORED VECTORING +%token __LOCK __TAG_L RDF_BOX_L VECTOR_L VECTORED FOR_VECTORED FOR_ROWS NOT_VECTORED VECTORING HANDLE_L STREAM_L %nonassoc ORDER FOR %left UNION EXCEPT @@ -574,7 +574,7 @@ %token CASCADE CHARACTER CHECK CLOSE COMMIT CONSTRAINT CONTINUE CREATE CUBE CURRENT %token CURSOR DECIMAL_L DECLARE DEFAULT DELETE_L DESC DISTINCT DOUBLE_L %token DROP ESCAPE EXISTS FETCH FLOAT_L FOREIGN FOUND FROM GOTO GO -%token GRANT GROUP GROUPING HAVING IN_L INDEX INDEX_NO_FILL INDEX_ONLY INDICATOR INSERT INTEGER INTO +%token GRANT GROUP GROUPING_L HAVING IN_L INDEX INDEX_NO_FILL INDEX_ONLY INDICATOR INSERT INTEGER INTO %token IS KEY LANGUAGE ENCODING LIKE NULLX NUMERIC OF ON OPEN OPTION %token PRECISION PRIMARY PRIVILEGES PROCEDURE %token PUBLIC REAL REFERENCES RESTRICT ROLLBACK ROLLUP SCHEMA SELECT SET @@ -584,6 +584,7 @@ /* Extensions */ %token CONTIGUOUS OBJECT_ID BITMAPPED UNDER CLUSTER __ELASTIC CLUSTERED VARCHAR VARBINARY BINARY LONG_L REPLACING SOFT HASH LOOP IRI_ID IRI_ID_8 SAME_AS TRANSITIVE QUIETCAST_L SPARQL_L UNAME_L +%token DICTIONARY_L REFERENCE_L /* Admin statements */ %token SHUTDOWN CHECKPOINT BACKUP REPLICATION @@ -653,8 +654,9 @@ %token WS_PRAGMA_C_ESC WS_PGRAGMA_UTF8_ESC WS_PRAGMA_PL_DEBUG WS_PRAGMA_SRC %token WS_COMMENT_EOL WS_COMMENT_BEGIN WS_COMMENT_END WS_COMMENT_LONG __COST + /* Important! Do NOT add meaningful SQL tokens at the end of this list! -Instead, add them _before_ WS_WHITESPACE. Tokens after WS_WHITESPACE is +Instead, add them _before_ WS_WHITESPACE. Tokens after WS_WHITESPACE are treated as garbage by sql_split_text(). */ %% @@ -746,6 +748,7 @@ identifier | SQL_L { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } | GENERAL { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } | DETERMINISTIC { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } + | DICTIONARY_L { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } | NO_L { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } | DISABLE_L { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } | NOVALIDATE_L { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } @@ -769,6 +772,7 @@ identifier | JAVA { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } | INOUT_L { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } | REMOTE { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } + | REFERENCE_L { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } | KEYSET { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } | VALUE { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } | PARAMETER { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } @@ -811,6 +815,8 @@ identifier | RDF_BOX_L { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } | VECTOR_L { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } | UNAME_L { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } + | HANDLE_L { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } + | STREAM_L { $$ = t_sqlp_box_id_upcase_nchars (global_scs->scs_scn3c.last_keyword_yytext, global_scs->scs_scn3c.last_keyword_yyleng); } ; opt_with_data @@ -2247,7 +2253,7 @@ opt_group_by_clause { $$ = (ST*) t_list_to_array(t_CONS (t_list_to_array ($3), NULL)); } - | GROUP BY GROUPING SETS '(' grouping_set_list ')' + | GROUP BY GROUPING_L SETS '(' grouping_set_list ')' { $$ = (ST *) t_list_to_array ($6); } @@ -2759,7 +2765,7 @@ function_call { $$ = t_listst (3, CALL_STMT, t_sqlp_box_id_upcase ("curdatetime"), t_list (1, $3)); } - | GROUPING '(' column_ref ')' + | GROUPING_L '(' column_ref ')' { caddr_t bit = t_box_num (0); caddr_t bit_index = t_box_num (0); @@ -2907,11 +2913,7 @@ literal | BINARYNUM | IRI_LIT | NULLX { $$ = (caddr_t) t_NULLCONST; } - | __TAG_L OF data_type { $$ = ((caddr_t *)$3)[0]; } - | __TAG_L OF XML { $$ = (caddr_t) DV_XML_ENTITY; } - | __TAG_L OF RDF_BOX_L { $$ = (caddr_t) DV_RDF; } - | __TAG_L OF VECTOR_L { $$ = (caddr_t) DV_ARRAY_OF_POINTER; } - | __TAG_L OF UNAME_L { $$ = (caddr_t) DV_UNAME; } + | __TAG_L OF tail_of_tag_of { $$ = $3; } ; signed_literal @@ -2939,6 +2941,24 @@ signed_literal | '+' APPROXNUM %prec UMINUS { $$ = $2; } | BINARYNUM | NULLX { $$ = (caddr_t) t_NULLCONST; } + | __TAG_L OF tail_of_tag_of { $$ = $3; } + ; + +tail_of_tag_of + : data_type { $$ = ((caddr_t *)$1)[0]; } + | data_type HANDLE_L + { + $$ = ((caddr_t *)$1)[0]; + if (!IS_BLOB_DTP($$)) + yyerror (scanner, "__TAG OF ... HANDLE is valid only for LONG datatypes"); + $$ = DV_BLOB_HANDLE_DTP_FOR_BLOB_DTP($$); + } + | DICTIONARY_L REFERENCE_L { $$ = (caddr_t) DV_DICT_ITERATOR; } + | STREAM_L { $$ = (caddr_t) DV_STRING_SESSION; } + | XML { $$ = (caddr_t) DV_XML_ENTITY; } + | RDF_BOX_L { $$ = (caddr_t) DV_RDF; } + | VECTOR_L { $$ = (caddr_t) DV_ARRAY_OF_POINTER; } + | UNAME_L { $$ = (caddr_t) DV_UNAME; } ; /* miscellaneous */ diff --git a/libsrc/Wi/sql3_vc.c b/libsrc/Wi/sql3_vc.c index 8d84518c8b..eaadc610fc 100644 --- a/libsrc/Wi/sql3_vc.c +++ b/libsrc/Wi/sql3_vc.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sql_code_blog.c b/libsrc/Wi/sql_code_blog.c index e4029cb5c3..239202756f 100644 --- a/libsrc/Wi/sql_code_blog.c +++ b/libsrc/Wi/sql_code_blog.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sql_code_cache_impl.c b/libsrc/Wi/sql_code_cache_impl.c index f21e285569..b043ead25c 100644 --- a/libsrc/Wi/sql_code_cache_impl.c +++ b/libsrc/Wi/sql_code_cache_impl.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sql_to_c.awk b/libsrc/Wi/sql_to_c.awk index cec7961c09..2168b085cb 100644 --- a/libsrc/Wi/sql_to_c.awk +++ b/libsrc/Wi/sql_to_c.awk @@ -8,7 +8,7 @@ # This file is part of the OpenLink Software Virtuoso Open-Source (VOS) # project. # -# Copyright (C) 1998-2018 OpenLink Software +# Copyright (C) 1998-2019 OpenLink Software # # This project is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -217,7 +217,12 @@ BEGIN { bif_text = "" RS = "\n;\n" print "/* This file is automatically generated by sql_to_c.awk */\n" - print "#include \"sqlnode.h\"\n#include \"sqlfn.h\"\n#include \"sqltype.h\"\n" + print "#include \"sqlnode.h\"" + print "#include \"sqlfn.h\"" + print "#include \"sqltype.h\"" + print "#include \"sqlbif.h\"" + if (extra_include != "") + print "#include \"" extra_include "\"\n" filename = FILENAME nfiles = 1 end_name = "" diff --git a/libsrc/Wi/sqlbif.c b/libsrc/Wi/sqlbif.c index 316dbdd15c..8dedb09ea2 100644 --- a/libsrc/Wi/sqlbif.c +++ b/libsrc/Wi/sqlbif.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -626,6 +626,18 @@ bif_long_low_range_arg (caddr_t * qst, state_slot_t ** args, int nth, const char return arg; } +boxint +bif_boxint_range_arg (caddr_t * qst, state_slot_t ** args, int nth, const char *func, boxint low, boxint hi) +{ + boxint arg = bif_long_arg (qst, args, nth, func); + if (arg < low) + sqlr_new_error ("22023", "SR339", "Function %s needs an integer not less than " BOXINT_FMT " as argument %d, but called with " BOXINT_FMT, + func, low, nth + 1, arg); + if (arg > hi) + sqlr_new_error ("22023", "SR340", "Function %s needs an integer not greater than than " BOXINT_FMT " as argument %d, but called with " BOXINT_FMT, + func, hi, nth + 1, arg); + return arg; +} boxint bif_long_or_null_arg (caddr_t * qst, state_slot_t ** args, int nth, const char *func, int *isnull) @@ -1843,6 +1855,7 @@ bif_define_ex (const char *raw_name, bif_t bif, ...) case BMD_NO_CLUSTER: bmd->bmd_no_cluster |= BIF_NO_CLUSTER; break; case BMD_OUT_OF_PARTITION: bmd->bmd_no_cluster |= BIF_OUT_OF_PARTITION; break; case BMD_NEED_ENLIST: bmd->bmd_no_cluster |= BIF_ENLIST; break; + case BMD_NO_FOLD: bmd->bmd_no_fold = 1; break; default: GPF_T1 ("invalid option in bif_define_ex"); } } @@ -12302,10 +12315,17 @@ bif_log_enable (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) qi->qi_client->cli_row_autocommit = ((flag & 2) ? 1 : 0); qi->qi_trx->lt_replicate = ((flag & 1) ? (caddr_t *) box_copy_tree ((caddr_t) qi->qi_client->cli_replicate) : REPL_NO_LOG); + qi->qi_client->cli_log_mode = flag; return box_num (old_value); } +caddr_t +bif_cli_log_mode (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ + query_instance_t *qi = (query_instance_t *) qst; + return box_num (qi->qi_client->cli_log_mode); +} caddr_t print_object_to_new_string (caddr_t xx, const char *fun_name, caddr_t * err_ret, int flags) @@ -13394,31 +13414,61 @@ caddr_t bif_checkpoint_interval (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) { query_instance_t *qi = (query_instance_t *) qst; - int32 old_cp_interval; - int atomic = srv_have_global_lock (THREAD_CURRENT_THREAD); - c_checkpoint_interval = (int32) bif_long_arg (qst, args, 0, "checkpoint_interval"); - old_cp_interval = cfg_autocheckpoint / 60000L; + int32 old_interval, new_interval; + int atomic = srv_have_global_lock (THREAD_CURRENT_THREAD); + + old_interval = c_checkpoint_interval; + new_interval = (int32) bif_long_arg (qst, args, 0, "checkpoint_interval"); sec_check_dba (qi, "checkpoint_interval"); if (!atomic) { - IN_CPT (((query_instance_t *) qst)->qi_trx); + IN_CPT (((query_instance_t *) qst)->qi_trx); } - if (-1 > c_checkpoint_interval) - c_checkpoint_interval = -1; - cfg_autocheckpoint = 60000L * c_checkpoint_interval; -#if 0 - /* - * PMN: THIS SHOULD NEVER BE WRITTEN BACK INTO THE .INI FILE !!!! - */ - cfg_set_checkpoint_interval (c_checkpoint_interval); -#endif + + if (-1 > new_interval) + new_interval = -1; + + c_checkpoint_interval = new_interval; + cfg_autocheckpoint = new_interval > 0 ? (60000L * new_interval) : 0L; + + if (!atomic) + { + LEAVE_CPT (((query_instance_t *) qst)->qi_trx); + } + + return box_num (old_interval); +} + + +caddr_t +bif_scheduler_interval (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) +{ + query_instance_t *qi = (query_instance_t *) qst; + boxint old_period, new_period; + int atomic = srv_have_global_lock (THREAD_CURRENT_THREAD); + + new_period = (boxint) bif_long_arg (qst, args, 0, "scheduler_interval"); + old_period = (boxint) (cfg_scheduler_period / 60000L); + + sec_check_dba (qi, "scheduler_interval"); + + if (!atomic) + { + IN_CPT (((query_instance_t *) qst)->qi_trx); + } + + if (0 > new_period) + new_period = 0; + cfg_scheduler_period = 60000L * new_period; + if (!atomic) { - LEAVE_CPT(((query_instance_t *) qst)->qi_trx); + LEAVE_CPT (((query_instance_t *) qst)->qi_trx); } - return box_num (old_cp_interval); + + return box_num (old_period); } @@ -13698,7 +13748,7 @@ bif_exec (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) caddr_t cache_b = get_keyword_ucase_int (options, "use_cache", NULL); if ((DV_LONG_INT == DV_TYPE_OF (cache_b)) && unbox (cache_b)) { - shc = shcompo_get_or_compile (&shcompo_vtable__qr, list (3, box_copy_tree (text), box_num (qi->qi_u_id), box_num (qi->qi_g_id)), 0, qi, NULL, &err); + shc = shcompo_get_or_compile (&shcompo_vtable__qr, list (3, box_copy_tree (text), qi->qi_u_id, qi->qi_g_id), 0, qi, NULL, &err); if (NULL == err) { shcompo_recompile_if_needed (&shc); @@ -16533,7 +16583,7 @@ bif_sparql_init (void) { bif_define ("rdf_ceil_impl", bif_rdf_ceil_impl); bif_define ("rdf_floor_impl", bif_rdf_floor_impl); - bif_define_ex ("rdf_rand_impl", bif_rdf_rand_impl, BMD_RET_TYPE, &bt_double, BMD_DONE); + bif_define_ex ("rdf_rand_impl", bif_rdf_rand_impl, BMD_RET_TYPE, &bt_double, BMD_NO_FOLD, BMD_DONE); bif_define ("rdf_round_impl", bif_rdf_round_impl); bif_define_ex ("rdf_strlen_impl", bif_rdf_strlen_impl, BMD_RET_TYPE, &bt_integer, BMD_DONE); bif_define_ex ("rdf_substr_impl", bif_rdf_substr_impl, BMD_RET_TYPE, &bt_string, BMD_DONE); @@ -16834,7 +16884,7 @@ sql_bif_init (void) bif_define_ex ("pi" , bif_pi , BMD_RET_TYPE, &bt_double , BMD_MIN_ARGCOUNT, 0, BMD_MAX_ARGCOUNT, 0 , BMD_IS_PURE, BMD_DONE); bif_define_ex ("round" , bif_round , BMD_RET_TYPE, &bt_double , BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1 , BMD_IS_PURE, BMD_DONE); - bif_define_ex ("rnd", bif_rnd, BMD_ALIAS, "rand" , BMD_RET_TYPE, &bt_integer , BMD_MIN_ARGCOUNT, 1 /*, BMD_IS_PURE*/, BMD_DONE); + bif_define_ex ("rnd", bif_rnd, BMD_ALIAS, "rand" , BMD_RET_TYPE, &bt_integer , BMD_MIN_ARGCOUNT, 1 /*, BMD_IS_PURE*/, BMD_NO_FOLD, BMD_DONE); bif_define ("randomize", bif_randomize); bif_define_ex ("hash" , bif_hash , BMD_RET_TYPE, &bt_integer , BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1 , BMD_IS_PURE, BMD_DONE); bif_define_ex ("md5_box", bif_md5_box, BMD_RET_TYPE, &bt_varchar, BMD_MIN_ARGCOUNT, 1, BMD_MAX_ARGCOUNT, 1, BMD_IS_PURE, @@ -16961,6 +17011,7 @@ sql_bif_init (void) bif_define ("repl_is_raw", bif_repl_is_raw); bif_define ("log_enable", bif_log_enable); bif_set_vectored (bif_log_enable, (bif_vec_t)bif_log_enable); + bif_define ("cli_log_mode", bif_cli_log_mode); bif_define_ex ("serialize", bif_serialize, BMD_RET_TYPE, &bt_varchar, BMD_DONE); bif_define_ex ("__serial_length", bif_serial_length, BMD_RET_TYPE, &bt_integer_nn, BMD_DONE); bif_define_ex ("deserialize", bif_deserialize, BMD_RET_TYPE, &bt_any, BMD_DONE); @@ -17030,6 +17081,7 @@ sql_bif_init (void) bif_define_ex ("\x01__reset_temp" /* was "__reset_temp" */, bif_clear_temp, BMD_MAX_ARGCOUNT, 0, BMD_IS_DBA_ONLY, BMD_DONE); bif_define ("__trx_disk_log_length", bif_trx_disk_log_length); bif_define ("checkpoint_interval", bif_checkpoint_interval); + bif_define ("scheduler_interval", bif_scheduler_interval); bif_define ("sql_lex_analyze", bif_sql_lex_analyze); bif_define ("sql_split_text", bif_sql_split_text); @@ -17275,6 +17327,14 @@ bif_set_vectored (bif_t bif, bif_vec_t vectored) bmd->bmd_vector_impl = vectored; } +int +bif_nofold (bif_t bif) +{ + bif_metadata_t *bmd = find_bif_metadata_by_bif (bif); + if (NULL == bmd) + return 0; + return bmd->bmd_no_fold; +} const char * bpel_run_check_proc = "RESTART_ALL_BPEL_INSTANCES ()"; diff --git a/libsrc/Wi/sqlbif.h b/libsrc/Wi/sqlbif.h index eaff399d02..531bb179a5 100644 --- a/libsrc/Wi/sqlbif.h +++ b/libsrc/Wi/sqlbif.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -85,7 +85,8 @@ typedef struct spar_tree_s *bif_sparql_optimizer_t (sparp_ptr_t sparp, int bif_o #define BMD_NO_CLUSTER 14 /*!< Flags that the function is not cluster friendly and can not be relocated from node to node without the change in semantics, no associated value */ #define BMD_OUT_OF_PARTITION 15 /*!< Flags that the function makes a cross partition cluster operation */ #define BMD_NEED_ENLIST 16 /*!< Flags that the query should get \c qr_need_enlist set to 1 if it contains any call of this function */ -#define COUNTOF__BMD_OPTIONs 17 +#define BMD_NO_FOLD 17 +#define COUNTOF__BMD_OPTIONs 18 /*! \brief Metadata about single BIF or similar object. These metadata are created once, remains constant after the creation and never deleted. @@ -107,6 +108,7 @@ typedef struct bif_metadata_s { ptrlong bmd_is_dba_only; /*!< see \c BMD_IS_DBA_ONLY */ ptrlong bmd_uses_index; /*!< see \c BMD_USES_INDEX */ ptrlong bmd_no_cluster; /*!< see \c BMD_NO_CLUSTER, \c BMD_OUT_OF_PARTITION and \c BMD_NEED_ENLIST */ + ptrlong bmd_no_fold; /*!< see \c BMD_NO_FOLD */ } bif_metadata_t; extern id_hash_t *name_to_bif_metadata_idhash; /*!< Metadata of all known BIFs (except \c BMD_SPARQL_ONLY records); results of sqlp_box_id_upcase() as keys, pointers to \c bif_metadata_t as values */ @@ -123,6 +125,7 @@ EXE_EXPORT (bif_metadata_t *, bif_define_typed, (const char * name, bif_t bif, b EXE_EXPORT (void, bif_set_uses_index, (bif_t bif)); EXE_EXPORT (bif_t, bif_find, (const char *name)); int bif_is_aggregate (bif_t bif); +int bif_nofold (bif_t bif); void bif_set_is_aggregate (bif_t bif); bif_vec_t bif_vectored (bif_t bif); void bif_set_vectored (bif_t bif, bif_vec_t vectored); @@ -153,6 +156,7 @@ EXE_EXPORT (caddr_t, bif_string_or_wide_or_null_or_strses_arg, (caddr_t * qst, s EXE_EXPORT (boxint, bif_long_arg, (caddr_t * qst, state_slot_t ** args, int nth, const char *func)); EXE_EXPORT (ptrlong, bif_long_range_arg, (caddr_t * qst, state_slot_t ** args, int nth, const char *func, ptrlong low, ptrlong hi)); EXE_EXPORT (ptrlong, bif_long_low_range_arg, (caddr_t * qst, state_slot_t ** args, int nth, const char *func, ptrlong low)); +EXE_EXPORT (boxint, bif_boxint_range_arg, (caddr_t * qst, state_slot_t ** args, int nth, const char *func, boxint low, boxint hi)); EXE_EXPORT (boxint, bif_long_or_null_arg, (caddr_t * qst, state_slot_t ** args, int nth, const char *func, int *isnull)); EXE_EXPORT (float, bif_float_arg, (caddr_t * qst, state_slot_t ** args, int nth, const char *func)); EXE_EXPORT (double, bif_double_arg, (caddr_t * qst, state_slot_t ** args, int nth, const char *func)); diff --git a/libsrc/Wi/sqlbif2.c b/libsrc/Wi/sqlbif2.c index cb5f363177..964cfcce6d 100644 --- a/libsrc/Wi/sqlbif2.c +++ b/libsrc/Wi/sqlbif2.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -700,9 +700,13 @@ bif_client_attr (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) else if (!stricmp ("client_ssl", mode)) { #ifdef _SSL - SSL *ssl = (SSL *) tcpses_get_ssl (qi->qi_client->cli_ws ? - qi->qi_client->cli_ws->ws_session->dks_session : - qi->qi_client->cli_session->dks_session); + SSL *ssl = NULL; + session_t * ses = (qi->qi_client->cli_ws ? + qi->qi_client->cli_ws->ws_session->dks_session : (qi->qi_client->cli_session ? + qi->qi_client->cli_session->dks_session : NULL)); + + if (ses) + ssl = (SSL *) tcpses_get_ssl (ses); if (ssl) return box_num (1); #else @@ -715,11 +719,15 @@ bif_client_attr (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args) #ifdef _SSL caddr_t ret = NULL; char *ptr; - SSL *ssl = (SSL *) tcpses_get_ssl (qi->qi_client->cli_ws ? - qi->qi_client->cli_ws->ws_session->dks_session : - qi->qi_client->cli_session->dks_session); + SSL *ssl = NULL; X509 *cert = NULL; BIO *in = NULL; + session_t * ses = (qi->qi_client->cli_ws ? + qi->qi_client->cli_ws->ws_session->dks_session : (qi->qi_client->cli_session ? + qi->qi_client->cli_session->dks_session : NULL)); + + if (ses) + ssl = (SSL *) tcpses_get_ssl (ses); if (ssl) cert = SSL_get_peer_certificate (ssl); diff --git a/libsrc/Wi/sqlcmps.h b/libsrc/Wi/sqlcmps.h index 80ef465837..199f2cf9c6 100644 --- a/libsrc/Wi/sqlcmps.h +++ b/libsrc/Wi/sqlcmps.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlcomp.c b/libsrc/Wi/sqlcomp.c index 100ec6fffa..d17ece1a2e 100644 --- a/libsrc/Wi/sqlcomp.c +++ b/libsrc/Wi/sqlcomp.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlcomp.h b/libsrc/Wi/sqlcomp.h index e15fb2b4c5..75ce54d2b2 100644 --- a/libsrc/Wi/sqlcomp.h +++ b/libsrc/Wi/sqlcomp.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlcomp2.c b/libsrc/Wi/sqlcomp2.c index 9c05dc187a..3269ac012e 100644 --- a/libsrc/Wi/sqlcomp2.c +++ b/libsrc/Wi/sqlcomp2.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlcost.c b/libsrc/Wi/sqlcost.c index 49310f5824..1ddc5e4ba0 100644 --- a/libsrc/Wi/sqlcost.c +++ b/libsrc/Wi/sqlcost.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlcr.c b/libsrc/Wi/sqlcr.c index f54a2a932b..49098468e6 100644 --- a/libsrc/Wi/sqlcr.c +++ b/libsrc/Wi/sqlcr.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlcstate.h b/libsrc/Wi/sqlcstate.h index e6938deceb..7490a748b0 100644 --- a/libsrc/Wi/sqlcstate.h +++ b/libsrc/Wi/sqlcstate.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqldf.c b/libsrc/Wi/sqldf.c index ea7f6515c8..74ef9f5e65 100644 --- a/libsrc/Wi/sqldf.c +++ b/libsrc/Wi/sqldf.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -2261,6 +2261,7 @@ sqlo_place_exp (sqlo_t * so, df_elt_t * super, df_elt_t * dfe) int n_args = BOX_ELEMENTS (dfe->dfe_tree->_.call.params); df_elt_t ** args = (df_elt_t **) t_box_copy ((caddr_t) dfe->dfe_tree->_.call.params); locus_t *arg_max_loc = NULL; + bif_t bif = bif_find (dfe->dfe_tree->_.call.name); dfe->dfe_locus = pref_loc; DO_BOX (ST *, arg, inx, dfe->dfe_tree->_.call.params) @@ -2292,7 +2293,7 @@ sqlo_place_exp (sqlo_t * so, df_elt_t * super, df_elt_t * dfe) placed = placed->dfe_prev; } else if (!stricmp (dfe->dfe_tree->_.call.name, GROUPING_FUNC)) - { + { int cond = so->so_place_code_forr_cond; so->so_place_code_forr_cond = 1; placed = dfe_latest (so, n_args, args, 1); @@ -2302,6 +2303,10 @@ sqlo_place_exp (sqlo_t * so, df_elt_t * super, df_elt_t * dfe) if (placed->dfe_type != DFE_GROUP) SQL_GPF_T1 (so->so_sc->sc_cc, GROUPING_FUNC " func without group by"); } + else if (bif && bif_nofold (bif)) + { + placed = so->so_gen_pt; + } else { placed = dfe_latest (so, n_args, args, 1); diff --git a/libsrc/Wi/sqlexp.c b/libsrc/Wi/sqlexp.c index 0845ca8704..9500c5e732 100644 --- a/libsrc/Wi/sqlexp.c +++ b/libsrc/Wi/sqlexp.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlfn.h b/libsrc/Wi/sqlfn.h index 9764f36918..e5686a6b2b 100644 --- a/libsrc/Wi/sqlfn.h +++ b/libsrc/Wi/sqlfn.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -247,14 +247,15 @@ caddr_t qr_quick_exec (query_t * qr, client_connection_t * cli, char * id, char * ddl_complete_table_name (query_instance_t * qi, char *name); void ddl_ensure_univ_tables (void); -void ddl_std_proc (const char * text, int is_public); -void ddl_std_proc_1 (const char *text, int is_public, int to_recompile); #define DDL_STD_REENTRANT 0x40 -void ddl_ensure_table (const char *name, const char *text); -void ddl_ensure_column (const char *table, const char *col, const char *text, int is_drop); -void ddl_sel_for_effect (const char *str); -caddr_t qi_sel_for_effect (query_instance_t * qi, char *str, int n_pars,...); +EXE_EXPORT (void, ddl_std_proc, (const char * text, int is_public)); +EXE_EXPORT (void, ddl_std_proc_1, (const char *text, int ddl_std_flags, int to_recompile)); +EXE_EXPORT (void, ddl_ensure_table, (const char *name, const char *text)); +EXE_EXPORT (void, ddl_ensure_column, (const char *table, const char *col, const char *text, int is_drop)); +EXE_EXPORT (void, ddl_sel_for_effect, (const char *str)); + +caddr_t qi_sel_for_effect (query_instance_t * qi, char *str, int n_pars,...); void ddl_create_table (query_instance_t * cli, const char * name, caddr_t * cols); @@ -848,20 +849,14 @@ void ts_aq_result (table_source_t * ts, caddr_t * inst); caddr_t deref_node_main_row (it_cursor_t * it, buffer_desc_t ** buf, dbe_key_t * key, it_cursor_t * main_itc); -client_connection_t * sqlc_client (void); +EXE_EXPORT (client_connection_t *, sqlc_client, (void)); +EXE_EXPORT (char *, cli_owner, (client_connection_t * cli)); +EXE_EXPORT (char *, sch_full_proc_name, (dbe_schema_t * sc, const char * ref_name, char * q_def, char * o_def)); +EXE_EXPORT (char *, sch_full_proc_name_1, (dbe_schema_t * sc, const char * ref_name, char * q_def, char * o_def, char *m_def)); +EXE_EXPORT (char *, sch_full_module_name, (dbe_schema_t * sc, char * ref_name, char * q_def, char * o_def)); +EXE_EXPORT (char *, cli_qual, (client_connection_t * cli)); -char * cli_owner (client_connection_t * cli); - -char * sch_full_proc_name (dbe_schema_t * sc, const char * ref_name, - char * q_def, char * o_def); -char * sch_full_proc_name_1 (dbe_schema_t * sc, const char * ref_name, - char * q_def, char * o_def, char *m_def); -char * sch_full_module_name (dbe_schema_t * sc, char * ref_name, - char * q_def, char * o_def); -char * cli_qual (client_connection_t * cli); - -long bh_get_data_from_user (blob_handle_t * bh, client_connection_t * cli, - db_buf_t to, int max_bytes); +long bh_get_data_from_user (blob_handle_t * bh, client_connection_t * cli, db_buf_t to, int max_bytes); void bh_set_it_fields (blob_handle_t *bh); void cli_end_blob_read (client_connection_t * cli); diff --git a/libsrc/Wi/sqlgen.c b/libsrc/Wi/sqlgen.c index f169a0043d..866c48e12a 100644 --- a/libsrc/Wi/sqlgen.c +++ b/libsrc/Wi/sqlgen.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -5438,11 +5438,11 @@ sqlg_dt_query_1 (sqlo_t * so, df_elt_t * dt_dfe, query_t * ext_query, ST ** targ if (dfe->dfe_tree) { caddr_t name = dfe->dfe_tree->_.call.name; - if (DV_STRINGP (name) && !stricmp (name, GROUPING_FUNC) && so->so_sc->sc_grouping) + if (DV_STRING_TYPE (name) && !stricmp (name, GROUPING_FUNC) && so->so_sc->sc_grouping) { ptrlong bitmap = 0; dfe->dfe_tree->_.call.params[2] = (ST*) t_box_num (so->so_sc->sc_grouping->ssl_index); - make_grouping_bitmap_set (NULL, dfe->dfe_tree->_.call.params[0], so->so_sc->sc_groupby_set, &bitmap); + make_grouping_bitmap_set (NULL, dfe->dfe_tree->_.call.params[0], so->so_sc->sc_groupby_set, &bitmap); dfe->dfe_tree->_.call.params[1] = (ST*) t_box_num (bitmap); } } diff --git a/libsrc/Wi/sqlhash.c b/libsrc/Wi/sqlhash.c index 0de83fa840..ffc88ed876 100644 --- a/libsrc/Wi/sqlhash.c +++ b/libsrc/Wi/sqlhash.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlintrp.c b/libsrc/Wi/sqlintrp.c index 7fd9fdf38a..2990732b6f 100644 --- a/libsrc/Wi/sqlintrp.c +++ b/libsrc/Wi/sqlintrp.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -1687,6 +1687,7 @@ opt_set_test () #endif long callstack_on_exception = 0; +long public_debug = 0; void err_append_callstack_procname (caddr_t err, caddr_t proc_name, caddr_t file_name, int line_no) { if (0 >= callstack_on_exception) diff --git a/libsrc/Wi/sqlintrp.h b/libsrc/Wi/sqlintrp.h index c8c8fad0f6..beeb142be0 100644 --- a/libsrc/Wi/sqlintrp.h +++ b/libsrc/Wi/sqlintrp.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlinx.c b/libsrc/Wi/sqlinx.c index 4808cd3478..680252bb17 100644 --- a/libsrc/Wi/sqlinx.c +++ b/libsrc/Wi/sqlinx.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqljp.c b/libsrc/Wi/sqljp.c index ecc81af48b..d30ff75297 100644 --- a/libsrc/Wi/sqljp.c +++ b/libsrc/Wi/sqljp.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlnode.h b/libsrc/Wi/sqlnode.h index 29b73afbba..f4e21f58c6 100644 --- a/libsrc/Wi/sqlnode.h +++ b/libsrc/Wi/sqlnode.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -1793,7 +1793,8 @@ typedef struct client_connection_s bitf_t cli_log_qi_stats:1; bitf_t cli_keep_csl:1; bitf_t cli_cl_dae_blob; - char cli_row_autocommit; + char cli_row_autocommit; /* can be reset from many places eg. ddl_node_input */ + char cli_log_mode; /* keeps value from log_enable call, set only there */ slice_id_t cli_slice; int cli_n_to_autocommit; cl_slice_t * cli_csl; @@ -2103,6 +2104,9 @@ extern int enable_vec; extern FILE *query_log; extern void log_cli_event (client_connection_t *cli, int print_full_content, const char *fmt, ...); extern void log_query_event (query_t *qr, int print_full_content, const char *fmt, ...); +#else +#define log_cli_event(cli,print_full_content,fmt,...) do { ; } while (0) +#define log_query_event (qr,print_full_content,fmt,...) do { ; } while (0) #endif #endif /* _SQLNODE_H */ diff --git a/libsrc/Wi/sqlo.c b/libsrc/Wi/sqlo.c index 5388269557..14c8363acd 100644 --- a/libsrc/Wi/sqlo.c +++ b/libsrc/Wi/sqlo.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -510,12 +510,10 @@ sqlo_col_scope_1 (sqlo_t * so, ST * col_ref, int generate) return 1; if (!generate) return 0; - { - char cn[MAX_NAME_LEN * 5 + 10]; - if (col_ref->_.col_ref.prefix) - snprintf (cn, sizeof (cn), "%s.%s", col_ref->_.col_ref.prefix, col_ref->_.col_ref.name); - sqlc_error (so->so_sc->sc_cc, "S0022", "No column %s.", col_ref->_.col_ref.prefix ? cn : col_ref->_.col_ref.name); - } + if (col_ref->_.col_ref.prefix) + sqlc_error (so->so_sc->sc_cc, "S0022", "No column %s.%s.", col_ref->_.col_ref.prefix, col_ref->_.col_ref.name); + else + sqlc_error (so->so_sc->sc_cc, "S0022", "No column %s.", col_ref->_.col_ref.name); return 0; /* dummy */ } @@ -1625,9 +1623,11 @@ sqlo_check_ft_offband (sqlo_t * so, op_table_t * ot, ST ** args, char type) continue; } if (inx >= surely_option_idx) - sqlc_error (sc->sc_cc, "37000", - "Argument %d of %s is '%.300s', not a keyword from list OFFBAND, DESCENDING, RANGES, MAIN_RANGES, ATTR_RANGES, SCORE, SCORE_LIMIT, EXT_FTI, GEO, GEO_RDF, PRECISION", - inx + 1, sqlo_spec_predicate_name(type), arg ); + { + sqlc_error (sc->sc_cc, "37000", + "Argument %d of %s is '%.300s', not a keyword from list OFFBAND, DESCENDING, RANGES, MAIN_RANGES, ATTR_RANGES, SCORE, SCORE_LIMIT, EXT_FTI, GEO, GEO_RDF, PRECISION", + inx + 1, sqlo_spec_predicate_name (type), arg); + } } if (off) ot->ot_text_offband = (op_virt_col_t **) list_to_array (off); diff --git a/libsrc/Wi/sqlo.h b/libsrc/Wi/sqlo.h index 3d2eb7d187..104d0e905a 100644 --- a/libsrc/Wi/sqlo.h +++ b/libsrc/Wi/sqlo.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqloby.c b/libsrc/Wi/sqloby.c index a869d7b6f7..f0bced48ee 100644 --- a/libsrc/Wi/sqloby.c +++ b/libsrc/Wi/sqloby.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlocr.c b/libsrc/Wi/sqlocr.c index b8d9bea3d9..6cf1dc8dcb 100644 --- a/libsrc/Wi/sqlocr.c +++ b/libsrc/Wi/sqlocr.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlocr.h b/libsrc/Wi/sqlocr.h index 635cf88b7f..e636f65604 100644 --- a/libsrc/Wi/sqlocr.h +++ b/libsrc/Wi/sqlocr.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlofn.h b/libsrc/Wi/sqlofn.h index a116f77d02..2ea8686050 100644 --- a/libsrc/Wi/sqlofn.h +++ b/libsrc/Wi/sqlofn.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqloinv.c b/libsrc/Wi/sqloinv.c index e3086c358a..162f22913c 100644 --- a/libsrc/Wi/sqloinv.c +++ b/libsrc/Wi/sqloinv.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqloinv.h b/libsrc/Wi/sqloinv.h index 8c14d3c4d3..91d69ef900 100644 --- a/libsrc/Wi/sqloinv.h +++ b/libsrc/Wi/sqloinv.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqloinx.c b/libsrc/Wi/sqloinx.c index 9d404a6f53..003416f70d 100644 --- a/libsrc/Wi/sqloinx.c +++ b/libsrc/Wi/sqloinx.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlopcod.h b/libsrc/Wi/sqlopcod.h index 73ac820cc4..1c5222b5ae 100644 --- a/libsrc/Wi/sqlopcod.h +++ b/libsrc/Wi/sqlopcod.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqloprt.c b/libsrc/Wi/sqloprt.c index 534bca7599..5073237497 100644 --- a/libsrc/Wi/sqloprt.c +++ b/libsrc/Wi/sqloprt.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlorder.c b/libsrc/Wi/sqlorder.c index 890cbc1b30..8c524764aa 100644 --- a/libsrc/Wi/sqlorder.c +++ b/libsrc/Wi/sqlorder.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlovdb.c b/libsrc/Wi/sqlovdb.c index 72b5680bfb..adcfbba0ae 100644 --- a/libsrc/Wi/sqlovdb.c +++ b/libsrc/Wi/sqlovdb.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlpar.h b/libsrc/Wi/sqlpar.h index 20eb910994..f1537b5052 100644 --- a/libsrc/Wi/sqlpar.h +++ b/libsrc/Wi/sqlpar.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlparext.h b/libsrc/Wi/sqlparext.h index cf9f581ccf..afbc4c293b 100644 --- a/libsrc/Wi/sqlparext.h +++ b/libsrc/Wi/sqlparext.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlpfn.c b/libsrc/Wi/sqlpfn.c index 7f22a7b5db..20c1840340 100644 --- a/libsrc/Wi/sqlpfn.c +++ b/libsrc/Wi/sqlpfn.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlpfn.h b/libsrc/Wi/sqlpfn.h index 771323be42..29ce300086 100644 --- a/libsrc/Wi/sqlpfn.h +++ b/libsrc/Wi/sqlpfn.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlprocc.c b/libsrc/Wi/sqlprocc.c index 3fdaa283fa..9fff722878 100644 --- a/libsrc/Wi/sqlprocc.c +++ b/libsrc/Wi/sqlprocc.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -164,6 +164,9 @@ sqlc_decl_variable_list_1 (sql_comp_t * sc, ST ** params, int is_arg_list, dk_se query_t * qr = sc->sc_cc->cc_query; int inx; + if (BOX_ELEMENTS_0 (params) > MAX_STATE_SLOTS) + SQL_GPF_T1 (sc->sc_cc, "Query too large, variables in state over the limit"); + DO_BOX (ST *, decl, inx, params) { state_slot_t *var; @@ -826,25 +829,25 @@ sqlc_set_brk (query_t *qr, long line1, int what, caddr_t * inst) inside_handler = 0; if (inside_handler && line1 <= 0) continue; - if (instr->ins_type == INS_BREAKPOINT) - { - if ((line1 > 0 && instr->_.breakpoint.line_no >= line1) || line1 <= 0) - { - if (line1 >= 0) - instr->_.breakpoint.brk_set = what; - else - instr->_.breakpoint.brk_set = (instr->_.breakpoint.brk_set & 2) | (what & 1); -/* fprintf (stderr, "Set Brkp %p at (%ld)\n", instr, instr->_.breakpoint.line_no);*/ - rc++; - if (line1 >= 0) - { - rc = instr->_.breakpoint.line_no; - if (inst) - *inst = (caddr_t) instr; - break; - } - } - } + if (instr->ins_type == INS_BREAKPOINT) + { + if ((line1 > 0 && instr->_.breakpoint.line_no >= line1) || line1 <= 0) + { + if (line1 >= 0) + instr->_.breakpoint.brk_set = what; + else + instr->_.breakpoint.brk_set = (instr->_.breakpoint.brk_set & 2) | (what & 1); + /* fprintf (stderr, "Set Brkp %p at (%ld)\n", instr, instr->_.breakpoint.line_no);*/ + rc++; + if (line1 >= 0) + { + rc = instr->_.breakpoint.line_no; + if (inst) + *inst = (caddr_t) instr; + break; + } + } + } } END_DO_INSTR; return rc; diff --git a/libsrc/Wi/sqlprt.c b/libsrc/Wi/sqlprt.c index d60fcef1cf..6debfd6f7c 100644 --- a/libsrc/Wi/sqlprt.c +++ b/libsrc/Wi/sqlprt.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlrbuf.c b/libsrc/Wi/sqlrbuf.c index 66da34a4d3..47f5d9727f 100644 --- a/libsrc/Wi/sqlrbuf.c +++ b/libsrc/Wi/sqlrbuf.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlrcomp.c b/libsrc/Wi/sqlrcomp.c index 13499ec9a9..342c97799c 100644 --- a/libsrc/Wi/sqlrcomp.c +++ b/libsrc/Wi/sqlrcomp.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlrcomp.h b/libsrc/Wi/sqlrcomp.h index cdba2a2113..c44dfc5508 100644 --- a/libsrc/Wi/sqlrcomp.h +++ b/libsrc/Wi/sqlrcomp.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlrrun.c b/libsrc/Wi/sqlrrun.c index 60ce922f5e..5daf3abce8 100644 --- a/libsrc/Wi/sqlrrun.c +++ b/libsrc/Wi/sqlrrun.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlrun.c b/libsrc/Wi/sqlrun.c index b8a3550a28..131243035e 100644 --- a/libsrc/Wi/sqlrun.c +++ b/libsrc/Wi/sqlrun.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -1959,9 +1959,9 @@ table_source_input (table_source_t * ts, caddr_t * inst, { float pct = (float) (ptrlong) ts->ts_rnd_pcnt; order_itc->itc_random_search = RANDOM_SEARCH_ON; - if (pct) + if (pct < 1) pct = 1; - if (pct >= 30) + else if (pct > 30) pct = 30; order_itc->itc_st.sample_size = (((float) row_est) / 100) * pct; if (order_itc->itc_st.sample_size < 200) @@ -2236,6 +2236,7 @@ insert_node_run (insert_node_t * ins, caddr_t * inst, caddr_t * state) QNCAST (query_instance_t, qi, inst); int k; dbe_table_t *tb = ins->ins_table; + int non_txn_insert; it_cursor_t auto_itc; it_cursor_t *itc; @@ -2307,6 +2308,7 @@ insert_node_run (insert_node_t * ins, caddr_t * inst, caddr_t * state) qi->qi_set_mask = mask_save; qi->qi_n_sets = n_sets; } + non_txn_insert = qi->qi_non_txn_insert; for (k = 0; k < BOX_ELEMENTS_INT (ins->ins_keys); k++) { if (qi->qi_client->cli_row_autocommit) @@ -2317,6 +2319,7 @@ insert_node_run (insert_node_t * ins, caddr_t * inst, caddr_t * state) itc_col_free (itc); } } + qi->qi_non_txn_insert = non_txn_insert; qi->qi_set_mask = save_sets; qi->qi_n_sets = n_sets; if (itc->itc_siblings) diff --git a/libsrc/Wi/sqlsrv.c b/libsrc/Wi/sqlsrv.c index 5189e5f0e7..b3604c0d7f 100644 --- a/libsrc/Wi/sqlsrv.c +++ b/libsrc/Wi/sqlsrv.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -449,6 +449,7 @@ client_connection_create (void) wi_inst.wi_master->dbs_log_name ? REPL_LOG : REPL_NO_LOG; else cli->cli_replicate = REPL_NO_LOG; + cli->cli_log_mode = 1; cli->cli_qualifier = box_string ("DB"); #ifdef SERIAL_CLI cli->cli_test_mtx = mutex_allocate (); @@ -4415,7 +4416,7 @@ srv_make_trx_error (int code, caddr_t detail) case LTE_LOG_IMAGE: err = srv_make_new_error ("40005", "SR325", "Transaction aborted because it's log after image size " - "went above the limit%s%s", + "went above the " OFF_T_PRINTF_FMT " bytes limit%s%s", (OFF_T_PRINTF_DTP)txn_after_image_limit, detail ? " : " : "", detail ? detail : ""); break; case LTE_OUT_OF_MEM: diff --git a/libsrc/Wi/sqlstmts.c b/libsrc/Wi/sqlstmts.c index c954e3a41e..17790e2fbd 100644 --- a/libsrc/Wi/sqlstmts.c +++ b/libsrc/Wi/sqlstmts.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqltrig.c b/libsrc/Wi/sqltrig.c index 72a8b03f01..fff168b8a0 100644 --- a/libsrc/Wi/sqltrig.c +++ b/libsrc/Wi/sqltrig.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqltype.c b/libsrc/Wi/sqltype.c index 9ecbcd2dcc..31df5f511a 100644 --- a/libsrc/Wi/sqltype.c +++ b/libsrc/Wi/sqltype.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqltype.h b/libsrc/Wi/sqltype.h index e90f041c31..ff7547f896 100644 --- a/libsrc/Wi/sqltype.h +++ b/libsrc/Wi/sqltype.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqltype_c.h b/libsrc/Wi/sqltype_c.h index 299deab9ac..1dd7542089 100644 --- a/libsrc/Wi/sqltype_c.h +++ b/libsrc/Wi/sqltype_c.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlvec.c b/libsrc/Wi/sqlvec.c index c039b7a9d0..d812db8448 100644 --- a/libsrc/Wi/sqlvec.c +++ b/libsrc/Wi/sqlvec.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlver.c b/libsrc/Wi/sqlver.c index a8d3b2fe98..9d4453978b 100644 --- a/libsrc/Wi/sqlver.c +++ b/libsrc/Wi/sqlver.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlver.h b/libsrc/Wi/sqlver.h index 3195972b5d..60777f5887 100644 --- a/libsrc/Wi/sqlver.h +++ b/libsrc/Wi/sqlver.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -27,7 +27,7 @@ #ifndef SQLVER_H #define SQLVER_H -#define PRODUCT_COPYRIGHT "Copyright (C) 1998-2018 OpenLink Software" +#define PRODUCT_COPYRIGHT "Copyright (C) 1998-2019 OpenLink Software" #define PRODUCT_NAME "OpenLink Virtuoso" /* DBMS Server */ @@ -35,7 +35,7 @@ #define DBMS_SRV_NAME PRODUCT_DBMS " Universal Server" #define DBMS_SRV_VER_ONLY "07.20" #define DBMS_SRV_GEN_MAJOR "32" -#define DBMS_SRV_GEN_MINOR "29" +#define DBMS_SRV_GEN_MINOR "30" #define DBMS_SRV_VER DBMS_SRV_VER_ONLY "." \ DBMS_SRV_GEN_MAJOR DBMS_SRV_GEN_MINOR diff --git a/libsrc/Wi/sqlview.c b/libsrc/Wi/sqlview.c index 7f708f9c41..8b035a2c09 100644 --- a/libsrc/Wi/sqlview.c +++ b/libsrc/Wi/sqlview.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlvnode.c b/libsrc/Wi/sqlvnode.c index e621e39051..cb3d2d283d 100644 --- a/libsrc/Wi/sqlvnode.c +++ b/libsrc/Wi/sqlvnode.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sqlvrun.c b/libsrc/Wi/sqlvrun.c index b5a9ef9bde..46f98ebb6f 100644 --- a/libsrc/Wi/sqlvrun.c +++ b/libsrc/Wi/sqlvrun.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -463,7 +463,11 @@ DBG_NAME(qi_vec_init) (DBG_PARAMS query_instance_t * qi, int n_sets) if (!(mp = qi->qi_mp)) { not_inited = 1; +#ifdef MALLOC_DEBUG mp = qi->qi_mp = DBG_NAME(mem_pool_alloc) (DBG_ARGS_0); +#else + mp = qi->qi_mp = mem_pool_alloc (); +#endif if (qr->qr_vec_ssls) { int ign; @@ -868,7 +872,7 @@ ssl_insert_cast (insert_node_t * ins, caddr_t * inst, int nth_col, caddr_t * err value = qst_get (inst, (state_slot_t *) source); } dtp = DV_TYPE_OF (value); - if (dtp == dtp_canonical[cl->cl_sqt.sqt_col_dtp]) + if (dtp_canonical[dtp] == dtp_canonical[cl->cl_sqt.sqt_col_dtp]) { switch (dtp) { @@ -890,6 +894,13 @@ ssl_insert_cast (insert_node_t * ins, caddr_t * inst, int nth_col, caddr_t * err goto general; dc_append_box (target_dc, value); break; + case DV_WIDE: + case DV_LONG_WIDE: + if ((cl->cl_sqt.sqt_precision && (box_length (value) / sizeof (wchar_t)) - 1 > cl->cl_sqt.sqt_precision) + || box_length (value) > 4095) + goto general; + dc_append_box (target_dc, value); + break; default: goto general; } } @@ -2458,7 +2469,8 @@ ts_handle_aq (table_source_t * ts, caddr_t * inst, buffer_desc_t ** order_buf_re SRC_IN_STATE (ts, inst) = NULL; ts_aq_result (ts, inst); if (qi->qi_client->cli_activity.da_anytime_result) - cli_anytime_timeout (qi->qi_client);return 1; + cli_anytime_timeout (qi->qi_client); + return 1; } } return 0; diff --git a/libsrc/Wi/sqlwords.gperf b/libsrc/Wi/sqlwords.gperf index 060dcef49c..4769dd0d1a 100644 --- a/libsrc/Wi/sqlwords.gperf +++ b/libsrc/Wi/sqlwords.gperf @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -96,6 +96,7 @@ DEFAULT, DEFAULT DELETE, DELETE_L DESC, DESC DETERMINISTIC, DETERMINISTIC +DICTIONARY, DICTIONARY_L DISABLE, DISABLE_L DISCONNECT, DISCONNECT DISTINCT, DISTINCT @@ -136,7 +137,8 @@ GO, GO GOTO, GOTO GRANT, GRANT GROUP, GROUP -GROUPING, GROUPING +GROUPING, GROUPING_L +HANDLE, HANDLE_L HANDLER, HANDLER HASH, HASH HAVING, HAVING @@ -229,6 +231,7 @@ READ, READ_L READS, READS REAL, REAL REF, REF +REFERENCE, REFERENCE_L REFERENCES, REFERENCES REFERENCING, REFERENCING REMOTE, REMOTE @@ -270,6 +273,7 @@ SQLSTATE, SQLSTATE_L SQLWARNING, SQLWARNING START, START_L STATIC, STATIC_L +STREAM, STREAM_L STYLE, STYLE SYNC, SYNC SYSTEM, SYSTEM diff --git a/libsrc/Wi/srvcr.c b/libsrc/Wi/srvcr.c index 51382882a8..9b2f2faa6d 100644 --- a/libsrc/Wi/srvcr.c +++ b/libsrc/Wi/srvcr.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/srvmultibyte.c b/libsrc/Wi/srvmultibyte.c index a1e66795ac..cbb482a38d 100644 --- a/libsrc/Wi/srvmultibyte.c +++ b/libsrc/Wi/srvmultibyte.c @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/srvmultibyte.h b/libsrc/Wi/srvmultibyte.h index 15a1e81ff4..cb1d346832 100644 --- a/libsrc/Wi/srvmultibyte.h +++ b/libsrc/Wi/srvmultibyte.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -30,8 +30,7 @@ void row_print_wide (caddr_t thing, dk_session_t * ses, dbe_column_t * col, caddr_t * err_ret, dtp_t dtp, wcharset_t *wcharset); -dk_set_t bh_string_list_w (/* this was before 3.0: index_space_t * isp, */ lock_trx_t * lt, blob_handle_t * bh, - long get_chars, int omit); /* if omit!=0, it just run through blob part */ +dk_set_t bh_string_list_w (/* this was before 3.0: index_space_t * isp, */ lock_trx_t * lt, blob_handle_t * bh, long get_chars, int omit); /* if omit!=0, it just run through blob part */ dk_session_t *bh_string_output_w (/* this was before 3.0: index_space_t * isp, */ lock_trx_t * lt, blob_handle_t * bh, int omit); /* if omit!=0, it just run through blob part */ int compare_wide_to_utf8 (caddr_t utf8_data, long utf8_len, caddr_t wide_data, long wide_len, collation_t *collation); int compare_utf8_with_collation (caddr_t dv1, long n1, caddr_t dv2, long n2, collation_t *collation); diff --git a/libsrc/Wi/srvstat.c b/libsrc/Wi/srvstat.c index 7bc9130d24..11f8d4dbbc 100644 --- a/libsrc/Wi/srvstat.c +++ b/libsrc/Wi/srvstat.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -643,7 +643,7 @@ dbms_status_report (void) char mem[100]; char rpc[200]; char col_ac_str[100]; - char w_rate[20]; + char w_rate[40]; long read_percent = 0, write_percent = 0, interval_msec = 0; static long last_time; static long last_read_cum_time, last_write_cum_time; @@ -1260,6 +1260,8 @@ get_total_sys_mem () } extern int process_is_swapping; +extern double curr_cpu_pct; +extern unsigned long curr_mem_rss; extern int64 dk_n_allocs; extern int64 dk_n_free; @@ -1842,6 +1844,7 @@ stat_desc_t dbf_descs [] = {"ha_rehash_pct", (long *)&ha_rehash_pct, SD_INT32}, {"c_use_aio", (long *)&c_use_aio, SD_INT32}, {"callstack_on_exception", &callstack_on_exception, NULL}, + {"public_debug", &public_debug, NULL}, {"enable_vec", (long *)&enable_vec, SD_INT32}, {"enable_qp", (long *)&enable_qp, SD_INT32}, {"enable_mt_txn", (long *)&enable_mt_txn, SD_INT32}, @@ -2694,8 +2697,8 @@ dbg_print_d_id_aux (FILE *out, d_id_t *d_id_buf_ptr) goto print_d_id_as_binary; for (ctr = 0; ctr < 4; ctr++) fprintf (out, "%02x", (unsigned int)(d_id_buf_ptr->id[ctr])); - return; - print_d_id_as_binary: + return; +print_d_id_as_binary: for (ctr = 0; ctr < 32; ctr++) fprintf (out, "%02x", (unsigned int)(d_id_buf_ptr->id[ctr])); } @@ -3537,7 +3540,7 @@ dbg_page_structure_error (buffer_desc_t * buf, db_buf_t ptr) trace [0] = 0; for (inx = 0, p = trace; inx < 32; inx++, p += 3) { - char buf [3]; + char buf [5]; snprintf (buf, sizeof (buf), "%02x ", ptr[inx]); strcat_ck (trace, buf); } diff --git a/libsrc/Wi/srvstat.h b/libsrc/Wi/srvstat.h index d1b3f3784a..cbc4459784 100644 --- a/libsrc/Wi/srvstat.h +++ b/libsrc/Wi/srvstat.h @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/ssl.c b/libsrc/Wi/ssl.c index 15737b65e4..781fabddc4 100644 --- a/libsrc/Wi/ssl.c +++ b/libsrc/Wi/ssl.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/statuslog.h b/libsrc/Wi/statuslog.h index 76e47f574b..25ad00d332 100644 --- a/libsrc/Wi/statuslog.h +++ b/libsrc/Wi/statuslog.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/string.c b/libsrc/Wi/string.c index 929c01df7e..a0f4cc3734 100644 --- a/libsrc/Wi/string.c +++ b/libsrc/Wi/string.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/string_tmpl.c b/libsrc/Wi/string_tmpl.c index 9505ed909f..e6706ad6cc 100644 --- a/libsrc/Wi/string_tmpl.c +++ b/libsrc/Wi/string_tmpl.c @@ -8,7 +8,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/strlike.h b/libsrc/Wi/strlike.h index 7b302da92b..2ca377747c 100644 --- a/libsrc/Wi/strlike.h +++ b/libsrc/Wi/strlike.h @@ -6,7 +6,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/subseq.c b/libsrc/Wi/subseq.c index 1c872374fa..1ba3face7e 100644 --- a/libsrc/Wi/subseq.c +++ b/libsrc/Wi/subseq.c @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/subseq.h b/libsrc/Wi/subseq.h index c2088a42f7..139efc7ded 100644 --- a/libsrc/Wi/subseq.h +++ b/libsrc/Wi/subseq.h @@ -4,7 +4,7 @@ * This file is part of the OpenLink Software Virtuoso Open-Source (VOS) * project. * - * Copyright (C) 1998-2018 OpenLink Software + * Copyright (C) 1998-2019 OpenLink Software * * This project is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/sys_unicode3_collations.sql b/libsrc/Wi/sys_unicode3_collations.sql index 570570eb8b..4f380a155c 100644 --- a/libsrc/Wi/sys_unicode3_collations.sql +++ b/libsrc/Wi/sys_unicode3_collations.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the diff --git a/libsrc/Wi/system.sql b/libsrc/Wi/system.sql index e935af0bc6..827011da7d 100644 --- a/libsrc/Wi/system.sql +++ b/libsrc/Wi/system.sql @@ -4,7 +4,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -122,8 +122,8 @@ create procedure REPL_COLTYPE_PS ( in _col_dtp integer, in _col_prec integer, in _col_scale integer) returns varchar { - if ((_col_dtp = 181 or _col_dtp = 182 or _col_dtp = 192 or - _col_dtp = 222 or _col_dtp = 225) + if ((_col_dtp = 181 or _col_dtp = __tag of varchar or _col_dtp = 192 or + _col_dtp = 222 or _col_dtp = __tag of nvarchar) and _col_prec is not null and _col_prec <> 0) { -- (length) for char or varchar @@ -141,7 +141,7 @@ create procedure REPL_COLTYPE_PS ( _coltype := concat (_prefix, _len_spec, _suffix); } } - else if (_col_dtp = 219) + else if (_col_dtp = __tag of decimal) { -- (prec, scale) for numeric if (_col_prec < _col_scale or _col_scale is null) @@ -159,7 +159,7 @@ create procedure REPL_COLTYPE (in _col any) returns varchar _col_scale := aref (_col, 2); _col_prec := aref (_col, 3); - if (_col_dtp = 219) + if (_col_dtp = __tag of decimal) { if (_col_scale > 15) _col_scale := 15; @@ -398,11 +398,11 @@ create procedure XML_URI_RESOLVE_LIKE_GET (in base_uri varchar, in rel_uri varch { declare res any; -- dbg_obj_princ ('XML_URI_RESOLVE_LIKE_GET (', base_uri, rel_uri, ')'); - if (__tag (base_uri) in (225, 226)) + if (__tag (base_uri) in (__tag of nvarchar, 226)) base_uri := charset_recode (base_uri, '_WIDE_', 'UTF-8'); else base_uri := coalesce (cast (base_uri as varchar), ''); - if (__tag (rel_uri) in (225, 226)) + if (__tag (rel_uri) in (__tag of nvarchar, 226)) rel_uri := charset_recode (rel_uri, '_WIDE_', 'UTF-8'); else rel_uri := coalesce (cast (rel_uri as varchar), ''); @@ -418,7 +418,7 @@ create function XML_URI_GET_AND_CACHE (in absolute_uri varchar) declare head, content any; whenever not found goto try_http_get; -- dbg_obj_princ ('XML_URI_GET_AND_CACHE (', absolute_uri, ')'); - if (__tag (absolute_uri) in (225, 226)) + if (__tag (absolute_uri) in (__tag of nvarchar, 226)) absolute_uri := charset_recode (absolute_uri, '_WIDE_', 'UTF-8'); else absolute_uri := charset_recode (absolute_uri, NULL, 'UTF-8'); @@ -481,7 +481,7 @@ create procedure XML_URI_GET (in base_uri varchar, in rel_uri varchar) -- dbg_obj_princ ('XML_URI_GET (', base_uri, rel_uri, ')'); base_uri := XML_URI_RESOLVE_LIKE_GET (base_uri, rel_uri); -- dbg_obj_princ ('base URI after XML_URI_RESOLVE_LIKE_GET:', base_uri); - if (__tag (base_uri) in (225, 226)) + if (__tag (base_uri) in (__tag of nvarchar, 226)) base_uri := charset_recode (base_uri, '_WIDE_', 'UTF-8'); else base_uri := charset_recode (base_uri, NULL, 'UTF-8'); @@ -604,7 +604,7 @@ skip_auth:; whenever not found goto cl_err; open cl (prefetch 1); fetch cl into tp; - if (tp = 189 or tp = 188) + if (tp = __tag of integer or tp = __tag of smallint) path1 := cast (path as integer); else if (tp = 191 or tp = 190) path1 := cast (path as double precision); @@ -2179,27 +2179,6 @@ create procedure DB.DBA.col_of_type (in tb varchar, in col varchar, in type_need -- Added new columns for schema in SYS_VT_INDEX (backward compatibility) ---#IF VER=5 ---!AFTER -alter table DB.DBA.SYS_VT_INDEX add VI_ID_CONSTR varchar -; - ---!AFTER -alter table DB.DBA.SYS_VT_INDEX add VI_OFFBAND_COLS varchar -; - ---!AFTER -alter table DB.DBA.SYS_VT_INDEX add VI_OPTIONS varchar -; - ---!AFTER -alter table DB.DBA.SYS_VT_INDEX add VI_LANGUAGE varchar -; - ---!AFTER -alter table DB.DBA.SYS_VT_INDEX add VI_ENCODING varchar -; ---#ENDIF charset_define ('MIK', N'\x1\x2\x3\x4\x5\x6\x7\x8\x9\xA\xB\xC\xD\xE\xF\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2A\x2B\x2C\x2D\x2E\x2F\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3A\x3B\x3C\x3D\x3E\x3F\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4A\x4B\x4C\x4D\x4E\x4F\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5A\x5B\x5C\x5D\x5E\x5F\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6A\x6B\x6C\x6D\x6E\x6F\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7A\x7B\x7C\x7D\x7E\x7F\x410\x411\x412\x413\x414\x415\x416\x417\x418\x419\x41A\x41B\x41C\x41D\x41E\x41F\x420\x421\x422\x423\x424\x425\x426\x427\x428\x429\x42A\x42B\x42C\x42D\x42E\x42F\x430\x431\x432\x433\x434\x435\x436\x437\x438\x439\x43A\x43B\x43C\x43D\x43E\x43F\x440\x441\x442\x443\x444\x445\x446\x447\x448\x449\x44A\x44B\x44C\x44D\x44E\x44F\x2514\x2534\x252C\x251C\x2500\x253C\x2563\x2551\x255A\x2554\x2569\x2566\x2560\x2550\x256C\x2510\x2591\x2592\x2593\x2502\x2524\x2116\xA7\x2557\x255D\x2518\x250C\x2588\x2584\x258C\x2590\x2580\x3B1\x3B2\x393\x3C0\x3A3\x3C3\x3BC\x3C4\x3A6\x398\x3A9\x3B4\x221E\x2205\x2208\x2229\x2261\xB1\x2265\x2264\x2320\x2321\xF7\x2248\xB0\x2219\xB7\x221A\x207F\xB2\x25A0\xA0', vector ('999', 'CP999')) @@ -2322,7 +2301,7 @@ scheduler_init () ; --!AWK PUBLIC -create procedure SYS_GENERATE_ALL_OPS (in col_name varchar, in col_dtp integer := 193) +create procedure SYS_GENERATE_ALL_OPS (in col_name varchar, in col_dtp integer := __tag of vector) { declare func, args varchar; func := @@ -2925,7 +2904,7 @@ done: http (sprintf (' if (rate = 0 AND vals_%I <> 0 ) { rate := 1; }; \n', col_name), proc); http (sprintf (' if (n_dist_%I < 20) { ndist_rate := 1; } else {ndist_rate := rate; }; \n', col_name), proc); - if (col_dtp = 189 or col_dtp = 247) -- DV_INT & DV_INT64 + if (col_dtp = __tag of integer or col_dtp = __tag of bigint) -- DV_INT & DV_INT64 { http (sprintf (' if ((n_dist_%I * ndist_rate) > (max_%I - min_%I)) { ndist_rate := 1; n_dist_%I := max_%I - min_%I; } \n', col_name, col_name, col_name, col_name, col_name, col_name), proc); @@ -3076,29 +3055,7 @@ alter index SYS_SOAP_DATATYPES on DB.DBA.SYS_SOAP_DATATYPES partition cluster re ; ---#IF VER=5 ---!AFTER -create procedure -DB.DBA.SOAP_DATATYPES_UPGRADE () -{ - if (exists (select 1 from SYS_COLS where \TABLE = 'DB.DBA.SYS_SOAP_DATATYPES' and \COLUMN = 'SDT_TYPE') and - exists (select 1 from SYS_COLS where \TABLE = 'DB.DBA.SYS_SOAP_DATATYPES' and \COLUMN = 'SDT_UDT') ) - return; - log_message ('Upgrading the SYS_SOAP_DATATYPES table'); - execstr ('alter table DB.DBA.SYS_SOAP_DATATYPES rename DB.DBA.SYS_SOAP_DATATYPES_OLD'); - execstr ('create table DB.DBA.SYS_SOAP_DATATYPES (SDT_NAME varchar, SDT_SCH long varchar, SDT_SOAP_SCH long varchar, SDT_TYPE integer, SDT_UDT varchar, primary key (SDT_NAME, SDT_TYPE))'); - execstr ('insert into DB.DBA.SYS_SOAP_DATATYPES (SDT_NAME, SDT_SCH, SDT_SOAP_SCH, SDT_TYPE) select (case when strrchr (SDT_NAME, '':'') is null then concat (''services.wsdl:'',SDT_NAME) else SDT_NAME end) , SDT_SCH, SDT_SOAP_SCH, 0 from DB.DBA.SYS_SOAP_DATATYPES_OLD'); -} -; ---!AFTER -DB.DBA.SOAP_DATATYPES_UPGRADE () -; ---#ENDIF - ---#IF VER=5 ---!AFTER_AND_BEFORE DB.DBA.SYS_SOAP_DATATYPES SDT_TYPE ! ---#ENDIF create procedure soap_dt_define (in name varchar, in sch varchar, in udt_name varchar := null) { @@ -3412,185 +3369,6 @@ DB.DBA.__XML_TEMPLATE (in path any, in params any, in lines any, in enc any := n } ; ---#IF VER=5 ---!AFTER -create procedure vt_upgrade_text_index ( - in tb varchar, - in is_xml integer := -1, - in _func integer := -1, - in _lang varchar := '*ini*', - in _enc varchar := '*ini*') -{ - declare text_id_col, kn, func, ufunc, col, obd, vtlog_suff, tb_suff varchar; - declare t1, t2, t3 any; - declare f_xml integer; - - if (_lang is null) - _lang := '*ini*'; - - if (_enc is null) - _enc := '*ini*'; - - tb := complete_table_name ((tb), 1); - - vtlog_suff := concat (name_part (tb, 0), '_', name_part (tb, 1), '_', name_part (tb, 2)); - tb_suff := DB.DBA.SYS_ALFANUM_NAME (vtlog_suff); - - - if (not exists (select 1 from DB.DBA.SYS_KEYS where 0 = casemode_strcmp (KEY_TABLE, tb))) - { - signal ('42S02', sprintf ('No table ''%s'' in create text index', tb), 'FT021'); - } - - if (not exists (select 1 from DB.DBA.SYS_VT_INDEX where 0 = casemode_strcmp (VI_TABLE, tb))) - { - signal ('42S01', 'Text index is not defined for table', 'FT022'); - } - - select VI_COL, VI_ID_COL, deserialize(VI_OFFBAND_COLS), VI_LANGUAGE, VI_ENCODING - into col, text_id_col, obd, _lang, _enc from SYS_VT_INDEX where VI_TABLE = tb; - - func := null; - ufunc := null; - - if (_func = 1 or _func < 0) - { - func := coalesce ((select P_NAME from DB.DBA.SYS_PROCEDURES where - 0 = casemode_strcmp (P_NAME, sprintf ('%s_%s_INDEX_HOOK', tb, col))), NULL); - if (func is null) - func := __proc_exists (sprintf ('%s_%s_INDEX_HOOK', tb, col)); - - ufunc := coalesce ((select P_NAME from DB.DBA.SYS_PROCEDURES where - 0 = casemode_strcmp (P_NAME, sprintf ('%s_%s_UNINDEX_HOOK', tb, col))), NULL); - - if (ufunc is null) - ufunc := __proc_exists (sprintf ('%s_%s_UNINDEX_HOOK', tb, col)); - } - - if (_func < 0 and (func is null or ufunc is null)) - { - func := null; - ufunc := null; - } - - if (_func = 1 and (func is null or ufunc is null)) - signal ('37000', 'The hook functions are not available.', 'FT023'); - - whenever not found goto eof; - select coalesce (T_TEXT, blob_to_string (T_MORE)) into t1 from SYS_TRIGGERS - where T_TABLE = tb and T_NAME like concat ('%.', tb_suff, '_VTI_log'); - select coalesce (T_TEXT, blob_to_string (T_MORE)) into t2 from SYS_TRIGGERS - where T_TABLE = tb and T_NAME like concat ('%.', tb_suff, '_VTU_log'); - select coalesce (T_TEXT, blob_to_string (T_MORE)) into t3 from SYS_TRIGGERS - where T_TABLE = tb and T_NAME like concat ('%.', tb_suff, '_VTD_log'); -eof: - - f_xml := 0; - if (isstring (t1) and strstr (t1, '(1 = 1)') is not null) - f_xml := f_xml + 1; - if (isstring (t2) and strstr (t2, '(1 = 1)') is not null) - f_xml := f_xml + 1; - if (isstring (t3) and strstr (t3, '(1 = 1)') is not null) - f_xml := f_xml + 1; - - if (_func < 0 and isstring (t1) and isstring (func) and strstr (t1, name_part (func, 2)) is null) - { - func := NULL; - ufunc := NULL; - } - if (_func < 0 and isstring (t3) and isstring (ufunc) and strstr (t3, name_part (ufunc, 2)) is null) - { - func := NULL; - ufunc := NULL; - } - - if (is_xml < 0 and f_xml = 3) - is_xml := 1; - else if (is_xml < 0) - is_xml := 0; - - if (tb = 'DB.DBA.MAIL_MESSAGE' or - tb = 'DB.DBA.NEWS_MSG' or - tb = 'WS.WS.SYS_DAV_RES') - is_xml := 2; - - if (_lang is null) - _lang := '*ini*'; - - if (_enc is null) - _enc := '*ini*'; - declare hits_proc varchar; - hits_proc := NULL; - for select coalesce (P_TEXT, blob_to_string (P_MORE)) as txt from DB.DBA.SYS_PROCEDURES - where 0 = casemode_strcmp (P_NAME, concat (name_part (tb,0),'.',name_part(tb,1),'.VT_HITS_', name_part (tb, 2))) do - { - hits_proc := txt; - } - - --dbg_obj_print (tb, ' is_xml: ', is_xml, ' hooks: ', func, ' & ', ufunc, _lang, _enc); - DB.DBA.vt_free_text_proc_gen (tb, text_id_col, col, is_xml, obd, func, ufunc, _lang, _enc); - DB.DBA.vt_create_update_log (tb, is_xml, 1, obd, func, ufunc, _lang, _enc, 0); - if (hits_proc is not null) - DB.DBA.execstr (hits_proc); - return 0; -} -; - ---!AFTER -create procedure -VT_INDEX_UPGRADE () -{ - declare st, msg varchar; - declare ver, db_ver any; - ver := registry_get ('__FTI_VERSION__'); - db_ver := sys_stat ('db_ver_string'); - db_ver := atoi (replace (db_ver, '.', '')); - if (not isstring (ver)) - ver := 0; - else - ver := atoi (ver); - - if (ver > 2204) - return; - - registry_set ('__FTI_VERSION__', '2205'); - - if (db_ver > 250) - return; - - log_message ('Upgrading the old type text indexes'); - for select VI_TABLE from DB.DBA.SYS_VT_INDEX do - { - declare tablename, vtlog_suff,q,o varchar; - tablename := VI_TABLE; - q := name_part (tablename, 0); - o := name_part (tablename, 1); - tablename := complete_table_name ((tablename), 1); - vtlog_suff := concat (name_part (tablename, 0), '_', name_part (tablename, 1), '_', name_part (tablename, 2)); - if ((not exists - (select 1 from SYS_COLS where \COLUMN = 'VT_GZ_WORDUMP' and \TABLE = - sprintf ('%s.%s.VTLOG_%s', q, o, vtlog_suff))) - or (not exists - (select 1 from SYS_COLS where \COLUMN = 'VT_OFFBAND_DATA' and \TABLE = - sprintf ('%s.%s.VTLOG_%s', q, o, vtlog_suff)))) - { - log_message ( - sprintf ('The text index on table %s can''t be upgraded, please drop the index and recreate', VI_TABLE)); - } - else - { --- log_message (sprintf ('Upgrading the old type text indexes on %s', VI_TABLE)); - vt_upgrade_text_index (VI_TABLE); - } - } -} -; - - ---!AFTER -VT_INDEX_UPGRADE () -; ---#ENDIF --!AWK PUBLIC create procedure @@ -3665,7 +3443,7 @@ DB.DBA.SQLX_OR_SPARQL_TEMPLATE (inout q varchar, inout params any, inout ses any { if (isentity (elm)) http_value (elm, null, ses); - else if (isstring (elm) or __tag (elm) = 185) + else if (isstring (elm) or __tag (elm) = __tag of stream) http (elm, ses); } } @@ -3676,9 +3454,6 @@ DB.DBA.SQLX_OR_SPARQL_TEMPLATE (inout q varchar, inout params any, inout ses any } ; ---#IF VER=5 ---!AFTER ---#ENDIF xslt_sheet ('__xml_template_default', xml_tree_doc (xml_tree( ' @@ -4211,9 +3986,6 @@ create procedure exec_quiet (in expn varchar) -- __ANY is a placeholder in a long any col declaration, not to be instantiated. ---#IF VER=5 ---!AFTER ---#ENDIF exec_quiet ('create type __ANY as (__any any)') ; @@ -4258,40 +4030,12 @@ as ( constructor method XMLType (_src any, _schema varchar, _validated integer, _wellformed integer) ; ---#IF VER=5 -call exec_quiet ('alter type XMLType add method transform (_xsl any) returns XMLType') -; - -call exec_quiet ('alter type XMLType add method transform (_xsl any, _param_map any) returns XMLType') -; - -call exec_quiet ('alter type XMLType drop method getStringVal () returns varchar') -; - -call exec_quiet ('alter type XMLType drop method getNamespace () returns any') -; - -call exec_quiet ('alter type XMLType add method query (_xquery varchar) returns any') -; - -call exec_quiet ('alter type XMLType add method getStringVal () returns nvarchar') -; - -call exec_quiet ('alter type XMLType add method getNamespace () returns nvarchar') -; - -call exec_quiet ('alter type XMLType add method setSchemaValidated () returns integer') -; - -call exec_quiet ('alter type XMLType add method setSchemaValidated (_flag integer) returns integer') -; ---#ENDIF create method existsNode (in _xpath varchar) returns integer for XMLType { declare _hit any; _hit := xpath_eval (_xpath, self.xt_ent, 1); - if (__tag (_hit) = 230) + if (__tag (_hit) = __tag of XML) return 1; return 0; } @@ -4306,7 +4050,7 @@ create method existsNode (in _xpath varchar, in _nsmap varchar) returns integer else _xpath := concat ('[', _nsmap, ']', _xpath); _hit := xpath_eval (_xpath, self.xt_ent, 1); - if (__tag (_hit) = 230) + if (__tag (_hit) = __tag of XML) return 1; return 0; } @@ -4316,7 +4060,7 @@ create method extract (in _xpath varchar) returns any for XMLType { declare _hit any; _hit := xpath_eval (_xpath, self.xt_ent, 1); - if (__tag (_hit) = 230) + if (__tag (_hit) = __tag of XML) return XMLType (_hit); return _hit; } @@ -4326,7 +4070,7 @@ create method query (in _xquery varchar) returns any for XMLType { declare _hit any; _hit := xquery_eval (_xquery, self.xt_ent, 1); - if (__tag (_hit) = 230) + if (__tag (_hit) = __tag of XML) return XMLType (_hit); return _hit; } @@ -4341,7 +4085,7 @@ create method extract (in _xpath varchar, in _nsmap varchar) returns any for XML else _xpath := concat ('[', _nsmap, ']', _xpath); _hit := xpath_eval (_xpath, self.xt_ent, 1); - if (__tag(_hit) = 230) + if (__tag(_hit) = __tag of XML) return XMLType (_hit); return _hit; } @@ -4540,9 +4284,9 @@ err: create constructor method XMLType (in _src any) for XMLType { - if (__tag (_src) = 230) + if (__tag (_src) = __tag of XML) self.xt_ent := _src; - else if (__tag (_src) = 193) + else if (__tag (_src) = __tag of vector) self.xt_ent := xml_tree_doc(_src); else self.xt_ent := xtree_doc (_src); @@ -4553,9 +4297,9 @@ create constructor method XMLType (in _src any) for XMLType create constructor method XMLType (in _src any, in _schema varchar) for XMLType { - if (__tag (_src) = 230) + if (__tag (_src) = __tag of XML) self.xt_ent := _src; - else if (__tag (_src) = 193) + else if (__tag (_src) = __tag of vector) self.xt_ent := xml_tree_doc(_src); else self.xt_ent := xtree_doc (_src); @@ -4566,9 +4310,9 @@ create constructor method XMLType (in _src any, in _schema varchar) for XMLType create constructor method XMLType (in _src any, in _schema varchar, in _validated integer) for XMLType { - if (__tag (_src) = 230) + if (__tag (_src) = __tag of XML) self.xt_ent := _src; - else if (__tag (_src) = 193) + else if (__tag (_src) = __tag of vector) self.xt_ent := xml_tree_doc(_src); else self.xt_ent := xtree_doc (_src); @@ -4579,9 +4323,9 @@ create constructor method XMLType (in _src any, in _schema varchar, in _validate create constructor method XMLType (in _src any, in _schema varchar, in _validated integer, in _wellformed integer) for XMLType { - if (__tag (_src) = 230) + if (__tag (_src) = __tag of XML) self.xt_ent := _src; - else if (__tag (_src) = 193) + else if (__tag (_src) = __tag of vector) self.xt_ent := xml_tree_doc(_src); else self.xt_ent := xtree_doc (_src); @@ -4592,7 +4336,7 @@ create constructor method XMLType (in _src any, in _schema varchar, in _validate create constructor method XMLType (in _src any, in _schema varchar := null, in _validated integer := 0, in _wellformed integer := 0) for XMLType { - if (__tag (_src) = 230) + if (__tag (_src) = __tag of XML) self.xt_ent := _src; else self.xt_ent := xtree_doc (_src); @@ -5615,7 +5359,7 @@ DB.DBA.SYS_SQL_VAL_PRINT (in v any) return sprintf ('%f', v); else if (isnumeric (v)) return cast (v as varchar); - else if (__tag (v) = 193) + else if (__tag (v) = __tag of vector) return concat ('vector (',SYS_SQL_VECTOR_PRINT (v),')'); else if (__tag (v) = 211) return sprintf ('{ts ''%s''}', datestring (v)); @@ -5762,16 +5506,16 @@ create procedure view_create_view (in _tbls any, in _dir varchar) create procedure view_dv_to_printf_str_type (in _dv varchar) { - if (_dv = 189 or _dv = 188) return '%d'; - if (_dv = 182) return '%U'; + if (_dv = __tag of integer or _dv = __tag of smallint) return '%d'; + if (_dv = __tag of varchar) return '%U'; signal ('XXXXX', sprintf ('Unknown DV %i in view_dv_to_printf_str_type', _dv)); } ; create procedure view_dv_to_sql_str_type (in _dv varchar) { - if (_dv = 189 or _dv = 188) return 'integer'; - if (_dv = 182) return 'varchar'; + if (_dv = __tag of integer or _dv = __tag of smallint) return 'integer'; + if (_dv = __tag of varchar) return 'varchar'; signal ('XXXXX', sprintf ('Unknown DV %i', _dv)); } ; diff --git a/libsrc/Wi/system2.sql b/libsrc/Wi/system2.sql index c56e23bc8b..6ed7679683 100644 --- a/libsrc/Wi/system2.sql +++ b/libsrc/Wi/system2.sql @@ -2,7 +2,7 @@ -- This file is part of the OpenLink Software Virtuoso Open-Source (VOS) -- project. -- --- Copyright (C) 1998-2018 OpenLink Software +-- Copyright (C) 1998-2019 OpenLink Software -- -- This project is free software; you can redistribute it and/or modify it -- under the terms of the GNU General Public License as published by the @@ -593,6 +593,7 @@ create procedure SYS_CREATE_TABLE_AS ( declare _cols any; declare _n_cols, _inx integer; declare _stmt varchar; + declare old_log_mode int; -- MI: no more need as sql_ddl_node always set flag to replicate, thus tbdef & insert will be logged separately -- declare log_is_on integer; -- log_is_on := client_attr ('transaction_log'); @@ -659,7 +660,14 @@ create procedure SYS_CREATE_TABLE_AS ( ); aref_set_0 (_insert_stmt, 2); aref_set_0 (_insert_stmt, 4); + declare exit handler for sqlstate '*' { + rollback work; + log_enable (old_log_mode, 1); + resignal; + }; + old_log_mode := log_enable (cli_log_mode (), 1); exec (_insert_stmt); + log_enable (old_log_mode, 1); --dbg_obj_print ('after insert'); } } @@ -838,7 +846,7 @@ add_protected_sequence ('vad_tmp') add_protected_sequence ('vdd_init') ; -create table SYS_X509_CERTIFICATES ( +create table DB.DBA.SYS_X509_CERTIFICATES ( C_U_ID int, -- user id C_ID varchar, -- key id C_DATA long varchar, -- certificate (and possibly key) pem format @@ -847,9 +855,9 @@ create table SYS_X509_CERTIFICATES ( primary key (C_U_ID, C_KIND, C_ID)) ; -create procedure X509_CA_CERTIFICATES_INIT () +create procedure DB.DBA.X509_CA_CERTIFICATES_INIT () { - for select C_DATA from SYS_X509_CERTIFICATES where C_U_ID = 0 and C_KIND = 1 do + for select C_DATA from DB.DBA.SYS_X509_CERTIFICATES where C_U_ID = 0 and C_KIND = 1 do { x509_ca_cert_add (cast (C_DATA as varchar)); } @@ -857,10 +865,10 @@ create procedure X509_CA_CERTIFICATES_INIT () ; --!AFTER -X509_CA_CERTIFICATES_INIT () +DB.DBA.X509_CA_CERTIFICATES_INIT () ; -create procedure X509_CERTIFICATES_ADD (in certs varchar, in kind int := 1) +create procedure DB.DBA.X509_CERTIFICATES_ADD (in certs varchar, in kind int := 1) { declare ki varchar; declare name, subj varchar; @@ -888,13 +896,13 @@ create procedure X509_CERTIFICATES_ADD (in certs varchar, in kind int := 1) name := subseq (name, pos + 1); name := split_and_decode (replace (name, '\\x', '%'))[0]; } - insert soft SYS_X509_CERTIFICATES (C_U_ID, C_ID, C_DATA, C_KIND, C_NAME) values (user_id, ki, cert, kind, name); + insert soft DB.DBA.SYS_X509_CERTIFICATES (C_U_ID, C_ID, C_DATA, C_KIND, C_NAME) values (user_id, ki, cert, kind, name); x509_ca_cert_add (cert); } } ; -create procedure X509_CERTIFICATES_DEL (in certs varchar, in kind int := 1) +create procedure DB.DBA.X509_CERTIFICATES_DEL (in certs varchar, in kind int := 1) { declare ki varchar; declare name, subj varchar; @@ -910,21 +918,47 @@ create procedure X509_CERTIFICATES_DEL (in certs varchar, in kind int := 1) ki := get_certificate_info (6, cert, 0, ''); if (ki is null) signal ('22023', 'Can not get certificate id'); - delete from SYS_X509_CERTIFICATES where C_U_ID = user_id and C_KIND = kind and C_ID = ki; + delete from DB.DBA.SYS_X509_CERTIFICATES where C_U_ID = user_id and C_KIND = kind and C_ID = ki; } x509_ca_certs_remove (); - X509_CA_CERTIFICATES_INIT (); + DB.DBA.X509_CA_CERTIFICATES_INIT (); } ; -create procedure X509_ROOT_CA_CERTS () +create procedure DB.DBA.X509_ROOT_CA_CERTS () { declare ret any; - ret := (select vector_agg (C_DATA) from SYS_X509_CERTIFICATES where C_U_ID = 0 and C_KIND = 1); + ret := (select vector_agg (C_DATA) from DB.DBA.SYS_X509_CERTIFICATES where C_U_ID = 0 and C_KIND = 1); return ret; } ; +create procedure DB.DBA.X509_STRING_DATE ( + in val varchar) +{ + declare ret, tmp any; + declare exit handler for sqlstate '*' + { + return null; + }; + + ret := NULL; + val := regexp_replace (val, '[ ]+', ' ', 1, null); + -- Jan 11 14:36:33 2012 GMT + if (val is not null and regexp_match ('[[:upper:]][[:lower:]]{2} [0-9]{1,} [0-9]{2}:[0-9]{2}:[0-9]{2} [0-9]{4,} GMT', val) is not null) + { + tmp := sprintf_inverse (val, '%s %s %s %s GMT', 0); + if (tmp is not null and length (tmp) > 3) + { + ret := http_string_date (sprintf ('Wee, %s %s %s %s GMT', tmp[1], tmp[0], tmp[3], tmp[2])); + ret := dt_set_tz (ret, 0); + } + } + return ret; +} +; + + create procedure uptime () { declare y,m,d,h,mn int; @@ -1335,7 +1369,7 @@ in check_plan int := 1, in plan_xpath varchar := null, in addp int := 0, in ref_ { declare tag int; tag := __tag (c[i]); - if (tag = 246) + if (tag = __tag of rdf_box) tag := __tag (rdf_box_data (c[i])); http (sprintf ('