Basic webservice tester

ltrr-arizona-edu · Jun 28, 2022 · c248ce7 · c248ce7
1 parent 590ecc2
commit c248ce7
Show file tree

Hide file tree

Showing 3,256 changed files with 950 additions and 50 deletions.
diff --git a/.classpath b/.classpath
@@ -29,6 +29,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="lib" path="/tmp"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-8-openjdk-amd64"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/.gitignore b/.gitignore
diff --git a/.project b/.project
@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
@@ -20,5 +25,6 @@
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
diff --git a/.settings/org.maven.ide.eclipse.prefs b/.settings/org.maven.ide.eclipse.prefs
diff --git a/Databases/cpgdb/.security-old.sql b/Databases/cpgdb/.security-old.sql
diff --git a/Databases/cpgdb/everything.sql b/Databases/cpgdb/everything.sql
diff --git a/Databases/cpgdb/findchildrenof.sql b/Databases/cpgdb/findchildrenof.sql
@@ -1,8 +1,8 @@
 CREATE OR REPLACE FUNCTION cpgdb.FindChildrenOfObjectAncestor(parentid uuid)
-RETURNS SETOF typVMeasurementSearchResult AS $$
+RETURNS SETOF public.typVMeasurementSearchResult AS $$
 DECLARE
    id tblobject.objectid%TYPE;
-   res typVMeasurementSearchResult;
+   res public.typVMeasurementSearchResult;
 BEGIN
    FOR id IN SELECT objectId FROM cpgdb.FindObjectDescendants(parentid, true) LOOP
       FOR res in SELECT * FROM cpgdb.FindChildrenOf('object', id) LOOP
@@ -13,7 +13,7 @@ END;
 $$ LANGUAGE 'plpgsql' STABLE;
 
 CREATE OR REPLACE FUNCTION cpgdb.FindChildrenOf(varchar, anyelement) 
-RETURNS SETOF typVMeasurementSearchResult AS $$
+RETURNS SETOF public.typVMeasurementSearchResult AS $$
 DECLARE
    stype ALIAS FOR $1;
    id ALIAS FOR $2;
@@ -25,7 +25,7 @@ DECLARE
    joinClause VARCHAR;
    query VARCHAR;
    vsid uuid;
-   res typVMeasurementSearchResult;
+   res public.typVMeasurementSearchResult;
 BEGIN
    -- Loop through our ordered array above, dynamically creating
    -- an SQL statement full of inner joins.

diff --git a/Databases/cpgdb/gps.sql b/Databases/cpgdb/gps.sql
diff --git a/Databases/cpgdb/graftAndMerge/mergeelements.sql b/Databases/cpgdb/graftAndMerge/mergeelements.sql
diff --git a/Databases/cpgdb/graftAndMerge/mergeobjects.sql b/Databases/cpgdb/graftAndMerge/mergeobjects.sql
diff --git a/Databases/cpgdb/graftAndMerge/mergeradii.sql b/Databases/cpgdb/graftAndMerge/mergeradii.sql
diff --git a/Databases/cpgdb/graftAndMerge/mergesamples.sql b/Databases/cpgdb/graftAndMerge/mergesamples.sql
diff --git a/Databases/cpgdb/informative-statistics.sql b/Databases/cpgdb/informative-statistics.sql
diff --git a/Databases/cpgdb/java-support/crossdate.sql b/Databases/cpgdb/java-support/crossdate.sql
diff --git a/Databases/cpgdb/java-support/derivedreadingnotes.sql b/Databases/cpgdb/java-support/derivedreadingnotes.sql
diff --git a/Databases/cpgdb/java-support/generated.sql b/Databases/cpgdb/java-support/generated.sql
diff --git a/Databases/cpgdb/java-support/redate.sql b/Databases/cpgdb/java-support/redate.sql
diff --git a/Databases/cpgdb/java-support/sum.sql b/Databases/cpgdb/java-support/sum.sql
diff --git a/Databases/cpgdb/java-support/truncate.sql b/Databases/cpgdb/java-support/truncate.sql
diff --git a/Databases/cpgdb/java-support/update-vmresultinfo.sql b/Databases/cpgdb/java-support/update-vmresultinfo.sql
diff --git a/Databases/cpgdb/migration_scripts/cleanup.sql b/Databases/cpgdb/migration_scripts/cleanup.sql
diff --git a/Databases/cpgdb/migration_scripts/fix_bad_sample_names.sql b/Databases/cpgdb/migration_scripts/fix_bad_sample_names.sql
diff --git a/Databases/cpgdb/migration_scripts/fix_redates_add_tblredate.sql b/Databases/cpgdb/migration_scripts/fix_redates_add_tblredate.sql
diff --git a/Databases/cpgdb/migration_scripts/fixelements.sql b/Databases/cpgdb/migration_scripts/fixelements.sql
diff --git a/Databases/cpgdb/migration_scripts/fixradii.sql b/Databases/cpgdb/migration_scripts/fixradii.sql
diff --git a/Databases/cpgdb/migration_scripts/fixsamples.sql b/Databases/cpgdb/migration_scripts/fixsamples.sql
diff --git a/Databases/cpgdb/misc.sql b/Databases/cpgdb/misc.sql
diff --git a/Databases/cpgdb/miscgisfunctions.sql b/Databases/cpgdb/miscgisfunctions.sql
diff --git a/Databases/cpgdb/newsecurity.sql b/Databases/cpgdb/newsecurity.sql
diff --git a/Databases/cpgdb/rastergisfunctions.sql b/Databases/cpgdb/rastergisfunctions.sql
diff --git a/Databases/cpgdb/readingnote-tabledefs.sql b/Databases/cpgdb/readingnote-tabledefs.sql
diff --git a/Databases/cpgdb/readingnotes.sql b/Databases/cpgdb/readingnotes.sql
diff --git a/Databases/cpgdb/recursive-find.sql b/Databases/cpgdb/recursive-find.sql
diff --git a/Databases/cpgdb/recursive-objects.sql b/Databases/cpgdb/recursive-objects.sql
diff --git a/Databases/cpgdb/setup-db.sql b/Databases/cpgdb/setup-db.sql
diff --git a/Databases/cpgdb/summary-functions.sql b/Databases/cpgdb/summary-functions.sql
diff --git a/Databases/cpgdb/tables/tblbox.sql b/Databases/cpgdb/tables/tblbox.sql
diff --git a/Databases/cpgdb/tables/tblcrossdate.sql b/Databases/cpgdb/tables/tblcrossdate.sql
diff --git a/Databases/cpgdb/tables/tblredate.sql b/Databases/cpgdb/tables/tblredate.sql
diff --git a/Databases/cpgdb/tables/tblsample.sql b/Databases/cpgdb/tables/tblsample.sql
diff --git a/Databases/cpgdb/tables/tbltruncate.sql b/Databases/cpgdb/tables/tbltruncate.sql
diff --git a/Databases/cpgdb/tables/tlkpcomplexpresenceabsence.sql b/Databases/cpgdb/tables/tlkpcomplexpresenceabsence.sql
diff --git a/Databases/cpgdb/taxonomy.sql b/Databases/cpgdb/taxonomy.sql
diff --git a/Databases/cpgdb/trigger-default_standardisedid.sql b/Databases/cpgdb/trigger-default_standardisedid.sql
diff --git a/Databases/cpgdb/trigger-tblradius-updatelocaiton.sql b/Databases/cpgdb/trigger-tblradius-updatelocaiton.sql
@@ -11,7 +11,7 @@ BEGIN
    -- update all child vmeasurement extents
    FOR vmid IN SELECT vmeasurementID FROM cpgdb.FindChildrenOf('Element', NEW.elementID) LOOP
       -- Calculate extent of vmeasurement by looking up locations of all associated direct Measurements
-      SELECT setsrid(extent(tblelement.locationgeometry)::geometry,4326)
+      SELECT st_setsrid(extent(tblelement.locationgeometry)::geometry,4326)
          INTO  newextent
          FROM  tblelement, tblsample, tblradius, tblMeasurement, tblvmeasurement
          WHERE tblvmeasurement.measurementid=tblmeasurement.measurementid

diff --git a/Databases/cpgdb/trigger-tblvmeasurementmetacache.sql b/Databases/cpgdb/trigger-tblvmeasurementmetacache.sql
diff --git a/Databases/cpgdb/trigger-tblvmeasurementrelyearreadingnote.sql b/Databases/cpgdb/trigger-tblvmeasurementrelyearreadingnote.sql
diff --git a/Databases/cpgdb/typesandtables.sql b/Databases/cpgdb/typesandtables.sql
diff --git a/Databases/cpgdb/update-java.sql b/Databases/cpgdb/update-java.sql
diff --git a/Databases/cpgdb/views/leaderboard.sql b/Databases/cpgdb/views/leaderboard.sql
diff --git a/Databases/cpgdb/views/orig/vwtblelement.sql.orig b/Databases/cpgdb/views/orig/vwtblelement.sql.orig
diff --git a/Databases/cpgdb/views/orig/vwtblobject.sql.orig b/Databases/cpgdb/views/orig/vwtblobject.sql.orig
diff --git a/Databases/cpgdb/views/orig/vwtblradius.sql.orig b/Databases/cpgdb/views/orig/vwtblradius.sql.orig
diff --git a/Databases/cpgdb/views/orig/vwtblsample.sql.orig b/Databases/cpgdb/views/orig/vwtblsample.sql.orig
diff --git a/Databases/cpgdb/views/vlkpvmeasurement.sql b/Databases/cpgdb/views/vlkpvmeasurement.sql
diff --git a/Databases/cpgdb/views/vwcomprehensivevm.sql b/Databases/cpgdb/views/vwcomprehensivevm.sql
diff --git a/Databases/cpgdb/views/vwlabcodesforsamples.sql b/Databases/cpgdb/views/vwlabcodesforsamples.sql
diff --git a/Databases/cpgdb/views/vwnotedreadingresult.sql b/Databases/cpgdb/views/vwnotedreadingresult.sql
diff --git a/Databases/cpgdb/views/vwtblbox.sql b/Databases/cpgdb/views/vwtblbox.sql
diff --git a/Databases/cpgdb/views/vwtblelement.sql b/Databases/cpgdb/views/vwtblelement.sql
diff --git a/Databases/cpgdb/views/vwtblmeasurement.sql b/Databases/cpgdb/views/vwtblmeasurement.sql
diff --git a/Databases/cpgdb/views/vwtblobject.sql b/Databases/cpgdb/views/vwtblobject.sql
diff --git a/Databases/cpgdb/views/vwtblradius.sql b/Databases/cpgdb/views/vwtblradius.sql
diff --git a/Databases/cpgdb/views/vwtblsample.sql b/Databases/cpgdb/views/vwtblsample.sql
diff --git a/Databases/cpgdb/views/vwtblvmeasurement.sql b/Databases/cpgdb/views/vwtblvmeasurement.sql
diff --git a/Databases/cpgdb/views/vwtblvmeasurementmetacache.sql b/Databases/cpgdb/views/vwtblvmeasurementmetacache.sql
diff --git a/Databases/cpgdb/views/vwtblvmeasurementresult.sql b/Databases/cpgdb/views/vwtblvmeasurementresult.sql
diff --git a/Databases/cpgdb/views/vwtlkptaxon.sql b/Databases/cpgdb/views/vwtlkptaxon.sql
diff --git a/Databases/cpgdb/views/vwvmeasurement.sql b/Databases/cpgdb/views/vwvmeasurement.sql
diff --git a/Databases/cpgdb/vm-functions.sql b/Databases/cpgdb/vm-functions.sql
diff --git a/Databases/cpgdb/vmeasurementmetacache.sql b/Databases/cpgdb/vmeasurementmetacache.sql
diff --git a/Databases/cpgdb/ws-support.sql b/Databases/cpgdb/ws-support.sql
diff --git a/Databases/database-taxon-flattening-tests.sql b/Databases/database-taxon-flattening-tests.sql
diff --git a/Databases/database_upgrade-0.1.6.sql b/Databases/database_upgrade-0.1.6.sql
diff --git a/Databases/db-extensions/dictionary-ext.sql b/Databases/db-extensions/dictionary-ext.sql
diff --git a/Databases/db-extensions/icms-fields.sql b/Databases/db-extensions/icms-fields.sql
diff --git a/Databases/db-extensions/ltrr-fields.sql b/Databases/db-extensions/ltrr-fields.sql
diff --git a/Databases/db-extensions/std-projecttypes.sql b/Databases/db-extensions/std-projecttypes.sql
diff --git a/Databases/db-extensions/std-remarks.sql b/Databases/db-extensions/std-remarks.sql
diff --git a/Databases/db-options/disable_cascade_delete.sql b/Databases/db-options/disable_cascade_delete.sql
diff --git a/Databases/db-options/enable_cascade_delete.sql b/Databases/db-options/enable_cascade_delete.sql
diff --git a/Databases/db-templates/.gitignore b/Databases/db-templates/.gitignore
diff --git a/Databases/db-templates/pljava_extension.sql b/Databases/db-templates/pljava_extension.sql
diff --git a/Databases/db-templates/set_basic_security.sql b/Databases/db-templates/set_basic_security.sql
diff --git a/Databases/db-templates/set_database_permission.template b/Databases/db-templates/set_database_permission.template
diff --git a/Databases/db-templates/tellervo_database_template.sql b/Databases/db-templates/tellervo_database_template.sql
@@ -1553,7 +1553,7 @@ $$;
 -- Name: findchildrenof(character varying, anyelement); Type: FUNCTION; Schema: cpgdb; Owner: -
 --
 
-CREATE FUNCTION findchildrenof(character varying, anyelement) RETURNS SETOF public.typvmeasurementsearchresult
+CREATE OR REPLACE FUNCTION findchildrenof(character varying, anyelement) RETURNS SETOF public.typvmeasurementsearchresult
     LANGUAGE plpgsql
     AS $_$
 DECLARE
@@ -1567,7 +1567,7 @@ DECLARE
    joinClause VARCHAR;
    query VARCHAR;
    vsid uuid;
-   res typVMeasurementSearchResult;
+   res public.typVMeasurementSearchResult;
 BEGIN
    joinClause := '';
    FOR i IN array_lower(searches, 1)+1..array_upper(searches,1) LOOP
@@ -1606,7 +1606,7 @@ CREATE FUNCTION findchildrenofobjectancestor(parentid uuid) RETURNS SETOF public
     AS $$
 DECLARE
    id tblobject.objectid%TYPE;
-   res typVMeasurementSearchResult;
+   res public.typVMeasurementSearchResult;
 BEGIN
    FOR id IN SELECT objectId FROM cpgdb.FindObjectDescendants(parentid, true) LOOP
       FOR res in SELECT * FROM cpgdb.FindChildrenOf('object', id::UUID) LOOP
@@ -2627,7 +2627,7 @@ CREATE FUNCTION getsearchresultforid(uuid) RETURNS public.typvmeasurementsearchr
 DECLARE
     _vsid ALIAS FOR $1;
 
-    res typVMeasurementSearchResult;
+    res public.typVMeasurementSearchResult;
     meta tblVMeasurementMetaCache%ROWTYPE;
 BEGIN
     SELECT o.Name, vs.Code, vs.Comments, vs.LastModifiedTimestamp
@@ -4848,7 +4848,7 @@ DECLARE
    _vsid ALIAS FOR $1;
    _recursionlevel INTEGER := $2;
 
-   res typVMeasurementSearchResult;
+   res public.typVMeasurementSearchResult;
    meta tblVMeasurementMetaCache%ROWTYPE;
    ref refcursor;
 
@@ -4912,7 +4912,7 @@ DECLARE
    _vsid ALIAS FOR $1;
    _recursionlevel INTEGER := $2;
 
-   res typVMeasurementSearchResult;
+   res public.typVMeasurementSearchResult;
    meta tblVMeasurementMetaCache%ROWTYPE;
    ref refcursor;
 

diff --git a/Databases/db-templates/tellervo_database_template_1.3.sql b/Databases/db-templates/tellervo_database_template_1.3.sql
diff --git a/Databases/db-templates/tellervo_database_template_2.0.sql b/Databases/db-templates/tellervo_database_template_2.0.sql
diff --git a/Databases/db-templates/tellervo_merge_databases.sql b/Databases/db-templates/tellervo_merge_databases.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-0.1.7.sql b/Databases/db-upgrade-patches/database_upgrade-0.1.7.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.0.0.sql b/Databases/db-upgrade-patches/database_upgrade-1.0.0.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.0.1.sql b/Databases/db-upgrade-patches/database_upgrade-1.0.1.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.1.2.sql b/Databases/db-upgrade-patches/database_upgrade-1.1.2.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.1.2a.sql b/Databases/db-upgrade-patches/database_upgrade-1.1.2a.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.1.3a.sql b/Databases/db-upgrade-patches/database_upgrade-1.1.3a.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.1.3b.sql b/Databases/db-upgrade-patches/database_upgrade-1.1.3b.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.1.3c.sql b/Databases/db-upgrade-patches/database_upgrade-1.1.3c.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.1.3d.sql b/Databases/db-upgrade-patches/database_upgrade-1.1.3d.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.1.3e.sql b/Databases/db-upgrade-patches/database_upgrade-1.1.3e.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.1.3f.sql b/Databases/db-upgrade-patches/database_upgrade-1.1.3f.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.1.3g.sql b/Databases/db-upgrade-patches/database_upgrade-1.1.3g.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.1.3h.sql b/Databases/db-upgrade-patches/database_upgrade-1.1.3h.sql
@@ -14,7 +14,7 @@ CREATE OR REPLACE VIEW vwtblsample AS
 DROP VIEW vwtblobject;
 
 CREATE OR REPLACE VIEW vwtblobject AS 
- SELECT cquery.countofchildvmeasurements, o.vegetationtype, o.comments, o.objectid, dom.domainid, dom.domain, o.title, o.code, o.createdtimestamp, o.lastmodifiedtimestamp, o.locationgeometry, ( SELECT st_asgml(3, o.locationgeometry, 15, 1) AS st_asgml) AS gml, xmin(o.locationgeometry::box3d) AS longitude, ymin(o.locationgeometry::box3d) AS latitude, o.locationtypeid, o.locationprecision, o.locationcomment, o.locationaddressline1, o.locationaddressline2, o.locationcityortown, o.locationstateprovinceregion, o.locationpostalcode, o.locationcountry, array_to_string(o.file, '><'::text) AS file, o.creator, o.owner, o.parentobjectid, o.description, o.objecttypeid, loctype.locationtype, objtype.objecttype, covtemp.coveragetemporal, covtempfound.coveragetemporalfoundation
+ SELECT cquery.countofchildvmeasurements, o.vegetationtype, o.comments, o.objectid, dom.domainid, dom.domain, o.title, o.code, o.createdtimestamp, o.lastmodifiedtimestamp, o.locationgeometry, ( SELECT st_asgml(3, o.locationgeometry, 15, 1) AS st_asgml) AS gml, st_xmin(o.locationgeometry::box3d) AS longitude, ymin(o.locationgeometry::box3d) AS latitude, o.locationtypeid, o.locationprecision, o.locationcomment, o.locationaddressline1, o.locationaddressline2, o.locationcityortown, o.locationstateprovinceregion, o.locationpostalcode, o.locationcountry, array_to_string(o.file, '><'::text) AS file, o.creator, o.owner, o.parentobjectid, o.description, o.objecttypeid, loctype.locationtype, objtype.objecttype, covtemp.coveragetemporal, covtempfound.coveragetemporalfoundation
    FROM tblobject o
    LEFT JOIN tlkpdomain dom ON o.domainid = dom.domainid
    LEFT JOIN tlkplocationtype loctype ON o.locationtypeid = loctype.locationtypeid
@@ -33,7 +33,7 @@ DROP VIEW vwtblelement;
 
 CREATE OR REPLACE VIEW vwtblelement AS 
  SELECT ( SELECT findobjecttoplevelancestor.code
-           FROM cpgdb.findobjecttoplevelancestor(e.objectid) findobjecttoplevelancestor(objectid, title, code, createdtimestamp, lastmodifiedtimestamp, locationgeometry, locationtypeid, locationprecision, locationcomment, creator, owner, parentobjectid, description, objecttypeid, coveragetemporalid, coveragetemporalfoundationid, comments, coveragetemporal, coveragetemporalfoundation, locationaddressline1, locationaddressline2, locationcityortown, locationstateprovinceregion, locationpostalcode, locationcountry, locationcountry, vegetationtype, domainid, projectid)) AS objectcode, e.comments, dom.domainid, dom.domain, e.elementid, e.locationprecision, e.code AS title, e.code, e.createdtimestamp, e.lastmodifiedtimestamp, e.locationgeometry, ( SELECT st_asgml(3, e.locationgeometry, 15, 1) AS st_asgml) AS gml, xmin(e.locationgeometry::box3d) AS longitude, ymin(e.locationgeometry::box3d) AS latitude, e.islivetree, e.originaltaxonname, e.locationtypeid, e.locationcomment, e.locationaddressline1, e.locationaddressline2, e.locationcityortown, e.locationstateprovinceregion, e.locationpostalcode, e.locationcountry, array_to_string(e.file, '><'::text) AS file, e.description, e.processing, e.marks, e.diameter, e.width, e.height, e.depth, e.unsupportedxml, e.objectid, e.elementtypeid, e.authenticity, e.elementshapeid, shape.elementshape, tbltype.elementtype, loctype.locationtype, e.altitude, e.slopeangle, e.slopeazimuth, e.soildescription, e.soildepth, e.bedrockdescription, vwt.taxonid, vwt.taxonlabel, vwt.parenttaxonid, vwt.colid, vwt.colparentid, vwt.taxonrank, unit.unit AS units, unit.unitid
+           FROM cpgdb.findobjecttoplevelancestor(e.objectid) findobjecttoplevelancestor(objectid, title, code, createdtimestamp, lastmodifiedtimestamp, locationgeometry, locationtypeid, locationprecision, locationcomment, creator, owner, parentobjectid, description, objecttypeid, coveragetemporalid, coveragetemporalfoundationid, comments, coveragetemporal, coveragetemporalfoundation, locationaddressline1, locationaddressline2, locationcityortown, locationstateprovinceregion, locationpostalcode, locationcountry, locationcountry, vegetationtype, domainid, projectid)) AS objectcode, e.comments, dom.domainid, dom.domain, e.elementid, e.locationprecision, e.code AS title, e.code, e.createdtimestamp, e.lastmodifiedtimestamp, e.locationgeometry, ( SELECT st_asgml(3, e.locationgeometry, 15, 1) AS st_asgml) AS gml, st_xmin(e.locationgeometry::box3d) AS longitude, ymin(e.locationgeometry::box3d) AS latitude, e.islivetree, e.originaltaxonname, e.locationtypeid, e.locationcomment, e.locationaddressline1, e.locationaddressline2, e.locationcityortown, e.locationstateprovinceregion, e.locationpostalcode, e.locationcountry, array_to_string(e.file, '><'::text) AS file, e.description, e.processing, e.marks, e.diameter, e.width, e.height, e.depth, e.unsupportedxml, e.objectid, e.elementtypeid, e.authenticity, e.elementshapeid, shape.elementshape, tbltype.elementtype, loctype.locationtype, e.altitude, e.slopeangle, e.slopeazimuth, e.soildescription, e.soildepth, e.bedrockdescription, vwt.taxonid, vwt.taxonlabel, vwt.parenttaxonid, vwt.colid, vwt.colparentid, vwt.taxonrank, unit.unit AS units, unit.unitid
    FROM tblelement e
    LEFT JOIN tlkpdomain dom ON e.domainid = dom.domainid
    LEFT JOIN tlkpelementshape shape ON e.elementshapeid = shape.elementshapeid

diff --git a/Databases/db-upgrade-patches/database_upgrade-1.1.4.sql b/Databases/db-upgrade-patches/database_upgrade-1.1.4.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.2.0.sql b/Databases/db-upgrade-patches/database_upgrade-1.2.0.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.2.1.sql b/Databases/db-upgrade-patches/database_upgrade-1.2.1.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.2.1b.sql b/Databases/db-upgrade-patches/database_upgrade-1.2.1b.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.3.0c.sql b/Databases/db-upgrade-patches/database_upgrade-1.3.0c.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.3.0d.sql b/Databases/db-upgrade-patches/database_upgrade-1.3.0d.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.3.0e.notransaction.sql b/Databases/db-upgrade-patches/database_upgrade-1.3.0e.notransaction.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.3.0f.sql b/Databases/db-upgrade-patches/database_upgrade-1.3.0f.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.3.1a.sql b/Databases/db-upgrade-patches/database_upgrade-1.3.1a.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.3.2.sql b/Databases/db-upgrade-patches/database_upgrade-1.3.2.sql
@@ -240,8 +240,8 @@ CREATE OR REPLACE VIEW public.vwtblobject AS
     o.lastmodifiedtimestamp,
     o.locationgeometry,
     ( SELECT st_asgml(3, o.locationgeometry, 15, 1) AS st_asgml) AS gml,
-    xmin(o.locationgeometry::box3d) AS longitude,
-    ymin(o.locationgeometry::box3d) AS latitude,
+    st_xmin(o.locationgeometry::box3d) AS longitude,
+    st_ymin(o.locationgeometry::box3d) AS latitude,
     o.locationtypeid,
     o.locationprecision,
     o.locationcomment,

diff --git a/Databases/db-upgrade-patches/database_upgrade-1.3.2b.sql b/Databases/db-upgrade-patches/database_upgrade-1.3.2b.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.3.3a.sql b/Databases/db-upgrade-patches/database_upgrade-1.3.3a.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.3.4.sql b/Databases/db-upgrade-patches/database_upgrade-1.3.4.sql
diff --git a/Databases/db-upgrade-patches/database_upgrade-1.3.4b.sql b/Databases/db-upgrade-patches/database_upgrade-1.3.4b.sql
@@ -25,8 +25,8 @@ CREATE OR REPLACE VIEW public.vwtblcurationevent AS
 ALTER TABLE public.vwtblcurationevent
   OWNER TO tellervo;
 
-DROP VIEW vwtblsample;
-DROP VIEW vwtblcurationmostrecent;
+DROP VIEW IF EXISTS vwtblsample;
+DROP VIEW IF EXISTS  vwtblcurationmostrecent;
 
 CREATE OR REPLACE VIEW public.vwtblcurationeventmostrecent AS 
  SELECT c.curationeventid,

diff --git a/Databases/db-upgrade-patches/database_upgrade-1.3.4c.sql b/Databases/db-upgrade-patches/database_upgrade-1.3.4c.sql
@@ -5,4 +5,7 @@ ALTER TABLE public.tblcurationevent DROP CONSTRAINT "fkey_tblcuration-tblbox";
 ALTER TABLE public.tblcurationevent
   ADD CONSTRAINT "fkey_tblcuration-tblbox" FOREIGN KEY (boxid)
       REFERENCES public.tblbox (boxid) MATCH SIMPLE
-      ON UPDATE NO ACTION ON DELETE CASCADE;
+      ON UPDATE NO ACTION ON DELETE CASCADE;
+
+ALTER TABLE tblupgradelog
+ADD CONSTRAINT uniqupgradelog UNIQUE (filename);
diff --git a/Databases/db-upgrade-patches/database_upgrade-2.0a.sql b/Databases/db-upgrade-patches/database_upgrade-2.0a.sql
diff --git a/Databases/db-upgrade-patches/taxon-upgrade-1.sql b/Databases/db-upgrade-patches/taxon-upgrade-1.sql
diff --git a/Databases/db-upgrade-patches/taxon-upgrade-2.sql b/Databases/db-upgrade-patches/taxon-upgrade-2.sql
diff --git a/Databases/db-upgrade-patches/taxon-upgrade-3.sql b/Databases/db-upgrade-patches/taxon-upgrade-3.sql
diff --git a/Databases/db-upgrade-patches/taxon-upgrade-4.sql b/Databases/db-upgrade-patches/taxon-upgrade-4.sql
@@ -1,3 +1,4 @@
 INSERT INTO tlkptaxon (taxonid, taxonrankid, label, parenttaxonid, colid) values (1012, 9, 'Prunus serotina Ehrh.', 552, 'X-1012');
 INSERT INTO tlkptaxon (taxonid, taxonrankid, label, parenttaxonid, colid) values (1013, 9, 'Ostrya virginiana (Mill.) K.Koch', 413, 'X-1013');
 INSERT INTO tlkptaxon (taxonid, taxonrankid, label, parenttaxonid, colid) values (1014, 9, 'Quercus macrocarpa Michx.', 565, 'X-1014');
+
diff --git a/Databases/db-upgrade-patches/taxon-upgrade-5.sql b/Databases/db-upgrade-patches/taxon-upgrade-5.sql
@@ -92,6 +92,12 @@ INSERT INTO tlkptaxon (taxonid, colid, taxonrankid, label, parenttaxonid) VALUES
 INSERT INTO tlkptaxon (taxonid, colid, taxonrankid, label, parenttaxonid) VALUES (2005, 'X-2005', 9, 'Combretum collinum', 1061);
 INSERT INTO tlkptaxon (taxonid, colid, taxonrankid, label, parenttaxonid) VALUES (2006, 'X-2006', 10, 'Combretum collinum subsp. hypopilinum (Diels) Okafor', 2005);
 
+INSERT INTO tlkptaxon (taxonid, taxonrankid, label, parenttaxonid, colid) values (2014, 9, 'Pinus occidentalis Sw.', 455, 'X-2014');
+
+INSERT INTO tlkptaxon (taxonid, taxonrankid, label, parenttaxonid, colid) values (2015, 9, 'Pinus taeda L.', 455, 'X-2015');
+
+
+
 INSERT INTO tlkptaxon (taxonid, taxonrankid, label, parenttaxonid, colid) values (2016, 9, 'Pinus montezumae Lamb.', 455, 'X-2016');
 INSERT INTO tlkptaxon (taxonid, taxonrankid, label, parenttaxonid, colid) values (2017, 9, 'Abies durangensis Martínez', 6, 'X-2017');