D-Net
/
dhp-schemas
9
1
Fork 0
Code Issues 1 Pull Requests 4 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into scholix_flat_indexing

This commit is contained in:
Sandro La Bruzzo 2023-10-12 10:53:42 +02:00
parent 3b91cae839 6ce896ca0a
commit ca68323002
5 changed files with 54 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.md
View File

@ -3,7 +3,8 @@
## Changelog ## Changelog
| **Version** | **Changes** | **Readiness** | | **Version** | **Changes** | **Readiness** |
|-------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------| |-------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
| 3.17.1 | [Graph model] </br> <ul><li>added fulltext field on the instance level.</li><li>added extra organization specific PID types</li><ul> | beta |
| 3.16.0 | [Graph model] </br> <ul><li>added entity level measures.</li><ul> | beta | | 3.16.0 | [Graph model] </br> <ul><li>added entity level measures.</li><ul> | beta |
| 3.15.0 | [Graph model] </br> <ul><li>added w3id as PID type, with ROHub as authority.</li> <ul> | beta | | 3.15.0 | [Graph model] </br> <ul><li>added w3id as PID type, with ROHub as authority.</li> <ul> | beta |
| 3.14.0 | [Graph model] </br> <ul><li>introduced specific type for result.subject</li> <ul> | beta | | 3.14.0 | [Graph model] </br> <ul><li>introduced specific type for result.subject</li> <ul> | beta |

2
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>eu.dnetlib.dhp</groupId> <groupId>eu.dnetlib.dhp</groupId>
<artifactId>dhp-schemas</artifactId> <artifactId>dhp-schemas</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>3.16.1-SNAPSHOT</version> <version>3.17.2-SNAPSHOT</version>
<licenses> <licenses>
<license> <license>

13
src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java
View File

@ -39,6 +39,11 @@ public class Instance implements Serializable {
private List<Measure> measures; private List<Measure> measures;
/**
* Direct fulltext URL.
*/
private String fulltext;
public Field<String> getLicense() { public Field<String> getLicense() {
return license; return license;
} }
@ -151,6 +156,14 @@ public class Instance implements Serializable {
this.measures = measures; this.measures = measures;
} }
public String getFulltext() {
return fulltext;
}
public void setFulltext(String fulltext) {
this.fulltext = fulltext;
}
public String toComparableString() { public String toComparableString() {
return String return String
.format( .format(

4
src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java
View File

@ -95,9 +95,9 @@ public class Result extends OafEntity implements Serializable {
private List<Field<String>> source; private List<Field<String>> source;
/** /**
* The Fulltext. * The list of direct fulltext URLs.
*/ */
private List<Field<String>> fulltext; // remove candidate private List<Field<String>> fulltext;
/** /**
* The Format. * The Format.

2
src/main/java/eu/dnetlib/dhp/schema/oaf/utils/PidType.java
View File

@ -59,7 +59,7 @@ public enum PidType {
pmc, handle, arXiv, nct, pdb, w3id, pmc, handle, arXiv, nct, pdb, w3id,
// Organization // Organization
openorgs, corda, corda_h2020, GRID, mag_id, urn, openorgs, ROR, GRID, PIC, ISNI, Wikidata, FundRef, corda, corda_h2020, mag_id, urn,
// Used by dedup // Used by dedup
undefined, original; undefined, original;