From 25a62b79e56523b6f9277bd1f0d54c91c37b251a Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 24 Oct 2019 11:39:41 +0200 Subject: [PATCH] added new model for information space dataframes --- dhp-applications/dhp-is-mapper/pom.xml | 40 - dhp-schemas/pom.xml | 45 +- .../eu/dnetlib/dhp/schema/oaf/Author.java | 58 + .../eu/dnetlib/dhp/schema/oaf/Context.java | 26 + .../eu/dnetlib/dhp/schema/oaf/DataInfo.java | 63 + .../eu/dnetlib/dhp/schema/oaf/Dataset.java | 77 + .../eu/dnetlib/dhp/schema/oaf/Datasource.java | 364 +++++ .../dhp/schema/oaf/ExternalReference.java | 93 ++ .../eu/dnetlib/dhp/schema/oaf/ExtraInfo.java | 56 + .../java/eu/dnetlib/dhp/schema/oaf/Field.java | 26 + .../dnetlib/dhp/schema/oaf/GeoLocation.java | 36 + .../eu/dnetlib/dhp/schema/oaf/Instance.java | 87 ++ .../eu/dnetlib/dhp/schema/oaf/Journal.java | 126 ++ .../eu/dnetlib/dhp/schema/oaf/KeyValue.java | 36 + .../dnetlib/dhp/schema/oaf/OAIProvenance.java | 16 + .../java/eu/dnetlib/dhp/schema/oaf/Oaf.java | 29 + .../eu/dnetlib/dhp/schema/oaf/OafEntity.java | 99 ++ .../dnetlib/dhp/schema/oaf/Organization.java | 168 +++ .../dhp/schema/oaf/OriginDescription.java | 76 + .../dhp/schema/oaf/OtherResearchProducts.java | 36 + .../eu/dnetlib/dhp/schema/oaf/Project.java | 267 ++++ .../dnetlib/dhp/schema/oaf/Publication.java | 17 + .../eu/dnetlib/dhp/schema/oaf/Qualifier.java | 53 + .../eu/dnetlib/dhp/schema/oaf/Relation.java | 66 + .../eu/dnetlib/dhp/schema/oaf/Result.java | 220 +++ .../eu/dnetlib/dhp/schema/oaf/Software.java | 47 + .../dhp/schema/oaf/StructuredProperty.java | 37 + .../dhp/schema/proto/TestParseProtoJson.java | 22 + .../dnetlib/dhp/schema/proto/hugeRecord.json | 1294 +++++++++++++++++ 29 files changed, 3501 insertions(+), 79 deletions(-) delete mode 100644 dhp-applications/dhp-is-mapper/pom.xml create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExtraInfo.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Journal.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OAIProvenance.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProducts.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java create mode 100644 dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java create mode 100644 dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/proto/TestParseProtoJson.java create mode 100644 dhp-schemas/src/test/resources/eu/dnetlib/dhp/schema/proto/hugeRecord.json diff --git a/dhp-applications/dhp-is-mapper/pom.xml b/dhp-applications/dhp-is-mapper/pom.xml deleted file mode 100644 index b30e84a38..000000000 --- a/dhp-applications/dhp-is-mapper/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - dhp-applications - eu.dnetlib.dhp - 1.0.0-SNAPSHOT - - 4.0.0 - - dhp-is-mapper - - - - - org.apache.spark - spark-core_2.11 - - - org.apache.spark - spark-sql_2.11 - - - - eu.dnetlib.dhp - dhp-common - 1.0.0-SNAPSHOT - - - - eu.dnetlib.dhp - dhp-schemas - - - - - - - \ No newline at end of file diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml index 6ba9dead7..1f9c38b56 100644 --- a/dhp-schemas/pom.xml +++ b/dhp-schemas/pom.xml @@ -14,39 +14,7 @@ dhp-schemas jar - - - dnet-plugin - dnet plugin repository - http://maven.research-infrastructures.eu/nexus/content/repositories/dnet4-bootstrap-release - default - - - - - - eu.dnetlib - protoc-jar-maven-plugin - 1.1.0 - - - generate-sources - - run - - - ${google.protobuf.version} - - src/main/resources - - src/gen/java - - - - - - @@ -65,18 +33,17 @@ commons-io commons-io - - - com.google.protobuf - protobuf-java - com.googlecode.protobuf-java-format protobuf-java-format - 1.2 - + + eu.dnetlib + dnet-openaire-data-protos + + + diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java new file mode 100644 index 000000000..892c8d4f5 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Author.java @@ -0,0 +1,58 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public class Author implements Serializable { + + private String name; + + private String typology; + + private String provenance; + + private String trust; + + // json containing a Citation or Statistics + private String value; + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getTypology() { + return typology; + } + + public void setTypology(String typology) { + this.typology = typology; + } + + public String getProvenance() { + return provenance; + } + + public void setProvenance(String provenance) { + this.provenance = provenance; + } + + public String getTrust() { + return trust; + } + + public void setTrust(String trust) { + this.trust = trust; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java new file mode 100644 index 000000000..64e23088e --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Context.java @@ -0,0 +1,26 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; +import java.util.List; + +public class Context implements Serializable { + private String id; + + private List dataInfo; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public List getDataInfo() { + return dataInfo; + } + + public void setDataInfo(List dataInfo) { + this.dataInfo = dataInfo; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java new file mode 100644 index 000000000..01a0396a8 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/DataInfo.java @@ -0,0 +1,63 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; +import java.util.List; + +public class DataInfo implements Serializable { + + private Boolean invisible = false; + private Boolean inferred; + private Boolean deletedbyinference; + private String trust; + private String inferenceprovenance; + private List provenanceaction; + + + public Boolean getInvisible() { + return invisible; + } + + public void setInvisible(Boolean invisible) { + this.invisible = invisible; + } + + public Boolean getInferred() { + return inferred; + } + + public void setInferred(Boolean inferred) { + this.inferred = inferred; + } + + public Boolean getDeletedbyinference() { + return deletedbyinference; + } + + public void setDeletedbyinference(Boolean deletedbyinference) { + this.deletedbyinference = deletedbyinference; + } + + public String getTrust() { + return trust; + } + + public void setTrust(String trust) { + this.trust = trust; + } + + public String getInferenceprovenance() { + return inferenceprovenance; + } + + public void setInferenceprovenance(String inferenceprovenance) { + this.inferenceprovenance = inferenceprovenance; + } + + public List getProvenanceaction() { + return provenanceaction; + } + + public void setProvenanceaction(List provenanceaction) { + this.provenanceaction = provenanceaction; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java new file mode 100644 index 000000000..44d5226e9 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Dataset.java @@ -0,0 +1,77 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; +import java.util.List; + +public class Dataset extends Result implements Serializable { + + private Field storagedate; + + private Field device; + + private Field size; + + private Field version; + + private Field lastmetadataupdate; + + private Field metadataversionnumber; + + private List geolocation; + + public Field getStoragedate() { + return storagedate; + } + + public void setStoragedate(Field storagedate) { + this.storagedate = storagedate; + } + + public Field getDevice() { + return device; + } + + public void setDevice(Field device) { + this.device = device; + } + + public Field getSize() { + return size; + } + + public void setSize(Field size) { + this.size = size; + } + + public Field getVersion() { + return version; + } + + public void setVersion(Field version) { + this.version = version; + } + + public Field getLastmetadataupdate() { + return lastmetadataupdate; + } + + public void setLastmetadataupdate(Field lastmetadataupdate) { + this.lastmetadataupdate = lastmetadataupdate; + } + + public Field getMetadataversionnumber() { + return metadataversionnumber; + } + + public void setMetadataversionnumber(Field metadataversionnumber) { + this.metadataversionnumber = metadataversionnumber; + } + + public List getGeolocation() { + return geolocation; + } + + public void setGeolocation(List geolocation) { + this.geolocation = geolocation; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java new file mode 100644 index 000000000..354045ba7 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Datasource.java @@ -0,0 +1,364 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; +import java.util.List; + +public class Datasource extends OafEntity implements Serializable { + + private Qualifier datasourcetype; + + private Qualifier openairecompatibility; + + private Field officialname; + + private Field englishname; + + private Field websiteurl; + + private Field logourl; + + private Field contactemail; + + private Field namespaceprefix; + + private Field latitude; + + private Field longitude; + + private Field dateofvalidation; + + private Field description; + + private List subjects; + + // opendoar specific fields (od*) + private Field odnumberofitems; + + private Field odnumberofitemsdate; + + private Field odpolicies; + + private List> odlanguages; + + private List< Field> odcontenttypes; + + private List< Field> accessinfopackage; + + // re3data fields + private Field releasestartdate; + + private Field releaseenddate; + + private Field missionstatementurl; + + private Field dataprovider; + + private Field serviceprovider; + + // {open, restricted or closed} + private Field databaseaccesstype; + + // {open, restricted or closed} + private Field datauploadtype; + + // {feeRequired, registration, other} + private Field databaseaccessrestriction; + + // {feeRequired, registration, other} + private Field datauploadrestriction9; + + private Field versioning; + + private Field citationguidelineurl; + + //{yes, no, uknown} + private Field qualitymanagementkind; + + private Field pidsystems; + + private Field certificates; + + private List< KeyValue> policies; + + private Journal journal; + + public Qualifier getDatasourcetype() { + return datasourcetype; + } + + public void setDatasourcetype(Qualifier datasourcetype) { + this.datasourcetype = datasourcetype; + } + + public Qualifier getOpenairecompatibility() { + return openairecompatibility; + } + + public void setOpenairecompatibility(Qualifier openairecompatibility) { + this.openairecompatibility = openairecompatibility; + } + + public Field getOfficialname() { + return officialname; + } + + public void setOfficialname(Field officialname) { + this.officialname = officialname; + } + + public Field getEnglishname() { + return englishname; + } + + public void setEnglishname(Field englishname) { + this.englishname = englishname; + } + + public Field getWebsiteurl() { + return websiteurl; + } + + public void setWebsiteurl(Field websiteurl) { + this.websiteurl = websiteurl; + } + + public Field getLogourl() { + return logourl; + } + + public void setLogourl(Field logourl) { + this.logourl = logourl; + } + + public Field getContactemail() { + return contactemail; + } + + public void setContactemail(Field contactemail) { + this.contactemail = contactemail; + } + + public Field getNamespaceprefix() { + return namespaceprefix; + } + + public void setNamespaceprefix(Field namespaceprefix) { + this.namespaceprefix = namespaceprefix; + } + + public Field getLatitude() { + return latitude; + } + + public void setLatitude(Field latitude) { + this.latitude = latitude; + } + + public Field getLongitude() { + return longitude; + } + + public void setLongitude(Field longitude) { + this.longitude = longitude; + } + + public Field getDateofvalidation() { + return dateofvalidation; + } + + public void setDateofvalidation(Field dateofvalidation) { + this.dateofvalidation = dateofvalidation; + } + + public Field getDescription() { + return description; + } + + public void setDescription(Field description) { + this.description = description; + } + + public List getSubjects() { + return subjects; + } + + public void setSubjects(List subjects) { + this.subjects = subjects; + } + + public Field getOdnumberofitems() { + return odnumberofitems; + } + + public void setOdnumberofitems(Field odnumberofitems) { + this.odnumberofitems = odnumberofitems; + } + + public Field getOdnumberofitemsdate() { + return odnumberofitemsdate; + } + + public void setOdnumberofitemsdate(Field odnumberofitemsdate) { + this.odnumberofitemsdate = odnumberofitemsdate; + } + + public Field getOdpolicies() { + return odpolicies; + } + + public void setOdpolicies(Field odpolicies) { + this.odpolicies = odpolicies; + } + + public List> getOdlanguages() { + return odlanguages; + } + + public void setOdlanguages(List> odlanguages) { + this.odlanguages = odlanguages; + } + + public List> getOdcontenttypes() { + return odcontenttypes; + } + + public void setOdcontenttypes(List> odcontenttypes) { + this.odcontenttypes = odcontenttypes; + } + + public List> getAccessinfopackage() { + return accessinfopackage; + } + + public void setAccessinfopackage(List> accessinfopackage) { + this.accessinfopackage = accessinfopackage; + } + + public Field getReleasestartdate() { + return releasestartdate; + } + + public void setReleasestartdate(Field releasestartdate) { + this.releasestartdate = releasestartdate; + } + + public Field getReleaseenddate() { + return releaseenddate; + } + + public void setReleaseenddate(Field releaseenddate) { + this.releaseenddate = releaseenddate; + } + + public Field getMissionstatementurl() { + return missionstatementurl; + } + + public void setMissionstatementurl(Field missionstatementurl) { + this.missionstatementurl = missionstatementurl; + } + + public Field getDataprovider() { + return dataprovider; + } + + public void setDataprovider(Field dataprovider) { + this.dataprovider = dataprovider; + } + + public Field getServiceprovider() { + return serviceprovider; + } + + public void setServiceprovider(Field serviceprovider) { + this.serviceprovider = serviceprovider; + } + + public Field getDatabaseaccesstype() { + return databaseaccesstype; + } + + public void setDatabaseaccesstype(Field databaseaccesstype) { + this.databaseaccesstype = databaseaccesstype; + } + + public Field getDatauploadtype() { + return datauploadtype; + } + + public void setDatauploadtype(Field datauploadtype) { + this.datauploadtype = datauploadtype; + } + + public Field getDatabaseaccessrestriction() { + return databaseaccessrestriction; + } + + public void setDatabaseaccessrestriction(Field databaseaccessrestriction) { + this.databaseaccessrestriction = databaseaccessrestriction; + } + + public Field getDatauploadrestriction9() { + return datauploadrestriction9; + } + + public void setDatauploadrestriction9(Field datauploadrestriction9) { + this.datauploadrestriction9 = datauploadrestriction9; + } + + public Field getVersioning() { + return versioning; + } + + public void setVersioning(Field versioning) { + this.versioning = versioning; + } + + public Field getCitationguidelineurl() { + return citationguidelineurl; + } + + public void setCitationguidelineurl(Field citationguidelineurl) { + this.citationguidelineurl = citationguidelineurl; + } + + public Field getQualitymanagementkind() { + return qualitymanagementkind; + } + + public void setQualitymanagementkind(Field qualitymanagementkind) { + this.qualitymanagementkind = qualitymanagementkind; + } + + public Field getPidsystems() { + return pidsystems; + } + + public void setPidsystems(Field pidsystems) { + this.pidsystems = pidsystems; + } + + public Field getCertificates() { + return certificates; + } + + public void setCertificates(Field certificates) { + this.certificates = certificates; + } + + public List getPolicies() { + return policies; + } + + public void setPolicies(List policies) { + this.policies = policies; + } + + public Journal getJournal() { + return journal; + } + + public void setJournal(Journal journal) { + this.journal = journal; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java new file mode 100644 index 000000000..006658133 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExternalReference.java @@ -0,0 +1,93 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public class ExternalReference implements Serializable { + // source + private String sitename; + + // title + private String label; + + // text() + private String url; + + // ?? not mapped yet ?? + private String description; + + // type + private Qualifier qualifier; + + // site internal identifier + private String refidentifier; + + // maps the oaf:reference/@query attribute + private String query; + + // ExternalReferences might be also inferred + private DataInfo dataInfo; + + public String getSitename() { + return sitename; + } + + public void setSitename(String sitename) { + this.sitename = sitename; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public Qualifier getQualifier() { + return qualifier; + } + + public void setQualifier(Qualifier qualifier) { + this.qualifier = qualifier; + } + + public String getRefidentifier() { + return refidentifier; + } + + public void setRefidentifier(String refidentifier) { + this.refidentifier = refidentifier; + } + + public String getQuery() { + return query; + } + + public void setQuery(String query) { + this.query = query; + } + + public DataInfo getDataInfo() { + return dataInfo; + } + + public void setDataInfo(DataInfo dataInfo) { + this.dataInfo = dataInfo; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExtraInfo.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExtraInfo.java new file mode 100644 index 000000000..028b812a5 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/ExtraInfo.java @@ -0,0 +1,56 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public class ExtraInfo implements Serializable { + private String name; + + private String typology; + + private String provenance; + + private String trust; + + // json containing a Citation or Statistics + private String value; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getTypology() { + return typology; + } + + public void setTypology(String typology) { + this.typology = typology; + } + + public String getProvenance() { + return provenance; + } + + public void setProvenance(String provenance) { + this.provenance = provenance; + } + + public String getTrust() { + return trust; + } + + public void setTrust(String trust) { + this.trust = trust; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java new file mode 100644 index 000000000..59287ddc4 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Field.java @@ -0,0 +1,26 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public abstract class Field implements Serializable { + + private T value; + + private DataInfo dataInfo; + + public T getValue() { + return value; + } + + public void setValue(T value) { + this.value = value; + } + + public DataInfo getDataInfo() { + return dataInfo; + } + + public void setDataInfo(DataInfo dataInfo) { + this.dataInfo = dataInfo; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java new file mode 100644 index 000000000..567254a23 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/GeoLocation.java @@ -0,0 +1,36 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public class GeoLocation implements Serializable { + + private String point; + + private String box; + + private String place; + + public String getPoint() { + return point; + } + + public void setPoint(String point) { + this.point = point; + } + + public String getBox() { + return box; + } + + public void setBox(String box) { + this.box = box; + } + + public String getPlace() { + return place; + } + + public void setPlace(String place) { + this.place = place; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java new file mode 100644 index 000000000..f27704c5c --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Instance.java @@ -0,0 +1,87 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public class Instance implements Serializable { + + private Field license; + + private Qualifier accessright; + + private Qualifier instancetype; + + private KeyValue hostedby; + + private String url; + + // other research products specifc + private String distributionlocation; + + private KeyValue collectedfrom; + + private Field dateofacceptance; + + public Field getLicense() { + return license; + } + + public void setLicense(Field license) { + this.license = license; + } + + public Qualifier getAccessright() { + return accessright; + } + + public void setAccessright(Qualifier accessright) { + this.accessright = accessright; + } + + public Qualifier getInstancetype() { + return instancetype; + } + + public void setInstancetype(Qualifier instancetype) { + this.instancetype = instancetype; + } + + public KeyValue getHostedby() { + return hostedby; + } + + public void setHostedby(KeyValue hostedby) { + this.hostedby = hostedby; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getDistributionlocation() { + return distributionlocation; + } + + public void setDistributionlocation(String distributionlocation) { + this.distributionlocation = distributionlocation; + } + + public KeyValue getCollectedfrom() { + return collectedfrom; + } + + public void setCollectedfrom(KeyValue collectedfrom) { + this.collectedfrom = collectedfrom; + } + + public Field getDateofacceptance() { + return dateofacceptance; + } + + public void setDateofacceptance(Field dateofacceptance) { + this.dateofacceptance = dateofacceptance; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Journal.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Journal.java new file mode 100644 index 000000000..06e5ca7dc --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Journal.java @@ -0,0 +1,126 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public class Journal implements Serializable { + + private String name; + + private String issnPrinted; + + private String issnOnline; + + private String issnLinking; + + private String ep; + + private String iss; + + private String sp; + + private String vol; + + private String edition; + + private String conferenceplace; + + private String conferencedate; + + private DataInfo dataInfo; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getIssnPrinted() { + return issnPrinted; + } + + public void setIssnPrinted(String issnPrinted) { + this.issnPrinted = issnPrinted; + } + + public String getIssnOnline() { + return issnOnline; + } + + public void setIssnOnline(String issnOnline) { + this.issnOnline = issnOnline; + } + + public String getIssnLinking() { + return issnLinking; + } + + public void setIssnLinking(String issnLinking) { + this.issnLinking = issnLinking; + } + + public String getEp() { + return ep; + } + + public void setEp(String ep) { + this.ep = ep; + } + + public String getIss() { + return iss; + } + + public void setIss(String iss) { + this.iss = iss; + } + + public String getSp() { + return sp; + } + + public void setSp(String sp) { + this.sp = sp; + } + + public String getVol() { + return vol; + } + + public void setVol(String vol) { + this.vol = vol; + } + + public String getEdition() { + return edition; + } + + public void setEdition(String edition) { + this.edition = edition; + } + + public String getConferenceplace() { + return conferenceplace; + } + + public void setConferenceplace(String conferenceplace) { + this.conferenceplace = conferenceplace; + } + + public String getConferencedate() { + return conferencedate; + } + + public void setConferencedate(String conferencedate) { + this.conferencedate = conferencedate; + } + + public DataInfo getDataInfo() { + return dataInfo; + } + + public void setDataInfo(DataInfo dataInfo) { + this.dataInfo = dataInfo; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java new file mode 100644 index 000000000..1c4c7e6ef --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/KeyValue.java @@ -0,0 +1,36 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public class KeyValue implements Serializable { + + private String key; + + private String value; + + private DataInfo dataInfo; + + public String getKey() { + return key; + } + + public void setKey(String key) { + this.key = key; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public DataInfo getDataInfo() { + return dataInfo; + } + + public void setDataInfo(DataInfo dataInfo) { + this.dataInfo = dataInfo; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OAIProvenance.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OAIProvenance.java new file mode 100644 index 000000000..bb97654b9 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OAIProvenance.java @@ -0,0 +1,16 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public class OAIProvenance implements Serializable { + + private OriginDescription originDescription; + + public OriginDescription getOriginDescription() { + return originDescription; + } + + public void setOriginDescription(OriginDescription originDescription) { + this.originDescription = originDescription; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java new file mode 100644 index 000000000..a47fe7174 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Oaf.java @@ -0,0 +1,29 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public abstract class Oaf implements Serializable { + + private DataInfo dataInfo; + + private Long lastupdatetimestamp; + + +// protected abstract T fromJson(final String json); + + public DataInfo getDataInfo() { + return dataInfo; + } + + public void setDataInfo(DataInfo dataInfo) { + this.dataInfo = dataInfo; + } + + public Long getLastupdatetimestamp() { + return lastupdatetimestamp; + } + + public void setLastupdatetimestamp(Long lastupdatetimestamp) { + this.lastupdatetimestamp = lastupdatetimestamp; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java new file mode 100644 index 000000000..98f435fab --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OafEntity.java @@ -0,0 +1,99 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; +import java.util.List; + +public abstract class OafEntity extends Oaf implements Serializable { + + private String id; + + private List originalId; + + private List collectedfrom; + + private List pid; + + private String dateofcollection; + + private String dateoftransformation; + + //TODO remove this field + private List children; + + private List extraInfo; + + private OAIProvenance oaiprovenance; + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public List getOriginalId() { + return originalId; + } + + public void setOriginalId(List originalId) { + this.originalId = originalId; + } + + public List getCollectedfrom() { + return collectedfrom; + } + + public void setCollectedfrom(List collectedfrom) { + this.collectedfrom = collectedfrom; + } + + public List getPid() { + return pid; + } + + public void setPid(List pid) { + this.pid = pid; + } + + public String getDateofcollection() { + return dateofcollection; + } + + public void setDateofcollection(String dateofcollection) { + this.dateofcollection = dateofcollection; + } + + public String getDateoftransformation() { + return dateoftransformation; + } + + public void setDateoftransformation(String dateoftransformation) { + this.dateoftransformation = dateoftransformation; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public List getExtraInfo() { + return extraInfo; + } + + public void setExtraInfo(List extraInfo) { + this.extraInfo = extraInfo; + } + + public OAIProvenance getOaiprovenance() { + return oaiprovenance; + } + + public void setOaiprovenance(OAIProvenance oaiprovenance) { + this.oaiprovenance = oaiprovenance; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java new file mode 100644 index 000000000..dd966deb5 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Organization.java @@ -0,0 +1,168 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; +import java.util.List; + +public class Organization extends OafEntity implements Serializable { + + private Field legalshortname; + + private Field legalname; + + private List> alternativeNames; + + private Field websiteurl; + + private Field logourl; + + private Field eclegalbody; + + private Field eclegalperson; + + private Field ecnonprofit; + + private Field ecresearchorganization; + + private Field echighereducation; + + private Field ecinternationalorganizationeurinterests; + + private Field ecinternationalorganization; + + private Field ecenterprise; + + private Field ecsmevalidated; + + private Field ecnutscode; + + private Qualifier country; + + + public Field getLegalshortname() { + return legalshortname; + } + + public void setLegalshortname(Field legalshortname) { + this.legalshortname = legalshortname; + } + + public Field getLegalname() { + return legalname; + } + + public void setLegalname(Field legalname) { + this.legalname = legalname; + } + + public List> getAlternativeNames() { + return alternativeNames; + } + + public void setAlternativeNames(List> alternativeNames) { + this.alternativeNames = alternativeNames; + } + + public Field getWebsiteurl() { + return websiteurl; + } + + public void setWebsiteurl(Field websiteurl) { + this.websiteurl = websiteurl; + } + + public Field getLogourl() { + return logourl; + } + + public void setLogourl(Field logourl) { + this.logourl = logourl; + } + + public Field getEclegalbody() { + return eclegalbody; + } + + public void setEclegalbody(Field eclegalbody) { + this.eclegalbody = eclegalbody; + } + + public Field getEclegalperson() { + return eclegalperson; + } + + public void setEclegalperson(Field eclegalperson) { + this.eclegalperson = eclegalperson; + } + + public Field getEcnonprofit() { + return ecnonprofit; + } + + public void setEcnonprofit(Field ecnonprofit) { + this.ecnonprofit = ecnonprofit; + } + + public Field getEcresearchorganization() { + return ecresearchorganization; + } + + public void setEcresearchorganization(Field ecresearchorganization) { + this.ecresearchorganization = ecresearchorganization; + } + + public Field getEchighereducation() { + return echighereducation; + } + + public void setEchighereducation(Field echighereducation) { + this.echighereducation = echighereducation; + } + + public Field getEcinternationalorganizationeurinterests() { + return ecinternationalorganizationeurinterests; + } + + public void setEcinternationalorganizationeurinterests(Field ecinternationalorganizationeurinterests) { + this.ecinternationalorganizationeurinterests = ecinternationalorganizationeurinterests; + } + + public Field getEcinternationalorganization() { + return ecinternationalorganization; + } + + public void setEcinternationalorganization(Field ecinternationalorganization) { + this.ecinternationalorganization = ecinternationalorganization; + } + + public Field getEcenterprise() { + return ecenterprise; + } + + public void setEcenterprise(Field ecenterprise) { + this.ecenterprise = ecenterprise; + } + + public Field getEcsmevalidated() { + return ecsmevalidated; + } + + public void setEcsmevalidated(Field ecsmevalidated) { + this.ecsmevalidated = ecsmevalidated; + } + + public Field getEcnutscode() { + return ecnutscode; + } + + public void setEcnutscode(Field ecnutscode) { + this.ecnutscode = ecnutscode; + } + + public Qualifier getCountry() { + return country; + } + + public void setCountry(Qualifier country) { + this.country = country; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java new file mode 100644 index 000000000..898c16210 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OriginDescription.java @@ -0,0 +1,76 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public class OriginDescription implements Serializable { + + private String harvestDate; + + private Boolean altered = true; + + private String baseURL; + + private String identifier; + + private String datestamp; + + private String metadataNamespace; + + private OriginDescription originDescription; + + public String getHarvestDate() { + return harvestDate; + } + + public void setHarvestDate(String harvestDate) { + this.harvestDate = harvestDate; + } + + public Boolean getAltered() { + return altered; + } + + public void setAltered(Boolean altered) { + this.altered = altered; + } + + public String getBaseURL() { + return baseURL; + } + + public void setBaseURL(String baseURL) { + this.baseURL = baseURL; + } + + public String getIdentifier() { + return identifier; + } + + public void setIdentifier(String identifier) { + this.identifier = identifier; + } + + public String getDatestamp() { + return datestamp; + } + + public void setDatestamp(String datestamp) { + this.datestamp = datestamp; + } + + public String getMetadataNamespace() { + return metadataNamespace; + } + + public void setMetadataNamespace(String metadataNamespace) { + this.metadataNamespace = metadataNamespace; + } + + public OriginDescription getOriginDescription() { + return originDescription; + } + + public void setOriginDescription(OriginDescription originDescription) { + this.originDescription = originDescription; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProducts.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProducts.java new file mode 100644 index 000000000..12b578904 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/OtherResearchProducts.java @@ -0,0 +1,36 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; +import java.util.List; + +public class OtherResearchProducts extends Result implements Serializable { + private List> contactperson; + + private List> contactgroup; + + private List> tool; + + public List> getContactperson() { + return contactperson; + } + + public void setContactperson(List> contactperson) { + this.contactperson = contactperson; + } + + public List> getContactgroup() { + return contactgroup; + } + + public void setContactgroup(List> contactgroup) { + this.contactgroup = contactgroup; + } + + public List> getTool() { + return tool; + } + + public void setTool(List> tool) { + this.tool = tool; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java new file mode 100644 index 000000000..65f22da37 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Project.java @@ -0,0 +1,267 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; +import java.util.List; + +public class Project extends OafEntity implements Serializable { + + private Field websiteurl; + + private Field code; + + private Field acronym; + + private Field title; + + private Field startdate; + + private Field enddate; + + private Field callidentifier; + + private Field keywords; + + private Field duration; + + private Field ecsc39; + + private Field oamandatepublications; + + private Field ecarticle29_3; + + private List subjects; + + private List> fundingtree; + + private Qualifier contracttype; + + private Field optional1; + + private Field optional2; + + private Field jsonextrainfo; + + private Field contactfullname; + + private Field contactfax; + + private Field contactphone; + + private Field contactemail; + + private Field summary; + + private Field currency; + + private Float totalcost; + + private Float fundedamount; + + public Field getWebsiteurl() { + return websiteurl; + } + + public void setWebsiteurl(Field websiteurl) { + this.websiteurl = websiteurl; + } + + public Field getCode() { + return code; + } + + public void setCode(Field code) { + this.code = code; + } + + public Field getAcronym() { + return acronym; + } + + public void setAcronym(Field acronym) { + this.acronym = acronym; + } + + public Field getTitle() { + return title; + } + + public void setTitle(Field title) { + this.title = title; + } + + public Field getStartdate() { + return startdate; + } + + public void setStartdate(Field startdate) { + this.startdate = startdate; + } + + public Field getEnddate() { + return enddate; + } + + public void setEnddate(Field enddate) { + this.enddate = enddate; + } + + public Field getCallidentifier() { + return callidentifier; + } + + public void setCallidentifier(Field callidentifier) { + this.callidentifier = callidentifier; + } + + public Field getKeywords() { + return keywords; + } + + public void setKeywords(Field keywords) { + this.keywords = keywords; + } + + public Field getDuration() { + return duration; + } + + public void setDuration(Field duration) { + this.duration = duration; + } + + public Field getEcsc39() { + return ecsc39; + } + + public void setEcsc39(Field ecsc39) { + this.ecsc39 = ecsc39; + } + + public Field getOamandatepublications() { + return oamandatepublications; + } + + public void setOamandatepublications(Field oamandatepublications) { + this.oamandatepublications = oamandatepublications; + } + + public Field getEcarticle29_3() { + return ecarticle29_3; + } + + public void setEcarticle29_3(Field ecarticle29_3) { + this.ecarticle29_3 = ecarticle29_3; + } + + public List getSubjects() { + return subjects; + } + + public void setSubjects(List subjects) { + this.subjects = subjects; + } + + public List> getFundingtree() { + return fundingtree; + } + + public void setFundingtree(List> fundingtree) { + this.fundingtree = fundingtree; + } + + public Qualifier getContracttype() { + return contracttype; + } + + public void setContracttype(Qualifier contracttype) { + this.contracttype = contracttype; + } + + public Field getOptional1() { + return optional1; + } + + public void setOptional1(Field optional1) { + this.optional1 = optional1; + } + + public Field getOptional2() { + return optional2; + } + + public void setOptional2(Field optional2) { + this.optional2 = optional2; + } + + public Field getJsonextrainfo() { + return jsonextrainfo; + } + + public void setJsonextrainfo(Field jsonextrainfo) { + this.jsonextrainfo = jsonextrainfo; + } + + public Field getContactfullname() { + return contactfullname; + } + + public void setContactfullname(Field contactfullname) { + this.contactfullname = contactfullname; + } + + public Field getContactfax() { + return contactfax; + } + + public void setContactfax(Field contactfax) { + this.contactfax = contactfax; + } + + public Field getContactphone() { + return contactphone; + } + + public void setContactphone(Field contactphone) { + this.contactphone = contactphone; + } + + public Field getContactemail() { + return contactemail; + } + + public void setContactemail(Field contactemail) { + this.contactemail = contactemail; + } + + public Field getSummary() { + return summary; + } + + public void setSummary(Field summary) { + this.summary = summary; + } + + public Field getCurrency() { + return currency; + } + + public void setCurrency(Field currency) { + this.currency = currency; + } + + public Float getTotalcost() { + return totalcost; + } + + public void setTotalcost(Float totalcost) { + this.totalcost = totalcost; + } + + public Float getFundedamount() { + return fundedamount; + } + + public void setFundedamount(Float fundedamount) { + this.fundedamount = fundedamount; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java new file mode 100644 index 000000000..9ca9cd3d6 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Publication.java @@ -0,0 +1,17 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public class Publication extends Result implements Serializable { + + // publication specific + private Journal journal; + + public Journal getJournal() { + return journal; + } + + public void setJournal(Journal journal) { + this.journal = journal; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java new file mode 100644 index 000000000..0d917d50e --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Qualifier.java @@ -0,0 +1,53 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public class Qualifier implements Serializable { + + private String classid; + private String classname; + private String schemeid; + private String schemename; + + private DataInfo dataInfo; + + public String getClassid() { + return classid; + } + + public void setClassid(String classid) { + this.classid = classid; + } + + public String getClassname() { + return classname; + } + + public void setClassname(String classname) { + this.classname = classname; + } + + public String getSchemeid() { + return schemeid; + } + + public void setSchemeid(String schemeid) { + this.schemeid = schemeid; + } + + public String getSchemename() { + return schemename; + } + + public void setSchemename(String schemename) { + this.schemename = schemename; + } + + public DataInfo getDataInfo() { + return dataInfo; + } + + public void setDataInfo(DataInfo dataInfo) { + this.dataInfo = dataInfo; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java new file mode 100644 index 000000000..5cf0883be --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Relation.java @@ -0,0 +1,66 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.util.List; + +public class Relation extends Oaf { + + private String relType; + + private String subRelType; + + private String relClass; + + private String source; + + private String target; + + private List collectedFrom; + + public String getRelType() { + return relType; + } + + public void setRelType(String relType) { + this.relType = relType; + } + + public String getSubRelType() { + return subRelType; + } + + public void setSubRelType(String subRelType) { + this.subRelType = subRelType; + } + + public String getRelClass() { + return relClass; + } + + public void setRelClass(String relClass) { + this.relClass = relClass; + } + + public String getSource() { + return source; + } + + public void setSource(String source) { + this.source = source; + } + + public String getTarget() { + return target; + } + + public void setTarget(String target) { + this.target = target; + } + + public List getCollectedFrom() { + return collectedFrom; + } + + public void setCollectedFrom(List collectedFrom) { + this.collectedFrom = collectedFrom; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java new file mode 100644 index 000000000..1a0f74aac --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Result.java @@ -0,0 +1,220 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; +import java.util.List; + +public abstract class Result extends OafEntity implements Serializable { + + private List author; + + // resulttype allows subclassing results into publications | datasets | software + private Qualifier resulttype; + + // common fields + private Qualifier language; + + private List country; + + private List subject; + + private List title; + + private List relevantdate; + + private List> description; + + private Field dateofacceptance; + + private Field publisher; + + private Field embargoenddate; + + private List> source; + + private List> fulltext; // remove candidate + + private List> format; + + private List> contributor; + + private Qualifier resourcetype; + + private List> coverage; + + private Field refereed; //peer-review status + + private List context; + + private List externalReference; + + private List instance; + + + public List getAuthor() { + return author; + } + + public void setAuthor(List author) { + this.author = author; + } + + public Qualifier getResulttype() { + return resulttype; + } + + public void setResulttype(Qualifier resulttype) { + this.resulttype = resulttype; + } + + public Qualifier getLanguage() { + return language; + } + + public void setLanguage(Qualifier language) { + this.language = language; + } + + public List getCountry() { + return country; + } + + public void setCountry(List country) { + this.country = country; + } + + public List getSubject() { + return subject; + } + + public void setSubject(List subject) { + this.subject = subject; + } + + public List getTitle() { + return title; + } + + public void setTitle(List title) { + this.title = title; + } + + public List getRelevantdate() { + return relevantdate; + } + + public void setRelevantdate(List relevantdate) { + this.relevantdate = relevantdate; + } + + public List> getDescription() { + return description; + } + + public void setDescription(List> description) { + this.description = description; + } + + public Field getDateofacceptance() { + return dateofacceptance; + } + + public void setDateofacceptance(Field dateofacceptance) { + this.dateofacceptance = dateofacceptance; + } + + public Field getPublisher() { + return publisher; + } + + public void setPublisher(Field publisher) { + this.publisher = publisher; + } + + public Field getEmbargoenddate() { + return embargoenddate; + } + + public void setEmbargoenddate(Field embargoenddate) { + this.embargoenddate = embargoenddate; + } + + public List> getSource() { + return source; + } + + public void setSource(List> source) { + this.source = source; + } + + public List> getFulltext() { + return fulltext; + } + + public void setFulltext(List> fulltext) { + this.fulltext = fulltext; + } + + public List> getFormat() { + return format; + } + + public void setFormat(List> format) { + this.format = format; + } + + public List> getContributor() { + return contributor; + } + + public void setContributor(List> contributor) { + this.contributor = contributor; + } + + public Qualifier getResourcetype() { + return resourcetype; + } + + public void setResourcetype(Qualifier resourcetype) { + this.resourcetype = resourcetype; + } + + public List> getCoverage() { + return coverage; + } + + public void setCoverage(List> coverage) { + this.coverage = coverage; + } + + public Field getRefereed() { + return refereed; + } + + public void setRefereed(Field refereed) { + this.refereed = refereed; + } + + public List getContext() { + return context; + } + + public void setContext(List context) { + this.context = context; + } + + public List getExternalReference() { + return externalReference; + } + + public void setExternalReference(List externalReference) { + this.externalReference = externalReference; + } + + public List getInstance() { + return instance; + } + + public void setInstance(List instance) { + this.instance = instance; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java new file mode 100644 index 000000000..e696cdb52 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/Software.java @@ -0,0 +1,47 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; +import java.util.List; + +public class Software extends Result implements Serializable { + + private List> documentationUrl; + + private List license; + + private Field codeRepositoryUrl; + + private Qualifier programmingLanguage; + + public List> getDocumentationUrl() { + return documentationUrl; + } + + public void setDocumentationUrl(List> documentationUrl) { + this.documentationUrl = documentationUrl; + } + + public List getLicense() { + return license; + } + + public void setLicense(List license) { + this.license = license; + } + + public Field getCodeRepositoryUrl() { + return codeRepositoryUrl; + } + + public void setCodeRepositoryUrl(Field codeRepositoryUrl) { + this.codeRepositoryUrl = codeRepositoryUrl; + } + + public Qualifier getProgrammingLanguage() { + return programmingLanguage; + } + + public void setProgrammingLanguage(Qualifier programmingLanguage) { + this.programmingLanguage = programmingLanguage; + } +} diff --git a/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java new file mode 100644 index 000000000..8a39d8d97 --- /dev/null +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/oaf/StructuredProperty.java @@ -0,0 +1,37 @@ +package eu.dnetlib.dhp.schema.oaf; + +import java.io.Serializable; + +public class StructuredProperty implements Serializable { + + private String value; + + private Qualifier qualifier; + + private DataInfo dataInfo; + + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public Qualifier getQualifier() { + return qualifier; + } + + public void setQualifier(Qualifier qualifier) { + this.qualifier = qualifier; + } + + public DataInfo getDataInfo() { + return dataInfo; + } + + public void setDataInfo(DataInfo dataInfo) { + this.dataInfo = dataInfo; + } +} diff --git a/dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/proto/TestParseProtoJson.java b/dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/proto/TestParseProtoJson.java new file mode 100644 index 000000000..e16050ab2 --- /dev/null +++ b/dhp-schemas/src/test/java/eu/dnetlib/dhp/schema/proto/TestParseProtoJson.java @@ -0,0 +1,22 @@ +package eu.dnetlib.dhp.schema.proto; + +import com.googlecode.protobuf.format.JsonFormat; +import eu.dnetlib.data.proto.OafProtos; +import org.apache.commons.io.IOUtils; +import org.junit.Test; + + +public class TestParseProtoJson { + + + @Test + public void testParse() throws Exception { + final String json = IOUtils.toString(this.getClass().getResourceAsStream("/eu/dnetlib/dhp/schema/proto/hugeRecord.json")); + + OafProtos.Oaf.Builder oafBuilder =OafProtos.Oaf.newBuilder(); + JsonFormat.merge(json,oafBuilder); + + System.out.println(JsonFormat.printToString(oafBuilder.build())); + + } +} diff --git a/dhp-schemas/src/test/resources/eu/dnetlib/dhp/schema/proto/hugeRecord.json b/dhp-schemas/src/test/resources/eu/dnetlib/dhp/schema/proto/hugeRecord.json new file mode 100644 index 000000000..b601f9023 --- /dev/null +++ b/dhp-schemas/src/test/resources/eu/dnetlib/dhp/schema/proto/hugeRecord.json @@ -0,0 +1,1294 @@ +{ + "kind": "relation", + "dataInfo": { + "provenanceaction": { + "classid": "iis", + "classname": "iis", + "schemename": "dnet:provenanceActions", + "schemeid": "dnet:provenanceActions" + }, + "trust": "0.9", + "inferred": true, + "inferenceprovenance": "iis::document_affiliations" + }, + "lastupdatetimestamp": 1559901970310, + "entity": { + "type": "result", + "id": "50|dedup_wf_001::00000016db3c44b536e40fde7dc8876b", + "originalId": [ + "oai:recercat.cat:2072/246120", + "oai:upcommons.upc.edu:2099.1/24887" + ], + "collectedfrom": [ + { + "key": "10|opendoar____::966b6dfb6b0819cc10644bea3115cf20", + "value": "UPCommons. Portal del coneixement obert de la UPC" + }, + { + "key": "10|opendoar____::7a614fd06c325499f1680b9896beedeb", + "value": "Research Repository of Catalonia" + } + ], + "pid": { + "value": "10.aefiuashd", + "dataInfo": { + "provenanceaction": { + "classid": "iis", + "classname": "iis", + "schemename": "dnet:provenanceActions", + "schemeid": "dnet:provenanceActions" + }, + "trust": "0.9", + "inferred": true, + "inferenceprovenance": "iis::document_affiliations" + } + }, + "dateofcollection": "2019-03-19T09:28:27.727Z", + "dateoftransformation": "2019-08-03T09:55:13.548Z", + "datasource": { + "metadata": { + "datasourcetype": { + "classid": "crissystem", + "classname": "CRIS System", + "schemename": "dnet:datasource_typologies", + "schemeid": "dnet:datasource_typologies" + }, + "namespaceprefix": { + "value": "CrisUnsNoviS" + }, + "websiteurl": { + "value": "https://cris.uns.ac.rs/" + }, + "logourl": { + "value": "https://cris.uns.ac.rs/" + }, + "dateofvalidation": { + "value": "https://cris.uns.ac.rs/" + }, + "description": { + "value": "This site provides access to the research output of the institution. The interface is available in English. Users may set up RSS feeds to be alerted to new content." + }, + "subjects": [ + { + "qualifier": { + "classid": "keywords", + "classname": "keywords", + "schemename": "dnet:subject_classification_typologies", + "schemeid": "dnet:subject_classification_typologies" + }, + "value": "Multidisciplinary" + } + ], + "odnumberofitems": { + "value": "1" + }, + "odnumberofitemsdate": { + "value": "yesterday" + }, + "odpolicies": { + "value": "1" + }, + "odlanguages": [ + { + "value": "eng" + } + ], + "odcontenttypes": [ + { + "value": "journal_articles" + }, + { + "value": "conference_and_workshop_papers" + }, + { + "value": "theses_and_dissertations" + }, + { + "value": "books_chapters_and_sections" + } + ], + "contactemail": { + "value": "a@a" + }, + "latitude": { + "value": "0.0" + }, + "longitude": { + "value": "0.0" + }, + "accessinfopackage": [ + { + "value": "https://cris.uns.ac.rs/OAIHandlerOpenAIRECRIS" + } + ], + "officialname": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "englishname": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "openairecompatibility": { + "classid": "openaire-cris_1.1", + "classname": "OpenAIRE CRIS v1.1", + "schemename": "dnet:datasourceCompatibilityLevel", + "schemeid": "dnet:datasourceCompatibilityLevel" + } + }, + "releasestartdate": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "releaseenddate": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "missionstatementurl": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "dataprovider": { + "value": true + }, + "serviceprovider": { + "value": true + }, + "databaseaccesstype": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "datauploadtype": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "databaseaccessrestriction": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "datauploadrestriction": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "versioning": { + "value": true + }, + "citationguidelineurl": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "qualitymanagementkind": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "pidsystems": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "certificates": { + "value": "CRIS UNS (Current Research Information System University of Novi Sad)" + }, + "policies": [ + { + "key": "10|opendoar____::966b6dfb6b0819cc10644bea3115cf20", + "value": "UPCommons. Portal del coneixement obert de la UPC" + }, + { + "key": "10|opendoar____::7a614fd06c325499f1680b9896beedeb", + "value": "Research Repository of Catalonia" + } + ], + "journal": { + "name": "name", + "issnPrinted": "iss", + "issnOnline": "a", + "issnLinking": "l", + "dataInfo": { + "inferred": true, + "deletedbyinference": false, + "trust": "1.0", + "inferenceprovenance": "provenance", + "provenanceaction": { + "classid": "classId", + "classname": "className", + "dataInfo": { + "inferred": true, + "deletedbyinference": false, + "trust": "1.0", + "inferenceprovenance": "provenance", + "provenanceaction": { + "classid": "classId", + "classname": "className" + }, + "invisible": false + } + }, + "invisible": false + }, + "ep": "a", + "iss": "iss", + "sp": "sp", + "vol": "vol", + "edition": "ed", + "conferenceplace": "cp", + "conferencedate": "cd" + } + }, + "organization": { + "metadata": { + "eclegalbody": { + "value": "false" + }, + "eclegalperson": { + "value": "false" + }, + "ecinternationalorganization": { + "value": "false" + }, + "ecnonprofit": { + "value": "false" + }, + "ecresearchorganization": { + "value": "false" + }, + "ecenterprise": { + "value": "false" + }, + "ecnutscode": { + "value": "false" + }, + "ecinternationalorganizationeurinterests": { + "value": "false" + }, + "legalname": { + "value": "University of Utrecht" + }, + "legalshortname": { + "value": "University of Utrecht" + }, + "alternativenames": [ + { + "value": "University of Utrecht" + } + ], + "websiteurl": { + "value": "University of Utrecht" + }, + "logourl": { + "value": "https://cris.uns.ac.rs/" + }, + "country": { + "classid": "FI", + "classname": "Finland", + "schemename": "dnet:countries", + "schemeid": "dnet:countries" + }, + "echighereducation": { + "value": "false" + }, + "ecsmevalidated": { + "value": "false" + } + } + }, + "project": { + "metadata": { + "websiteurl": { + "value": "https://cris.uns.ac.rs/" + }, + "code": { + "value": "116408" + }, + "acronym": { + "value": "https://cris.uns.ac.rs/" + }, + "optional1": { + "value": "354,920 €" + }, + "startdate": { + "value": "https://cris.uns.ac.rs/" + }, + "enddate": { + "value": "https://cris.uns.ac.rs/" + }, + "keywords": { + "value": "https://cris.uns.ac.rs/" + }, + "duration": { + "value": "https://cris.uns.ac.rs/" + }, + "ecsc39": { + "value": "https://cris.uns.ac.rs/" + }, + "subjects": [ + { + "qualifier": { + "classid": "keywords", + "classname": "keywords", + "schemename": "dnet:subject_classification_typologies", + "schemeid": "dnet:subject_classification_typologies" + }, + "value": "Multidisciplinary" + } + ], + "title": { + "value": "Critical lipid oxidation products in food matrices" + }, + "oamandatepublications": { + "value": "false" + }, + "optional2": { + "value": "false" + }, + "totalcost": "33.3", + "fundedamount": "33", + "contactfullname": { + "value": "false" + }, + "contactfax": { + "value": "false" + }, + "contactphone": { + "value": "false" + }, + "contactemail": { + "value": "false" + }, + "summary": { + "value": "false" + }, + "currency": { + "value": "false" + }, + "contracttype": { + "classid": "keywords", + "classname": "keywords", + "schemename": "dnet:subject_classification_typologies", + "schemeid": "dnet:subject_classification_typologies" + }, + "jsonextrainfo": { + "value": "{}" + }, + "callidentifier": { + "value": "Yleiset tutkimusmäärärahat BY" + }, + "fundingtree": [ + { + "value": " aka_________::AKA AKA Academy of Finland Academy of Finland FI " + } + ] + } + }, + "result": { + "instance": [ + { + "license": { + "value": "2014-07-01" + }, + "hostedby": { + "key": "10|opendoar____::966b6dfb6b0819cc10644bea3115cf20", + "value": "UPCommons. Portal del coneixement obert de la UPC" + }, + "url": [ + "http://hdl.handle.net/2099.1/24887" + ], + "distributionlocation": "abc", + "dateofacceptance": { + "value": "2014-07-01" + }, + "collectedfrom": { + "key": "10|opendoar____::966b6dfb6b0819cc10644bea3115cf20", + "value": "UPCommons. Portal del coneixement obert de la UPC" + }, + "accessright": { + "classid": "RESTRICTED", + "classname": "Restricted", + "schemeid": "dnet:access_modes", + "schemename": "dnet:access_modes" + }, + "instancetype": { + "classid": "0008", + "classname": "Bachelor thesis", + "schemeid": "dnet:publication_resource", + "schemename": "dnet:publication_resource" + } + } + ], + "metadata": { + "country": [ + { + "classid": "FI", + "classname": "Finland", + "schemename": "dnet:countries", + "schemeid": "dnet:countries" + } + ], + "context": { + "id": "id", + "dataInfo": [ + { + "inferred": true, + "deletedbyinference": false, + "trust": "1.0", + "inferenceprovenance": "provenance", + "provenanceaction": { + "classid": "classId", + "classname": "className", + "dataInfo": { + "inferred": true, + "deletedbyinference": false, + "trust": "1.0", + "inferenceprovenance": "provenance", + "provenanceaction": { + "classid": "classId", + "classname": "className" + }, + "invisible": false + } + }, + "invisible": false + } + ] + }, + "storagedate": { + "value": "v" + }, + "device": { + "value": "v" + }, + "size": { + "value": "v" + }, + "version": { + "value": "v" + }, + "lastmetadataupdate": { + "value": "v" + }, + "metadataversionnumber": { + "value": "v" + }, + "publisher": { + "value": "Universitat Polit\u00e8cnica de Catalunya" + }, + "embargoenddate": { + "value": "" + }, + "refereed": { + "value": "" + }, + "documentationUrl": [ + { + "value": "" + } + ], + "license": [ + { + "qualifier": { + "classid": "main title", + "classname": "main title", + "schemeid": "dnet:dataCite_title", + "schemename": "dnet:dataCite_title" + }, + "value": "Protecci\u00f3n de la legalidad urban\u00edstica" + } + ], + "codeRepositoryUrl": { + "value": "" + }, + "programmingLanguage": { + "classid": "eng", + "classname": "English", + "schemeid": "dnet:languages", + "schemename": "dnet:languages" + }, + "contactperson": [ + { + "value": "" + } + ], + "contactgroup": [ + { + "value": "" + } + ], + "tool": [ + { + "value": "" + } + ], + "source": [ + { + "value": "El presente Trabajo Final de Grado con modalidad B (pr\u00e1cticum) ha tenido como objetivo\ndentro del \u00c1rea de Urbanismo y Vivienda del Ayuntamiento de Corbera de Llobregat, realizar\nun seguimiento de los procedimientos administrativos sobre la Protecci\u00f3n de la Legalidad\nUrban\u00edstica, con el fin de la sistematizaci\u00f3n, ordenaci\u00f3n e identificaci\u00f3n de la informaci\u00f3n\ndocumental contenida en aquellos expedientes resultantes de incoaci\u00f3n, gestionando la\nidentificaci\u00f3n de los procedimientos administrativos, asegurando de esta manera la\nresoluci\u00f3n futura en t\u00e9rminos de validez y eficacia.\nEn el desarrollo de este proyecto, se har\u00e1 referencia a las normativas aplicadas a la\nProtecci\u00f3n de la Legalidad Urban\u00edstica, que tienen por finalidad prevenir e impedir cualquier\nforma de transgresi\u00f3n de la legalidad jur\u00eddico-urban\u00edstica y, en caso de llegar a producirse\nesta, restaurar la realidad urban\u00edstica infringida mediante la reposici\u00f3n de la realidad f\u00edsica\nalterada o trasformada al estado anterior a la actuaci\u00f3n ilegal y, en su caso, la anulaci\u00f3n de\nlos actos administrativos en los que pueda ampararse dicha actuaci\u00f3n ilegal.\nPara dar mejor compresi\u00f3n a todo lo que es el procedimiento administrativo, y con toda la\nteor\u00eda, se ha llegado a los concretos expedientes implicados en las ilegalidades urban\u00edsticas,\ncon todos los hitos procedimentales que han sido pertinentes una vez que han sido\nincoados." + } + ], + "fulltext": [ + { + "value": "El presente Trabajo Final de Grado con modalidad B (pr\u00e1cticum) ha tenido como objetivo\ndentro del \u00c1rea de Urbanismo y Vivienda del Ayuntamiento de Corbera de Llobregat, realizar\nun seguimiento de los procedimientos administrativos sobre la Protecci\u00f3n de la Legalidad\nUrban\u00edstica, con el fin de la sistematizaci\u00f3n, ordenaci\u00f3n e identificaci\u00f3n de la informaci\u00f3n\ndocumental contenida en aquellos expedientes resultantes de incoaci\u00f3n, gestionando la\nidentificaci\u00f3n de los procedimientos administrativos, asegurando de esta manera la\nresoluci\u00f3n futura en t\u00e9rminos de validez y eficacia.\nEn el desarrollo de este proyecto, se har\u00e1 referencia a las normativas aplicadas a la\nProtecci\u00f3n de la Legalidad Urban\u00edstica, que tienen por finalidad prevenir e impedir cualquier\nforma de transgresi\u00f3n de la legalidad jur\u00eddico-urban\u00edstica y, en caso de llegar a producirse\nesta, restaurar la realidad urban\u00edstica infringida mediante la reposici\u00f3n de la realidad f\u00edsica\nalterada o trasformada al estado anterior a la actuaci\u00f3n ilegal y, en su caso, la anulaci\u00f3n de\nlos actos administrativos en los que pueda ampararse dicha actuaci\u00f3n ilegal.\nPara dar mejor compresi\u00f3n a todo lo que es el procedimiento administrativo, y con toda la\nteor\u00eda, se ha llegado a los concretos expedientes implicados en las ilegalidades urban\u00edsticas,\ncon todos los hitos procedimentales que han sido pertinentes una vez que han sido\nincoados." + } + ], + "coverage": [ + { + "value": "El presente Trabajo Final de Grado con modalidad B (pr\u00e1cticum) ha tenido como objetivo\ndentro del \u00c1rea de Urbanismo y Vivienda del Ayuntamiento de Corbera de Llobregat, realizar\nun seguimiento de los procedimientos administrativos sobre la Protecci\u00f3n de la Legalidad\nUrban\u00edstica, con el fin de la sistematizaci\u00f3n, ordenaci\u00f3n e identificaci\u00f3n de la informaci\u00f3n\ndocumental contenida en aquellos expedientes resultantes de incoaci\u00f3n, gestionando la\nidentificaci\u00f3n de los procedimientos administrativos, asegurando de esta manera la\nresoluci\u00f3n futura en t\u00e9rminos de validez y eficacia.\nEn el desarrollo de este proyecto, se har\u00e1 referencia a las normativas aplicadas a la\nProtecci\u00f3n de la Legalidad Urban\u00edstica, que tienen por finalidad prevenir e impedir cualquier\nforma de transgresi\u00f3n de la legalidad jur\u00eddico-urban\u00edstica y, en caso de llegar a producirse\nesta, restaurar la realidad urban\u00edstica infringida mediante la reposici\u00f3n de la realidad f\u00edsica\nalterada o trasformada al estado anterior a la actuaci\u00f3n ilegal y, en su caso, la anulaci\u00f3n de\nlos actos administrativos en los que pueda ampararse dicha actuaci\u00f3n ilegal.\nPara dar mejor compresi\u00f3n a todo lo que es el procedimiento administrativo, y con toda la\nteor\u00eda, se ha llegado a los concretos expedientes implicados en las ilegalidades urban\u00edsticas,\ncon todos los hitos procedimentales que han sido pertinentes una vez que han sido\nincoados." + } + ], + "description": [ + { + "value": "El presente Trabajo Final de Grado con modalidad B (pr\u00e1cticum) ha tenido como objetivo\ndentro del \u00c1rea de Urbanismo y Vivienda del Ayuntamiento de Corbera de Llobregat, realizar\nun seguimiento de los procedimientos administrativos sobre la Protecci\u00f3n de la Legalidad\nUrban\u00edstica, con el fin de la sistematizaci\u00f3n, ordenaci\u00f3n e identificaci\u00f3n de la informaci\u00f3n\ndocumental contenida en aquellos expedientes resultantes de incoaci\u00f3n, gestionando la\nidentificaci\u00f3n de los procedimientos administrativos, asegurando de esta manera la\nresoluci\u00f3n futura en t\u00e9rminos de validez y eficacia.\nEn el desarrollo de este proyecto, se har\u00e1 referencia a las normativas aplicadas a la\nProtecci\u00f3n de la Legalidad Urban\u00edstica, que tienen por finalidad prevenir e impedir cualquier\nforma de transgresi\u00f3n de la legalidad jur\u00eddico-urban\u00edstica y, en caso de llegar a producirse\nesta, restaurar la realidad urban\u00edstica infringida mediante la reposici\u00f3n de la realidad f\u00edsica\nalterada o trasformada al estado anterior a la actuaci\u00f3n ilegal y, en su caso, la anulaci\u00f3n de\nlos actos administrativos en los que pueda ampararse dicha actuaci\u00f3n ilegal.\nPara dar mejor compresi\u00f3n a todo lo que es el procedimiento administrativo, y con toda la\nteor\u00eda, se ha llegado a los concretos expedientes implicados en las ilegalidades urban\u00edsticas,\ncon todos los hitos procedimentales que han sido pertinentes una vez que han sido\nincoados." + } + ], + "language": { + "classid": "eng", + "classname": "English", + "schemeid": "dnet:languages", + "schemename": "dnet:languages" + }, + "title": [ + { + "qualifier": { + "classid": "main title", + "classname": "main title", + "schemeid": "dnet:dataCite_title", + "schemename": "dnet:dataCite_title" + }, + "value": "Protecci\u00f3n de la legalidad urban\u00edstica" + } + ], + "relevantdate": [ + { + "qualifier": { + "classid": "main title", + "classname": "main title", + "schemeid": "dnet:dataCite_title", + "schemename": "dnet:dataCite_title" + }, + "value": "Protecci\u00f3n de la legalidad urban\u00edstica" + } + ], + "journal": { + "name": "name", + "issnPrinted": "iss", + "issnOnline": "a", + "issnLinking": "l", + "dataInfo": { + "inferred": true, + "deletedbyinference": false, + "trust": "1.0", + "inferenceprovenance": "provenance", + "provenanceaction": { + "classid": "classId", + "classname": "className", + "dataInfo": { + "inferred": true, + "deletedbyinference": false, + "trust": "1.0", + "inferenceprovenance": "provenance", + "provenanceaction": { + "classid": "classId", + "classname": "className" + }, + "invisible": false + } + }, + "invisible": false + }, + "ep": "a", + "iss": "iss", + "sp": "sp", + "vol": "vol", + "edition": "ed", + "conferenceplace": "cp", + "conferencedate": "cd" + }, + "format": [ + { + "value": "application/pdf" + }, + { + "value": "application/pdf" + } + ], + "resulttype": { + "classid": "publication", + "classname": "publication", + "schemeid": "dnet:result_typologies", + "schemename": "dnet:result_typologies" + }, + "author": [ + { + "fullname": "Romero Romero, Radexy", + "surname": "Romero Romero", + "name": "Radexy", + "rank": 1 + } + ], + "dateofacceptance": { + "value": "2014-07-01" + }, + "contributor": [ + { + "value": "Universitat Polit\u00e8cnica de Catalunya. Departament d'Organitzaci\u00f3 d'Empreses" + }, + { + "value": "Larrubia Garc\u00eda, Yolanda" + }, + { + "value": "Universitat Polit\u00e8cnica de Catalunya. Departament d'Organitzaci\u00f3 d'Empreses" + }, + { + "value": "Larrubia Garc\u00eda, Yolanda" + } + ], + "subject": [ + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": ":Edificaci\u00f3 [\u00c0rees tem\u00e0tiques de la UPC]" + }, + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": "City planning and redevelopment law" + }, + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": "Cities and towns" + }, + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": "Dret urban\u00edstic -- Legislaci\u00f3 -- Catalunya -- Corbera de Llobregat" + }, + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": "Urbanisme -- Catalunya -- Corbera de Llobregat" + } + ] + }, + "externalreference": { + "sitename": "siteName", + "label": "label", + "url": "url", + "description": "description", + "qualifier": { + "classid": "classId", + "classname": "className" + }, + "refidentifier": "refId", + "query": "query", + "dataInfo": { + "inferred": true, + "deletedbyinference": false, + "trust": "1.0", + "inferenceprovenance": "provenance", + "provenanceaction": { + "classid": "classId", + "classname": "className" + }, + "invisible": false + } + } + }, + "children": [ + { + "dateoftransformation": "2019-08-03T13:39:00.984Z", + "originalId": [ + "oai:upcommons.upc.edu:2099.1/24887" + ], + "oaiprovenance": { + "originDescription": { + "metadataNamespace": "http://www.openarchives.org/OAI/2.0/oai_dc/", + "harvestDate": "2019-03-12T13:55:05.808Z", + "baseURL": "http://upcommons.upc.edu/oai/openaire", + "datestamp": "2019-03-06T06:47:38Z", + "altered": true, + "identifier": "oai:upcommons.upc.edu:2099.1/24887" + } + }, + "result": { + "instance": [ + { + "hostedby": { + "key": "10|opendoar____::966b6dfb6b0819cc10644bea3115cf20", + "value": "UPCommons. Portal del coneixement obert de la UPC" + }, + "url": [ + "http://hdl.handle.net/2099.1/24887" + ], + "dateofacceptance": { + "value": "2014-07-01" + }, + "collectedfrom": { + "key": "10|opendoar____::966b6dfb6b0819cc10644bea3115cf20", + "value": "UPCommons. Portal del coneixement obert de la UPC" + }, + "accessright": { + "classid": "RESTRICTED", + "classname": "Restricted", + "schemeid": "dnet:access_modes", + "schemename": "dnet:access_modes" + }, + "instancetype": { + "classid": "0008", + "classname": "Bachelor thesis", + "schemeid": "dnet:publication_resource", + "schemename": "dnet:publication_resource" + } + } + ], + "metadata": { + "publisher": { + "value": "Universitat Polit\u00e8cnica de Catalunya" + }, + "embargoenddate": { + "value": "" + }, + "description": [ + { + "value": "El presente Trabajo Final de Grado con modalidad B (pr\u00e1cticum) ha tenido como objetivo\ndentro del \u00c1rea de Urbanismo y Vivienda del Ayuntamiento de Corbera de Llobregat, realizar\nun seguimiento de los procedimientos administrativos sobre la Protecci\u00f3n de la Legalidad\nUrban\u00edstica, con el fin de la sistematizaci\u00f3n, ordenaci\u00f3n e identificaci\u00f3n de la informaci\u00f3n\ndocumental contenida en aquellos expedientes resultantes de incoaci\u00f3n, gestionando la\nidentificaci\u00f3n de los procedimientos administrativos, asegurando de esta manera la\nresoluci\u00f3n futura en t\u00e9rminos de validez y eficacia.\nEn el desarrollo de este proyecto, se har\u00e1 referencia a las normativas aplicadas a la\nProtecci\u00f3n de la Legalidad Urban\u00edstica, que tienen por finalidad prevenir e impedir cualquier\nforma de transgresi\u00f3n de la legalidad jur\u00eddico-urban\u00edstica y, en caso de llegar a producirse\nesta, restaurar la realidad urban\u00edstica infringida mediante la reposici\u00f3n de la realidad f\u00edsica\nalterada o trasformada al estado anterior a la actuaci\u00f3n ilegal y, en su caso, la anulaci\u00f3n de\nlos actos administrativos en los que pueda ampararse dicha actuaci\u00f3n ilegal.\nPara dar mejor compresi\u00f3n a todo lo que es el procedimiento administrativo, y con toda la\nteor\u00eda, se ha llegado a los concretos expedientes implicados en las ilegalidades urban\u00edsticas,\ncon todos los hitos procedimentales que han sido pertinentes una vez que han sido\nincoados." + } + ], + "language": { + "classid": "eng", + "classname": "English", + "schemeid": "dnet:languages", + "schemename": "dnet:languages" + }, + "title": [ + { + "qualifier": { + "classid": "main title", + "classname": "main title", + "schemeid": "dnet:dataCite_title", + "schemename": "dnet:dataCite_title" + }, + "value": "Protecci\u00f3n de la legalidad urban\u00edstica" + } + ], + "resourcetype": { + "classid": "0008", + "classname": "Bachelor thesis", + "schemeid": "dnet:publication_resource", + "schemename": "dnet:publication_resource" + }, + "journal": { + "name": "name", + "issnPrinted": "iss", + "issnOnline": "a", + "issnLinking": "l", + "dataInfo": { + "inferred": true, + "deletedbyinference": false, + "trust": "1.0", + "inferenceprovenance": "provenance", + "provenanceaction": { + "classid": "classId", + "classname": "className", + "dataInfo": { + "inferred": true, + "deletedbyinference": false, + "trust": "1.0", + "inferenceprovenance": "provenance", + "provenanceaction": { + "classid": "classId", + "classname": "className" + }, + "invisible": false + } + }, + "invisible": false + }, + "ep": "a", + "iss": "iss", + "sp": "sp", + "vol": "vol", + "edition": "ed", + "conferenceplace": "cp", + "conferencedate": "cd" + }, + "format": [ + { + "value": "application/pdf" + }, + { + "value": "application/pdf" + } + ], + "resulttype": { + "classid": "publication", + "classname": "publication", + "schemeid": "dnet:result_typologies", + "schemename": "dnet:result_typologies" + }, + "author": [ + { + "fullname": "Romero Romero, Radexy", + "surname": "Romero Romero", + "name": "Radexy", + "rank": 1 + } + ], + "dateofacceptance": { + "value": "2014-07-01" + }, + "contributor": [ + { + "value": "Universitat Polit\u00e8cnica de Catalunya. Departament d'Organitzaci\u00f3 d'Empreses" + }, + { + "value": "Larrubia Garc\u00eda, Yolanda" + } + ], + "subject": [ + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": ":Edificaci\u00f3 [\u00c0rees tem\u00e0tiques de la UPC]" + }, + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": "Cities and towns" + }, + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": "City planning and redevelopment law" + }, + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": "Dret urban\u00edstic -- Legislaci\u00f3 -- Catalunya -- Corbera de Llobregat" + }, + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": "Urbanisme -- Catalunya -- Corbera de Llobregat" + } + ] + } + }, + "collectedfrom": [ + { + "key": "10|opendoar____::966b6dfb6b0819cc10644bea3115cf20", + "value": "UPCommons. Portal del coneixement obert de la UPC" + } + ], + "dateofcollection": "2019-03-12T13:55:05.808Z", + "type": "result", + "id": "50|od______3484::00000016db3c44b536e40fde7dc8876b" + }, + { + "dateoftransformation": "2019-08-03T09:55:13.548Z", + "originalId": [ + "oai:recercat.cat:2072/246120" + ], + "oaiprovenance": { + "originDescription": { + "metadataNamespace": "http://www.openarchives.org/OAI/2.0/oai_dc/", + "harvestDate": "2019-03-19T09:28:27.727Z", + "baseURL": "http://oai.recercat.cat/request", + "datestamp": "2019-03-11T00:06:45Z", + "altered": true, + "identifier": "oai:recercat.cat:2072/246120" + } + }, + "result": { + "instance": [ + { + "url": [ + "http://hdl.handle.net/2099.1/24887" + ], + "collectedfrom": { + "key": "10|opendoar____::7a614fd06c325499f1680b9896beedeb", + "value": "Research Repository of Catalonia" + }, + "hostedby": { + "key": "10|opendoar____::7a614fd06c325499f1680b9896beedeb", + "value": "Research Repository of Catalonia" + }, + "accessright": { + "classid": "OPEN", + "classname": "Open Access", + "schemeid": "dnet:access_modes", + "schemename": "dnet:access_modes" + }, + "instancetype": { + "classid": "0008", + "classname": "Bachelor thesis", + "schemeid": "dnet:publication_resource", + "schemename": "dnet:publication_resource" + } + } + ], + "metadata": { + "publisher": { + "value": "Universitat Polit\u00e8cnica de Catalunya" + }, + "description": [ + { + "value": "El presente Trabajo Final de Grado con modalidad B (pr\u00e1cticum) ha tenido como objetivo\ndentro del \u00c1rea de Urbanismo y Vivienda del Ayuntamiento de Corbera de Llobregat, realizar\nun seguimiento de los procedimientos administrativos sobre la Protecci\u00f3n de la Legalidad\nUrban\u00edstica, con el fin de la sistematizaci\u00f3n, ordenaci\u00f3n e identificaci\u00f3n de la informaci\u00f3n\ndocumental contenida en aquellos expedientes resultantes de incoaci\u00f3n, gestionando la\nidentificaci\u00f3n de los procedimientos administrativos, asegurando de esta manera la\nresoluci\u00f3n futura en t\u00e9rminos de validez y eficacia.\nEn el desarrollo de este proyecto, se har\u00e1 referencia a las normativas aplicadas a la\nProtecci\u00f3n de la Legalidad Urban\u00edstica, que tienen por finalidad prevenir e impedir cualquier\nforma de transgresi\u00f3n de la legalidad jur\u00eddico-urban\u00edstica y, en caso de llegar a producirse\nesta, restaurar la realidad urban\u00edstica infringida mediante la reposici\u00f3n de la realidad f\u00edsica\nalterada o trasformada al estado anterior a la actuaci\u00f3n ilegal y, en su caso, la anulaci\u00f3n de\nlos actos administrativos en los que pueda ampararse dicha actuaci\u00f3n ilegal.\nPara dar mejor compresi\u00f3n a todo lo que es el procedimiento administrativo, y con toda la\nteor\u00eda, se ha llegado a los concretos expedientes implicados en las ilegalidades urban\u00edsticas,\ncon todos los hitos procedimentales que han sido pertinentes una vez que han sido\nincoados." + } + ], + "language": { + "classid": "eng", + "classname": "English", + "schemeid": "dnet:languages", + "schemename": "dnet:languages" + }, + "author": [ + { + "fullname": "Romero Romero, Radexy", + "surname": "Romero Romero", + "name": "Radexy", + "rank": 1 + } + ], + "journal": { + "name": "name", + "issnPrinted": "iss", + "issnOnline": "a", + "issnLinking": "l", + "dataInfo": { + "inferred": true, + "deletedbyinference": false, + "trust": "1.0", + "inferenceprovenance": "provenance", + "provenanceaction": { + "classid": "classId", + "classname": "className", + "dataInfo": { + "inferred": true, + "deletedbyinference": false, + "trust": "1.0", + "inferenceprovenance": "provenance", + "provenanceaction": { + "classid": "classId", + "classname": "className" + }, + "invisible": false + } + }, + "invisible": false + }, + "ep": "a", + "iss": "iss", + "sp": "sp", + "vol": "vol", + "edition": "ed", + "conferenceplace": "cp", + "conferencedate": "cd" + }, + "title": [ + { + "qualifier": { + "classid": "main title", + "classname": "main title", + "schemeid": "dnet:dataCite_title", + "schemename": "dnet:dataCite_title" + }, + "value": "Protecci\u00f3n de la legalidad urban\u00edstica" + } + ], + "resulttype": { + "classid": "publication", + "classname": "publication", + "schemeid": "dnet:result_typologies", + "schemename": "dnet:result_typologies" + }, + "contributor": [ + { + "value": "Universitat Polit\u00e8cnica de Catalunya. Departament d'Organitzaci\u00f3 d'Empreses" + }, + { + "value": "Larrubia Garc\u00eda, Yolanda" + } + ], + "subject": [ + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": ":Edificaci\u00f3 [\u00c0rees tem\u00e0tiques de la UPC]" + }, + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": "Cities and towns" + }, + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": "City planning and redevelopment law" + }, + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": "Dret urban\u00edstic -- Legislaci\u00f3 -- Catalunya -- Corbera de Llobregat" + }, + { + "qualifier": { + "classid": "keyword", + "classname": "keyword", + "schemeid": "dnet:result_subject", + "schemename": "dnet:result_subject" + }, + "value": "Urbanisme -- Catalunya -- Corbera de Llobregat" + } + ] + } + }, + "collectedfrom": [ + { + "key": "10|opendoar____::7a614fd06c325499f1680b9896beedeb", + "value": "Research Repository of Catalonia" + } + ], + "dateofcollection": "2019-03-19T09:28:27.727Z", + "type": "result", + "id": "50|od_______272::9e27fcd08fceab2c5043e825ac72cf45" + } + ], + "extraInfo": { + "name": "eInfo", + "typology": "tipology", + "provenance": "prov", + "trust": "0.9", + "value": "abb" + }, + "oaiprovenance": { + "originDescription": { + "metadataNamespace": "http://www.openarchives.org/OAI/2.0/oai_dc/", + "harvestDate": "2019-03-19T09:28:27.727Z", + "baseURL": "http://oai.recercat.cat/request", + "datestamp": "2019-03-11T00:06:45Z", + "altered": true, + "identifier": "oai:recercat.cat:2072/246120" + } + } + }, + "rel": { + "subRelType": "affiliation", + "relClass": "isAuthorInstitutionOf", + "target": "50|dedup_wf_001::1fc35b70379be0de4eb30ba700b0e2c8", + "relType": "resultOrganization", + "source": "20|____________::14bcdabd409ac067c7c90ecf15599ef7", + "child": false, + "datasourceOrganization": { + "provision": { + "relMetadata": { + "semantics": { + "classid": "isAuthorInstitutionOf", + "classname": "isAuthorInstitutionOf", + "schemename": "dnet:result_organization_relations", + "schemeid": "dnet:result_organization_relations" + } + } + } + }, + "projectOrganization": { + "participation": { + "relMetadata": { + "semantics": { + "classid": "isAuthorInstitutionOf", + "classname": "isAuthorInstitutionOf", + "schemename": "dnet:result_organization_relations", + "schemeid": "dnet:result_organization_relations" + } + } + } + }, + "resultOrganization": { + "affiliation": { + "relMetadata": { + "semantics": { + "classid": "isAuthorInstitutionOf", + "classname": "isAuthorInstitutionOf", + "schemename": "dnet:result_organization_relations", + "schemeid": "dnet:result_organization_relations" + } + } + } + }, + "resultProject": { + "outcome": { + "relMetadata": { + "semantics": { + "classid": "isAuthorInstitutionOf", + "classname": "isAuthorInstitutionOf", + "schemename": "dnet:result_organization_relations", + "schemeid": "dnet:result_organization_relations" + } + } + } + }, + "resultResult": { + "similarity": { + "type": "STANDARD", + "relMetadata": { + "semantics": { + "classid": "hasAmongTopNSimilarDocuments", + "classname": "hasAmongTopNSimilarDocuments", + "schemename": "dnet:result_result_relations", + "schemeid": "dnet:result_result_relations" + } + }, + "similarity": 0.79513913 + }, + "publicationDataset": { + "relMetadata": { + "semantics": { + "classid": "isRelatedTo", + "classname": "isRelatedTo", + "schemeid": "dnet:result_result_relations", + "schemename": "dnet:result_result_relations" + } + } + }, + "dedup": { + "relMetadata": { + "semantics": { + "classid": "isMergedIn", + "classname": "isMergedIn", + "schemeid": "dnet:result_result_relations", + "schemename": "dnet:result_result_relations" + } + } + }, + "dedupSimilarity": { + "relMetadata": { + "semantics": { + "classid": "isSimilarTo", + "classname": "isSimilarTo", + "schemeid": "dnet:result_result_relations", + "schemename": "dnet:result_result_relations" + } + } + }, + "supplement": { + "relMetadata": { + "semantics": { + "classid": "supplement", + "classname": "supplement", + "schemeid": "dnet:result_result_relations", + "schemename": "dnet:result_result_relations" + } + } + }, + "part": { + "relMetadata": { + "semantics": { + "classid": "isPartOf", + "classname": "isPartOf", + "schemeid": "dnet:result_result_relations", + "schemename": "dnet:result_result_relations" + } + } + }, + "relationship": { + "relMetadata": { + "semantics": { + "classid": "isRelatedTo", + "classname": "isRelatedTo", + "schemeid": "dnet:result_result_relations", + "schemename": "dnet:result_result_relations" + } + } + }, + "softwareSoftware": { + "relMetadata": { + "semantics": { + "classid": "isVersionOf", + "classname": "isVersionOf", + "schemeid": "dnet:result_result_relations", + "schemename": "dnet:result_result_relations" + } + } + } + }, + "organizationOrganization": { + "dedup": { + "relMetadata": { + "semantics": { + "classid": "isMergedIn", + "classname": "isMergedIn", + "schemeid": "dnet:result_result_relations", + "schemename": "dnet:result_result_relations" + } + } + }, + "dedupSimilarity": { + "relMetadata": { + "semantics": { + "classid": "isSimilarTo", + "classname": "isSimilarTo", + "schemeid": "dnet:result_result_relations", + "schemename": "dnet:result_result_relations" + } + } + } + }, + "collectedfrom": [ + { + "key": "a", + "value": "b", + "dataInfo": { + "provenanceaction": { + "classid": "iis", + "classname": "iis", + "schemename": "dnet:provenanceActions", + "schemeid": "dnet:provenanceActions" + }, + "trust": "0.9", + "inferred": true, + "inferenceprovenance": "iis::document_affiliations" + } + } + ] + } +} \ No newline at end of file