Project

General

Profile

« Previous | Next » 

Revision 916f20cf

Added by Andreas Müller almost 13 years ago

Make "formerly" presenceTerms absenceTerms (#2373) and added Gazetteer to !ReferenceSystems (#2374)

View differences:

.gitattributes
1037 1037
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/TermUpdater_30_31.java -text
1038 1038
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/TermUpdater_311_312.java -text
1039 1039
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/TermUpdater_312_313.java -text
1040
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/TermUpdater_313_314.java -text
1040 1041
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/TermUpdater_31_311.java -text
1041 1042
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/AbstractBeanInitializer.java -text
1042 1043
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/AutoPropertyInitializer.java -text
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmMetaData.java
79 79
	 * 
80 80
	 * The last number represents the date of change.
81 81
	 */
82
	private static final String termsVersion = "3.0.1.3.201103210000";
82
	private static final String termsVersion = "3.0.1.4.201105100000";
83 83
	
84 84
	
85 85
	public enum MetaDataPropertyName{
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/AbsenceTerm.java
53 53
	private static final UUID uuidNF=UUID.fromString("61cee840-801e-41d8-bead-015ad866c2f1");
54 54
	private static final UUID uuidIF=UUID.fromString("aeec2947-2700-4623-8e32-9e3a430569d1");
55 55
	private static final UUID uuidCF=UUID.fromString("9d4d3431-177a-4abe-8e4b-1558573169d6");
56
	private static final UUID uuidNE=UUID.fromString("5c397f7b-59ef-4c11-a33c-45691ceda91b");
57
	private static final UUID uuidIE=UUID.fromString("b74dc30b-ee93-496d-8c00-4d00abae1ec7");
56 58
	
57 59

  
58 60
	/** 
......
140 142
		return getTermByUuid(uuidIF);
141 143
	}
142 144

  
145
	public static final AbsenceTerm NATIVE_FORMERLY_NATIVE(){
146
		return getTermByUuid(uuidNE);
147
	}
148

  
149
	public static final AbsenceTerm INTRODUCED_FORMERLY_INTRODUCED(){
150
		return getTermByUuid(uuidIE);
151
	}
152
	
143 153
	//TODO make automatic like in TDWGArea
144 154
	public static AbsenceTerm getPresenceTermByAbbreviation(String abbrev) { 
145 155
		if (abbrev == null) { throw new NullPointerException("abbrev is 'null' in getPresenceTermByAbbreviation");
146 156
		} else if (abbrev.equalsIgnoreCase("cf")) { return AbsenceTerm.CULTIVATED_REPORTED_IN_ERROR();
147 157
		} else if (abbrev.equalsIgnoreCase("if")) { return AbsenceTerm.INTRODUCED_REPORTED_IN_ERROR();
148 158
		} else if (abbrev.equalsIgnoreCase("nf")) { return AbsenceTerm.NATIVE_REPORTED_IN_ERROR();
159
		} else if (abbrev.equalsIgnoreCase("ne")) { return AbsenceTerm.NATIVE_FORMERLY_NATIVE();
160
		} else if (abbrev.equalsIgnoreCase("ie")) { return AbsenceTerm.INTRODUCED_FORMERLY_INTRODUCED();
149 161
		} else {
150 162
			logger.warn("Unknown absence status term: " + abbrev);
151 163
			return null;
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceTerm.java
53 53
	
54 54
	private static final UUID uuidN=UUID.fromString("ddeac4f2-d8fa-43b8-ad7e-ca13abdd32c7");
55 55
	private static final UUID uuidNQ=UUID.fromString("925662c1-bb10-459a-8c53-da5a738ac770");
56
	private static final UUID uuidNE=UUID.fromString("8ad9e9df-49cd-4b6a-880b-51ec4de4ce32");
57 56
	private static final UUID uuidND=UUID.fromString("310373bf-7df4-4d02-8cb3-bcc7448805fc");
58 57
	private static final UUID uuidC=UUID.fromString("9eb99fe6-59e2-4445-8e6a-478365bd0fa9");
59 58
	private static final UUID uuidI=UUID.fromString("643cf9d1-a5f1-4622-9837-82ef961e880b");
60 59
	private static final UUID uuidIQ=UUID.fromString("83eb0aa0-1a45-495a-a3ca-bf6958b74366");
61
	private static final UUID uuidIE=UUID.fromString("2522c527-e488-45d4-87df-a5a5ef0fdbbd");
62 60
	private static final UUID uuidID=UUID.fromString("0c54761e-4887-4788-9dfa-7190c88746e3");
63 61
	private static final UUID uuidIP=UUID.fromString("da159544-b0dd-4599-a9c9-640826af8c17");
64 62
	private static final UUID uuidIA=UUID.fromString("42946bd6-9c22-45ad-a910-7427e8f60bfd");
......
158 156
		return getTermByUuid(uuidID);
159 157
	}
160 158

  
161
	public static final PresenceTerm INTRODUCED_FORMERLY_INTRODUCED(){
162
		return getTermByUuid(uuidIE);
163
	}
164
		public static final PresenceTerm INTRODUCED_NATURALIZED(){
159
	public static final PresenceTerm INTRODUCED_NATURALIZED(){
165 160
		return getTermByUuid(uuidIN);
166 161
	}
167 162

  
......
180 175
	public static final PresenceTerm NATIVE_DOUBTFULLY_NATIVE(){
181 176
		return getTermByUuid(uuidND);
182 177
	}
183

  
184
	public static final PresenceTerm NATIVE_FORMERLY_NATIVE(){
185
		return getTermByUuid(uuidNE);
186
	}
187 178
	
188 179
	public static final PresenceTerm NATIVE_PRESENCE_QUESTIONABLE(){
189 180
		return getTermByUuid(uuidNQ);
......
206 197
		} else if (abbrev.equalsIgnoreCase("ia")) { return PresenceTerm.INTRODUCED_ADVENTITIOUS();
207 198
		} else if (abbrev.equalsIgnoreCase("ic")) { return PresenceTerm.INTRODUCED_CULTIVATED();
208 199
		} else if (abbrev.equalsIgnoreCase("id")) { return PresenceTerm.INTRODUCED_DOUBTFULLY_INTRODUCED();
209
		} else if (abbrev.equalsIgnoreCase("ie")) { return PresenceTerm.INTRODUCED_FORMERLY_INTRODUCED();
210 200
		} else if (abbrev.equalsIgnoreCase("in")) { return PresenceTerm.INTRODUCED_NATURALIZED();
211 201
		} else if (abbrev.equalsIgnoreCase("ip")) { return PresenceTerm.INTRODUCED_UNCERTAIN_DEGREE_OF_NATURALISATION();
212 202
		} else if (abbrev.equalsIgnoreCase("iq")) { return PresenceTerm.INTRODUCED_PRESENCE_QUESTIONABLE();
213 203
		} else if (abbrev.equalsIgnoreCase("n"))  { return PresenceTerm.NATIVE();
214 204
		} else if (abbrev.equalsIgnoreCase("nd")) { return PresenceTerm.NATIVE_DOUBTFULLY_NATIVE();
215
		} else if (abbrev.equalsIgnoreCase("ne")) { return PresenceTerm.NATIVE_FORMERLY_NATIVE();
216 205
		} else if (abbrev.equalsIgnoreCase("nq")) { return PresenceTerm.NATIVE_PRESENCE_QUESTIONABLE();
217 206
		} else if (abbrev.equalsIgnoreCase("p"))  { return PresenceTerm.PRESENT();
218 207
		} else if (abbrev.equalsIgnoreCase("na"))  { return PresenceTerm.NATURALISED();
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/ReferenceSystem.java
51 51

  
52 52
	private static final UUID uuidWGS84 = UUID.fromString("63f4dd55-00fa-49e7-96fd-2b7059a1c1ee");
53 53
	private static final UUID uuidGoogleEarth = UUID.fromString("1bb67042-2814-4b09-9e76-c8c1e68aa281");
54
	private static final UUID uuidGazetteer = UUID.fromString("e35f1d1c-9347-4190-bd47-a3b00632fcf3");
55
	
54 56
	
55 57
	/**
56 58
	 * Factory method
......
109 111
		return getTermByUuid(uuidGoogleEarth);
110 112
	}
111 113

  
114
	public static final ReferenceSystem GAZETTEER(){
115
		return getTermByUuid(uuidGazetteer);
116
	}
117
	
112 118
	@Override
113 119
	protected void setDefaultTerms(TermVocabulary<ReferenceSystem> termVocabulary){
114 120
		termMap = new HashMap<UUID, ReferenceSystem>();
cdmlib-model/src/main/resources/terms/AbsenceTerm.csv
3 3
"38604788-cf05-4607-b155-86db456f7680",,"reported in error","reported in error","f","cccccc"
4 4
"61cee840-801e-41d8-bead-015ad866c2f1",,"native: reported in error","native: reported in error","nf","fdb462",
5 5
"aeec2947-2700-4623-8e32-9e3a430569d1",,"introduced: reported in error","introduced: reported in error","if","ffed3f",
6
"9d4d3431-177a-4abe-8e4b-1558573169d6",,"cultivated: reported in error","cultivated: reported in error","cf","fccde5",
6
"9d4d3431-177a-4abe-8e4b-1558573169d6",,"cultivated: reported in error","cultivated: reported in error","cf","fccde5",
7
"5c397f7b-59ef-4c11-a33c-45691ceda91b",,"native: formerly native","native: formerly native","ne","ccb462",
8
"b74dc30b-ee93-496d-8c00-4d00abae1ec7",,"introduced: formerly introduced","introduced: formerly introduced","ie","ccebcc",
cdmlib-model/src/main/resources/terms/PresenceTerm.csv
3 3
"75a60279-a4c2-4f53-bc57-466028a4b3db",,"doubtfully present","present: doubtfully present","pd","8dd320",
4 4
"ddeac4f2-d8fa-43b8-ad7e-ca13abdd32c7",,"native","native","n","ffffb3",
5 5
"925662c1-bb10-459a-8c53-da5a738ac770",,"native: presence questionable","native: presence questionable","nq","bebada",
6
"8ad9e9df-49cd-4b6a-880b-51ec4de4ce32",,"native: formerly native","native: formerly native","ne","fb8072",
7 6
"310373bf-7df4-4d02-8cb3-bcc7448805fc",,"native: doubtfully native","native: doubtfully native","nd","80b1d3",
8 7
"9eb99fe6-59e2-4445-8e6a-478365bd0fa9",,"cultivated","cultivated","c","b3de69",
9 8
"643cf9d1-a5f1-4622-9837-82ef961e880b",,"introduced","introduced","i","d9d9d9",
10 9
"83eb0aa0-1a45-495a-a3ca-bf6958b74366",,"introduced: presence questionable","introduced: presence questionable","iq","bc80bd",
11
"2522c527-e488-45d4-87df-a5a5ef0fdbbd",,"introduced: formerly introduced","introduced: formerly introduced","ie","ccebc5",
12 10
"0c54761e-4887-4788-9dfa-7190c88746e3",,"introduced: doubtfully introduced (perhaps cultivated only)","introduced: doubtfully introduced (perhaps cultivated only)","id","ffed6f",
13 11
"da159544-b0dd-4599-a9c9-640826af8c17",,"introduced: uncertain degree of naturalisation","introduced: uncertain degree of naturalisation","ip","afed6f",
14 12
"42946bd6-9c22-45ad-a910-7427e8f60bfd",,"introduced: adventitious (casual)","introduced: adventitious (casual)","id","ffed61",
cdmlib-model/src/main/resources/terms/ReferenceSystem.csv
1 1
"ec6376e5-0c9c-4f5c-848b-b288e6c17a86",,"Reference System","Reference System"
2 2
"63f4dd55-00fa-49e7-96fd-2b7059a1c1ee",,"WGS84","WGS84","WGS84"
3
"1bb67042-2814-4b09-9e76-c8c1e68aa281",,"Google Earth","Google Earth", "Google"
3
"1bb67042-2814-4b09-9e76-c8c1e68aa281",,"Google Earth","Google Earth", "Google"
4
"e35f1d1c-9347-4190-bd47-a3b00632fcf3",,"Gazetteer","Gazetteer", "Gazetteer"
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/TermUpdater_312_313.java
56 56
	protected List<ITermUpdaterStep> getUpdaterList() {
57 57
		List<ITermUpdaterStep> list = new ArrayList<ITermUpdaterStep>();
58 58

  
59
		//THIS CLASS IS FOR FUTURE USE. NOT NEEDED YET.
60
		
61 59
		
62 60
		String description;
63 61
		String label;
......
69 67
		UUID uuidLang;
70 68
		String stepName;
71 69

  
72
		// reported in error
73
		UUID uuidTerm = UUID.fromString("38604788-cf05-4607-b155-86db456f7680");
74
		description = "reported in error";
75
		label = "reported in error";
76
		abbrev = "f";
77
		dtype = AbsenceTerm.class.getSimpleName();
78
		isOrdered = true;
79
		uuidVocabulary = UUID.fromString("5cd438c8-a8a1-4958-842e-169e83e2ceee");
80
		uuidAfterTerm = UUID.fromString("59709861-f7d9-41f9-bb21-92559cedd598");
81
		uuidLang = Language.uuidEnglish;
82
		stepName = "Add 'reported in error' to absence terms";
83
		list.add( SingleTermUpdater.NewInstance(stepName, uuidTerm, description, label, abbrev, dtype, uuidVocabulary, uuidLang, isOrdered, uuidAfterTerm));
84

  
85
		String updateQuery = "UPDATE DefinedTermBase SET defaultColor = 'cccccc' WHERE uuid = '38604788-cf05-4607-b155-86db456f7680'";
86
		stepName = "Add 'colour schema' to reported in error";
87
		SimpleSchemaUpdaterStep colourUpdater = SimpleSchemaUpdaterStep.NewInstance(stepName, updateQuery);
88
		list.add(colourUpdater);
70
//		// reported in error
71
//		UUID uuidTerm = UUID.fromString("38604788-cf05-4607-b155-86db456f7680");
72
//		description = "reported in error";
73
//		label = "reported in error";
74
//		abbrev = "f";
75
//		dtype = AbsenceTerm.class.getSimpleName();
76
//		isOrdered = true;
77
//		uuidVocabulary = UUID.fromString("5cd438c8-a8a1-4958-842e-169e83e2ceee");
78
//		uuidAfterTerm = UUID.fromString("59709861-f7d9-41f9-bb21-92559cedd598");
79
//		uuidLang = Language.uuidEnglish;
80
//		stepName = "Add 'reported in error' to absence terms";
81
//		list.add( SingleTermUpdater.NewInstance(stepName, uuidTerm, description, label, abbrev, dtype, uuidVocabulary, uuidLang, isOrdered, uuidAfterTerm));
82
//
83
//		String updateQuery = "UPDATE DefinedTermBase SET defaultColor = 'cccccc' WHERE uuid = '38604788-cf05-4607-b155-86db456f7680'";
84
//		stepName = "Add 'colour schema' to reported in error";
85
//		SimpleSchemaUpdaterStep colourUpdater = SimpleSchemaUpdaterStep.NewInstance(stepName, updateQuery);
86
//		list.add(colourUpdater);
89 87
		
90 88
		return list;
91 89
	}
......
96 94
	 */
97 95
	@Override
98 96
	public ITermUpdater getNextUpdater() {
99
		return null;
97
		return TermUpdater_313_314.NewInstance();
100 98
	}
101 99

  
102 100
	/* (non-Javadoc)
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v30_31/TermUpdater_313_314.java
1
// $Id$
2
/**
3
* Copyright (C) 2009 EDIT
4
* European Distributed Institute of Taxonomy 
5
* http://www.e-taxonomy.eu
6
* 
7
* The contents of this file are subject to the Mozilla Public License Version 1.1
8
* See LICENSE.TXT at the top of this package for the full license terms.
9
*/
10
package eu.etaxonomy.cdm.database.update.v30_31;
11

  
12
import java.util.ArrayList;
13
import java.util.List;
14
import java.util.UUID;
15

  
16
import org.apache.log4j.Logger;
17

  
18
import eu.etaxonomy.cdm.database.update.ITermUpdater;
19
import eu.etaxonomy.cdm.database.update.ITermUpdaterStep;
20
import eu.etaxonomy.cdm.database.update.SimpleSchemaUpdaterStep;
21
import eu.etaxonomy.cdm.database.update.SingleTermUpdater;
22
import eu.etaxonomy.cdm.database.update.TermUpdaterBase;
23
import eu.etaxonomy.cdm.model.common.Language;
24
import eu.etaxonomy.cdm.model.location.ReferenceSystem;
25

  
26
/**
27
 * @author a.mueller
28
 * @date 10.09.2010
29
 *
30
 */
31
public class TermUpdater_313_314 extends TermUpdaterBase implements ITermUpdater {
32
	@SuppressWarnings("unused")
33
	private static final Logger logger = Logger.getLogger(TermUpdater_313_314.class);
34
	
35
	public static final String startTermVersion = "3.0.1.3.201103210000";
36
	private static final String endTermVersion = "3.0.1.4.201105100000";
37
	
38
// *************************** FACTORY **************************************/
39
	
40
	public static TermUpdater_313_314 NewInstance(){
41
		return new TermUpdater_313_314(startTermVersion, endTermVersion);
42
	}
43
	
44
// *************************** CONSTRUCTOR ***********************************/	
45

  
46
	protected TermUpdater_313_314(String startTermVersion, String endTermVersion) {
47
		super(startTermVersion, endTermVersion);
48
	}
49
	
50
// 
51
	
52
	/* (non-Javadoc)
53
	 * @see eu.etaxonomy.cdm.database.update.ICdmUpdater#invoke()
54
	 */
55
	@Override
56
	protected List<ITermUpdaterStep> getUpdaterList() {
57
		List<ITermUpdaterStep> list = new ArrayList<ITermUpdaterStep>();
58

  
59
		
60
		String description;
61
		String label;
62
		String abbrev;
63
		String dtype;
64
		boolean isOrdered;
65
		UUID uuidVocabulary;
66
		UUID uuidAfterTerm;
67
		UUID uuidLang;
68
		String stepName;
69

  
70
		// native: formerly native
71
		UUID uuidTerm = UUID.fromString("5c397f7b-59ef-4c11-a33c-45691ceda91b");
72
		UUID oldUuid = UUID.fromString("8ad9e9df-49cd-4b6a-880b-51ec4de4ce32");
73
		
74
		String updateQuery = "UPDATE DefinedTermBase " + 
75
			"SET DTYPE='AbsenceTerm', uuid='"+uuidTerm+"', defaultColor = 'ccb462', orderIndex=6 "+
76
			"WHERE uuid = '"+oldUuid+"'";
77
		stepName = "Move 'native: formerly native' to absence terms";
78
		SimpleSchemaUpdaterStep formerlyUpdater = SimpleSchemaUpdaterStep.NewInstance(stepName, updateQuery);
79
		list.add(formerlyUpdater);
80
	
81
		// introduced: formerly introduced
82
		uuidTerm = UUID.fromString("b74dc30b-ee93-496d-8c00-4d00abae1ec7");
83
		oldUuid = UUID.fromString("2522c527-e488-45d4-87df-a5a5ef0fdbbd");
84
		
85
		updateQuery = "UPDATE DefinedTermBase " + 
86
			"SET DTYPE='AbsenceTerm', uuid='"+uuidTerm+"', defaultColor = 'ccebcc', orderIndex=7 "+
87
			"WHERE uuid = '"+oldUuid+"'";
88
		stepName = "Move 'introduced: formerly introduced' to absence terms";
89
		formerlyUpdater = SimpleSchemaUpdaterStep.NewInstance(stepName, updateQuery);
90
		list.add(formerlyUpdater);
91
	
92
		
93
		// gazzetteer
94
		uuidTerm = UUID.fromString("e35f1d1c-9347-4190-bd47-a3b00632fcf3");
95
		description = "Gazetteer";
96
		label = "Gazetteer";
97
		abbrev = "Gazetteer";
98
		dtype = ReferenceSystem.class.getSimpleName();
99
		isOrdered = false;
100
		uuidVocabulary = UUID.fromString("ec6376e5-0c9c-4f5c-848b-b288e6c17a86");
101
		uuidAfterTerm = null;
102
		uuidLang = Language.uuidEnglish;
103
		stepName = "Add 'gazetteer' to reference systems";
104
		list.add( SingleTermUpdater.NewInstance(stepName, uuidTerm, description, label, abbrev, dtype, uuidVocabulary, uuidLang, isOrdered, uuidAfterTerm));
105

  
106
		
107
		return list;
108
	}
109
	
110
	
111
	/* (non-Javadoc)
112
	 * @see eu.etaxonomy.cdm.database.update.ICdmUpdater#getNextUpdater()
113
	 */
114
	@Override
115
	public ITermUpdater getNextUpdater() {
116
		return null;
117
	}
118

  
119
	/* (non-Javadoc)
120
	 * @see eu.etaxonomy.cdm.database.update.ICdmUpdater#getPreviousUpdater()
121
	 */
122
	@Override
123
	public ITermUpdater getPreviousUpdater() {
124
		return TermUpdater_312_313.NewInstance();
125
	}
126

  
127
}

Also available in: Unified diff