Skip to content

Commit

Permalink
Merge pull request #67 from aodn/features/6324-gn4-point-to-gn3
Browse files Browse the repository at this point in the history
Features/6324 gn4 point to gn3
  • Loading branch information
utas-raymondng authored Feb 3, 2025
2 parents 559a3a7 + 1ab3f39 commit a9b28ed
Show file tree
Hide file tree
Showing 9 changed files with 478 additions and 11 deletions.
32 changes: 30 additions & 2 deletions geonetwork-config/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -799,40 +799,68 @@
"type": "vocabularies",
"jsonFileName": "australian_discovery_parameter.json"
},
{
"type": "settings",
"jsonFileName": "imos-{active_profile}.json"
},
{
"type": "harvesters",
"env": "edge",
"jsonFileName": "1_imos-craig-catalogue.json"
},
{
"type": "harvesters",
"env": "edge",
"jsonFileName": "2_aims_nrs.json"
},
{
"type": "harvesters",
"env": "edge",
"jsonFileName": "3_csiro_hplc_pigment.json"
},
{
"type": "harvesters",
"env": "edge",
"jsonFileName": "4_aad.json"
},
{
"type": "harvesters",
"env": "edge",
"jsonFileName": "5_aims.json"
},
{
"type": "harvesters",
"env": "edge",
"jsonFileName": "6_csiro_ocean_atmosphere.json"
},
{
"type": "harvesters",
"env": "edge",
"jsonFileName": "7_imas.json"
},
{
"type": "harvesters",
"env": "edge",
"jsonFileName": "8_ga-marine.json"
},
{
"type": "settings",
"jsonFileName": "imos-{active_profile}.json"
"type": "harvesters",
"env": "staging",
"jsonFileName": "catalog-aodn.json"
},
{
"type": "harvesters",
"env": "staging",
"jsonFileName": "catalog-imos.json"
},
{
"type": "harvesters",
"env": "production",
"jsonFileName": "catalog-aodn.json"
},
{
"type": "harvesters",
"env": "production",
"jsonFileName": "catalog-imos.json"
}
]
152 changes: 152 additions & 0 deletions geonetwork-config/harvesters/catalog-aodn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
{
"name": "Catalog AODN",
"comments": "Harvest all data from production catalog-aodn",
"harvester_data": {
"node": {
"owner": {
"id": "1"
},
"searches": {
"search": {
"digital": "false",
"keywords": {
"-self-closing": "true"
},
"anyValue": {
"-self-closing": "true"
},
"freeText": {
"-self-closing": "true"
},
"abstract": {
"-self-closing": "true"
},
"anyField": {
"-self-closing": "true"
},
"source": {
"name": {
"-self-closing": "true"
},
"uuid": {
"-self-closing": "true"
}
},
"title": {
"-self-closing": "true"
},
"hardcopy": "false"
}
},
"privileges": {
"group": {
"-id": "1",
"operation": [
{
"-name": "view",
"-self-closing": "true"
},
{
"-name": "dynamic",
"-self-closing": "true"
},
{
"-name": "download",
"-self-closing": "true"
}
]
}
},
"-id": "2471",
"ownerGroup": {
"name": "sample",
"id": "2"
},
"groupsCopyPolicy": {
"-self-closing": "true"
},
"ifRecordExistAppendPrivileges": "false",
"content": {
"translateContent": "false",
"importxslt": "none",
"translateContentFields": {
"-self-closing": "true"
},
"translateContentLangs": {
"-self-closing": "true"
},
"validate": "NOVALIDATION",
"batchEdits": {
"-self-closing": "true"
}
},
"site": {
"node": "srv",
"mefFormatFull": "false",
"useChangeDateForUpdate": "false",
"createRemoteCategory": "false",
"name": "catalog-aodn",
"host": "https://catalogue-aodn.aodn.org.au/geonetwork",
"uuid": "b75f4a64-dca2-4a92-97da-eb302d48376a",
"xslfilter": {
"-self-closing": "true"
},
"account": {
"password": {
"-self-closing": "true"
},
"use": "false",
"username": {
"-self-closing": "true"
}
}
},
"ownerUser": {
"id": "1"
},
"-type": "geonetwork",
"options": {
"oneRunOnly": "false",
"overrideUuid": "SKIP",
"every": "0 0 0 ? * *",
"status": "active"
},
"info": {
"running": "false",
"result": {
"fragmentsMatched": "0",
"fragmentsUnknownSchema": "0",
"added": "0",
"serviceRecords": "0",
"incompatible": "0",
"thumbnailsFailed": "0",
"total": "14653",
"privilegesAppendedOnExistingRecord": "0",
"doesNotValidate": "0",
"subtemplatesRemoved": "0",
"badFormat": "0",
"subtemplatesAdded": "0",
"duplicatedResource": "0",
"fragmentsReturned": "0",
"recordsBuilt": "0",
"unchanged": "11377",
"unknownSchema": "1575",
"subtemplatesUpdated": "0",
"unretrievable": "1",
"datasetUuidExist": "1699",
"atomicDatasetRecords": "0",
"recordsUpdated": "0",
"removed": "0",
"xpathFilterExcluded": "0",
"collectionDatasetRecords": "0",
"thumbnails": "0",
"updated": "1",
"errors": {
"-self-closing": "true"
}
},
"lastRun": "2025-02-02T13:00:00.120949Z"
}
}
}
}
152 changes: 152 additions & 0 deletions geonetwork-config/harvesters/catalog-imos.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
{
"name": "Catalog IMOS",
"comments": "Harvest all data from production catalog-imos",
"harvester_data": {
"node": {
"owner": {
"id": "1"
},
"searches": {
"search": {
"digital": "false",
"keywords": {
"-self-closing": "true"
},
"anyValue": {
"-self-closing": "true"
},
"freeText": {
"-self-closing": "true"
},
"abstract": {
"-self-closing": "true"
},
"anyField": {
"-self-closing": "true"
},
"source": {
"name": {
"-self-closing": "true"
},
"uuid": {
"-self-closing": "true"
}
},
"title": {
"-self-closing": "true"
},
"hardcopy": "false"
}
},
"privileges": {
"group": {
"-id": "1",
"operation": [
{
"-name": "view",
"-self-closing": "true"
},
{
"-name": "dynamic",
"-self-closing": "true"
},
{
"-name": "download",
"-self-closing": "true"
}
]
}
},
"-id": "2422",
"ownerGroup": {
"name": "sample",
"id": "2"
},
"groupsCopyPolicy": {
"-self-closing": "true"
},
"ifRecordExistAppendPrivileges": "false",
"content": {
"translateContent": "false",
"importxslt": "none",
"translateContentFields": {
"-self-closing": "true"
},
"translateContentLangs": {
"-self-closing": "true"
},
"validate": "NOVALIDATION",
"batchEdits": {
"-self-closing": "true"
}
},
"site": {
"node": "srv",
"mefFormatFull": "false",
"useChangeDateForUpdate": "false",
"createRemoteCategory": "false",
"name": "catalog-imos",
"host": "https://catalogue-imos.aodn.org.au/geonetwork",
"uuid": "91484802-d8ad-4297-939d-8c979dbabbf4",
"xslfilter": {
"-self-closing": "true"
},
"account": {
"password": {
"-self-closing": "true"
},
"use": "false",
"username": {
"-self-closing": "true"
}
}
},
"ownerUser": {
"id": "1"
},
"-type": "geonetwork",
"options": {
"oneRunOnly": "false",
"overrideUuid": "SKIP",
"every": "0 0 0 ? * *",
"status": "active"
},
"info": {
"running": "false",
"result": {
"fragmentsMatched": "0",
"fragmentsUnknownSchema": "0",
"added": "0",
"serviceRecords": "0",
"incompatible": "0",
"thumbnailsFailed": "0",
"total": "1700",
"privilegesAppendedOnExistingRecord": "0",
"doesNotValidate": "0",
"subtemplatesRemoved": "0",
"badFormat": "0",
"subtemplatesAdded": "0",
"duplicatedResource": "0",
"fragmentsReturned": "0",
"recordsBuilt": "0",
"unchanged": "1682",
"unknownSchema": "0",
"subtemplatesUpdated": "0",
"unretrievable": "0",
"datasetUuidExist": "1",
"atomicDatasetRecords": "0",
"recordsUpdated": "0",
"removed": "0",
"xpathFilterExcluded": "0",
"collectionDatasetRecords": "0",
"thumbnails": "0",
"updated": "17",
"errors": {
"-self-closing": "true"
}
},
"lastRun": "2025-02-02T13:00:00.067383Z"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public class Config {

protected Logger logger = LogManager.getLogger(Config.class);

@Value("${aodn.geonetwork4.env:DEV}")
@Value("${aodn.geonetwork4.env:dev}")
protected Environment environment;

@Value("${aodn.geonetwork4.githubBranch}")
Expand Down Expand Up @@ -115,7 +115,7 @@ public void init() throws NoSuchAlgorithmException, KeyManagementException {
/*
* No need to do host verfication, this should apply to dev env only
*/
if(environment == Environment.DEV) {
if(environment == Environment.dev) {
HttpsTrustManager.allowAllSSL();
}

Expand Down
Loading

0 comments on commit a9b28ed

Please sign in to comment.