Project

General

Profile

« Previous | Next » 

Revision 51171c9d

Added by Andreas Müller over 12 years ago

last updates for Taxon Excel Import and moving all success variables to state

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXModsImport.java
57 57
		return result;
58 58
	}
59 59

  
60
	public boolean doInvoke(TaxonXImportState state){		
61
		boolean success = true;
60
	public void doInvoke(TaxonXImportState state){		
62 61
		logger.info("start make mods reference ...");
63 62
		TaxonXImportConfigurator config = state.getConfig();
64 63
		Element root = config.getSourceRoot();
......
74 73
				//TitleInfo
75 74
				Element elTitleInfo = elMods.getChild("titleInfo", nsMods);
76 75
				if (elTitleInfo != null){
77
					success &= makeTitleInfo(elTitleInfo, ref);
76
					makeTitleInfo(elTitleInfo, ref);
78 77
				}else{
79 78
					logger.warn("TitleInfo element is missing in " + state.getConfig().getSource());
80 79
				}
81 80
				//mods name
82 81
				Element elModsName = elMods.getChild("name", nsMods);
83
				success &= makeModsName(elModsName, ref);
82
				makeModsName(elModsName, ref);
84 83
				//origin info
85 84
				Element elOriginInfo = elMods.getChild("originInfo", nsMods);
86
				success &= makeOriginInfo(elOriginInfo, ref);
85
				makeOriginInfo(elOriginInfo, ref);
87 86
				
88 87
				//publish
89 88
				if (state.getConfig().isPublishReferences()){
......
98 97
		}
99 98

  
100 99
		logger.info("end make mods reference ...");
101
		return true;
100
		return;
102 101
	}
103 102
	
104 103

  
......
122 121
	 * @param elModsName
123 122
	 * @param ref
124 123
	 */
125
	private boolean makeOriginInfo(Element elOriginInfo, Reference<?> ref) {
124
	private void makeOriginInfo(Element elOriginInfo, Reference<?> ref) {
126 125
		Namespace nsMods = elOriginInfo.getNamespace();
127 126
		List<Content> contentList = elOriginInfo.getContent();
128 127
		
......
157 156
		for (Content o: contentList){
158 157
			logger.warn(o + " (in mods:originInfo) not yet implemented for mods import");
159 158
		}
160
		return true;
159
		return;
161 160
	}
162 161

  
163 162

  
......
169 168
	//THIS implementation is against the mods semantics but supports the current
170 169
	//format for palmae taxonX files
171 170
	//The later has to be changed and this part has to be adapted
172
	private boolean makeModsName(Element elModsName, Reference<?> ref) {
171
	private void makeModsName(Element elModsName, Reference<?> ref) {
173 172
		int UNPARSED = 0;
174 173
		int PARSED = 1;
175 174
		Namespace nsMods = elModsName.getNamespace();
......
219 218
		for (Content o: contentList){
220 219
			logger.warn(o + " (in mods:name) not yet implemented for mods import");
221 220
		}
222
		return true;
221
		return;
223 222
	}
224 223

  
225 224
	/**
226 225
	 * @param elTitleInfo
227 226
	 * @param ref
228 227
	 */
229
	private boolean makeTitleInfo(Element elTitleInfo, Reference<?> ref) {
228
	private void makeTitleInfo(Element elTitleInfo, Reference<?> ref) {
230 229
		Namespace nsMods = elTitleInfo.getNamespace();
231 230
		List<Content> contentList = elTitleInfo.getContent();
232 231
		
......
241 240
		for (Content o: contentList){
242 241
			logger.warn(o + " (in titleInfo) not yet implemented for mods import");
243 242
		}
244
		return true;
243
		return;
245 244
	}
246 245
	
247 246
	/* (non-Javadoc)

Also available in: Unified diff