forked from D-Net/dnet-hadoop
Compare commits
No commits in common. "22eaf211e82931174dc1f34be1bf7fab2feab7ca" and "cd9c51fd7a139cb5b410af8f83ce855c6f49aaee" have entirely different histories.
22eaf211e8
...
cd9c51fd7a
|
@ -25,10 +25,6 @@
|
|||
/build
|
||||
spark-warehouse
|
||||
/**/job-override.properties
|
||||
<<<<<<< HEAD
|
||||
/**/*.log
|
||||
=======
|
||||
/**/*.log
|
||||
/**/.factorypath
|
||||
|
||||
>>>>>>> upstream/master
|
||||
|
|
0
dhp-build/dhp-build-assembly-resources/src/main/resources/assemblies/oozie-installer.xml
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/assemblies/oozie-installer.xml
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/assemblies/tests.xml
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/assemblies/tests.xml
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/commands/get_working_dir.sh
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/commands/get_working_dir.sh
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/commands/print_working_dir.sh
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/commands/print_working_dir.sh
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/commands/readme.markdown
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/commands/readme.markdown
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/commands/run_workflow.sh
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/commands/run_workflow.sh
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/commands/upload_workflow.sh
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/commands/upload_workflow.sh
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/project-default.properties
Executable file → Normal file
0
dhp-build/dhp-build-assembly-resources/src/main/resources/project-default.properties
Executable file → Normal file
0
dhp-build/dhp-build-properties-maven-plugin/src/main/java/eu/dnetlib/maven/plugin/properties/GenerateOoziePropertiesMojo.java
Executable file → Normal file
0
dhp-build/dhp-build-properties-maven-plugin/src/main/java/eu/dnetlib/maven/plugin/properties/GenerateOoziePropertiesMojo.java
Executable file → Normal file
0
dhp-build/dhp-build-properties-maven-plugin/src/test/resources/eu/dnetlib/maven/plugin/properties/included.properties
Executable file → Normal file
0
dhp-build/dhp-build-properties-maven-plugin/src/test/resources/eu/dnetlib/maven/plugin/properties/included.properties
Executable file → Normal file
0
dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_aosp.xml
Executable file → Normal file
0
dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_aosp.xml
Executable file → Normal file
0
dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_dnet.xml
Executable file → Normal file
0
dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_dnet.xml
Executable file → Normal file
0
dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_google.xml
Executable file → Normal file
0
dhp-build/dhp-code-style/src/main/resources/eclipse/formatter_google.xml
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/application/ArgumentApplicationParser.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/application/ArgumentApplicationParser.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/application/OptionsParameter.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/application/OptionsParameter.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/application/SparkScalaApplication.scala
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/application/SparkScalaApplication.scala
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/collection/ApiDescriptor.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/collection/ApiDescriptor.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/FunctionalInterfaceSupport.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/FunctionalInterfaceSupport.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/GraphResultMapper.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/GraphResultMapper.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/SparkSessionSupport.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/SparkSessionSupport.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/aggregation/AggregatorReport.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/aggregation/AggregatorReport.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/InputStreamRequestBody.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/InputStreamRequestBody.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/MissingConceptDoiException.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/MissingConceptDoiException.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/ZenodoAPIClient.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/ZenodoAPIClient.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/Community.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/Community.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/Creator.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/Creator.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/Grant.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/Grant.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/Links.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/Links.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/Metadata.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/Metadata.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/PrereserveDoi.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/PrereserveDoi.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/RelatedIdentifier.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/RelatedIdentifier.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/ZenodoModel.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/ZenodoModel.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/ZenodoModelList.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/api/zenodo/ZenodoModelList.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/collection/CollectorException.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/collection/CollectorException.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/collection/GetCSV.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/collection/GetCSV.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/collection/HttpClientParams.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/collection/HttpClientParams.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/collection/HttpConnector2.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/collection/HttpConnector2.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/rest/DNetRestClient.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/rest/DNetRestClient.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/vocabulary/Vocabulary.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/vocabulary/Vocabulary.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/vocabulary/VocabularyGroup.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/vocabulary/VocabularyGroup.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/vocabulary/VocabularyTerm.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/common/vocabulary/VocabularyTerm.java
Executable file → Normal file
|
@ -120,17 +120,9 @@ public class AuthorMerger {
|
|||
}
|
||||
|
||||
public static String pidToComparableString(StructuredProperty pid) {
|
||||
<<<<<<< HEAD
|
||||
if (pid == null)
|
||||
return "";
|
||||
return (pid.getQualifier() != null
|
||||
? pid.getQualifier().getClassid() != null ? pid.getQualifier().getClassid().toLowerCase() : ""
|
||||
: "")
|
||||
=======
|
||||
final String classid = pid.getQualifier().getClassid() != null ? pid.getQualifier().getClassid().toLowerCase()
|
||||
: "";
|
||||
return (pid.getQualifier() != null ? classid : "")
|
||||
>>>>>>> upstream/master
|
||||
+ (pid.getValue() != null ? pid.getValue().toLowerCase() : "");
|
||||
}
|
||||
|
||||
|
|
0
dhp-common/src/main/java/eu/dnetlib/dhp/parser/utility/VtdException.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/parser/utility/VtdException.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/parser/utility/VtdUtilityParser.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/parser/utility/VtdUtilityParser.java
Executable file → Normal file
36
dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java
Executable file → Normal file
36
dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/GraphCleaningFunctions.java
Executable file → Normal file
|
@ -16,8 +16,6 @@ import com.github.sisyphsu.dateparser.DateParserUtils;
|
|||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Sets;
|
||||
|
||||
import eu.dnetlib.dhp.common.vocabulary.Vocabulary;
|
||||
import eu.dnetlib.dhp.common.vocabulary.VocabularyGroup;
|
||||
import eu.dnetlib.dhp.schema.common.ModelConstants;
|
||||
import eu.dnetlib.dhp.schema.common.ModelSupport;
|
||||
import eu.dnetlib.dhp.schema.oaf.*;
|
||||
|
@ -117,7 +115,7 @@ public class GraphCleaningFunctions extends CleaningFunctions {
|
|||
return true;
|
||||
}
|
||||
|
||||
public static <T extends Oaf> T cleanup(T value, VocabularyGroup vocs) {
|
||||
public static <T extends Oaf> T cleanup(T value) {
|
||||
if (value instanceof Datasource) {
|
||||
// nothing to clean here
|
||||
} else if (value instanceof Project) {
|
||||
|
@ -236,38 +234,6 @@ public class GraphCleaningFunctions extends CleaningFunctions {
|
|||
if (Objects.nonNull(r.getInstance())) {
|
||||
|
||||
for (Instance i : r.getInstance()) {
|
||||
if (!vocs.termExists(ModelConstants.DNET_PUBLICATION_RESOURCE, i.getInstancetype().getClassid())) {
|
||||
if (r instanceof Publication) {
|
||||
i
|
||||
.setInstancetype(
|
||||
OafMapperUtils
|
||||
.qualifier(
|
||||
"0038", "Other literature type", ModelConstants.DNET_PUBLICATION_RESOURCE,
|
||||
ModelConstants.DNET_PUBLICATION_RESOURCE));
|
||||
} else if (r instanceof Dataset) {
|
||||
i
|
||||
.setInstancetype(
|
||||
OafMapperUtils
|
||||
.qualifier(
|
||||
"0039", "Other dataset type", ModelConstants.DNET_PUBLICATION_RESOURCE,
|
||||
ModelConstants.DNET_PUBLICATION_RESOURCE));
|
||||
} else if (r instanceof Software) {
|
||||
i
|
||||
.setInstancetype(
|
||||
OafMapperUtils
|
||||
.qualifier(
|
||||
"0040", "Other software type", ModelConstants.DNET_PUBLICATION_RESOURCE,
|
||||
ModelConstants.DNET_PUBLICATION_RESOURCE));
|
||||
} else if (r instanceof OtherResearchProduct) {
|
||||
i
|
||||
.setInstancetype(
|
||||
OafMapperUtils
|
||||
.qualifier(
|
||||
"0020", "Other ORP type", ModelConstants.DNET_PUBLICATION_RESOURCE,
|
||||
ModelConstants.DNET_PUBLICATION_RESOURCE));
|
||||
}
|
||||
}
|
||||
|
||||
if (Objects.nonNull(i.getPid())) {
|
||||
i.setPid(processPidCleaning(i.getPid()));
|
||||
}
|
||||
|
|
0
dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtils.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtils.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/utils/ISLookupClientFactory.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/utils/ISLookupClientFactory.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/AbstractExtensionFunction.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/AbstractExtensionFunction.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/ExtractYear.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/ExtractYear.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/NormalizeDate.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/NormalizeDate.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/SaxonTransformerFactory.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/dhp/utils/saxon/SaxonTransformerFactory.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/scholexplorer/relation/RelInfo.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/scholexplorer/relation/RelInfo.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/scholexplorer/relation/RelationMapper.java
Executable file → Normal file
0
dhp-common/src/main/java/eu/dnetlib/scholexplorer/relation/RelationMapper.java
Executable file → Normal file
0
dhp-common/src/main/resources/eu/dnetlib/dhp/schema/oaf/utils/pid_blacklist.json
Executable file → Normal file
0
dhp-common/src/main/resources/eu/dnetlib/dhp/schema/oaf/utils/pid_blacklist.json
Executable file → Normal file
0
dhp-common/src/main/resources/eu/dnetlib/scholexplorer/relation/relations.json
Executable file → Normal file
0
dhp-common/src/main/resources/eu/dnetlib/scholexplorer/relation/relations.json
Executable file → Normal file
0
dhp-common/src/test/java/eu/dnetlib/dhp/application/ArgumentApplicationParserTest.java
Executable file → Normal file
0
dhp-common/src/test/java/eu/dnetlib/dhp/application/ArgumentApplicationParserTest.java
Executable file → Normal file
0
dhp-common/src/test/java/eu/dnetlib/dhp/common/SparkSessionSupportTest.java
Executable file → Normal file
0
dhp-common/src/test/java/eu/dnetlib/dhp/common/SparkSessionSupportTest.java
Executable file → Normal file
0
dhp-common/src/test/java/eu/dnetlib/dhp/common/api/ZenodoAPIClientTest.java
Executable file → Normal file
0
dhp-common/src/test/java/eu/dnetlib/dhp/common/api/ZenodoAPIClientTest.java
Executable file → Normal file
0
dhp-common/src/test/java/eu/dnetlib/dhp/oa/merge/AuthorMergerTest.java
Executable file → Normal file
0
dhp-common/src/test/java/eu/dnetlib/dhp/oa/merge/AuthorMergerTest.java
Executable file → Normal file
0
dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtilsTest.java
Executable file → Normal file
0
dhp-common/src/test/java/eu/dnetlib/dhp/schema/oaf/utils/OafMapperUtilsTest.java
Executable file → Normal file
0
dhp-common/src/test/java/eu/dnetlib/scholexplorer/relation/RelationMapperTest.java
Executable file → Normal file
0
dhp-common/src/test/java/eu/dnetlib/scholexplorer/relation/RelationMapperTest.java
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/application/parameters.json
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/application/parameters.json
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/dhp/common/api/metadata.json
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/dhp/common/api/metadata.json
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/dhp/common/api/newDeposition
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/dhp/common/api/newDeposition
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/dhp/oa/merge/publications_with_authors.json
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/dhp/oa/merge/publications_with_authors.json
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_1.json
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_1.json
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_2.json
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/dataset_2.json
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_1.json
Executable file → Normal file
0
dhp-common/src/test/resources/eu/dnetlib/dhp/schema/oaf/utils/publication_1.json
Executable file → Normal file
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue