From 7e87bdb3fe305694a2e7e5de43c89c93f5bd5585 Mon Sep 17 00:00:00 2001 From: cont_anki Date: Fri, 2 Aug 2024 12:53:14 +0530 Subject: [PATCH 1/5] Updated H2 DB to latest version --- geoportal-application/geoportal-harvester-war/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geoportal-application/geoportal-harvester-war/pom.xml b/geoportal-application/geoportal-harvester-war/pom.xml index cabc9276..17f166fb 100644 --- a/geoportal-application/geoportal-harvester-war/pom.xml +++ b/geoportal-application/geoportal-harvester-war/pom.xml @@ -67,7 +67,7 @@ com.h2database h2 - 2.2.220 + 2.3.230 From c539f524b7b0b6afe5eca12cb4d30c6b068aa7e1 Mon Sep 17 00:00:00 2001 From: cont_anki Date: Fri, 2 Aug 2024 13:15:39 +0530 Subject: [PATCH 2/5] Updated Spring version (pull request 225) --- geoportal-application/geoportal-harvester-war/pom.xml | 4 ++-- .../src/main/resources/config/hrv-beans.xml | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/geoportal-application/geoportal-harvester-war/pom.xml b/geoportal-application/geoportal-harvester-war/pom.xml index 17f166fb..5ed7553c 100644 --- a/geoportal-application/geoportal-harvester-war/pom.xml +++ b/geoportal-application/geoportal-harvester-war/pom.xml @@ -13,8 +13,8 @@ ${project.build.directory}/endorsed - 5.3.27 - 5.3.10.RELEASE + 5.3.37 + 5.6.9 diff --git a/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-beans.xml b/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-beans.xml index dc190db4..d7ac905c 100644 --- a/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-beans.xml +++ b/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-beans.xml @@ -29,10 +29,7 @@ - - - - + From ed2cc3e0de03b760313616e9c2394930400195fd Mon Sep 17 00:00:00 2001 From: cont_anki Date: Fri, 2 Aug 2024 19:59:11 +0530 Subject: [PATCH 3/5] Reverted accidental removal --- .../src/main/resources/config/hrv-beans.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-beans.xml b/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-beans.xml index d7ac905c..79a804e9 100644 --- a/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-beans.xml +++ b/geoportal-application/geoportal-harvester-war/src/main/resources/config/hrv-beans.xml @@ -29,7 +29,10 @@ - + + + + From 50e649ed9866a431e8f132ab92c91021ec58214d Mon Sep 17 00:00:00 2001 From: Marten Hogeweg Date: Fri, 2 Aug 2024 07:38:57 -0700 Subject: [PATCH 4/5] further xml translate steps --- .../resources/meta/ISO19139_to_ArcGIS.xsl | 123 +++++++++++------- .../main/resources/meta/decodeiso19115-2.xslt | 11 ++ .../harvester/agp/AgpOutputBroker.java | 16 ++- 3 files changed, 105 insertions(+), 45 deletions(-) diff --git a/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/ISO19139_to_ArcGIS.xsl b/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/ISO19139_to_ArcGIS.xsl index 17deaca0..ff8db119 100644 --- a/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/ISO19139_to_ArcGIS.xsl +++ b/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/ISO19139_to_ArcGIS.xsl @@ -13,7 +13,9 @@ - + + + @@ -23,58 +25,91 @@ - 2022-07-21 - 12:26:34.68 - 2022-07-21 - 12:59:19.59 + + + + 00:00:00.00 + + + + 00:00:00.00 + + + + + + 00:00:00.00 + + + + 00:00:00.00 + + editor:esri.dijit.metadata.editor 1.0 ISO 19139 Metadata Implementation Specification GML3.2 ISO19139 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + @@ -324,7 +359,7 @@ - + diff --git a/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/decodeiso19115-2.xslt b/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/decodeiso19115-2.xslt index f5d1202b..01a45c3d 100644 --- a/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/decodeiso19115-2.xslt +++ b/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/decodeiso19115-2.xslt @@ -14,6 +14,15 @@ description= xdescription= modified= + + +resource.url= + + +resource.url= + + + + thumbnail.url= bbox= , diff --git a/geoportal-connectors/geoportal-harvester-agp-publisher/src/main/java/com/esri/geoportal/harvester/agp/AgpOutputBroker.java b/geoportal-connectors/geoportal-harvester-agp-publisher/src/main/java/com/esri/geoportal/harvester/agp/AgpOutputBroker.java index 955630cd..c20fccc9 100644 --- a/geoportal-connectors/geoportal-harvester-agp-publisher/src/main/java/com/esri/geoportal/harvester/agp/AgpOutputBroker.java +++ b/geoportal-connectors/geoportal-harvester-agp-publisher/src/main/java/com/esri/geoportal/harvester/agp/AgpOutputBroker.java @@ -356,7 +356,7 @@ public PublishingStatus publish(DataReference ref) throws DataOutputException { // if the item url is the same as the resourceUrl, proceed. // otherwise the metadata is for a sublayer, but the item is the parent - if (resourceUrl.equals(itemEntry.url)) { + if (resourceUrl.toLowerCase().equals(itemEntry.url.toLowerCase())) { ItemResponse response = updateItem( itemEntry.id, itemEntry.owner, @@ -467,6 +467,20 @@ private ItemEntry searchForItem(String src_uri_s) throws URISyntaxException, IOE QueryResponse search = client.search(String.format("url:%s", String.format("%s", src_uri_s)), 0, 0, token); ItemEntry itemEntry = search != null && search.results != null && search.results.length > 0 ? search.results[0] : null; + // if no results found see if changing the case of /arcgis/ to /ArcGIS/ or vice versa in the src_uri_s does find it + if (itemEntry == null) { + String src_uri_s_alternative = ""; + if (src_uri_s.contains("/arcgis/rest/services")) { + src_uri_s_alternative = src_uri_s.replace("/arcgis/rest/services", "/ArcGIS/rest/services"); + } else if (src_uri_s.contains("/ArcGIS/rest/services")) { + src_uri_s_alternative = src_uri_s.replace("/ArcGIS/rest/services", "/arcgis/rest/services"); + } + if (!src_uri_s_alternative.isBlank()) { + search = client.search(String.format("url:%s", String.format("%s", src_uri_s_alternative)), 0, 0, token); + itemEntry = search != null && search.results != null && search.results.length > 0 ? search.results[0] : null; + } + } + // if no results found and the source uri (src_uri_s) ends in /0, /1, ... this may be a sublayer // look for the parent service if (itemEntry == null) { From 1bb4fb38b4b129a2c65086d4d1680164fdc6f5f5 Mon Sep 17 00:00:00 2001 From: Marten Hogeweg Date: Fri, 2 Aug 2024 07:52:40 -0700 Subject: [PATCH 5/5] update locale values --- .../src/main/resources/meta/ISO19139_to_ArcGIS.xsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/ISO19139_to_ArcGIS.xsl b/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/ISO19139_to_ArcGIS.xsl index ff8db119..bc0de9a9 100644 --- a/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/ISO19139_to_ArcGIS.xsl +++ b/geoportal-commons/geoportal-commons-meta/src/main/resources/meta/ISO19139_to_ArcGIS.xsl @@ -74,7 +74,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -90,7 +90,7 @@ - +