Project

General

Profile

« Previous | Next » 

Revision 31e57990

Added by Patrick Plitzner about 5 years ago

Adapt imports to tem model changes

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/plantglossary/PlantGlossaryCategoryAsPropertiesImport.java
18 18
import eu.etaxonomy.cdm.common.CdmUtils;
19 19
import eu.etaxonomy.cdm.io.csv.in.CsvImportBase;
20 20
import eu.etaxonomy.cdm.model.common.IdentifiableSource;
21
import eu.etaxonomy.cdm.model.description.Feature;
22 21
import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
22
import eu.etaxonomy.cdm.model.term.DefinedTerm;
23
import eu.etaxonomy.cdm.model.term.TermType;
23 24
import eu.etaxonomy.cdm.model.term.TermVocabulary;
24 25

  
25 26
/**
......
53 54

  
54 55
        String description = currentRecord.get(HEADER_DESCRIPTION);
55 56
        String uri = currentRecord.get(HEADER_URI);
56
        Feature property = Feature.NewInstance(description, label, null);
57
        DefinedTerm property = DefinedTerm.NewInstance(TermType.Property, description, label, null);
57 58
        property.setUri(URI.create(uri));
58 59
        property.setIdInVocabulary(label);
59 60

  
app-import/src/main/java/eu/etaxonomy/cdm/io/plantglossary/PlantGlossaryCategoryImport.java
21 21
import eu.etaxonomy.cdm.model.common.AnnotationType;
22 22
import eu.etaxonomy.cdm.model.common.IdentifiableSource;
23 23
import eu.etaxonomy.cdm.model.common.Language;
24
import eu.etaxonomy.cdm.model.description.State;
24 25
import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
25 26
import eu.etaxonomy.cdm.model.term.TermType;
26 27
import eu.etaxonomy.cdm.model.term.TermVocabulary;
......
56 57
            return;
57 58
        }
58 59

  
59
        TermVocabulary<?> stateVoc = TermVocabulary.NewInstance(
60
        TermVocabulary<State> stateVoc = TermVocabulary.NewInstance(
60 61
                TermType.State,
61 62
                currentRecord.get(HEADER_DESCRIPTION),
62 63
                vocName,
app-import/src/main/java/eu/etaxonomy/cdm/io/plantglossary/PlantGlossaryCsvImportState.java
23 23
import eu.etaxonomy.cdm.model.agent.Team;
24 24
import eu.etaxonomy.cdm.model.common.IdentifiableSource;
25 25
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
26
import eu.etaxonomy.cdm.model.description.Feature;
27 26
import eu.etaxonomy.cdm.model.description.State;
28 27
import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
29 28
import eu.etaxonomy.cdm.model.reference.Reference;
30 29
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
30
import eu.etaxonomy.cdm.model.term.DefinedTerm;
31 31
import eu.etaxonomy.cdm.model.term.TermType;
32 32
import eu.etaxonomy.cdm.model.term.TermVocabulary;
33 33

  
......
39 39
 */
40 40
public class PlantGlossaryCsvImportState extends CsvImportState<PlantGlossaryCsvImportConfigurator> {
41 41

  
42
    private TermVocabulary<Feature> propertyVoc;
42
    private TermVocabulary<DefinedTerm> propertyVoc;
43 43
    private List<TermVocabulary> existingVocabularies = new ArrayList<>();
44 44
    private List<State> existingTerms = new ArrayList<>();
45 45
    private Set<TermVocabulary> vocabularies = new HashSet<>();
......
72 72
        } catch (URISyntaxException e) {
73 73
        }
74 74

  
75
        propertyVoc = TermVocabulary.NewInstance(TermType.Feature, Feature.class);
75
        propertyVoc = TermVocabulary.NewInstance(TermType.Property, DefinedTerm.class);
76 76
        propertyVoc.setLabel("Plant Glossary Properties");
77 77
        propertyVoc.addSource(IdentifiableSource.NewInstance(OriginalSourceType.Import, citation.getTitle(), null, citation, null));
78 78
    }
......
82 82
        super.resetSession();
83 83
    }
84 84

  
85
    public TermVocabulary<Feature> getPropertyVoc() {
85
    public TermVocabulary<DefinedTerm> getPropertyVoc() {
86 86
        return propertyVoc;
87 87
    }
88 88

  
app-import/src/main/java/eu/etaxonomy/cdm/io/plantglossary/kew/KewPlantGlossaryActivator.java
6 6
import org.apache.log4j.Logger;
7 7

  
8 8
import eu.etaxonomy.cdm.app.common.CdmDestinations;
9
import eu.etaxonomy.cdm.database.DatabaseTypeEnum;
9 10
import eu.etaxonomy.cdm.database.DbSchemaValidation;
10 11
import eu.etaxonomy.cdm.database.ICdmDataSource;
11 12
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
......
43 44
	public static void main(String[] args) {
44 45
		KewPlantGlossaryActivator activator = new KewPlantGlossaryActivator();
45 46
		try {
46
//	        ICdmDataSource dataSource = CdmDestinations.makeDestination(DatabaseTypeEnum.MySQL, "127.0.0.1", "empty", 3306, "root", null);
47
	        ICdmDataSource dataSource = CdmDestinations.cdm_additivity_ontology();
47
	        ICdmDataSource dataSource = CdmDestinations.makeDestination(DatabaseTypeEnum.MySQL, "127.0.0.1", "empty", 3306, "root", null);
48
//	        ICdmDataSource dataSource = CdmDestinations.cdm_additivity_ontology();
48 49
            activator.doImport(dataSource);
49 50
        } catch (IOException e) {
50 51
            e.printStackTrace();
app-import/src/main/java/eu/etaxonomy/cdm/io/plantglossary/kew/KewPlantGlossaryCsvImportState.java
16 16
import eu.etaxonomy.cdm.model.agent.Institution;
17 17
import eu.etaxonomy.cdm.model.agent.Person;
18 18
import eu.etaxonomy.cdm.model.common.VerbatimTimePeriod;
19
import eu.etaxonomy.cdm.model.description.Feature;
20 19
import eu.etaxonomy.cdm.model.reference.Reference;
21 20
import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
21
import eu.etaxonomy.cdm.model.term.DefinedTerm;
22 22
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
23 23
import eu.etaxonomy.cdm.model.term.TermType;
24 24
import eu.etaxonomy.cdm.model.term.TermVocabulary;
......
35 35
    private List<TermVocabulary> existingVocabularies = new ArrayList<>();
36 36
    private List<UuidAndTitleCache<DefinedTermBase>> existingTerms = new ArrayList<>();
37 37
    private final Reference citation;
38
    private final TermVocabulary<Feature> structureVoc;
38
    private final TermVocabulary<DefinedTerm> structureVoc;
39 39

  
40 40

  
41 41
    protected KewPlantGlossaryCsvImportState(KewPlantGlossaryCsvImportConfigurator config) {
42 42
        super(config);
43
        structureVoc = TermVocabulary.NewInstance(TermType.Feature);
43
        structureVoc = TermVocabulary.NewInstance(TermType.Structure, DefinedTerm.class);
44 44
        structureVoc.setLabel("Structures");
45 45

  
46 46
        citation = ReferenceFactory.newBook();
......
66 66
        return existingTerms.stream().anyMatch(term->term.getTitleCache().equals(termName));
67 67
    }
68 68

  
69
    TermVocabulary<Feature> getStructureVoc() {
69
    TermVocabulary<DefinedTerm> getStructureVoc() {
70 70
        return structureVoc;
71 71
    }
72 72

  
app-import/src/main/java/eu/etaxonomy/cdm/io/plantglossary/kew/KewPlantGlossaryImport.java
17 17
import eu.etaxonomy.cdm.common.CdmUtils;
18 18
import eu.etaxonomy.cdm.io.csv.in.CsvImportBase;
19 19
import eu.etaxonomy.cdm.model.common.IdentifiableSource;
20
import eu.etaxonomy.cdm.model.description.Feature;
21 20
import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
21
import eu.etaxonomy.cdm.model.term.DefinedTerm;
22
import eu.etaxonomy.cdm.model.term.TermType;
22 23
import eu.etaxonomy.cdm.model.term.TermVocabulary;
23 24

  
24 25
/**
......
52 53
            return;
53 54
        }
54 55

  
55
        Feature structure = Feature.NewInstance(currentRecord.get(HEADER_DEFINITION), termLabel, null);
56
        DefinedTerm structure = DefinedTerm.NewInstance(TermType.Structure, currentRecord.get(HEADER_DEFINITION), termLabel, null);
56 57
        structure.setIdInVocabulary(termLabel);
57 58

  
58 59
        TermVocabulary vocabulary = importState.getStructureVoc();

Also available in: Unified diff