Skip to content

Commit

Permalink
INSPIRE ATOM - retrieve the metadata ATOM feed using only the resourc…
Browse files Browse the repository at this point in the history 
…e identifier (geonetwork#7305)
  • Loading branch information
@josegar74
josegar74 authored Sep 7, 2023
1 parent 7d5422c commit 79865d1
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 52 deletions.
4 changes: 2 additions & 2 deletions inspire-atom/src/main/java/org/fao/geonet/inspireatom/harvester/InspireAtomHarvester.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ private void processDatasetsMetadataFeeds(final ServiceContext context,

try {
// Find the metadata UUID using the resource identifier gmd:MD_Identifier/gmd:code
metadataUuid = InspireAtomUtil.retrieveDatasetUuidFromIdentifier(ServiceContext.get(),
metadataUuid = InspireAtomUtil.retrieveDatasetUuidFromIdentifier(
gc.getBean(EsSearchManager.class), datasetFeedInfo.identifier);

String atomUrl = datasetFeedInfo.feedUrl;
Expand Down Expand Up @@ -376,7 +376,7 @@ private void processDatasetsMetadataFeedsForService(final ServiceContext context
String metadataUuid = "";

try {
metadataUuid = InspireAtomUtil.retrieveDatasetUuidFromIdentifier(context,
metadataUuid = InspireAtomUtil.retrieveDatasetUuidFromIdentifier(
gc.getBean(EsSearchManager.class), atomDatasetId);

String atomDatasetNs = datasetFeedInfo.namespace;
Expand Down
75 changes: 28 additions & 47 deletions inspire-atom/src/main/java/org/fao/geonet/inspireatom/util/InspireAtomUtil.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//=============================================================================
//=== Copyright (C) 2001-2017 Food and Agriculture Organization of the
//=== Copyright (C) 2001-2023 Food and Agriculture Organization of the
//=== United Nations (FAO-UN), United Nations World Food Programme (WFP)
//=== and United Nations Environment Programme (UNEP)
//===
Expand All @@ -24,7 +24,6 @@

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import jeeves.server.ServiceConfig;
import jeeves.server.context.ServiceContext;
import org.apache.commons.lang.StringUtils;
import org.apache.lucene.search.TotalHits;
Expand Down Expand Up @@ -71,11 +70,6 @@ public class InspireAtomUtil {
**/
private static final String EXTRACT_DATASETS = "extract-datasets.xsl";

/**
* Xslt process to get if a metadata is a service or a dataset.
**/
private static final String EXTRACT_MD_TYPE = "extract-type.xsl";

/**
* Xslt process to get the atom feed link from the metadata.
**/
Expand Down Expand Up @@ -116,6 +110,10 @@ public class InspireAtomUtil {
**/
public static final String LOCAL_DOWNLOAD_DATASET_URL_SUFFIX = "atom/download/dataset";

private InspireAtomUtil() {

}

/**
* Issue an http request to retrieve the remote Atom feed document.
*
Expand Down Expand Up @@ -162,7 +160,7 @@ public static void filterDatasetFeedByCrs(final Element feed,
final String crs)
throws Exception {

List<Element> elementsToRemove = new ArrayList<Element>();
List<Element> elementsToRemove = new ArrayList<>();

Iterator it = feed.getChildren().iterator();

Expand Down Expand Up @@ -190,7 +188,7 @@ public static void filterDatasetFeedByCrs(final Element feed,
public static boolean isServiceMetadata(DataManager dm, String schema, Element md) throws Exception {
java.nio.file.Path styleSheet = dm.getSchemaDir(schema).resolve("extract-type.xsl");

Map<String, Object> paramsM = new HashMap<String, Object>();
Map<String, Object> paramsM = new HashMap<>();
String mdType = Xml.transform(md, styleSheet, paramsM).getText().trim();

return "service".equalsIgnoreCase(mdType);
Expand Down Expand Up @@ -235,7 +233,7 @@ public static List<DatasetFeedInfo> extractRelatedDatasetsInfoFromServiceFeed(fi

java.nio.file.Path defaultStyleSheet = dataManager.getSchemaDir("iso19139").resolve(EXTRACT_DATASETS_FROM_SERVICE_XSLT);

Map<String, Object> params = new HashMap<String, Object>();
Map<String, Object> params = new HashMap<>();
Element atomIndexFields = Xml.transform(serviceFeed, defaultStyleSheet, params);

List<DatasetFeedInfo> datasetsInformation = new ArrayList<>();
Expand Down Expand Up @@ -287,7 +285,7 @@ private static Map<String, String> processAtomFeedsInternal(DataManager dataMana
List<AbstractMetadata> iso19139Metadata, String type,
String atomProtocol) throws Exception {

Map<String, String> metadataAtomFeeds = new HashMap<String, String>();
Map<String, String> metadataAtomFeeds = new HashMap<>();

for (AbstractMetadata md : iso19139Metadata) {
int id = md.getId();
Expand Down Expand Up @@ -386,8 +384,7 @@ public static List<AbstractMetadata> searchMetadataByTypeAndProtocol(ServiceCont
}


public static String retrieveDatasetUuidFromIdentifier(ServiceContext context,
EsSearchManager searchMan,
public static String retrieveDatasetUuidFromIdentifier(EsSearchManager searchMan,
String datasetIdCode) {
String jsonQuery = "{" +
" \"bool\": {" +
Expand Down Expand Up @@ -515,34 +512,20 @@ private static Path getAtomFeedXSLStylesheet(final String schema, final DataMana
.resolve(TRANSFORM_MD_TO_ATOM_FEED);
}

public static Element getDatasetFeed(final ServiceContext context, final String spIdentifier,
final String spNamespace, final Map<String, Object> params, String requestedLanguage) throws Exception {
public static Element getMetadataFeedByResourceIdentifier(final ServiceContext context, final String spIdentifier,
final String spNamespace, final Map<String, Object> params, String requestedLanguage) throws Exception {

ServiceConfig config = new ServiceConfig();
EsSearchManager searchMan = context.getBean(EsSearchManager.class);

// Search for the dataset identified by spIdentifier
AbstractMetadata datasetMd = null;

String jsonQuery = "{" +
" \"bool\": {" +
" \"must\": [" +
" {" +
" \"term\": {" +
" \"resourceType\": {" +
" \"value\": \"%s\"" +
" }" +
" }" +
" }, " +
" {" +
" \"term\": {" +
" \"resourceIdentifier.code\": {" +
" \"value\": \"%s\"" +
" }" +
" }" +
" }" +
" ]" +
" }" +
" \"term\": {" +
" \"resourceIdentifier.code\": {" +
" \"value\": \"%s\"" +
" }" +
" }" +
"}";
ObjectMapper objectMapper = new ObjectMapper();
IMetadataUtils repo = context.getBean(IMetadataUtils.class);
Expand All @@ -563,7 +546,7 @@ public static Element getDatasetFeed(final ServiceContext context, final String
// searchResult = searcher.present(context, dsLuceneSearchParams.getRootElement(), config);
// }
// }
JsonNode esJsonQuery = objectMapper.readTree(String.format(jsonQuery, "dataset", spIdentifier));
JsonNode esJsonQuery = objectMapper.readTree(String.format(jsonQuery, spIdentifier));

final SearchResponse result = searchMan.query(
esJsonQuery,
Expand Down Expand Up @@ -646,9 +629,9 @@ public static Element getDatasetFeed(final ServiceContext context, final String
}

public static Element prepareOpenSearchDescriptionEltBeforeTransform(final ServiceContext context,
final Map<String, Object> params, final String fileIdentifier, final String schema,
final Element serviceAtomFeed, final String defaultLanguage,
final DataManager dataManager) throws Exception {
final Map<String, Object> params, final String fileIdentifier,
final Element serviceAtomFeed, final String defaultLanguage
) throws Exception {

List<String> keywords = retrieveKeywordsFromFileIdentifier(context, fileIdentifier);
Namespace ns = serviceAtomFeed.getNamespace();
Expand All @@ -658,7 +641,7 @@ public static Element prepareOpenSearchDescriptionEltBeforeTransform(final Servi
response.addContent(new Element("fileId").setText(fileIdentifier));
response.addContent(new Element("title").setText(serviceAtomFeed.getChildText("title", ns)));
response.addContent(new Element("subtitle").setText(serviceAtomFeed.getChildText("subtitle", ns)));
List<String> languages = new ArrayList<String>();
List<String> languages = new ArrayList<>();
languages.add(XslUtil.twoCharLangCode(defaultLanguage));
Iterator<Element> linksChildren = (serviceAtomFeed.getChildren("link", ns)).iterator();
while (linksChildren.hasNext()) {
Expand All @@ -685,15 +668,15 @@ public static Element prepareOpenSearchDescriptionEltBeforeTransform(final Servi
response.addContent(datasetsEl);
Namespace inspiredlsns = serviceAtomFeed.getNamespace("inspire_dls");
Iterator<Element> datasets = (serviceAtomFeed.getChildren("entry", ns)).iterator();
List<String> fileTypes = new ArrayList<String>();
List<String> fileTypes = new ArrayList<>();
while (datasets.hasNext()) {
Element dataset = datasets.next();
String datasetIdCode = dataset.getChildText("spatial_dataset_identifier_code", inspiredlsns);
String datasetIdNs = dataset.getChildText("spatial_dataset_identifier_namespace", inspiredlsns);

Element datasetAtomFeed = null;
try {
datasetAtomFeed = InspireAtomUtil.getDatasetFeed(context, datasetIdCode, datasetIdNs, params, XslUtil.twoCharLangCode(defaultLanguage));
datasetAtomFeed = InspireAtomUtil.getMetadataFeedByResourceIdentifier(context, datasetIdCode, datasetIdNs, params, XslUtil.twoCharLangCode(defaultLanguage));
} catch (Exception e) {
Log.error(Geonet.ATOM, "No dataset metadata found with uuid:"
+ fileIdentifier);
Expand All @@ -708,7 +691,7 @@ public static Element prepareOpenSearchDescriptionEltBeforeTransform(final Servi
datasetEl.addContent(new Element("authorName").setText(authorName));
}
}
Map<String, Integer> downloadsCountByCrs = new HashMap<String, Integer>();
Map<String, Integer> downloadsCountByCrs = new HashMap<>();
Iterator<Element> entries = (datasetAtomFeed.getChildren("entry", ns)).iterator();
while (entries.hasNext()) {
Element entry = entries.next();
Expand All @@ -717,7 +700,7 @@ public static Element prepareOpenSearchDescriptionEltBeforeTransform(final Servi
String term = category.getAttributeValue("term");
Integer count = downloadsCountByCrs.get(term);
if (count == null) {
count = new Integer(0);
count = 0;
}
downloadsCountByCrs.put(term, count + 1);
}
Expand Down Expand Up @@ -820,15 +803,13 @@ private static Element buildDatasetInfo(final String identifier, final String na

public static List<String> retrieveKeywordsFromFileIdentifier(ServiceContext context, String uuid) {
EsSearchManager searchManager = context.getBean(EsSearchManager.class);
List<String> keywordsList = new ArrayList<String>();
List<String> keywordsList = new ArrayList<>();
try {
Map<String, Object> document = searchManager.getDocument(uuid);
Object tags = document.get("tag");
if (tags instanceof List) {
ArrayList<HashMap<String, String>> list = (ArrayList) tags;
list.forEach(tag -> {
keywordsList.add(tag.get("default"));
});
list.forEach(tag -> keywordsList.add(tag.get("default")));
}
} catch (Exception ex) {
Log.error(Geonet.ATOM, ex.getMessage(), ex);
Expand Down
8 changes: 5 additions & 3 deletions inspire-atom/src/main/java/org/fao/geonet/services/inspireatom/AtomPredefinedFeed.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public HttpEntity<byte[]> localDatasetDescribe(
if (StringUtils.isNotBlank(searchTerms)) {
params.put("searchTerms", searchTerms.toLowerCase());
}
Element feed = InspireAtomUtil.getDatasetFeed(context, spIdentifier, spNamespace, params, language);
Element feed = InspireAtomUtil.getMetadataFeedByResourceIdentifier(context, spIdentifier, spNamespace, params, language);
return writeOutResponse(Xml.getString(feed), "application", "atom+xml");
}

Expand Down Expand Up @@ -247,7 +247,7 @@ public HttpEntity<byte[]> localDatasetDownload(
if (StringUtils.isNotBlank(searchTerms)) {
params.put("searchTerms", searchTerms.toLowerCase());
}
Element feed = InspireAtomUtil.getDatasetFeed(context, spIdentifier, spNamespace, params, language);
Element feed = InspireAtomUtil.getMetadataFeedByResourceIdentifier(context, spIdentifier, spNamespace, params, language);
Map<Integer, Element> crsCounts = new HashMap<Integer, Element>();;
Namespace ns = Namespace.getNamespace("http://www.w3.org/2005/Atom");
if (crs!=null) {
Expand Down Expand Up @@ -368,7 +368,9 @@ private Element getOpenSearchDescription(ServiceContext context, final String uu
String defaultLanguage = dm.extractDefaultLanguage(schema, md);
Map<String, Object> params = getDefaultXSLParams(sm, context, XslUtil.twoCharLangCode(defaultLanguage));

Element inputDoc = InspireAtomUtil.prepareOpenSearchDescriptionEltBeforeTransform(context, params, uuid, schema, InspireAtomUtil.convertDatasetMdToAtom("iso19139", InspireAtomUtil.prepareServiceFeedEltBeforeTransform(schema, md, dm), dm, params), defaultLanguage, dm);
Element inputDoc = InspireAtomUtil.prepareOpenSearchDescriptionEltBeforeTransform(context, params, uuid,
InspireAtomUtil.convertDatasetMdToAtom("iso19139",
InspireAtomUtil.prepareServiceFeedEltBeforeTransform(schema, md, dm), dm, params), defaultLanguage);

return InspireAtomUtil.convertServiceMdToOpenSearchDescription(context, inputDoc, params);
}
Expand Down

0 comments on commit 79865d1

Please sign in to comment.