Project

General

Profile

« Previous | Next » 

Revision 2d481abb

Added by Katja Luther almost 10 years ago

changes in Fauna Europeae Import and Index Fungorum Import and PESI Export

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/faunaEuropaea/FaunaEuropaeaRelTaxonIncludeImport.java
50 50
	private static final Logger logger = Logger.getLogger(FaunaEuropaeaRelTaxonIncludeImport.class);
51 51
	//private static final String acceptedTaxonUUID = "A9C24E42-69F5-4681-9399-041E652CF338"; // any accepted taxon uuid, taken from original fauna europaea database
52 52
	//private static final String acceptedTaxonUUID = "E23E6295-836A-4332-BF72-7D29949C7C60"; //faunaEu_1_3
53
	private static final String acceptedTaxonUUID = "BB9CDF6C-BBA3-4AC7-A3FD-648A14F518A0"; //for faunEu (2.4)
53
	//private static final String acceptedTaxonUUID = "bab7642e-f733-4a21-848d-a15250d2f4ed"; //for faunEu (2.4)
54
	private static final String acceptedTaxonUUID = "DADA6F44-B7B5-4C0A-9F32-980F54B02C36"; // for MfNFaunaEuropaea
54 55
	
55 56
	private Reference<?> sourceRef;
56 57
	private static String ALL_SYNONYM_FROM_CLAUSE = " FROM Taxon INNER JOIN Taxon AS Parent " +
......
108 109

  
109 110
		Classification tree = getClassificationFor(state, sourceRef);
110 111
		commitTransaction(txStatus);
111
		/*
112
		logger.warn("Before processParentsChildren");
113 112
		
114
		ProfilerController.memorySnapshot();
115
		*/
116
		if (state.getConfig().isDoTaxonomicallyIncluded()) {
113
		logger.warn("Before processParentsChildren" + state.getConfig().isDoTaxonomicallyIncluded());
114
		
115
		//ProfilerController.memorySnapshot();
116
		
117
		if (state.getConfig().isDoTaxonomicallyIncluded())  {
117 118
			processParentsChildren(state);
118 119
		}
119
		/*
120
		logger.warn("Before processMissappliedNames");
121 120
		
122
		ProfilerController.memorySnapshot();
123
		*/
121
		logger.warn("Before processMissappliedNames" + state.getConfig().isDoMisappliedNames());
122
		
123
		//ProfilerController.memorySnapshot();
124
		
124 125
		if (state.getConfig().isDoMisappliedNames()) {
125 126
			processMisappliedNames(state);
126 127
		}
......
138 139
		logger.warn("End RelTaxon doInvoke");
139 140
		ProfilerController.memorySnapshot();
140 141
		*/
141
		logger.info("End making taxa...");
142
		logger.info("End making relationships......");
142 143

  
143 144
		return;
144 145
	}
......
225 226
					}
226 227
				}
227 228
			}
228
	        
229
	        rs = null;
229 230
	        if (childParentMap != null){
230 231
	        	logger.info("processParentsChildren... last commit");
231 232
	        	createAndCommitParentChildRelationships(
......
237 238
			logger.error("SQLException:" +  e);
238 239
			state.setUnsuccessfull();
239 240
		}
241
		childParentMap = null;
240 242
		return;		
241 243
	}
242 244

  
......
395 397
			}
396 398
	        
397 399
	        storeSynonymRelationships(rs, count, state);
398

  
400
	        rs = null;
399 401
		} catch (SQLException e) {
400 402
			logger.error("SQLException:" +  e);
401 403
			state.setUnsuccessfull();

Also available in: Unified diff