From 3aa0ea412339102a014317a0f21871e3270732c8 Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Wed, 10 Jan 2024 12:07:33 +0100 Subject: [PATCH 1/2] moving context at the level of the entity --- .../eu/dnetlib/dhp/schema/oaf/OafEntity.java | 25 +++++++++++++++++++ .../eu/dnetlib/dhp/schema/oaf/Result.java | 25 ------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java index be3bf83..00c5729 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java @@ -26,6 +26,29 @@ public abstract class OafEntity extends Oaf implements Serializable { */ private List measures; + /** + * The Context. + */ + private List context; + + /** + * Gets context. + * + * @return the context + */ + public List getContext() { + return context; + } + + /** + * Sets context. + * + * @param context the context + */ + public void setContext(List context) { + this.context = context; + } + /** * Gets measures. * @@ -119,6 +142,8 @@ public abstract class OafEntity extends Oaf implements Serializable { oaiprovenance = e.getOaiprovenance(); measures = mergeLists(measures, e.getMeasures()); + + context = mergeLists(context, e.getContext()); } @SafeVarargs diff --git a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java index 50578eb..af01531 100644 --- a/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java +++ b/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java @@ -130,11 +130,6 @@ public class Result extends OafEntity implements Serializable { */ private Qualifier bestaccessright; - /** - * The Context. - */ - private List context; - /** * The External reference. */ @@ -508,24 +503,6 @@ public class Result extends OafEntity implements Serializable { this.bestaccessright = bestaccessright; } - /** - * Gets context. - * - * @return the context - */ - public List getContext() { - return context; - } - - /** - * Sets context. - * - * @param context the context - */ - public void setContext(List context) { - this.context = context; - } - /** * Gets external reference. * @@ -890,8 +867,6 @@ public class Result extends OafEntity implements Serializable { coverage = mergeLists(coverage, r.getCoverage()); - context = mergeLists(context, r.getContext()); - externalReference = mergeLists(externalReference, r.getExternalReference()); } From 70cc447dbb399b3d34ab7bf3c9622af03ec590d7 Mon Sep 17 00:00:00 2001 From: "miriam.baglioni" Date: Wed, 10 Jan 2024 12:12:17 +0100 Subject: [PATCH 2/2] apdate the changelog --- CHANGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 511d42a..aff1453 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,7 +4,8 @@ | **Version** | **Changes** | **Readiness** | |-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------| -| 4.17.2 | [Graph model]
  • added InstaceTypeMapping field on the instance level.
  • new result level fields to support the activities in the Irish tender `isGreen`, `openAccessColor`, `isInDiamondJournal`, `publiclyFunded`
      • | beta | +| 4.17.3 | [Graph model]
      • moved context at the level of the entity.
      +| 4.17.2 | [Graph model]
      • added InstaceTypeMapping field on the instance level.
      • new result level fields to support the activities in the Irish tender `isGreen`, `openAccessColor`, `isInDiamondJournal`, `publiclyFunded`
          • | production | | 3.17.1 | [Graph model]
          • added fulltext field on the instance level.
          • added extra organization specific PID types
              • | production | | 3.16.0 | [Graph model]
              • added entity level measures.
                  • | production | | 3.15.0 | [Graph model]
                  • added w3id as PID type, with ROHub as authority.
                      • | production |